diff --git a/apps/storybook/src/mockData/profiles.ts b/apps/storybook/src/mockData/profiles.ts
index 7d3caff691..eb37c7785e 100644
--- a/apps/storybook/src/mockData/profiles.ts
+++ b/apps/storybook/src/mockData/profiles.ts
@@ -3,6 +3,9 @@ import type {
   ProfileDetails,
   ProfileVar,
   ProfileCommand,
+  ProfileMcpServer,
+  ProfileSkill,
+  ProfileAgent,
 } from '@/hooks/useCloudAgentProfiles';
 
 /**
@@ -52,6 +55,74 @@ export const mockProfileCommands: ProfileCommand[] = [
   { sequence: 1, command: 'npm run build' },
 ];
 
+export const mockProfileMcpServers: ProfileMcpServer[] = [
+  {
+    id: 'mcp-1',
+    name: 'filesystem-tools',
+    type: 'local',
+    enabled: true,
+    timeout: 30,
+    config: {
+      command: ['npx', '@modelcontextprotocol/server-filesystem', '/workspace'],
+      environment: {
+        API_TOKEN: '***',
+      },
+    },
+    createdAt: '2025-01-01T00:00:00Z',
+    updatedAt: '2025-01-02T00:00:00Z',
+  },
+  {
+    id: 'mcp-2',
+    name: 'docs-search',
+    type: 'remote',
+    enabled: true,
+    timeout: null,
+    config: {
+      url: 'https://mcp.example.com/sse',
+      headers: {
+        Authorization: '***',
+      },
+    },
+    createdAt: '2025-01-01T00:00:00Z',
+    updatedAt: '2025-01-02T00:00:00Z',
+  },
+];
+
+export const mockProfileSkills: ProfileSkill[] = [
+  {
+    id: 'skill-1',
+    name: 'Release notes',
+    description: 'Draft concise release notes from merged changes',
+    sourceType: 'custom',
+    sourceUrl: null,
+    rawMarkdown: '# Release notes\n\nSummarize changes for users.',
+    files: {
+      'reference/template.md': '# Template\n\n## Highlights',
+    },
+    enabled: true,
+    createdAt: '2025-01-01T00:00:00Z',
+    updatedAt: '2025-01-02T00:00:00Z',
+  },
+];
+
+export const mockProfileAgents: ProfileAgent[] = [
+  {
+    id: 'agent-1',
+    slug: 'release-engineer',
+    name: 'Release Engineer',
+    config: {
+      prompt: 'Review release readiness and identify rollout risks.',
+      description: 'Checks release notes, migrations, and operational risks.',
+      mode: 'primary',
+      permission: {
+        edit: 'deny',
+      },
+    },
+    createdAt: '2025-01-01T00:00:00Z',
+    updatedAt: '2025-01-02T00:00:00Z',
+  },
+];
+
 export const mockProfiles: ProfileSummary[] = [
   {
     id: 'profile-1',
@@ -62,6 +133,9 @@ export const mockProfiles: ProfileSummary[] = [
     updatedAt: '2025-01-02T00:00:00Z',
     varCount: 5,
     commandCount: 2,
+    mcpServerCount: 2,
+    skillCount: 1,
+    agentCount: 1,
   },
   {
     id: 'profile-2',
@@ -72,6 +146,9 @@ export const mockProfiles: ProfileSummary[] = [
     updatedAt: '2025-01-03T00:00:00Z',
     varCount: 3,
     commandCount: 0,
+    mcpServerCount: 0,
+    skillCount: 0,
+    agentCount: 0,
   },
   {
     id: 'profile-3',
@@ -82,6 +159,9 @@ export const mockProfiles: ProfileSummary[] = [
     updatedAt: '2025-01-05T00:00:00Z',
     varCount: 8,
     commandCount: 3,
+    mcpServerCount: 1,
+    skillCount: 0,
+    agentCount: 0,
   },
   {
     id: 'profile-4',
@@ -92,6 +172,9 @@ export const mockProfiles: ProfileSummary[] = [
     updatedAt: '2025-01-06T00:00:00Z',
     varCount: 10,
     commandCount: 5,
+    mcpServerCount: 0,
+    skillCount: 0,
+    agentCount: 0,
   },
   {
     id: 'profile-5',
@@ -102,6 +185,9 @@ export const mockProfiles: ProfileSummary[] = [
     updatedAt: '2025-01-07T00:00:00Z',
     varCount: 0,
     commandCount: 0,
+    mcpServerCount: 0,
+    skillCount: 0,
+    agentCount: 0,
   },
 ];
 
@@ -114,6 +200,9 @@ export const mockProfileDetails: ProfileDetails = {
   updatedAt: '2025-01-02T00:00:00Z',
   vars: mockProfileVars,
   commands: mockProfileCommands,
+  mcpServers: mockProfileMcpServers,
+  skills: mockProfileSkills,
+  agents: mockProfileAgents,
 };
 
 export const mockEmptyProfileDetails: ProfileDetails = {
@@ -125,6 +214,9 @@ export const mockEmptyProfileDetails: ProfileDetails = {
   updatedAt: '2025-01-07T00:00:00Z',
   vars: [],
   commands: [],
+  mcpServers: [],
+  skills: [],
+  agents: [],
 };
 
 export const mockLocalDevProfileDetails: ProfileDetails = {
@@ -158,6 +250,9 @@ export const mockLocalDevProfileDetails: ProfileDetails = {
     },
   ],
   commands: [],
+  mcpServers: [],
+  skills: [],
+  agents: [],
 };
 
 export const mockStagingProfileDetails: ProfileDetails = {
@@ -195,4 +290,7 @@ export const mockStagingProfileDetails: ProfileDetails = {
     { sequence: 1, command: 'npm run migrate' },
     { sequence: 2, command: 'npm run seed:staging' },
   ],
+  mcpServers: [mockProfileMcpServers[1]],
+  skills: [],
+  agents: [],
 };
diff --git a/apps/storybook/stories/cloud-agent/ProfileSelector.stories.tsx b/apps/storybook/stories/cloud-agent/ProfileSelector.stories.tsx
index 682e74f6d3..f98b83ca33 100644
--- a/apps/storybook/stories/cloud-agent/ProfileSelector.stories.tsx
+++ b/apps/storybook/stories/cloud-agent/ProfileSelector.stories.tsx
@@ -246,6 +246,9 @@ export const ManyProfiles: Story = {
       updatedAt: '2025-01-01T00:00:00Z',
       varCount: Math.floor(Math.random() * 10),
       commandCount: Math.floor(Math.random() * 5),
+      mcpServerCount: Math.floor(Math.random() * 3),
+      skillCount: Math.floor(Math.random() * 3),
+      agentCount: Math.floor(Math.random() * 2),
     }));
     return <ProfileSelectorWrapper profiles={manyProfiles} />;
   },
diff --git a/apps/storybook/stories/cloud-agent/ProfileVarEditor.stories.tsx b/apps/storybook/stories/cloud-agent/ProfileVarEditor.stories.tsx
index 110a33f7e1..5cc9e303c3 100644
--- a/apps/storybook/stories/cloud-agent/ProfileVarEditor.stories.tsx
+++ b/apps/storybook/stories/cloud-agent/ProfileVarEditor.stories.tsx
@@ -870,6 +870,9 @@ export const ManyVariables: Story = {
         updatedAt: '2025-01-01T00:00:00Z',
       })),
       commands: [],
+      mcpServers: [],
+      skills: [],
+      agents: [],
     };
     return <ProfileVarEditorWrapper profile={manyVarsProfile} initialTab="vars" />;
   },
@@ -892,6 +895,9 @@ export const ManyCommands: Story = {
         sequence: i,
         command: `command-${i + 1} --option=${i} --verbose`,
       })),
+      mcpServers: [],
+      skills: [],
+      agents: [],
     };
     return <ProfileVarEditorWrapper profile={manyCommandsProfile} initialTab="commands" />;
   },
diff --git a/apps/storybook/stories/cloud-agent/ProfilesListDialog.stories.tsx b/apps/storybook/stories/cloud-agent/ProfilesListDialog.stories.tsx
index c2e7bc6fad..dbb3658e60 100644
--- a/apps/storybook/stories/cloud-agent/ProfilesListDialog.stories.tsx
+++ b/apps/storybook/stories/cloud-agent/ProfilesListDialog.stories.tsx
@@ -602,6 +602,9 @@ export const ManyProfiles: Story = {
       updatedAt: '2025-01-01T00:00:00Z',
       varCount: Math.floor(Math.random() * 10),
       commandCount: Math.floor(Math.random() * 5),
+      mcpServerCount: Math.floor(Math.random() * 3),
+      skillCount: Math.floor(Math.random() * 3),
+      agentCount: Math.floor(Math.random() * 2),
     }));
     return <ProfilesListDialogWrapper profiles={manyProfiles} />;
   },
diff --git a/apps/web/package.json b/apps/web/package.json
index 761e4508da..4ad394813e 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -41,6 +41,7 @@
     "@chat-adapter/state-redis": "^4.27.0",
     "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
+    "@kilocode/cloud-agent-profile": "workspace:*",
     "@kilocode/db": "workspace:*",
     "@kilocode/encryption": "workspace:*",
     "@kilocode/event-service": "workspace:*",
diff --git a/apps/web/src/app/api/cloud-agent/sessions/prepare/route.test.ts b/apps/web/src/app/api/cloud-agent/sessions/prepare/route.test.ts
index f528e02cba..1f8f47021c 100644
--- a/apps/web/src/app/api/cloud-agent/sessions/prepare/route.test.ts
+++ b/apps/web/src/app/api/cloud-agent/sessions/prepare/route.test.ts
@@ -12,11 +12,6 @@ import {
 } from '@/lib/cloud-agent/github-integration-helpers';
 import { createCloudAgentClient } from '@/lib/cloud-agent/cloud-agent-client';
 import { signStreamTicket } from '@/lib/cloud-agent/stream-ticket';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-  type MergeProfileConfigurationResult,
-} from '@/lib/agent/profile-session-config';
 import type { User } from '@kilocode/db/schema';
 
 jest.mock('@/lib/user.server');
@@ -24,10 +19,6 @@ jest.mock('@/routers/organizations/utils');
 jest.mock('@/lib/cloud-agent/github-integration-helpers');
 jest.mock('@/lib/cloud-agent/cloud-agent-client');
 jest.mock('@/lib/cloud-agent/stream-ticket');
-jest.mock('@/lib/agent/profile-session-config', () => ({
-  mergeProfileConfiguration: jest.fn(),
-  ProfileNotFoundError: class ProfileNotFoundError extends Error {},
-}));
 
 const mockedGetUserFromAuth = jest.mocked(getUserFromAuth);
 const mockedEnsureOrganizationAccess = jest.mocked(ensureOrganizationAccess);
@@ -41,7 +32,6 @@ const mockedValidateGitHubRepoAccessForOrganization = jest.mocked(
 );
 const mockedCreateCloudAgentClient = jest.mocked(createCloudAgentClient);
 const mockedSignStreamTicket = jest.mocked(signStreamTicket);
-const mockedMergeProfileConfiguration = jest.mocked(mergeProfileConfiguration);
 
 function makeRequest(body: unknown) {
   return new Request('http://localhost:3000/api/cloud-agent/sessions/prepare', {
@@ -132,11 +122,6 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
     jest.resetAllMocks();
     mockedValidateGitHubRepoAccessForUser.mockResolvedValue(true);
     mockedValidateGitHubRepoAccessForOrganization.mockResolvedValue(true);
-    mockedMergeProfileConfiguration.mockResolvedValue({
-      envVars: undefined,
-      setupCommands: undefined,
-      encryptedSecrets: undefined,
-    });
     mockedSignStreamTicket.mockReturnValue({ ticket: 'test-ticket', expiresAt: 1234567890 });
   });
 
@@ -183,13 +168,14 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
       expect(body.details).toContainEqual(expect.objectContaining({ path: 'prompt' }));
     });
 
-    test('returns 400 when mode is invalid', async () => {
+    test('returns 400 when mode is not a valid slug', async () => {
       setUserAuth();
 
       const response = await POST(
         makeRequest({
           ...validInput,
-          mode: 'invalid-mode',
+          // Uppercase + space — not a valid slug shape.
+          mode: 'Invalid Mode!',
         })
       );
 
@@ -554,12 +540,6 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
         autoCommit: true,
       };
 
-      mockedMergeProfileConfiguration.mockResolvedValueOnce({
-        envVars: inputWithOptionals.envVars,
-        setupCommands: inputWithOptionals.setupCommands,
-        encryptedSecrets: undefined,
-      });
-
       await POST(makeRequest(inputWithOptionals));
 
       expect(mockPrepareSession).toHaveBeenCalledWith(
@@ -578,9 +558,11 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
     });
   });
 
-  describe('profileName integration', () => {
-    test('merges profile configuration before calling cloud-agent', async () => {
-      const user = setUserAuth();
+  describe('profile forwarding', () => {
+    const profileId = 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa';
+
+    test('forwards profileId and inline overrides to cloud-agent-next unchanged', async () => {
+      setUserAuth();
       mockedGetGitHubInstallationIdForUser.mockResolvedValue('12345');
       const mockPrepareSession = jest.fn().mockResolvedValue({
         kiloSessionId: '123e4567-e89b-12d3-a456-426614174000',
@@ -588,48 +570,37 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
       });
       mockedCreateCloudAgentClient.mockReturnValue(createMockCloudAgentClient(mockPrepareSession));
 
-      const mergedConfig: MergeProfileConfigurationResult = {
-        envVars: { FROM_PROFILE: 'value' },
-        setupCommands: ['pnpm install'],
-        encryptedSecrets: undefined,
-      };
-      mockedMergeProfileConfiguration.mockResolvedValueOnce(mergedConfig);
-
       await POST(
         makeRequest({
           ...validInput,
-          profileName: 'My Default',
+          profileId,
           envVars: { INLINE: 'value' },
           setupCommands: ['echo inline'],
         })
       );
 
-      expect(mockedMergeProfileConfiguration).toHaveBeenCalledWith({
-        profileName: 'My Default',
-        owner: { type: 'user', id: user.id },
-        userId: undefined,
-        repoFullName: 'owner/repo',
-        platform: 'github',
-        envVars: { INLINE: 'value' },
-        setupCommands: ['echo inline'],
-      });
-
       expect(mockPrepareSession).toHaveBeenCalledWith(
         expect.objectContaining({
-          envVars: mergedConfig.envVars,
-          setupCommands: mergedConfig.setupCommands,
+          profileId,
+          envVars: { INLINE: 'value' },
+          setupCommands: ['echo inline'],
         })
       );
     });
 
-    test('returns 404 when the profile cannot be found', async () => {
+    test('returns 404 when cloud-agent reports the profile is not found', async () => {
       setUserAuth();
-      mockedMergeProfileConfiguration.mockRejectedValueOnce(new ProfileNotFoundError('Missing'));
+      mockedGetGitHubInstallationIdForUser.mockResolvedValue('12345');
+      mockedCreateCloudAgentClient.mockReturnValue(
+        createMockCloudAgentClient(
+          jest.fn().mockRejectedValue(new Error(`Profile '${profileId}' not found`))
+        )
+      );
 
       const response = await POST(
         makeRequest({
           ...validInput,
-          profileName: 'Missing',
+          profileId,
         })
       );
 
@@ -638,46 +609,7 @@ describe('POST /api/cloud-agent/sessions/prepare', () => {
       expect(body.error).toBe('Profile not found');
       expect(body.details).toContainEqual(
         expect.objectContaining({
-          path: 'profileName',
-        })
-      );
-    });
-
-    test('passes encryptedSecrets from profile to cloud-agent worker', async () => {
-      setUserAuth();
-      mockedGetGitHubInstallationIdForUser.mockResolvedValue('12345');
-      const mockPrepareSession = jest.fn().mockResolvedValue({
-        kiloSessionId: '123e4567-e89b-12d3-a456-426614174000',
-        cloudAgentSessionId: 'cloud-session-123',
-      });
-      mockedCreateCloudAgentClient.mockReturnValue(createMockCloudAgentClient(mockPrepareSession));
-
-      const encryptedEnvelope = {
-        encryptedData: 'base64-encrypted-data',
-        encryptedDEK: 'base64-encrypted-dek',
-        algorithm: 'rsa-aes-256-gcm' as const,
-        version: 1 as const,
-      };
-
-      const mergedConfig: MergeProfileConfigurationResult = {
-        envVars: { PUBLIC_VAR: 'value' },
-        setupCommands: ['npm install'],
-        encryptedSecrets: { SECRET_KEY: encryptedEnvelope },
-      };
-      mockedMergeProfileConfiguration.mockResolvedValueOnce(mergedConfig);
-
-      await POST(
-        makeRequest({
-          ...validInput,
-          profileName: 'production',
-        })
-      );
-
-      expect(mockPrepareSession).toHaveBeenCalledWith(
-        expect.objectContaining({
-          envVars: { PUBLIC_VAR: 'value' },
-          encryptedSecrets: { SECRET_KEY: encryptedEnvelope },
-          setupCommands: ['npm install'],
+          path: 'profileId',
         })
       );
     });
diff --git a/apps/web/src/app/api/cloud-agent/sessions/prepare/route.ts b/apps/web/src/app/api/cloud-agent/sessions/prepare/route.ts
index 5206000f3d..cddf72e9a1 100644
--- a/apps/web/src/app/api/cloud-agent/sessions/prepare/route.ts
+++ b/apps/web/src/app/api/cloud-agent/sessions/prepare/route.ts
@@ -21,13 +21,7 @@ import { generateApiToken } from '@/lib/tokens';
 import { publicPrepareSessionSchema } from './schema';
 import { captureException } from '@sentry/nextjs';
 import { TRPCError } from '@trpc/server';
-import type { ProfileOwner } from '@/lib/agent/types';
-import type { EncryptedEnvelope } from '@/lib/encryption';
 import { signStreamTicket } from '@/lib/cloud-agent/stream-ticket';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-} from '@/lib/agent/profile-session-config';
 import { PLATFORM } from '@/lib/integrations/core/constants';
 
 function handleTRPCError(error: unknown): NextResponse {
@@ -177,50 +171,6 @@ export async function POST(request: Request) {
       );
     }
 
-    let mergedEnvVars: Record<string, string> | undefined;
-    let mergedSetupCommands: string[] | undefined;
-    let encryptedSecrets: Record<string, EncryptedEnvelope> | undefined;
-
-    try {
-      const owner: ProfileOwner = input.organizationId
-        ? { type: 'organization', id: input.organizationId }
-        : { type: 'user', id: user.id };
-
-      const repoFullName = input.githubRepo ?? input.gitlabProject;
-      const platform = input.gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-      const merged = await mergeProfileConfiguration({
-        profileName: input.profileName,
-        owner,
-        // In org context, pass userId to enable fallback to personal profiles
-        userId: input.organizationId ? user.id : undefined,
-        repoFullName,
-        platform,
-        envVars: input.envVars,
-        setupCommands: input.setupCommands,
-      });
-
-      mergedEnvVars = merged.envVars;
-      mergedSetupCommands = merged.setupCommands;
-      encryptedSecrets = merged.encryptedSecrets;
-    } catch (error) {
-      if (error instanceof ProfileNotFoundError) {
-        return NextResponse.json(
-          {
-            error: 'Profile not found',
-            details: [
-              {
-                path: 'profileName',
-                message: error.message,
-              },
-            ],
-          },
-          { status: 404 }
-        );
-      }
-      throw error;
-    }
-
     try {
       const authToken = generateApiToken(user);
       const client = createCloudAgentClient(authToken);
@@ -239,9 +189,12 @@ export async function POST(request: Request) {
         platform: input.gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB,
         // Common params
         kilocodeOrganizationId,
-        envVars: mergedEnvVars,
-        encryptedSecrets,
-        setupCommands: mergedSetupCommands,
+        // Profile resolution happens in cloud-agent-next — forward profileId
+        // and any inline overrides. cloud agent merges profile-derived values with
+        // the inline fields using the same precedence the web used to apply.
+        profileId: input.profileId,
+        envVars: input.envVars,
+        setupCommands: input.setupCommands,
         mcpServers: input.mcpServers,
         autoCommit: input.autoCommit,
         upstreamBranch: input.upstreamBranch,
@@ -260,6 +213,25 @@ export async function POST(request: Request) {
         ...ticketResult,
       });
     } catch (error) {
+      // Profile resolution failures are surfaced by cloud agent as 404s. Forward them
+      // through without mapping to a generic "Failed to prepare session"
+      // response so the caller sees the same shape we used before this
+      // refactor.
+      if (error instanceof Error && /Profile '.+' not found/i.test(error.message)) {
+        return NextResponse.json(
+          {
+            error: 'Profile not found',
+            details: [
+              {
+                path: 'profileId',
+                message: error.message,
+              },
+            ],
+          },
+          { status: 404 }
+        );
+      }
+
       captureException(error, {
         tags: { source: 'cloud-agent-prepare-session', step: 'forward-to-cloud-agent' },
         extra: {
diff --git a/apps/web/src/app/api/cloud-agent/sessions/prepare/schema.ts b/apps/web/src/app/api/cloud-agent/sessions/prepare/schema.ts
index adcd6dc42b..f2daff5369 100644
--- a/apps/web/src/app/api/cloud-agent/sessions/prepare/schema.ts
+++ b/apps/web/src/app/api/cloud-agent/sessions/prepare/schema.ts
@@ -49,10 +49,11 @@ export const publicPrepareSessionSchema = z
     organizationId: z.string().uuid('Invalid organization ID format').optional(),
 
     // Optional environment profile
-    // If provided, envVars and setupCommands from the profile will be used.
-    // Any inline envVars/setupCommands will be merged (inline takes precedence).
-    // If organizationId is provided, looks up org profile; otherwise looks up user profile.
-    profileName: z.string().max(100, 'Profile name must be at most 100 characters').optional(),
+    // If provided, envVars/setupCommands/MCP servers/skills/secrets from the
+    // profile are merged with inline values (inline takes precedence).
+    // When omitted no profile is applied — pass the desired profile's UUID
+    // explicitly to opt into profile-based configuration.
+    profileId: z.string().uuid('Invalid profile ID format').optional(),
 
     // Optional configuration
     envVars: z
diff --git a/apps/web/src/components/cloud-agent-next/ChatInput.tsx b/apps/web/src/components/cloud-agent-next/ChatInput.tsx
index f0cd3db2be..52034b8c76 100644
--- a/apps/web/src/components/cloud-agent-next/ChatInput.tsx
+++ b/apps/web/src/components/cloud-agent-next/ChatInput.tsx
@@ -9,9 +9,13 @@ import { Send, Square, Paperclip, Upload } from 'lucide-react';
 import type { SlashCommand } from '@/lib/cloud-agent/slash-commands';
 import { cn } from '@/lib/utils';
 import { BrowseCommandsDialog } from './BrowseCommandsDialog';
-import { ModeCombobox, NEXT_MODE_OPTIONS } from '@/components/shared/ModeCombobox';
+import { ModeCombobox, NEXT_MODE_OPTIONS, type ModeOption } from '@/components/shared/ModeCombobox';
 import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
+import { formatShortModelDisplayName } from '@/lib/format-model-name';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { VariantCombobox } from '@/components/shared/VariantCombobox';
+import { thinkingEffortLabel } from '@/lib/code-reviews/core/model-variants';
+import { Brain } from 'lucide-react';
 import { MobileToolbarPopover } from './MobileToolbarPopover';
 import { ImagePreviewStrip } from '@/components/shared/ImagePreviewStrip';
 import { useImageUpload, type UseImageUploadOptions } from '@/hooks/useImageUpload';
@@ -53,6 +57,16 @@ type ChatInputProps = {
   showToolbar?: boolean;
   /** Pre-populate the textarea (e.g. to restore text after a failed send) */
   initialValue?: string;
+  /** Custom modes exposed by the session's profile stack (shown in picker) */
+  customModeOptions?: ModeOption<AgentMode>[];
+  /** When true, the model picker is rendered read-only (e.g. agent has a model override). */
+  modelPickerDisabled?: boolean;
+  /** Explanatory tooltip shown alongside the locked model picker. */
+  modelPickerTooltip?: string;
+  /** When true, the variant picker is rendered read-only (e.g. agent has a thinking-effort override). */
+  variantPickerDisabled?: boolean;
+  /** Explanatory tooltip shown alongside the locked variant picker. */
+  variantPickerTooltip?: string;
 };
 
 export function ChatInput({
@@ -74,6 +88,11 @@ export function ChatInput({
   showToolbar = false,
   initialValue,
   imageUploadOptions,
+  customModeOptions,
+  modelPickerDisabled,
+  modelPickerTooltip,
+  variantPickerDisabled,
+  variantPickerTooltip,
 }: ChatInputProps) {
   const [value, setValue] = useState('');
   const [showAutocomplete, setShowAutocomplete] = useState(false);
@@ -101,6 +120,18 @@ export function ChatInput({
     textareaRef.current?.focus();
   }, [initialValue, setInputValue]);
 
+  // Resolve the pinned model's display name from the allowed models list, so the
+  // locked-read-only toolbar shows the same label as the ModelCombobox. Falls
+  // back to the raw id when the model isn't in the org's allowed list (e.g. an
+  // agent pinned a model that was later restricted).
+  const lockedModelOption = useMemo(
+    () => modelOptions.find(m => m.id === model),
+    [modelOptions, model]
+  );
+  const lockedModelLabel = lockedModelOption
+    ? formatShortModelDisplayName(lockedModelOption.name)
+    : model;
+
   // Filter commands based on current input
   const filteredCommands = useMemo(() => {
     if (!slashCommands || slashCommands.length === 0) return [];
@@ -411,7 +442,12 @@ export function ChatInput({
                 availableVariants={availableVariants}
                 onVariantChange={onVariantChange}
                 disabled={disabled || isStreaming}
+                modelPickerDisabled={modelPickerDisabled}
+                modelPickerTooltip={modelPickerTooltip}
+                variantPickerDisabled={variantPickerDisabled}
+                variantPickerTooltip={variantPickerTooltip}
                 className="md:hidden"
+                customModeOptions={customModeOptions}
               />
               {/* Desktop: individual pickers */}
               <div className="hidden md:contents">
@@ -419,28 +455,63 @@ export function ChatInput({
                   value={mode}
                   onValueChange={onModeChange}
                   options={NEXT_MODE_OPTIONS}
+                  customOptions={customModeOptions}
                   variant="compact"
                   disabled={disabled || isStreaming}
                   className="min-w-0"
                 />
-                <ModelCombobox
-                  models={modelOptions}
-                  value={model}
-                  onValueChange={onModelChange}
-                  variant="compact"
-                  isLoading={isLoadingModels}
-                  disabled={disabled || isStreaming}
-                  className="min-w-0"
-                />
-                {availableVariants.length > 0 && onVariantChange && (
-                  <VariantCombobox
-                    variants={availableVariants}
-                    value={variant}
-                    onValueChange={onVariantChange}
+                {modelPickerDisabled ? (
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <div className="text-muted-foreground flex h-9 min-w-0 items-center rounded-md border border-dashed px-2 text-xs">
+                        <span className={cn('truncate', !lockedModelOption && 'font-mono')}>
+                          {lockedModelLabel}
+                        </span>
+                      </div>
+                    </TooltipTrigger>
+                    {modelPickerTooltip && (
+                      <TooltipContent side="top" className="text-xs">
+                        {modelPickerTooltip}
+                      </TooltipContent>
+                    )}
+                  </Tooltip>
+                ) : (
+                  <ModelCombobox
+                    models={modelOptions}
+                    value={model}
+                    onValueChange={onModelChange}
+                    variant="compact"
+                    isLoading={isLoadingModels}
                     disabled={disabled || isStreaming}
                     className="min-w-0"
                   />
                 )}
+                {variantPickerDisabled
+                  ? variant && (
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <div className="text-muted-foreground flex h-9 min-w-0 items-center gap-1.5 rounded-md border border-dashed px-2 text-xs">
+                            <Brain className="h-3.5 w-3.5 shrink-0 opacity-70" />
+                            <span className="truncate">{thinkingEffortLabel(variant)}</span>
+                          </div>
+                        </TooltipTrigger>
+                        {variantPickerTooltip && (
+                          <TooltipContent side="top" className="text-xs">
+                            {variantPickerTooltip}
+                          </TooltipContent>
+                        )}
+                      </Tooltip>
+                    )
+                  : availableVariants.length > 0 &&
+                    onVariantChange && (
+                      <VariantCombobox
+                        variants={availableVariants}
+                        value={variant}
+                        onValueChange={onVariantChange}
+                        disabled={disabled || isStreaming}
+                        className="min-w-0"
+                      />
+                    )}
               </div>
             </>
           )}
diff --git a/apps/web/src/components/cloud-agent-next/CloudAgentProvider.tsx b/apps/web/src/components/cloud-agent-next/CloudAgentProvider.tsx
index 4e2cf5e6b5..6b4bbd2cfa 100644
--- a/apps/web/src/components/cloud-agent-next/CloudAgentProvider.tsx
+++ b/apps/web/src/components/cloud-agent-next/CloudAgentProvider.tsx
@@ -14,21 +14,9 @@ import {
   type CloudAgentSessionId,
 } from '@/lib/cloud-agent-sdk';
 import { CLOUD_AGENT_NEXT_WS_URL, SESSION_INGEST_WS_URL } from '@/lib/constants';
-import type { AgentMode } from './types';
 import { usePostHog } from 'posthog-js/react';
 
 const ManagerContext = createContext<SessionManager | null>(null);
-const CLOUD_AGENT_NEXT_MODES = [
-  'code',
-  'plan',
-  'debug',
-  'orchestrator',
-  'ask',
-] satisfies AgentMode[];
-
-function isCloudAgentNextMode(mode: string | undefined): mode is AgentMode {
-  return CLOUD_AGENT_NEXT_MODES.some(validMode => validMode === mode);
-}
 
 type CloudAgentProviderProps = {
   children: ReactNode;
@@ -122,7 +110,7 @@ export function CloudAgentProvider({ children, organizationId }: CloudAgentProvi
 
       api: {
         send: async payload => {
-          const mode = isCloudAgentNextMode(payload.mode) ? payload.mode : 'code';
+          const mode = payload.mode ?? 'code';
           if (payload.model === undefined) {
             throw new Error('Cloud Agent model is required');
           }
@@ -282,6 +270,7 @@ export function CloudAgentProvider({ children, organizationId }: CloudAgentProvi
           isPreparingAsync: Boolean(rs && !rs.preparedAt),
           prompt: rs?.prompt ?? null,
           initialMessageId: rs?.initialMessageId ?? null,
+          runtimeAgents: rs?.runtimeAgents,
         };
       },
 
diff --git a/apps/web/src/components/cloud-agent-next/CloudChatPage.tsx b/apps/web/src/components/cloud-agent-next/CloudChatPage.tsx
index 466109606e..612fe852f4 100644
--- a/apps/web/src/components/cloud-agent-next/CloudChatPage.tsx
+++ b/apps/web/src/components/cloud-agent-next/CloudChatPage.tsx
@@ -12,6 +12,7 @@ import { useManager } from './CloudAgentProvider';
 import { MobileSidebarToggle } from './MobileSidebarToggle';
 import { ChatHeader } from './ChatHeader';
 import { ChatInput } from './ChatInput';
+import type { ModeOption } from '@/components/shared/ModeCombobox';
 import { MessageErrorBoundary } from './MessageErrorBoundary';
 import { MessageBubble } from './MessageBubble';
 import { SessionStatusIndicator } from './SessionStatusIndicator';
@@ -275,11 +276,24 @@ export default function CloudChatPage({ organizationId }: CloudChatPageProps) {
   const handleSendMessage = useCallback(
     async (prompt: string, images?: Images) => {
       setChatUI({ shouldAutoScroll: true });
+      const selectedRuntimeAgentForSend = sessionConfig?.runtimeAgents?.find(
+        a => a.slug === sessionConfig?.mode
+      );
+      const agentModelOverrideForSend = selectedRuntimeAgentForSend?.model?.trim() || undefined;
+      // An agent's variant only applies when it also pins a model — variants
+      // are model-specific (validated at write time in AgentConfigSchema). When
+      // an agent pins a model, its variant (if any) wins; otherwise the
+      // user-selected session variant applies.
+      const agentVariantOverrideForSend = agentModelOverrideForSend
+        ? selectedRuntimeAgentForSend?.variant?.trim() || undefined
+        : undefined;
       const acceptedPromise = manager.send({
         prompt,
         mode: sessionConfig?.mode ?? 'code',
-        model: sessionConfig?.model ?? '',
-        variant: sessionConfig?.variant ?? undefined,
+        model: agentModelOverrideForSend ?? sessionConfig?.model ?? '',
+        variant: agentModelOverrideForSend
+          ? agentVariantOverrideForSend
+          : (sessionConfig?.variant ?? undefined),
         images,
       });
       scheduleScrollToBottom();
@@ -328,6 +342,36 @@ export default function CloudChatPage({ organizationId }: CloudChatPageProps) {
     [manager]
   );
 
+  // Expose the session's custom agents to the chat picker. Slug + name only;
+  // the full config stays server-side. `GetSessionOutput.runtimeAgents`
+  // already filters to enabled & non-hidden at send time, so we just pass
+  // through.
+  const customModeOptions: ModeOption<AgentMode>[] | undefined = sessionConfig?.runtimeAgents
+    ?.length
+    ? sessionConfig.runtimeAgents.map(a => ({
+        value: a.slug as AgentMode,
+        label: a.name,
+        description: '',
+      }))
+    : undefined;
+
+  // If the selected custom agent pins a model, the chat model picker must
+  // reflect + lock that value. The agent's `variant` is only meaningful when
+  // it also pins a model (variants are model-specific, validated at write
+  // time in AgentConfigSchema), so we surface it alongside the locked model.
+  const selectedRuntimeAgent = sessionConfig?.runtimeAgents?.find(
+    a => a.slug === sessionConfig?.mode
+  );
+  const agentModelOverride = selectedRuntimeAgent?.model?.trim() || undefined;
+  const agentVariantOverride = agentModelOverride
+    ? selectedRuntimeAgent?.variant?.trim() || undefined
+    : undefined;
+  const displayModel = agentModelOverride ?? sessionConfig?.model;
+  const modelPickerLocked = !!agentModelOverride;
+  const lockTooltip = modelPickerLocked
+    ? `Locked by agent "${selectedRuntimeAgent?.name}"`
+    : undefined;
+
   const handleModeChange = useCallback(
     (mode: AgentMode) => {
       if (sessionConfig) setSessionConfig({ ...sessionConfig, mode });
@@ -374,6 +418,14 @@ export default function CloudChatPage({ organizationId }: CloudChatPageProps) {
     ? formatShortModelDisplayName(currentModelOption.name)
     : undefined;
   const availableVariants = currentModelOption?.variants ?? [];
+  // When an agent locks the model, swap the user's session variant for the
+  // agent's variant (which may be undefined — i.e. no thinking-effort chip).
+  // The variant picker is hidden in that case; it only shows when the user is
+  // free to pick their own model.
+  const displayVariant = modelPickerLocked
+    ? agentVariantOverride
+    : (sessionConfig?.variant ?? undefined);
+  const displayAvailableVariants = modelPickerLocked ? [] : availableVariants;
 
   const placeholder = isLoading
     ? 'Loading session…'
@@ -507,16 +559,21 @@ export default function CloudChatPage({ organizationId }: CloudChatPageProps) {
                         placeholder={placeholder}
                         slashCommands={availableCommands}
                         mode={sessionConfig?.mode as AgentMode | undefined}
-                        model={sessionConfig?.model}
+                        model={displayModel}
                         modelOptions={modelOptions}
                         isLoadingModels={isLoadingModels}
                         onModeChange={handleModeChange}
                         onModelChange={handleModelChange}
-                        variant={sessionConfig?.variant ?? undefined}
+                        variant={displayVariant}
                         onVariantChange={handleVariantChange}
-                        availableVariants={availableVariants}
+                        availableVariants={displayAvailableVariants}
                         showToolbar={Boolean(sessionIdFromParams)}
                         initialValue={failedPrompt ?? undefined}
+                        customModeOptions={customModeOptions}
+                        modelPickerDisabled={modelPickerLocked}
+                        modelPickerTooltip={lockTooltip}
+                        variantPickerDisabled={modelPickerLocked}
+                        variantPickerTooltip={lockTooltip}
                         imageUploadOptions={{
                           messageUuid: imageMessageUuid,
                           organizationId,
diff --git a/apps/web/src/components/cloud-agent-next/MobileToolbarPopover.tsx b/apps/web/src/components/cloud-agent-next/MobileToolbarPopover.tsx
index 0030d1a0df..c4d13ff03f 100644
--- a/apps/web/src/components/cloud-agent-next/MobileToolbarPopover.tsx
+++ b/apps/web/src/components/cloud-agent-next/MobileToolbarPopover.tsx
@@ -5,9 +5,10 @@ import { Button } from '@/components/ui/button';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
 import { ChevronsUpDown } from 'lucide-react';
 import { cn } from '@/lib/utils';
-import { ModeCombobox, NEXT_MODE_OPTIONS } from '@/components/shared/ModeCombobox';
+import { ModeCombobox, NEXT_MODE_OPTIONS, type ModeOption } from '@/components/shared/ModeCombobox';
 import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
 import { VariantCombobox } from '@/components/shared/VariantCombobox';
+import { thinkingEffortLabel } from '@/lib/code-reviews/core/model-variants';
 import { formatShortModelDisplayName } from '@/lib/format-model-name';
 import type { AgentMode } from './types';
 
@@ -22,7 +23,14 @@ type MobileToolbarPopoverProps = {
   availableVariants?: string[];
   onVariantChange?: (variant: string) => void;
   disabled?: boolean;
+  /** When set, the model picker is rendered as read-only with this explanatory tooltip. */
+  modelPickerDisabled?: boolean;
+  modelPickerTooltip?: string;
+  /** When set, the variant picker is rendered as read-only with this explanatory tooltip. */
+  variantPickerDisabled?: boolean;
+  variantPickerTooltip?: string;
   className?: string;
+  customModeOptions?: ModeOption[];
 };
 
 export function MobileToolbarPopover({
@@ -36,7 +44,12 @@ export function MobileToolbarPopover({
   availableVariants = [],
   onVariantChange,
   disabled,
+  modelPickerDisabled,
+  modelPickerTooltip,
+  variantPickerDisabled,
+  variantPickerTooltip,
   className,
+  customModeOptions,
 }: MobileToolbarPopoverProps) {
   const [open, setOpen] = useState(false);
 
@@ -69,29 +82,53 @@ export function MobileToolbarPopover({
             value={mode}
             onValueChange={onModeChange}
             options={NEXT_MODE_OPTIONS}
+            customOptions={customModeOptions}
             label="Mode"
           />
         )}
         {onModelChange && (
-          <ModelCombobox
-            models={modelOptions}
-            value={model}
-            onValueChange={onModelChange}
-            isLoading={isLoadingModels}
-            label="Model"
-          />
-        )}
-        {availableVariants.length > 0 && onVariantChange && (
           <div className="space-y-2">
-            <label className="text-sm font-medium">Thinking effort</label>
-            <VariantCombobox
-              variants={availableVariants}
-              value={variant}
-              onValueChange={onVariantChange}
-              className="w-full"
-            />
+            <label className="text-sm font-medium">Model</label>
+            {modelPickerDisabled ? (
+              <div className="text-muted-foreground rounded-md border border-dashed px-2 py-2 text-xs">
+                <div className={cn(!selectedModel && 'font-mono')}>
+                  {selectedModel ? displayName : model}
+                </div>
+                {modelPickerTooltip && <div className="mt-1">{modelPickerTooltip}</div>}
+              </div>
+            ) : (
+              <ModelCombobox
+                models={modelOptions}
+                value={model}
+                onValueChange={onModelChange}
+                isLoading={isLoadingModels}
+                label=""
+              />
+            )}
           </div>
         )}
+        {variantPickerDisabled
+          ? variant && (
+              <div className="space-y-2">
+                <label className="text-sm font-medium">Thinking effort</label>
+                <div className="text-muted-foreground rounded-md border border-dashed px-2 py-2 text-xs">
+                  <div>{thinkingEffortLabel(variant)}</div>
+                  {variantPickerTooltip && <div className="mt-1">{variantPickerTooltip}</div>}
+                </div>
+              </div>
+            )
+          : availableVariants.length > 0 &&
+            onVariantChange && (
+              <div className="space-y-2">
+                <label className="text-sm font-medium">Thinking effort</label>
+                <VariantCombobox
+                  variants={availableVariants}
+                  value={variant}
+                  onValueChange={onVariantChange}
+                  className="w-full"
+                />
+              </div>
+            )}
       </PopoverContent>
     </Popover>
   );
diff --git a/apps/web/src/components/cloud-agent-next/NewSessionPanel.tsx b/apps/web/src/components/cloud-agent-next/NewSessionPanel.tsx
index 3def5082ff..b70a5339e3 100644
--- a/apps/web/src/components/cloud-agent-next/NewSessionPanel.tsx
+++ b/apps/web/src/components/cloud-agent-next/NewSessionPanel.tsx
@@ -3,16 +3,16 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useRouter } from 'next/navigation';
-import { useAtom, useAtomValue, useSetAtom } from 'jotai';
+import { useAtom, useSetAtom } from 'jotai';
 import { toast } from 'sonner';
 import {
   AlertCircle,
+  Brain,
   FolderGit2,
   Loader2,
   Lock,
   RefreshCw,
   Send,
-  Settings,
   Unlock,
   Check,
   Paperclip,
@@ -22,26 +22,16 @@ import { startOfDay, subDays } from 'date-fns';
 import { useTRPC, useRawTRPCClient } from '@/lib/trpc/utils';
 import { SetPageTitle } from '@/components/SetPageTitle';
 import { Badge } from '@/components/ui/badge';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { MobileSidebarToggle } from './MobileSidebarToggle';
 import { MobileToolbarPopover } from './MobileToolbarPopover';
 
-import {
-  useProfile,
-  useProfiles,
-  useCombinedProfiles,
-  useRepoBindings,
-} from '@/hooks/useCloudAgentProfiles';
+import { useProfiles, useCombinedProfiles, useProfile } from '@/hooks/useCloudAgentProfiles';
 import { useRefreshRepositories } from '@/hooks/useRefreshRepositories';
 import { useOrganizationDefaults } from '@/app/api/organizations/hooks';
 import { useModelSelectorList } from '@/app/api/openrouter/hooks';
 import {
-  manualEnvVarsAtom,
-  manualSetupCommandsAtom,
   selectedProfileIdAtom,
-  hasAutoSelectedDefaultAtom,
-  profileConfigAtom,
-  effectiveEnvVarsAtom,
-  effectiveSetupCommandsAtom,
   resetSessionFormAtom,
 } from '@/components/cloud-agent/store/session-form-atoms';
 import {
@@ -49,16 +39,13 @@ import {
   type RepositoryPlatform,
 } from '@/components/shared/RepositoryCombobox';
 import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
-import { ModeCombobox, NEXT_MODE_OPTIONS } from '@/components/shared/ModeCombobox';
+import { formatShortModelDisplayName } from '@/lib/format-model-name';
+import { ModeCombobox, NEXT_MODE_OPTIONS, type ModeOption } from '@/components/shared/ModeCombobox';
 import { VariantCombobox } from '@/components/shared/VariantCombobox';
+import { thinkingEffortLabel } from '@/lib/code-reviews/core/model-variants';
 import { InsufficientBalanceBanner } from '@/components/shared/InsufficientBalanceBanner';
-import { AdvancedConfig } from '@/components/shared/AdvancedConfig';
-import {
-  buildProfileConfigIndicatorState,
-  ProfileConfigIndicator,
-} from '@/components/cloud-agent/ProfileConfigIndicator';
+import { ProfilePickerPopover } from '@/components/cloud-agent/ProfilePickerPopover';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { Separator } from '@/components/ui/separator';
 import {
   Command,
   CommandEmpty,
@@ -189,15 +176,9 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
   const isImageLimitReached = imageUpload.images.length >= CLOUD_AGENT_IMAGE_MAX_COUNT;
 
   // ---------------------------------------------------------------------------
-  // Session form atoms (profile / env / commands)
+  // Session form atoms (profile override)
   // ---------------------------------------------------------------------------
-  const [manualEnvVars, setManualEnvVars] = useAtom(manualEnvVarsAtom);
-  const [manualSetupCommands, setManualSetupCommands] = useAtom(manualSetupCommandsAtom);
   const [selectedProfileId, setSelectedProfileId] = useAtom(selectedProfileIdAtom);
-  const [hasAutoSelectedDefault, setHasAutoSelectedDefault] = useAtom(hasAutoSelectedDefaultAtom);
-  const setProfileConfig = useSetAtom(profileConfigAtom);
-  const effectiveEnvVars = useAtomValue(effectiveEnvVarsAtom);
-  const effectiveSetupCommands = useAtomValue(effectiveSetupCommandsAtom);
   const resetSessionForm = useSetAtom(resetSessionFormAtom);
 
   // Clear any lingering manual overrides whenever the page loads
@@ -271,21 +252,14 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
   );
 
   // ---------------------------------------------------------------------------
-  // Profiles
+  // Profiles — used for the selector and to clear a stale selection when a
+  // selected profile is deleted elsewhere.
   // ---------------------------------------------------------------------------
-  const {
-    data: combinedProfilesData,
-    isLoading: isLoadingCombinedProfiles,
-    error: combinedProfilesError,
-  } = useCombinedProfiles({
+  const { data: combinedProfilesData } = useCombinedProfiles({
     organizationId: organizationId ?? '',
     enabled: !!organizationId,
   });
-  const {
-    data: personalProfiles,
-    isLoading: isLoadingPersonalProfiles,
-    error: personalProfilesError,
-  } = useProfiles({
+  const { data: personalProfiles } = useProfiles({
     organizationId: undefined,
     enabled: !organizationId,
   });
@@ -296,101 +270,64 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
         ...(combinedProfilesData?.personalProfiles ?? []),
       ]
     : (personalProfiles ?? []);
-  const effectiveDefaultId = organizationId
-    ? combinedProfilesData?.effectiveDefaultId
-    : personalProfiles?.find(p => p.isDefault)?.id;
-
-  // Auto-select effective default profile on initial load
-  useEffect(() => {
-    if (!hasAutoSelectedDefault && !selectedProfileId && effectiveDefaultId) {
-      setSelectedProfileId(effectiveDefaultId);
-      setHasAutoSelectedDefault(true);
-    } else if (!hasAutoSelectedDefault && allProfiles.length > 0) {
-      setHasAutoSelectedDefault(true);
-    }
-  }, [
-    allProfiles.length,
-    effectiveDefaultId,
-    hasAutoSelectedDefault,
-    selectedProfileId,
-    setSelectedProfileId,
-    setHasAutoSelectedDefault,
-  ]);
 
-  // If a profile is deleted from the list, clear the selection
+  // If the override profile was deleted, clear the selection
   useEffect(() => {
-    if (!selectedProfileId || allProfiles.length === 0) {
-      return;
-    }
-    const stillPresent = allProfiles.some(p => p.id === selectedProfileId);
-    if (!stillPresent) {
+    if (!selectedProfileId || allProfiles.length === 0) return;
+    if (!allProfiles.some(p => p.id === selectedProfileId)) {
       setSelectedProfileId(null);
-      setProfileConfig(null);
     }
-  }, [allProfiles, selectedProfileId, setProfileConfig, setSelectedProfileId]);
-
-  const selectedProfileSummary = selectedProfileId
-    ? allProfiles.find(profile => profile.id === selectedProfileId)
-    : undefined;
-
-  const { data: repoBindings, error: repoBindingsError } = useRepoBindings({
-    organizationId,
-    enabled: !!selectedRepo,
+  }, [allProfiles, selectedProfileId, setSelectedProfileId]);
+
+  // Resolve the profile whose custom agents should appear in the mode picker.
+  // Prefers an explicit selection; otherwise falls back to the effective
+  // default (personal default wins over org default). This mirrors the
+  // server-side resolution in mergeProfileConfiguration for a useful preview.
+  const effectiveAgentProfileId =
+    selectedProfileId ??
+    (organizationId
+      ? combinedProfilesData?.effectiveDefaultId
+      : (personalProfiles?.find(p => p.isDefault)?.id ?? null)) ??
+    null;
+  const effectiveAgentProfileOrg =
+    effectiveAgentProfileId && organizationId
+      ? combinedProfilesData?.orgProfiles.some(p => p.id === effectiveAgentProfileId)
+        ? organizationId
+        : undefined
+      : undefined;
+  const { data: selectedProfileDetails } = useProfile(effectiveAgentProfileId ?? '', {
+    organizationId: effectiveAgentProfileOrg,
+    enabled: !!effectiveAgentProfileId,
   });
-
-  const repoBoundProfileName = useMemo(() => {
-    if (!selectedRepo || !repoBindings) return null;
-    const binding = repoBindings.find(
-      repoBinding =>
-        repoBinding.repoFullName.toLowerCase() === selectedRepo.toLowerCase() &&
-        repoBinding.platform === selectedPlatform
-    );
-    return binding?.profileName ?? null;
-  }, [repoBindings, selectedPlatform, selectedRepo]);
-
-  const isProfilesLoading = organizationId ? isLoadingCombinedProfiles : isLoadingPersonalProfiles;
-  const profilesError = organizationId ? combinedProfilesError : personalProfilesError;
-  const profileIndicatorState = buildProfileConfigIndicatorState({
-    selectedProfileName: selectedProfileSummary?.name ?? null,
-    repoBoundProfileName,
-    hasManualEnvVars: Object.keys(manualEnvVars).length > 0,
-    hasManualSetupCommands: manualSetupCommands.length > 0,
-    hasSelectedProfileId: !!selectedProfileId,
-    isProfilesLoading,
-    hasProfileError: !!profilesError,
-    hasRepoBindingError: !!selectedRepo && !!repoBindingsError,
-  });
-
-  // Fetch selected profile data
-  const { data: selectedProfile } = useProfile(selectedProfileId || '', {
-    organizationId,
-    enabled: !!selectedProfileId,
-  });
-
-  // Update profile config atom when profile data is loaded
-  useEffect(() => {
-    if (selectedProfile) {
-      setProfileConfig({
-        vars: selectedProfile.vars.map(v => ({
-          key: v.key,
-          value: v.value,
-          isSecret: v.isSecret,
-        })),
-        commands: selectedProfile.commands
-          .sort((a, b) => a.sequence - b.sequence)
-          .map(c => c.command),
-      });
-    } else {
-      setProfileConfig(null);
-    }
-  }, [selectedProfile, setProfileConfig]);
-
-  const handleProfileSelect = useCallback(
-    (profileId: string | null) => {
-      setSelectedProfileId(profileId);
-    },
-    [setSelectedProfileId]
+  // Expose only agents that would actually surface in the chat picker:
+  // not disabled, not hidden, and not subagent-only. Matches the
+  // extension's `session.agents().filter(a => a.mode !== 'subagent' && !a.hidden)`.
+  const visibleCustomAgents = (selectedProfileDetails?.agents ?? []).filter(
+    a => !a.config.disable && !a.config.hidden && a.config.mode !== 'subagent'
   );
+  const customModeOptions: ModeOption<AgentMode>[] = visibleCustomAgents.map(a => ({
+    value: a.slug as AgentMode,
+    label: a.name,
+    description: a.config.description ?? '',
+  }));
+
+  // When a custom agent pins a `model`, the override wins over the user's
+  // model combobox selection. The agent's `variant` is only meaningful when
+  // it also pins a model (variants are model-specific, validated at write
+  // time in AgentConfigSchema), so it travels with the locked model.
+  const selectedCustomAgent = visibleCustomAgents.find(a => a.slug === mode);
+  const agentModelOverride = selectedCustomAgent?.config.model?.trim() || undefined;
+  const hasAgentModelOverride = !!agentModelOverride;
+  const agentVariantOverride = hasAgentModelOverride
+    ? selectedCustomAgent?.config.variant?.trim() || undefined
+    : undefined;
+  const displayModel = agentModelOverride ?? model;
+  const displayModelOption = modelOptions.find(m => m.id === displayModel);
+  const displayModelLabel = displayModelOption
+    ? formatShortModelDisplayName(displayModelOption.name)
+    : displayModel;
+  const displayVariant = hasAgentModelOverride ? agentVariantOverride : variant;
+  const displayVariants = hasAgentModelOverride ? [] : availableVariants;
 
   // ---------------------------------------------------------------------------
   // Repositories (GitHub + GitLab)
@@ -607,7 +544,6 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
   // Repo popover state (must be declared before early returns to satisfy Rules of Hooks)
   // ---------------------------------------------------------------------------
   const [repoPopoverOpen, setRepoPopoverOpen] = useState(false);
-  const [settingsPopoverOpen, setSettingsPopoverOpen] = useState(false);
 
   const recentFullNames = useMemo(() => new Set(recentRepos.map(r => r.fullName)), [recentRepos]);
   const githubRepos = unifiedRepositories.filter(
@@ -656,11 +592,9 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
       const baseInput = {
         prompt: prompt.trim(),
         mode,
-        model,
-        variant,
-        envVars: Object.keys(manualEnvVars).length > 0 ? manualEnvVars : undefined,
-        setupCommands: manualSetupCommands.length > 0 ? manualSetupCommands : undefined,
-        profileName: selectedProfile?.name,
+        model: displayModel,
+        variant: displayVariant,
+        profileId: selectedProfileId ?? undefined,
         autoCommit: true,
         autoInitiate: true,
         initialMessageId,
@@ -696,8 +630,10 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
         }
       }
 
-      setLastUsedModel(model, organizationId);
-      if (variant) {
+      if (!hasAgentModelOverride) {
+        setLastUsedModel(model, organizationId);
+      }
+      if (!hasAgentModelOverride && variant) {
         setLastUsedVariant(model, variant, organizationId);
       }
 
@@ -723,8 +659,15 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
     }
   }, [
     imageUpload,
-    manualEnvVars,
-    manualSetupCommands,
+    displayModel,
+    // `displayVariant` is what we actually submit; raw `variant` is only read
+    // inside the `!hasAgentModelOverride` branch for last-used persistence, so
+    // keeping `displayVariant` (which equals `variant` in that branch) here is
+    // sufficient and avoids the stale-variant race when the agent-provided
+    // override changes while `variant`/`model`/`mode`/`hasAgentModelOverride`
+    // stay the same.
+    displayVariant,
+    hasAgentModelOverride,
     model,
     mode,
     organizationId,
@@ -732,11 +675,10 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
     queryClient,
     router,
     selectedPlatform,
+    selectedProfileId,
     selectedRepo,
-    selectedProfile,
     trpc.cliSessionsV2.list,
     trpcClient,
-    variant,
   ]);
 
   // ---------------------------------------------------------------------------
@@ -922,15 +864,24 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
             <MobileToolbarPopover
               mode={mode}
               onModeChange={setMode}
-              model={model}
+              model={displayModel}
               modelOptions={modelOptions}
               onModelChange={handleModelChange}
               isLoadingModels={!modelsData}
-              variant={variant}
-              availableVariants={availableVariants}
+              variant={displayVariant}
+              availableVariants={displayVariants}
               onVariantChange={handleVariantChange}
               disabled={isPreparing}
+              modelPickerDisabled={hasAgentModelOverride}
+              modelPickerTooltip={
+                hasAgentModelOverride ? `Locked by agent "${selectedCustomAgent?.name}"` : undefined
+              }
+              variantPickerDisabled={hasAgentModelOverride}
+              variantPickerTooltip={
+                hasAgentModelOverride ? `Locked by agent "${selectedCustomAgent?.name}"` : undefined
+              }
               className="md:hidden"
+              customModeOptions={customModeOptions}
             />
             {/* Desktop: individual pickers */}
             <div className="hidden md:contents">
@@ -938,28 +889,58 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
                 value={mode}
                 onValueChange={setMode}
                 options={NEXT_MODE_OPTIONS}
+                customOptions={customModeOptions}
                 variant="compact"
                 disabled={isPreparing}
                 className="min-w-0"
               />
-              <ModelCombobox
-                models={modelOptions}
-                value={model}
-                onValueChange={handleModelChange}
-                isLoading={!modelsData}
-                variant="compact"
-                disabled={isPreparing}
-                className="min-w-0"
-              />
-              {availableVariants.length > 0 && (
-                <VariantCombobox
-                  variants={availableVariants}
-                  value={variant}
-                  onValueChange={handleVariantChange}
+              {hasAgentModelOverride ? (
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div className="text-muted-foreground flex h-9 min-w-0 items-center rounded-md border border-dashed px-2 text-xs">
+                      <span className={cn('truncate', !displayModelOption && 'font-mono')}>
+                        {displayModelLabel}
+                      </span>
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent side="top" className="text-xs">
+                    Model is locked by agent &ldquo;{selectedCustomAgent?.name}&rdquo;
+                  </TooltipContent>
+                </Tooltip>
+              ) : (
+                <ModelCombobox
+                  models={modelOptions}
+                  value={model}
+                  onValueChange={handleModelChange}
+                  isLoading={!modelsData}
+                  variant="compact"
                   disabled={isPreparing}
                   className="min-w-0"
                 />
               )}
+              {hasAgentModelOverride
+                ? displayVariant && (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <div className="text-muted-foreground flex h-9 min-w-0 items-center gap-1.5 rounded-md border border-dashed px-2 text-xs">
+                          <Brain className="h-3.5 w-3.5 shrink-0 opacity-70" />
+                          <span className="truncate">{thinkingEffortLabel(displayVariant)}</span>
+                        </div>
+                      </TooltipTrigger>
+                      <TooltipContent side="top" className="text-xs">
+                        Locked by agent &ldquo;{selectedCustomAgent?.name}&rdquo;
+                      </TooltipContent>
+                    </Tooltip>
+                  )
+                : availableVariants.length > 0 && (
+                    <VariantCombobox
+                      variants={availableVariants}
+                      value={variant}
+                      onValueChange={handleVariantChange}
+                      disabled={isPreparing}
+                      className="min-w-0"
+                    />
+                  )}
             </div>
 
             <div className="flex-1" />
@@ -1106,52 +1087,14 @@ export function NewSessionPanel({ organizationId }: NewSessionPanelProps) {
             </PopoverContent>
           </Popover>
 
-          {/* Settings — bottom right */}
-          <div className="flex shrink-0 items-center gap-3">
-            <ProfileConfigIndicator
-              state={profileIndicatorState}
-              onOpenSettings={() => setSettingsPopoverOpen(true)}
-            />
-            {profileIndicatorState && <Separator orientation="vertical" className="h-4" />}
-            <Popover open={settingsPopoverOpen} onOpenChange={setSettingsPopoverOpen}>
-              <PopoverTrigger asChild>
-                <button
-                  type="button"
-                  className="text-muted-foreground hover:text-foreground inline-flex items-center gap-1 text-sm"
-                >
-                  <Settings className="h-3.5 w-3.5" />
-                  Settings
-                </button>
-              </PopoverTrigger>
-              <PopoverContent
-                className="w-[min(28rem,calc(100vw-2rem))] p-0"
-                align="end"
-                side="bottom"
-                sideOffset={8}
-              >
-                <div className="px-4 py-3">
-                  <p className="text-sm font-medium">Advanced settings</p>
-                </div>
-                <Separator />
-                <div className="p-4">
-                  <AdvancedConfig
-                    label=""
-                    organizationId={organizationId}
-                    selectedProfileId={selectedProfileId}
-                    onProfileSelect={handleProfileSelect}
-                    manualEnvVars={manualEnvVars}
-                    manualSetupCommands={manualSetupCommands}
-                    effectiveEnvVars={effectiveEnvVars}
-                    effectiveSetupCommands={effectiveSetupCommands}
-                    onManualEnvVarsChange={setManualEnvVars}
-                    onManualSetupCommandsChange={setManualSetupCommands}
-                    repoFullName={selectedRepo || undefined}
-                    platform={selectedPlatform}
-                  />
-                </div>
-              </PopoverContent>
-            </Popover>
-          </div>
+          {/* Profile chip — bottom right */}
+          <ProfilePickerPopover
+            organizationId={organizationId}
+            selectedOverrideProfileId={selectedProfileId}
+            onOverrideProfileSelect={setSelectedProfileId}
+            repoFullName={selectedRepo || undefined}
+            platform={selectedPlatform}
+          />
         </div>
       </div>
     </div>
diff --git a/apps/web/src/components/cloud-agent-next/ProfilesListDialog.tsx b/apps/web/src/components/cloud-agent-next/ProfilesListDialog.tsx
index 8d52a1eed2..a396f3afee 100644
--- a/apps/web/src/components/cloud-agent-next/ProfilesListDialog.tsx
+++ b/apps/web/src/components/cloud-agent-next/ProfilesListDialog.tsx
@@ -794,7 +794,7 @@ function ProfileEditPanel({ profileId, organizationId }: ProfileEditPanelProps)
           onClick={() => setActiveTab('commands')}
         >
           <Terminal className="mr-1.5 inline-block h-4 w-4" />
-          Commands ({profile?.commands.length || 0})
+          Setup Commands ({profile?.commands.length || 0})
         </button>
       </div>
 
diff --git a/apps/web/src/components/cloud-agent-next/types.ts b/apps/web/src/components/cloud-agent-next/types.ts
index 6151bb9534..a5ff3753de 100644
--- a/apps/web/src/components/cloud-agent-next/types.ts
+++ b/apps/web/src/components/cloud-agent-next/types.ts
@@ -241,10 +241,19 @@ export function isMessageStreaming(message: StoredMessage): boolean {
 // ============================================================================
 
 /**
- * Valid mode values for cloud agent sessions.
- * Uses new modes for cloud-agent-next.
+ * Valid mode values for cloud agent sessions. Includes the cloud-agent-next
+ * built-in slugs plus any custom slug from a session's profile-scoped
+ * `runtimeAgents`. `(string & {})` keeps the literal completions while still
+ * accepting custom slugs.
  */
-export type AgentMode = 'code' | 'plan' | 'debug' | 'orchestrator' | 'ask';
+export type AgentMode =
+  | 'code'
+  | 'plan'
+  | 'debug'
+  | 'orchestrator'
+  | 'ask'
+  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+  | (string & {});
 
 // ============================================================================
 // Stream Event Types
diff --git a/apps/web/src/components/cloud-agent/CloudSessionsPage.tsx b/apps/web/src/components/cloud-agent/CloudSessionsPage.tsx
index 618dd7a9ae..d68fb1f961 100644
--- a/apps/web/src/components/cloud-agent/CloudSessionsPage.tsx
+++ b/apps/web/src/components/cloud-agent/CloudSessionsPage.tsx
@@ -33,18 +33,9 @@ import {
   type DemoConfig,
 } from './demo-config';
 import type { AgentMode } from './types';
-import { useProfile, useProfiles, useCombinedProfiles } from '@/hooks/useCloudAgentProfiles';
-import { useAtom, useAtomValue, useSetAtom } from 'jotai';
-import {
-  manualEnvVarsAtom,
-  manualSetupCommandsAtom,
-  selectedProfileIdAtom,
-  hasAutoSelectedDefaultAtom,
-  profileConfigAtom,
-  effectiveEnvVarsAtom,
-  effectiveSetupCommandsAtom,
-  resetSessionFormAtom,
-} from './store/session-form-atoms';
+import { useProfiles, useCombinedProfiles } from '@/hooks/useCloudAgentProfiles';
+import { useAtom, useSetAtom } from 'jotai';
+import { selectedProfileIdAtom, resetSessionFormAtom } from './store/session-form-atoms';
 import { useOrganizationDefaults } from '@/app/api/organizations/hooks';
 import { useModelSelectorList } from '@/app/api/openrouter/hooks';
 import {
@@ -53,7 +44,7 @@ import {
   type RepositoryPlatform,
 } from '@/components/shared/RepositoryCombobox';
 import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
-import { AdvancedConfig } from '@/components/shared/AdvancedConfig';
+import { ProfilePickerPopover } from '@/components/cloud-agent/ProfilePickerPopover';
 import { cn } from '@/lib/utils';
 import { CLOUD_AGENT_PROMPT_MAX_LENGTH } from '@/lib/cloud-agent/constants';
 import { MODES } from './ResumeConfigModal';
@@ -110,14 +101,8 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
   const [isDemoActionLoading, setIsDemoActionLoading] = useState(false);
   const [highlightedDemoId, setHighlightedDemoId] = useState<string | null>(null);
 
-  // Session form atoms (profile/env/commands)
-  const [manualEnvVars, setManualEnvVars] = useAtom(manualEnvVarsAtom);
-  const [manualSetupCommands, setManualSetupCommands] = useAtom(manualSetupCommandsAtom);
+  // Profile override selection (base profile resolved server-side from repo binding / default)
   const [selectedProfileId, setSelectedProfileId] = useAtom(selectedProfileIdAtom);
-  const [hasAutoSelectedDefault, setHasAutoSelectedDefault] = useAtom(hasAutoSelectedDefaultAtom);
-  const setProfileConfig = useSetAtom(profileConfigAtom);
-  const effectiveEnvVars = useAtomValue(effectiveEnvVarsAtom);
-  const effectiveSetupCommands = useAtomValue(effectiveSetupCommandsAtom);
   const resetSessionForm = useSetAtom(resetSessionFormAtom);
 
   // Clear any lingering manual overrides whenever the page loads
@@ -181,71 +166,13 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
         ...(combinedProfilesData?.personalProfiles ?? []),
       ]
     : (personalProfiles ?? []);
-  const effectiveDefaultId = organizationId
-    ? combinedProfilesData?.effectiveDefaultId
-    : personalProfiles?.find(p => p.isDefault)?.id;
-
-  // Auto-select effective default profile on initial load
-  useEffect(() => {
-    if (!hasAutoSelectedDefault && !selectedProfileId && effectiveDefaultId) {
-      setSelectedProfileId(effectiveDefaultId);
-      setHasAutoSelectedDefault(true);
-    } else if (!hasAutoSelectedDefault && allProfiles.length > 0) {
-      // Mark as auto-selected even if no default exists
-      setHasAutoSelectedDefault(true);
-    }
-  }, [
-    allProfiles.length,
-    effectiveDefaultId,
-    hasAutoSelectedDefault,
-    selectedProfileId,
-    setSelectedProfileId,
-    setHasAutoSelectedDefault,
-  ]);
 
-  // If a profile is deleted from the list, clear the selection so derived counts reset
+  // If override profile was deleted, clear the selection
   useEffect(() => {
-    if (!selectedProfileId || allProfiles.length === 0) {
-      return;
-    }
+    if (!selectedProfileId || allProfiles.length === 0) return;
     const stillPresent = allProfiles.some(p => p.id === selectedProfileId);
-    if (!stillPresent) {
-      setSelectedProfileId(null);
-      setProfileConfig(null);
-    }
-  }, [allProfiles, selectedProfileId, setProfileConfig, setSelectedProfileId]);
-
-  // Fetch selected profile data
-  const { data: selectedProfile } = useProfile(selectedProfileId || '', {
-    organizationId,
-    enabled: !!selectedProfileId,
-  });
-
-  // Update profile config atom when profile data is loaded
-  useEffect(() => {
-    if (selectedProfile) {
-      setProfileConfig({
-        vars: selectedProfile.vars.map(v => ({
-          key: v.key,
-          value: v.value,
-          isSecret: v.isSecret,
-        })),
-        commands: selectedProfile.commands
-          .sort((a, b) => a.sequence - b.sequence)
-          .map(c => c.command),
-      });
-    } else {
-      setProfileConfig(null);
-    }
-  }, [selectedProfile, setProfileConfig]);
-
-  // Profile selection handler
-  const handleProfileSelect = useCallback(
-    (profileId: string | null) => {
-      setSelectedProfileId(profileId);
-    },
-    [setSelectedProfileId]
-  );
+    if (!stillPresent) setSelectedProfileId(null);
+  }, [allProfiles, selectedProfileId, setSelectedProfileId]);
 
   // Fetch GitHub repositories
   const {
@@ -419,17 +346,13 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
     setIsPreparing(true);
 
     try {
-      // Call prepareSession to create DB entry and cloud-agent DO
-      // If a profile is selected, pass the profile name so the backend
-      // can resolve encrypted secrets from the profile
-      // Build the base input without the repo field
+      // Call prepareSession to create DB entry and cloud-agent DO.
+      // profileId is unambiguous across org/personal.
       const baseInput = {
         prompt: prompt.trim(),
         mode,
         model,
-        envVars: Object.keys(manualEnvVars).length > 0 ? manualEnvVars : undefined,
-        setupCommands: manualSetupCommands.length > 0 ? manualSetupCommands : undefined,
-        profileName: selectedProfile?.name,
+        profileId: selectedProfileId ?? undefined,
         autoCommit: true,
       };
 
@@ -491,8 +414,6 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
       setIsPreparing(false);
     }
   }, [
-    manualEnvVars,
-    manualSetupCommands,
     model,
     mode,
     organizationId,
@@ -501,7 +422,7 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
     router,
     selectedPlatform,
     selectedRepo,
-    selectedProfile,
+    selectedProfileId,
     trpc.unifiedSessions.list,
     trpcClient,
   ]);
@@ -687,20 +608,16 @@ export function CloudSessionsPage({ organizationId }: CloudSessionsPageProps) {
             isLoadingModels={!modelsData}
           />
 
-          {/* Advanced Configuration */}
-          <AdvancedConfig
-            organizationId={organizationId}
-            selectedProfileId={selectedProfileId}
-            onProfileSelect={handleProfileSelect}
-            manualEnvVars={manualEnvVars}
-            manualSetupCommands={manualSetupCommands}
-            effectiveEnvVars={effectiveEnvVars}
-            effectiveSetupCommands={effectiveSetupCommands}
-            onManualEnvVarsChange={setManualEnvVars}
-            onManualSetupCommandsChange={setManualSetupCommands}
-            repoFullName={selectedRepo || undefined}
-            platform={selectedPlatform}
-          />
+          {/* Profile picker — sits below mode/model row */}
+          <div className="flex items-center justify-end">
+            <ProfilePickerPopover
+              organizationId={organizationId}
+              selectedOverrideProfileId={selectedProfileId}
+              onOverrideProfileSelect={setSelectedProfileId}
+              repoFullName={selectedRepo || undefined}
+              platform={selectedPlatform}
+            />
+          </div>
 
           {/* Submit Button */}
           <SubmitButton
diff --git a/apps/web/src/components/cloud-agent/ProfilePickerPopover.tsx b/apps/web/src/components/cloud-agent/ProfilePickerPopover.tsx
new file mode 100644
index 0000000000..b5e3e33aca
--- /dev/null
+++ b/apps/web/src/components/cloud-agent/ProfilePickerPopover.tsx
@@ -0,0 +1,465 @@
+'use client';
+
+import { useState, useMemo, useEffect } from 'react';
+import { Layers, ChevronDown, Check, Plus, FolderCog, X, ArrowLeft, Zap } from 'lucide-react';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import { cn } from '@/lib/utils';
+import {
+  useProfiles,
+  useCombinedProfiles,
+  useRepoBindings,
+  type ProfileSummaryWithOwner,
+} from '@/hooks/useCloudAgentProfiles';
+import { resolveProfileLayers } from '@kilocode/cloud-agent-profile';
+import { ProfilesListDialog } from './ProfilesListDialog';
+
+type ProfilePickerPopoverProps = {
+  organizationId?: string;
+  selectedOverrideProfileId: string | null;
+  onOverrideProfileSelect: (id: string | null) => void;
+  repoFullName?: string;
+  platform?: 'github' | 'gitlab';
+};
+
+export function ProfilePickerPopover({
+  organizationId,
+  selectedOverrideProfileId,
+  onOverrideProfileSelect,
+  repoFullName,
+  platform,
+}: ProfilePickerPopoverProps) {
+  const [open, setOpen] = useState(false);
+  const [pickingOverride, setPickingOverride] = useState(false);
+  const [showManageProfiles, setShowManageProfiles] = useState(false);
+  const [openToNewProfile, setOpenToNewProfile] = useState(false);
+  const [editProfileId, setEditProfileId] = useState<string | null>(null);
+
+  // Reset override-picker mode whenever the popover closes.
+  useEffect(() => {
+    if (!open) setPickingOverride(false);
+  }, [open]);
+
+  const openEditDialog = (profileId: string) => {
+    setOpen(false);
+    setOpenToNewProfile(false);
+    setEditProfileId(profileId);
+    setShowManageProfiles(true);
+  };
+
+  const { data: combinedData } = useCombinedProfiles({
+    organizationId: organizationId ?? '',
+    enabled: !!organizationId,
+  });
+  const { data: personalProfilesData } = useProfiles({
+    organizationId: undefined,
+    enabled: !organizationId,
+  });
+
+  const allProfiles: ProfileSummaryWithOwner[] = useMemo(
+    () =>
+      organizationId
+        ? (combinedData?.allProfiles ?? [])
+        : (personalProfilesData ?? []).map(p => ({ ...p, ownerType: 'user' as const })),
+    [organizationId, combinedData, personalProfilesData]
+  );
+
+  const effectiveDefaultProfileId = organizationId
+    ? (combinedData?.effectiveDefaultId ?? null)
+    : (personalProfilesData?.find(p => p.isDefault)?.id ?? null);
+
+  const { data: repoBindings } = useRepoBindings({ organizationId });
+
+  const repoBindingProfileId = useMemo(() => {
+    if (!repoFullName || !repoBindings) return null;
+    const binding = repoBindings.find(
+      b =>
+        b.repoFullName.toLowerCase() === repoFullName.toLowerCase() &&
+        (!platform || b.platform === platform)
+    );
+    return binding?.profileId ?? null;
+  }, [repoFullName, repoBindings, platform]);
+
+  // Shared resolution logic — same rules as the server-side merge.
+  const layers = useMemo(
+    () =>
+      resolveProfileLayers({
+        repoBindingProfileId,
+        effectiveDefaultProfileId,
+        explicitOverrideProfileId: selectedOverrideProfileId,
+      }),
+    [repoBindingProfileId, effectiveDefaultProfileId, selectedOverrideProfileId]
+  );
+
+  const baseProfile = useMemo(
+    () => (layers.base ? (allProfiles.find(p => p.id === layers.base?.profileId) ?? null) : null),
+    [allProfiles, layers.base]
+  );
+
+  const topProfile = useMemo(
+    () => (layers.top ? (allProfiles.find(p => p.id === layers.top?.profileId) ?? null) : null),
+    [allProfiles, layers.top]
+  );
+  const topSource = layers.top?.source ?? null;
+
+  // Profiles offered as override candidates. The base profile is omitted
+  // because picking it would dedupe to a no-op in `resolveProfileLayers`.
+  const overrideCandidates = useMemo(
+    () => allProfiles.filter(p => p.id !== layers.base?.profileId),
+    [allProfiles, layers.base]
+  );
+
+  const chipName = topProfile?.name ?? baseProfile?.name ?? null;
+
+  const chipCounts = useMemo(() => {
+    const vars = Math.max(baseProfile?.varCount ?? 0, topProfile?.varCount ?? 0);
+    const mcps = (baseProfile?.mcpServerCount ?? 0) + (topProfile?.mcpServerCount ?? 0);
+    const skills = (baseProfile?.skillCount ?? 0) + (topProfile?.skillCount ?? 0);
+    return [vars > 0 && `${vars} vars`, mcps > 0 && `${mcps} MCP`, skills > 0 && `${skills} skills`]
+      .filter(Boolean)
+      .join(' · ');
+  }, [baseProfile, topProfile]);
+
+  function formatCounts(profile: ProfileSummaryWithOwner) {
+    return [
+      profile.varCount > 0 && `${profile.varCount} vars`,
+      profile.mcpServerCount > 0 && `${profile.mcpServerCount} MCP`,
+      profile.skillCount > 0 && `${profile.skillCount} skills`,
+    ]
+      .filter(Boolean)
+      .join(' · ');
+  }
+
+  // Two layers are present (repo + something on top). Used for the "+1" hint
+  // and the "on top of …" affordance regardless of whether the top is an
+  // explicit pick or just the default.
+  const hasTwoLayers = !!topProfile && !!baseProfile;
+
+  return (
+    <>
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger asChild>
+          <button
+            className={cn(
+              'inline-flex cursor-pointer items-center gap-1.5 rounded-md px-2 py-1 text-xs transition-colors',
+              'border border-border/50 bg-muted/30 hover:bg-muted/60 hover:border-border',
+              'text-muted-foreground hover:text-foreground',
+              open && 'border-border bg-muted/60 text-foreground'
+            )}
+          >
+            <Layers className="h-3 w-3 shrink-0" />
+            {chipName ? (
+              <>
+                <span className="font-medium">{chipName}</span>
+                {chipCounts && <span className="opacity-60">· {chipCounts}</span>}
+                {hasTwoLayers && <span className="text-primary/80 ml-0.5">+1</span>}
+              </>
+            ) : (
+              <span>No profile</span>
+            )}
+            <ChevronDown className="h-3 w-3 shrink-0 opacity-50" />
+          </button>
+        </PopoverTrigger>
+
+        <PopoverContent className="w-80 p-3" align="end" sideOffset={6}>
+          {pickingOverride ? (
+            <OverridePickerView
+              candidates={overrideCandidates}
+              selectedOverrideProfileId={selectedOverrideProfileId}
+              formatCounts={formatCounts}
+              onSelect={id => {
+                onOverrideProfileSelect(id);
+                setPickingOverride(false);
+              }}
+              onBack={() => setPickingOverride(false)}
+            />
+          ) : (
+            <ActiveProfileView
+              baseProfile={baseProfile}
+              topProfile={topProfile}
+              topSource={topSource}
+              allProfiles={allProfiles}
+              overrideCandidatesCount={overrideCandidates.length}
+              formatCounts={formatCounts}
+              onEditProfile={openEditDialog}
+              onStartPickOverride={() => setPickingOverride(true)}
+              onRemoveOverride={() => onOverrideProfileSelect(null)}
+              onSelectProfile={id => {
+                onOverrideProfileSelect(id);
+                setOpen(false);
+              }}
+            />
+          )}
+
+          <div className="my-3 border-t" />
+
+          <div className="flex gap-2">
+            <button
+              className="flex flex-1 cursor-pointer items-center gap-1.5 rounded-md border px-2 py-1.5 text-xs transition-colors hover:bg-accent"
+              onClick={() => {
+                setOpen(false);
+                setOpenToNewProfile(true);
+                setShowManageProfiles(true);
+              }}
+            >
+              <Plus className="h-3 w-3 shrink-0" />
+              New profile
+            </button>
+            <button
+              className="flex flex-1 cursor-pointer items-center gap-1.5 rounded-md border px-2 py-1.5 text-xs transition-colors hover:bg-accent"
+              onClick={() => {
+                setOpen(false);
+                setOpenToNewProfile(false);
+                setShowManageProfiles(true);
+              }}
+            >
+              <FolderCog className="h-3 w-3 shrink-0" />
+              Manage profiles...
+            </button>
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      <ProfilesListDialog
+        organizationId={organizationId}
+        open={showManageProfiles}
+        onOpenChange={open => {
+          setShowManageProfiles(open);
+          if (!open) {
+            setOpenToNewProfile(false);
+            setEditProfileId(null);
+          }
+        }}
+        onProfileSelect={id => {
+          onOverrideProfileSelect(id);
+          setShowManageProfiles(false);
+        }}
+        openToNewProfile={openToNewProfile}
+        initialSelectedProfileId={editProfileId}
+      />
+    </>
+  );
+}
+
+type PickerRowProps = {
+  label: string;
+  meta?: string;
+  isSelected: boolean;
+  onClick: () => void;
+};
+
+function PickerRow({ label, meta, isSelected, onClick }: PickerRowProps) {
+  return (
+    <button
+      className={cn(
+        'flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors',
+        'hover:bg-accent text-left',
+        isSelected && 'text-foreground'
+      )}
+      onClick={onClick}
+    >
+      <span className="flex h-4 w-4 shrink-0 items-center justify-center">
+        {isSelected && <Check className="text-primary h-3 w-3" />}
+      </span>
+      <span className={cn('flex-1', isSelected ? 'font-medium' : 'text-muted-foreground')}>
+        {label}
+      </span>
+      {meta && <span className="text-muted-foreground shrink-0 text-xs">{meta}</span>}
+    </button>
+  );
+}
+
+type ActiveProfileViewProps = {
+  baseProfile: ProfileSummaryWithOwner | null;
+  topProfile: ProfileSummaryWithOwner | null;
+  topSource: 'repo-binding' | 'default' | 'explicit' | null;
+  allProfiles: ProfileSummaryWithOwner[];
+  overrideCandidatesCount: number;
+  formatCounts: (p: ProfileSummaryWithOwner) => string;
+  onEditProfile: (id: string) => void;
+  onStartPickOverride: () => void;
+  onRemoveOverride: () => void;
+  onSelectProfile: (id: string) => void;
+};
+
+function ActiveProfileView({
+  baseProfile,
+  topProfile,
+  topSource,
+  allProfiles,
+  overrideCandidatesCount,
+  formatCounts,
+  onEditProfile,
+  onStartPickOverride,
+  onRemoveOverride,
+  onSelectProfile,
+}: ActiveProfileViewProps) {
+  // Nothing selected at all and no profiles exist.
+  if (!baseProfile && !topProfile && allProfiles.length === 0) {
+    return (
+      <p className="text-muted-foreground text-xs">
+        No profiles yet. Create one to add environment variables, MCP servers, and skills.
+      </p>
+    );
+  }
+
+  // No base and no top, but profiles exist — show the picker list directly so
+  // the user can select one with a single click.
+  if (!baseProfile && !topProfile) {
+    return (
+      <>
+        <p className="text-muted-foreground mb-2 text-[10px] font-semibold uppercase tracking-wider">
+          Pick a profile
+        </p>
+        <div className="max-h-48 space-y-0.5 overflow-y-auto">
+          {allProfiles.map(profile => (
+            <PickerRow
+              key={profile.id}
+              label={profile.name}
+              meta={formatCounts(profile)}
+              isSelected={false}
+              onClick={() => onSelectProfile(profile.id)}
+            />
+          ))}
+        </div>
+      </>
+    );
+  }
+
+  // The profile the user sees as "active" — top takes precedence over base.
+  const active = topProfile ?? baseProfile;
+  if (!active) return null;
+
+  // An explicit pick is what the user can change/remove for this task.
+  const isExplicit = topSource === 'explicit';
+  // Show "override" badge only when the explicit pick is layered on a base.
+  const isOverridingBase = isExplicit && !!baseProfile;
+  // When only the base is showing (no top), badge it as "repo" — distinct from
+  // the default case which is the expected baseline and unbadged.
+  const badgeLabel = isOverridingBase ? 'override' : !topProfile && baseProfile ? 'repo' : null;
+
+  return (
+    <>
+      <p className="text-muted-foreground mb-2 text-[10px] font-semibold uppercase tracking-wider">
+        Active profile
+      </p>
+
+      <div className="overflow-hidden rounded-lg border">
+        <div className="bg-accent/10 hover:bg-accent/30 flex items-center gap-2 p-3 transition-colors">
+          <Layers className="text-primary h-3.5 w-3.5 shrink-0" />
+          <button
+            type="button"
+            onClick={() => onEditProfile(active.id)}
+            className="min-w-0 flex-1 cursor-pointer text-left"
+            title="Edit profile"
+          >
+            <div className="truncate text-sm font-medium">{active.name}</div>
+            {formatCounts(active) && (
+              <div className="text-muted-foreground text-xs">{formatCounts(active)}</div>
+            )}
+          </button>
+          {badgeLabel && (
+            <span className="text-muted-foreground border-muted-foreground/30 shrink-0 rounded border px-1.5 py-0.5 text-[10px]">
+              {badgeLabel}
+            </span>
+          )}
+          {isExplicit && (
+            <button
+              type="button"
+              onClick={onRemoveOverride}
+              className="text-muted-foreground hover:bg-accent hover:text-foreground shrink-0 cursor-pointer rounded p-0.5 transition-colors"
+              title={isOverridingBase ? 'Remove override' : 'Clear profile'}
+            >
+              <X className="h-3.5 w-3.5" />
+            </button>
+          )}
+        </div>
+
+        {/* When two layers are active, show the base underneath so the user
+            knows what the top is layered on top of. The base is always the
+            repo binding in the new model. */}
+        {topProfile && baseProfile && (
+          <button
+            type="button"
+            onClick={() => onEditProfile(baseProfile.id)}
+            className="hover:bg-accent/30 block w-full cursor-pointer border-t border-dashed px-3 py-2 text-left transition-colors"
+            title="Edit base profile"
+          >
+            <div className="text-muted-foreground flex items-center gap-2 text-xs">
+              <span className="opacity-60">on top of</span>
+              <span className="truncate font-medium">{baseProfile.name}</span>
+              <span className="ml-auto shrink-0 text-[10px] opacity-60">repo</span>
+            </div>
+          </button>
+        )}
+      </div>
+
+      {!isExplicit && overrideCandidatesCount > 0 && (
+        <div className="mt-3">
+          <button
+            type="button"
+            onClick={onStartPickOverride}
+            className="hover:bg-accent flex w-full cursor-pointer items-center justify-center gap-1.5 rounded-md border px-2 py-1.5 text-xs transition-colors"
+          >
+            <Zap className="h-3 w-3 shrink-0" />
+            Override for this task…
+          </button>
+        </div>
+      )}
+    </>
+  );
+}
+
+type OverridePickerViewProps = {
+  candidates: ProfileSummaryWithOwner[];
+  selectedOverrideProfileId: string | null;
+  formatCounts: (p: ProfileSummaryWithOwner) => string;
+  onSelect: (id: string | null) => void;
+  onBack: () => void;
+};
+
+function OverridePickerView({
+  candidates,
+  selectedOverrideProfileId,
+  formatCounts,
+  onSelect,
+  onBack,
+}: OverridePickerViewProps) {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-2">
+        <button
+          type="button"
+          onClick={onBack}
+          className="text-muted-foreground hover:text-foreground -ml-1 cursor-pointer rounded p-0.5 transition-colors"
+          title="Back"
+        >
+          <ArrowLeft className="h-3.5 w-3.5" />
+        </button>
+        <p className="text-muted-foreground text-[10px] font-semibold uppercase tracking-wider">
+          Pick override
+        </p>
+      </div>
+
+      {candidates.length > 0 ? (
+        <div className="max-h-48 space-y-0.5 overflow-y-auto">
+          <PickerRow
+            label="None"
+            isSelected={!selectedOverrideProfileId}
+            onClick={() => onSelect(null)}
+          />
+          {candidates.map(profile => (
+            <PickerRow
+              key={profile.id}
+              label={profile.name}
+              meta={formatCounts(profile)}
+              isSelected={profile.id === selectedOverrideProfileId}
+              onClick={() => onSelect(profile.id === selectedOverrideProfileId ? null : profile.id)}
+            />
+          ))}
+        </div>
+      ) : (
+        <p className="text-muted-foreground text-xs">No other profiles available.</p>
+      )}
+    </>
+  );
+}
diff --git a/apps/web/src/components/cloud-agent/ProfilesListDialog.tsx b/apps/web/src/components/cloud-agent/ProfilesListDialog.tsx
index 8d52a1eed2..8621eb274e 100644
--- a/apps/web/src/components/cloud-agent/ProfilesListDialog.tsx
+++ b/apps/web/src/components/cloud-agent/ProfilesListDialog.tsx
@@ -1,7 +1,8 @@
-/** Dialog to list and manage all environment profiles with inline editing. */
+/** Dialog to list and manage all environment profiles with list+detail layout. */
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
+import { useQuery } from '@tanstack/react-query';
 import { toast } from 'sonner';
 import {
   FolderCog,
@@ -9,49 +10,64 @@ import {
   Plus,
   Loader2,
   AlertCircle,
-  ChevronDown,
-  ChevronRight,
   Eye,
   EyeOff,
   Lock,
+  Unlock,
+  Check,
   Trash2,
   Key,
   Terminal,
   Building,
   User,
+  GitBranch,
+  Link2Off,
+  Link2,
+  ChevronDown,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@/components/ui/command';
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
 import { Textarea } from '@/components/ui/textarea';
 import { Switch } from '@/components/ui/switch';
-import { Checkbox } from '@/components/ui/checkbox';
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
 import { InlineDeleteConfirmation } from '@/components/ui/inline-delete-confirmation';
+import { cn } from '@/lib/utils';
+import { useTRPC } from '@/lib/trpc/utils';
 import {
   useProfiles,
   useCombinedProfiles,
   useProfile,
   useProfileMutations,
   useCombinedProfileMutations,
+  useRepoBindings,
+  useBindRepoMutation,
+  useUnbindRepoMutation,
   type ProfileSummaryWithOwner,
   type ProfileVar,
-  type ProfileOwnerType,
 } from '@/hooks/useCloudAgentProfiles';
+import type { ProfileOwnerType } from '@kilocode/cloud-agent-profile';
+import { McpServersTab } from './profile-editor/McpServersTab';
+import { SkillsTab } from './profile-editor/SkillsTab';
+import { ProfileAgentsTab } from './profile-editor/ProfileAgentsTab';
 
 type ProfilesListDialogProps = {
   organizationId?: string;
   open: boolean;
   onOpenChange: (open: boolean) => void;
   onProfileSelect?: (profileId: string) => void;
+  openToNewProfile?: boolean;
+  /** If provided, the dialog opens with this profile pre-selected for editing. */
+  initialSelectedProfileId?: string | null;
 };
 
 export function ProfilesListDialog({
@@ -59,8 +75,9 @@ export function ProfilesListDialog({
   open,
   onOpenChange,
   onProfileSelect,
+  openToNewProfile,
+  initialSelectedProfileId,
 }: ProfilesListDialogProps) {
-  // Use combined profiles when in org context
   const combinedQuery = useCombinedProfiles({
     organizationId: organizationId ?? '',
     enabled: open && !!organizationId,
@@ -73,43 +90,52 @@ export function ProfilesListDialog({
   const isLoading = organizationId ? combinedQuery.isLoading : regularQuery.isLoading;
   const error = organizationId ? combinedQuery.error : regularQuery.error;
 
-  // Get profiles based on context
   const orgProfiles = organizationId ? (combinedQuery.data?.orgProfiles ?? []) : [];
   const personalProfiles = organizationId
     ? (combinedQuery.data?.personalProfiles ?? [])
     : (regularQuery.data ?? []).map(p => ({ ...p, ownerType: 'user' as const }));
   const effectiveDefaultId = organizationId ? combinedQuery.data?.effectiveDefaultId : null;
+  const allProfiles: ProfileSummaryWithOwner[] = [...orgProfiles, ...personalProfiles];
 
-  // Use combined mutations when in org context
-  const combinedMutations = useCombinedProfileMutations({
-    organizationId: organizationId ?? '',
-  });
-  const regularMutations = useProfileMutations({
-    organizationId: undefined,
-  });
+  const combinedMutations = useCombinedProfileMutations({ organizationId: organizationId ?? '' });
+  const regularMutations = useProfileMutations({ organizationId: undefined });
+  const mutations = organizationId ? combinedMutations : regularMutations;
 
-  // State for creating new profile
+  const [selectedId, setSelectedId] = useState<string | null>(null);
   const [isCreating, setIsCreating] = useState(false);
   const [newProfileName, setNewProfileName] = useState('');
   const [newProfileDescription, setNewProfileDescription] = useState('');
-  const [newProfileOwnerType, setNewProfileOwnerType] = useState<ProfileOwnerType>(
-    organizationId ? 'organization' : 'user'
+  const [newProfileOwnerType, setNewProfileOwnerType] = useState<'personal' | 'organization'>(
+    'personal'
   );
+  const [savingNew, setSavingNew] = useState(false);
+  const [deletingId, setDeletingId] = useState<string | null>(null);
 
-  // State for expanded profile (accordion - only one at a time)
-  const [expandedProfileId, setExpandedProfileId] = useState<string | null>(null);
+  // Open in "new profile" mode if requested
+  useEffect(() => {
+    if (open && openToNewProfile) {
+      setIsCreating(true);
+      setSelectedId(null);
+      setNewProfileName('');
+      setNewProfileDescription('');
+      setNewProfileOwnerType('personal');
+    }
+  }, [open, openToNewProfile]);
 
-  // Loading states
-  const [deletingId, setDeletingId] = useState<string | null>(null);
-  const [togglingDefaultId, setTogglingDefaultId] = useState<string | null>(null);
-  const [savingId, setSavingId] = useState<string | null>(null);
+  // When the caller asks us to open to a specific profile, honor it on open.
+  useEffect(() => {
+    if (open && !openToNewProfile && initialSelectedProfileId) {
+      setSelectedId(initialSelectedProfileId);
+      setIsCreating(false);
+    }
+  }, [open, openToNewProfile, initialSelectedProfileId]);
 
-  // Reset owner type when dialog opens in org context
+  // Select first profile when list loads and nothing is selected
   useEffect(() => {
-    if (open && organizationId) {
-      setNewProfileOwnerType('organization');
+    if (!isCreating && !selectedId && allProfiles.length > 0) {
+      setSelectedId(allProfiles[0]?.id ?? null);
     }
-  }, [open, organizationId]);
+  }, [allProfiles, selectedId, isCreating]);
 
   const handleDelete = async (profile: ProfileSummaryWithOwner) => {
     setDeletingId(profile.id);
@@ -127,57 +153,24 @@ export function ProfilesListDialog({
         });
       }
       toast.success(`Profile "${profile.name}" deleted`);
-      if (expandedProfileId === profile.id) {
-        setExpandedProfileId(null);
-      }
-    } catch (err) {
-      console.error('Failed to delete profile:', err);
+      if (selectedId === profile.id) setSelectedId(null);
+    } catch {
       toast.error('Failed to delete profile');
     } finally {
       setDeletingId(null);
     }
   };
 
-  const handleToggleDefault = async (profile: ProfileSummaryWithOwner) => {
-    setTogglingDefaultId(profile.id);
-    try {
-      const profileOrgId = profile.ownerType === 'organization' ? organizationId : undefined;
-      const mutations = organizationId ? combinedMutations : regularMutations;
-
-      if (profile.isDefault) {
-        await mutations.clearDefault.mutateAsync({
-          profileId: profile.id,
-          organizationId: profileOrgId,
-        });
-        toast.success(`"${profile.name}" is no longer the default`);
-      } else {
-        await mutations.setAsDefault.mutateAsync({
-          profileId: profile.id,
-          organizationId: profileOrgId,
-        });
-        toast.success(`"${profile.name}" is now the default profile`);
-      }
-    } catch (err) {
-      console.error('Failed to toggle default:', err);
-      toast.error('Failed to update default profile');
-    } finally {
-      setTogglingDefaultId(null);
-    }
-  };
-
   const handleCreateProfile = async () => {
     if (!newProfileName.trim()) {
       toast.error('Profile name is required');
       return;
     }
-
-    setSavingId('new');
+    setSavingNew(true);
     try {
-      // Determine which organizationId to use based on owner type selection
-      const createOrgId = newProfileOwnerType === 'organization' ? organizationId : undefined;
-
-      const mutations = organizationId ? combinedMutations : regularMutations;
-      const createdProfile = await mutations.createProfile.mutateAsync({
+      const createOrgId =
+        organizationId && newProfileOwnerType === 'organization' ? organizationId : undefined;
+      const created = await mutations.createProfile.mutateAsync({
         name: newProfileName.trim(),
         description: newProfileDescription.trim() || undefined,
         organizationId: createOrgId,
@@ -186,895 +179,1512 @@ export function ProfilesListDialog({
       setIsCreating(false);
       setNewProfileName('');
       setNewProfileDescription('');
-      // Expand the newly created profile for editing
-      if (createdProfile?.id) {
-        setExpandedProfileId(createdProfile.id);
-      }
-    } catch (err) {
-      console.error('Failed to create profile:', err);
+      if (created?.id) setSelectedId(created.id);
+    } catch {
       toast.error('Failed to create profile');
     } finally {
-      setSavingId(null);
+      setSavingNew(false);
     }
   };
 
-  const handleToggleExpand = (profileId: string) => {
-    setExpandedProfileId(prev => (prev === profileId ? null : profileId));
-  };
-
-  const handleProfileUse = (profileId: string) => {
-    if (!onProfileSelect) {
-      return;
-    }
-    onProfileSelect(profileId);
-    onOpenChange(false);
-  };
-
-  const hasNoProfiles = orgProfiles.length === 0 && personalProfiles.length === 0 && !isCreating;
+  const isEffectiveDefault = (profile: ProfileSummaryWithOwner) =>
+    organizationId ? profile.id === effectiveDefaultId : profile.isDefault;
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-[650px]">
-        <DialogHeader>
-          <DialogTitle className="flex items-center gap-2">
-            <FolderCog className="h-5 w-5" />
+      <DialogContent className="flex h-[560px] flex-col gap-0 p-0 sm:max-w-[860px]">
+        <DialogHeader className="border-b px-4 py-3">
+          <DialogTitle className="flex items-center gap-2 text-sm font-semibold">
+            <FolderCog className="h-4 w-4" />
             Manage Profiles
           </DialogTitle>
-          <DialogDescription>
-            Create and manage environment profiles with variables and setup commands.
-          </DialogDescription>
         </DialogHeader>
 
-        <div className="max-h-[60vh] overflow-y-auto py-4">
-          {isLoading ? (
-            <div className="flex items-center justify-center py-8">
-              <Loader2 className="h-6 w-6 animate-spin" />
-            </div>
-          ) : error ? (
-            <div className="text-destructive flex items-center justify-center gap-2 py-8">
-              <AlertCircle className="h-5 w-5" />
-              <span>Failed to load profiles</span>
-            </div>
-          ) : hasNoProfiles ? (
-            <div className="py-8 text-center">
-              <p className="text-muted-foreground">No profiles yet.</p>
-              <p className="text-muted-foreground mt-1 text-sm">
-                Create a profile to save environment variables and setup commands.
-              </p>
-            </div>
-          ) : (
-            <div className="space-y-4">
-              {/* Organization profiles section */}
-              {organizationId && orgProfiles.length > 0 && (
-                <div>
-                  <h4 className="text-muted-foreground mb-2 flex items-center gap-2 text-sm font-medium">
-                    <Building className="h-4 w-4" />
-                    Organization Profiles
-                  </h4>
-                  <div className="space-y-2">
-                    {orgProfiles.map(profile => (
-                      <ProfileRow
-                        key={profile.id}
-                        profile={profile}
-                        organizationId={organizationId}
-                        isExpanded={expandedProfileId === profile.id}
-                        onToggleExpand={() => handleToggleExpand(profile.id)}
-                        onDelete={() => handleDelete(profile)}
-                        onToggleDefault={() => handleToggleDefault(profile)}
-                        isDeleting={deletingId === profile.id}
-                        isTogglingDefault={togglingDefaultId === profile.id}
-                        onProfileSelect={handleProfileUse}
-                        isEffectiveDefault={profile.id === effectiveDefaultId}
-                      />
-                    ))}
-                  </div>
+        <div className="flex min-h-0 flex-1">
+          {/* Left panel — profile list */}
+          <div className="flex w-52 flex-shrink-0 flex-col border-r">
+            <div className="min-h-0 flex-1 overflow-y-auto">
+              {isLoading ? (
+                <div className="flex items-center justify-center py-8">
+                  <Loader2 className="h-5 w-5 animate-spin" />
                 </div>
-              )}
-
-              {/* Personal profiles section */}
-              {personalProfiles.length > 0 && (
-                <div>
-                  <h4 className="text-muted-foreground mb-2 flex items-center gap-2 text-sm font-medium">
-                    <User className="h-4 w-4" />
-                    {organizationId ? 'Personal Profiles' : 'Your Profiles'}
-                  </h4>
-                  <div className="space-y-2">
-                    {personalProfiles.map(profile => (
-                      <ProfileRow
-                        key={profile.id}
-                        profile={profile}
-                        organizationId={
-                          profile.ownerType === 'organization' ? organizationId : undefined
-                        }
-                        isExpanded={expandedProfileId === profile.id}
-                        onToggleExpand={() => handleToggleExpand(profile.id)}
-                        onDelete={() => handleDelete(profile)}
-                        onToggleDefault={() => handleToggleDefault(profile)}
-                        isDeleting={deletingId === profile.id}
-                        isTogglingDefault={togglingDefaultId === profile.id}
-                        onProfileSelect={handleProfileUse}
-                        isEffectiveDefault={
-                          organizationId ? profile.id === effectiveDefaultId : profile.isDefault
-                        }
-                      />
-                    ))}
-                  </div>
+              ) : error ? (
+                <div className="text-destructive flex flex-col items-center gap-2 py-8 text-center text-xs">
+                  <AlertCircle className="h-4 w-4" />
+                  Failed to load
                 </div>
-              )}
-
-              {/* Create new profile form */}
-              {isCreating && (
-                <div className="rounded-lg border border-dashed p-3">
-                  <div className="space-y-3">
-                    {/* Owner type selection (only in org context) */}
-                    {organizationId && (
-                      <div className="grid gap-2">
-                        <Label>Profile Type</Label>
-                        <RadioGroup
-                          value={newProfileOwnerType}
-                          onValueChange={v => setNewProfileOwnerType(v as ProfileOwnerType)}
-                          className="flex gap-4"
-                        >
-                          <div className="flex items-center space-x-2">
-                            <RadioGroupItem value="organization" id="owner-org" />
-                            <Label
-                              htmlFor="owner-org"
-                              className="flex cursor-pointer items-center gap-2"
-                            >
-                              <Building className="h-4 w-4" />
-                              Organization
-                              <span className="text-muted-foreground text-xs">(shared)</span>
-                            </Label>
-                          </div>
-                          <div className="flex items-center space-x-2">
-                            <RadioGroupItem value="user" id="owner-user" />
-                            <Label
-                              htmlFor="owner-user"
-                              className="flex cursor-pointer items-center gap-2"
-                            >
-                              <User className="h-4 w-4" />
-                              Personal
-                              <span className="text-muted-foreground text-xs">(only you)</span>
-                            </Label>
-                          </div>
-                        </RadioGroup>
-                      </div>
-                    )}
-                    <div className="grid gap-2">
-                      <Label htmlFor="new-profile-name">Name</Label>
-                      <Input
-                        id="new-profile-name"
-                        value={newProfileName}
-                        onChange={e => setNewProfileName(e.target.value)}
-                        placeholder="New profile name"
-                        autoFocus={!organizationId}
-                      />
-                    </div>
-                    <div className="grid gap-2">
-                      <Label htmlFor="new-profile-desc">Description</Label>
-                      <Textarea
-                        id="new-profile-desc"
-                        value={newProfileDescription}
-                        onChange={e => setNewProfileDescription(e.target.value)}
-                        placeholder="Optional description"
-                        rows={2}
-                      />
-                    </div>
-                    <div className="flex justify-end gap-2">
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        onClick={() => {
-                          setIsCreating(false);
-                          setNewProfileName('');
-                          setNewProfileDescription('');
-                          setNewProfileOwnerType(organizationId ? 'organization' : 'user');
-                        }}
-                        disabled={savingId === 'new'}
-                      >
-                        Cancel
-                      </Button>
-                      <Button size="sm" onClick={handleCreateProfile} disabled={savingId === 'new'}>
-                        {savingId === 'new' ? (
-                          <Loader2 className="h-4 w-4 animate-spin" />
-                        ) : (
-                          'Create'
-                        )}
-                      </Button>
-                    </div>
-                  </div>
+              ) : (
+                <div className="py-1">
+                  {organizationId && orgProfiles.length > 0 && (
+                    <>
+                      <p className="text-muted-foreground px-3 py-1.5 text-[10px] font-semibold uppercase tracking-wider">
+                        Organization
+                      </p>
+                      {orgProfiles.map(p => (
+                        <ProfileListItem
+                          key={p.id}
+                          profile={p}
+                          isSelected={selectedId === p.id}
+                          isEffectiveDefault={isEffectiveDefault(p)}
+                          onSelect={() => {
+                            setSelectedId(p.id);
+                            setIsCreating(false);
+                          }}
+                        />
+                      ))}
+                    </>
+                  )}
+                  {personalProfiles.length > 0 && (
+                    <>
+                      {organizationId && (
+                        <p className="text-muted-foreground mt-1 px-3 py-1.5 text-[10px] font-semibold uppercase tracking-wider">
+                          Personal
+                        </p>
+                      )}
+                      {personalProfiles.map(p => (
+                        <ProfileListItem
+                          key={p.id}
+                          profile={p}
+                          isSelected={selectedId === p.id}
+                          isEffectiveDefault={isEffectiveDefault(p)}
+                          onSelect={() => {
+                            setSelectedId(p.id);
+                            setIsCreating(false);
+                          }}
+                        />
+                      ))}
+                    </>
+                  )}
+                  {allProfiles.length === 0 && !isCreating && (
+                    <p className="text-muted-foreground px-3 py-6 text-center text-xs">
+                      No profiles yet.
+                    </p>
+                  )}
                 </div>
               )}
             </div>
-          )}
-        </div>
 
-        <DialogFooter className="flex justify-between sm:justify-between">
-          {!isCreating && (
-            <Button variant="outline" onClick={() => setIsCreating(true)}>
-              <Plus className="mr-2 h-4 w-4" />
-              New Profile
-            </Button>
-          )}
-          <Button variant="outline" onClick={() => onOpenChange(false)}>
-            Close
-          </Button>
-        </DialogFooter>
+            {/* New profile button */}
+            <div className="border-t p-2">
+              <button
+                className={cn(
+                  'flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-xs transition-colors',
+                  'text-muted-foreground hover:bg-accent hover:text-foreground',
+                  isCreating && 'bg-accent text-foreground'
+                )}
+                onClick={() => {
+                  setIsCreating(true);
+                  setSelectedId(null);
+                  setNewProfileName('');
+                  setNewProfileDescription('');
+                }}
+              >
+                <Plus className="h-3.5 w-3.5" />
+                New profile
+              </button>
+            </div>
+          </div>
+
+          {/* Right panel — detail view */}
+          <div className="min-h-0 flex-1 overflow-y-auto">
+            {isCreating ? (
+              <NewProfilePane
+                organizationId={organizationId}
+                name={newProfileName}
+                description={newProfileDescription}
+                ownerType={newProfileOwnerType}
+                onNameChange={setNewProfileName}
+                onDescriptionChange={setNewProfileDescription}
+                onOwnerTypeChange={setNewProfileOwnerType}
+                onSave={handleCreateProfile}
+                onCancel={() => {
+                  setIsCreating(false);
+                  if (allProfiles.length > 0) setSelectedId(allProfiles[0]?.id ?? null);
+                }}
+                isSaving={savingNew}
+              />
+            ) : selectedId ? (
+              <ProfileDetailPane
+                profileId={selectedId}
+                ownerType={allProfiles.find(p => p.id === selectedId)?.ownerType ?? 'user'}
+                organizationId={
+                  allProfiles.find(p => p.id === selectedId)?.ownerType === 'organization'
+                    ? organizationId
+                    : undefined
+                }
+                isEffectiveDefault={
+                  !!allProfiles.find(p => p.id === selectedId && isEffectiveDefault(p))
+                }
+                onProfileSelect={
+                  onProfileSelect
+                    ? () => {
+                        onProfileSelect(selectedId);
+                        onOpenChange(false);
+                      }
+                    : undefined
+                }
+                onDelete={() => {
+                  const profile = allProfiles.find(p => p.id === selectedId);
+                  if (profile) void handleDelete(profile);
+                }}
+                isDeleting={deletingId === selectedId}
+                mutations={mutations}
+              />
+            ) : (
+              <div className="flex h-full items-center justify-center">
+                <p className="text-muted-foreground text-sm">Select a profile to view details</p>
+              </div>
+            )}
+          </div>
+        </div>
       </DialogContent>
     </Dialog>
   );
 }
 
 // -------------------------------------------------------------------
-// ProfileRow - A single profile row that can be expanded/collapsed
+// ProfileListItem
 // -------------------------------------------------------------------
 
-type ProfileRowProps = {
+type ProfileListItemProps = {
   profile: ProfileSummaryWithOwner;
-  organizationId?: string;
-  isExpanded: boolean;
-  onToggleExpand: () => void;
-  onDelete: () => void;
-  onToggleDefault: () => void;
-  isDeleting: boolean;
-  isTogglingDefault: boolean;
-  onProfileSelect?: (profileId: string) => void;
-  isEffectiveDefault?: boolean;
+  isSelected: boolean;
+  isEffectiveDefault: boolean;
+  onSelect: () => void;
 };
 
-function ProfileRow({
+function ProfileListItem({
   profile,
-  organizationId,
-  isExpanded,
-  onToggleExpand,
-  onDelete,
-  onToggleDefault,
-  isDeleting,
-  isTogglingDefault,
-  onProfileSelect,
+  isSelected,
   isEffectiveDefault,
-}: ProfileRowProps) {
+  onSelect,
+}: ProfileListItemProps) {
   return (
-    <div className="rounded-lg border transition-colors">
-      {/* Collapsed header - always visible */}
-      <div
-        className="hover:bg-accent/50 flex cursor-pointer items-center gap-2 p-3"
-        onClick={onToggleExpand}
-      >
-        <span className="text-muted-foreground shrink-0">
-          {isExpanded ? <ChevronDown className="h-4 w-4" /> : <ChevronRight className="h-4 w-4" />}
-        </span>
-
-        {/* Owner type icon */}
-        <span className="text-muted-foreground shrink-0">
-          {profile.ownerType === 'organization' ? (
-            <Building className="h-4 w-4" />
-          ) : (
-            <User className="h-4 w-4" />
-          )}
-        </span>
-
-        <div className="flex-1">
-          <div className="flex items-center gap-2">
-            <span className="font-medium">{profile.name}</span>
-            {isEffectiveDefault && <Star className="text-primary h-4 w-4 fill-current" />}
-          </div>
-          {!isExpanded && profile.description && (
-            <p className="text-muted-foreground mt-0.5 line-clamp-1 text-sm">
-              {profile.description}
-            </p>
-          )}
-          {!isExpanded && (
-            <p className="text-muted-foreground mt-1 text-xs">
-              {profile.varCount} variables · {profile.commandCount} commands
-            </p>
-          )}
+    <div
+      className={cn(
+        'mx-1 flex cursor-pointer items-center gap-2 rounded-md px-2 py-2 transition-colors',
+        isSelected ? 'bg-accent text-foreground' : 'hover:bg-accent/50 text-muted-foreground'
+      )}
+      onClick={onSelect}
+    >
+      {profile.ownerType === 'organization' ? (
+        <Building className="h-3.5 w-3.5 shrink-0" />
+      ) : (
+        <User className="h-3.5 w-3.5 shrink-0" />
+      )}
+      <div className="min-w-0 flex-1">
+        <div
+          className={cn('flex items-center gap-1 truncate text-sm', isSelected && 'font-medium')}
+        >
+          <span className="truncate">{profile.name}</span>
+          {isEffectiveDefault && <Star className="text-primary h-3 w-3 shrink-0 fill-current" />}
         </div>
+        <div className="text-muted-foreground text-[10px]">
+          {[
+            profile.varCount > 0 && `${profile.varCount}v`,
+            profile.mcpServerCount > 0 && `${profile.mcpServerCount}m`,
+            profile.skillCount > 0 && `${profile.skillCount}s`,
+          ]
+            .filter(Boolean)
+            .join(' · ')}
+        </div>
+      </div>
+    </div>
+  );
+}
 
-        <div className="flex shrink-0 items-center gap-1" onClick={e => e.stopPropagation()}>
-          {onProfileSelect ? (
-            <Button variant="ghost" size="sm" onClick={() => onProfileSelect(profile.id)}>
-              Use
-            </Button>
-          ) : null}
-          <InlineDeleteConfirmation onDelete={onDelete} isLoading={isDeleting} />
-          <div
-            className="ml-2 flex items-center gap-1.5 border-l pl-2"
-            title={profile.isDefault ? 'Default profile' : 'Set as default'}
-          >
-            <Switch
-              checked={profile.isDefault}
-              onCheckedChange={onToggleDefault}
-              disabled={isTogglingDefault}
-            />
+// -------------------------------------------------------------------
+// NewProfilePane
+// -------------------------------------------------------------------
+
+type NewProfilePaneProps = {
+  organizationId?: string;
+  name: string;
+  description: string;
+  ownerType: 'personal' | 'organization';
+  onNameChange: (v: string) => void;
+  onDescriptionChange: (v: string) => void;
+  onOwnerTypeChange: (v: 'personal' | 'organization') => void;
+  onSave: () => void;
+  onCancel: () => void;
+  isSaving: boolean;
+};
+
+function NewProfilePane({
+  organizationId,
+  name,
+  description,
+  ownerType,
+  onNameChange,
+  onDescriptionChange,
+  onOwnerTypeChange,
+  onSave,
+  onCancel,
+  isSaving,
+}: NewProfilePaneProps) {
+  return (
+    <div className="space-y-4 p-4">
+      <h3 className="text-sm font-semibold">New Profile</h3>
+
+      {organizationId && (
+        <div className="grid gap-1.5">
+          <Label className="text-xs">Owner</Label>
+          <div className="flex gap-1.5">
+            {(
+              [
+                { value: 'personal', label: 'Personal', Icon: User },
+                { value: 'organization', label: 'Organization', Icon: Building },
+              ] as const
+            ).map(({ value, label, Icon }) => (
+              <button
+                key={value}
+                type="button"
+                className={cn(
+                  'flex flex-1 items-center justify-center gap-1.5 rounded-md border px-2 py-1.5 text-xs transition-colors',
+                  ownerType === value
+                    ? 'border-primary bg-accent text-foreground font-medium'
+                    : 'text-muted-foreground hover:bg-accent/50'
+                )}
+                onClick={() => onOwnerTypeChange(value)}
+                disabled={isSaving}
+              >
+                <Icon className="h-3.5 w-3.5" />
+                {label}
+              </button>
+            ))}
           </div>
         </div>
-      </div>
+      )}
 
-      {/* Expanded content */}
-      {isExpanded && (
-        <ProfileEditPanel
-          profileId={profile.id}
-          organizationId={profile.ownerType === 'organization' ? organizationId : undefined}
+      <div className="grid gap-2">
+        <Label htmlFor="new-profile-name">Name</Label>
+        <Input
+          id="new-profile-name"
+          value={name}
+          onChange={e => onNameChange(e.target.value)}
+          placeholder="e.g. Backend debugging"
+          autoFocus
+          onKeyDown={e => e.key === 'Enter' && !isSaving && onSave()}
         />
-      )}
+      </div>
+      <div className="grid gap-2">
+        <Label htmlFor="new-profile-desc">Description</Label>
+        <Textarea
+          id="new-profile-desc"
+          value={description}
+          onChange={e => onDescriptionChange(e.target.value)}
+          placeholder="Optional description"
+          rows={2}
+        />
+      </div>
+      <div className="flex justify-end gap-2">
+        <Button variant="ghost" size="sm" onClick={onCancel} disabled={isSaving}>
+          Cancel
+        </Button>
+        <Button size="sm" onClick={onSave} disabled={isSaving || !name.trim()}>
+          {isSaving ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Create'}
+        </Button>
+      </div>
     </div>
   );
 }
 
 // -------------------------------------------------------------------
-// ProfileEditPanel - Inline editing UI for variables and commands
+// ProfileDetailPane
 // -------------------------------------------------------------------
 
-type ProfileEditPanelProps = {
+type ProfileDetailPaneProps = {
   profileId: string;
+  ownerType: ProfileOwnerType;
   organizationId?: string;
+  isEffectiveDefault: boolean;
+  onProfileSelect?: () => void;
+  onDelete: () => void;
+  isDeleting: boolean;
+  mutations:
+    | ReturnType<typeof useProfileMutations>
+    | ReturnType<typeof useCombinedProfileMutations>;
 };
 
-function ProfileEditPanel({ profileId, organizationId }: ProfileEditPanelProps) {
+function ProfileDetailPane({
+  profileId,
+  ownerType,
+  organizationId,
+  isEffectiveDefault,
+  onProfileSelect,
+  onDelete,
+  isDeleting,
+  mutations,
+}: ProfileDetailPaneProps) {
   const { data: profile, isLoading, error } = useProfile(profileId, { organizationId });
-  const { setVar, deleteVar, setCommands, updateProfile } = useProfileMutations({ organizationId });
-
-  // State for editable profile metadata
-  const [profileName, setProfileName] = useState('');
-  const [profileDescription, setProfileDescription] = useState('');
-  const [savingMetadata, setSavingMetadata] = useState(false);
-
-  // State for adding new variable
-  const [isAddingVar, setIsAddingVar] = useState(false);
-  const [newVarKey, setNewVarKey] = useState('');
-  const [newVarValue, setNewVarValue] = useState('');
-  const [newVarIsSecret, setNewVarIsSecret] = useState(false);
-  const [showNewVarValue, setShowNewVarValue] = useState(false);
-
-  // State for editing existing variable value
-  const [editingVarKey, setEditingVarKey] = useState<string | null>(null);
-  const [editingVarValue, setEditingVarValue] = useState('');
-  const [showEditingVarValue, setShowEditingVarValue] = useState(false);
-
-  // State for adding new command
-  const [isAddingCommand, setIsAddingCommand] = useState(false);
-  const [newCommand, setNewCommand] = useState('');
+  const [activeTab, setActiveTab] = useState<
+    'overview' | 'vars' | 'commands' | 'mcps' | 'skills' | 'agents'
+  >('overview');
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <Loader2 className="h-5 w-5 animate-spin" />
+      </div>
+    );
+  }
+
+  if (error || !profile) {
+    return (
+      <div className="text-destructive flex h-full flex-col items-center justify-center gap-2 text-sm">
+        <AlertCircle className="h-5 w-5" />
+        Failed to load profile
+      </div>
+    );
+  }
 
-  // Loading states
-  const [savingVarKey, setSavingVarKey] = useState<string | null>(null);
-  const [deletingVarKey, setDeletingVarKey] = useState<string | null>(null);
-  const [savingCommands, setSavingCommands] = useState(false);
+  return (
+    <div className="flex h-full flex-col">
+      {/* Header */}
+      <div className="flex shrink-0 items-center justify-between border-b px-4 py-2.5">
+        <h3 className="truncate text-sm font-semibold">{profile.name}</h3>
+        {onProfileSelect && (
+          <Button variant="outline" size="sm" onClick={onProfileSelect}>
+            Use for next task
+          </Button>
+        )}
+      </div>
 
-  // Active tab
-  const [activeTab, setActiveTab] = useState<'vars' | 'commands'>('vars');
+      {/* Tabs */}
+      <div className="flex shrink-0 border-b">
+        {(
+          [
+            { id: 'overview', label: 'Overview' },
+            { id: 'vars', label: `Variables (${profile.vars.length})` },
+            { id: 'commands', label: `Setup Commands (${profile.commands.length})` },
+            { id: 'mcps', label: `MCP servers (${profile.mcpServers.length})` },
+            { id: 'skills', label: `Skills (${profile.skills.length})` },
+            { id: 'agents', label: `Agents (${profile.agents.length})` },
+          ] as const
+        ).map(tab => (
+          <button
+            key={tab.id}
+            className={cn(
+              'border-b-2 px-3 py-2 text-xs font-medium transition-colors',
+              activeTab === tab.id
+                ? 'border-primary text-foreground'
+                : 'text-muted-foreground hover:text-foreground border-transparent'
+            )}
+            onClick={() => setActiveTab(tab.id)}
+          >
+            {tab.label}
+          </button>
+        ))}
+      </div>
+
+      {/* Tab content */}
+      <div className="flex-1 overflow-y-auto">
+        {activeTab === 'overview' && (
+          <OverviewTab
+            profile={profile}
+            ownerType={ownerType}
+            organizationId={organizationId}
+            isEffectiveDefault={isEffectiveDefault}
+            mutations={mutations}
+            onDelete={onDelete}
+            isDeleting={isDeleting}
+          />
+        )}
+        {activeTab === 'vars' && (
+          <VarsTab
+            profileId={profileId}
+            organizationId={organizationId}
+            vars={profile.vars}
+            mutations={mutations}
+          />
+        )}
+        {activeTab === 'commands' && (
+          <CommandsTab
+            profileId={profileId}
+            organizationId={organizationId}
+            commands={profile.commands}
+            mutations={mutations}
+          />
+        )}
+        {activeTab === 'mcps' && (
+          <McpServersTab
+            profileId={profileId}
+            organizationId={organizationId}
+            mcpServers={profile.mcpServers}
+          />
+        )}
+        {activeTab === 'skills' && (
+          <SkillsTab
+            profileId={profileId}
+            organizationId={organizationId}
+            skills={profile.skills}
+          />
+        )}
+        {activeTab === 'agents' && (
+          <ProfileAgentsTab
+            profileId={profileId}
+            organizationId={organizationId}
+            agents={profile.agents}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
+
+// -------------------------------------------------------------------
+// AutoSaveField — always-visible scalar field that commits on blur/Enter.
+//
+// Matches the industry pattern for inline-editable text in admin panels
+// (Notion, Linear, GitHub). On blur (or Enter for single-line inputs) the
+// current value is committed via `onSave`; while saving we show a subtle
+// "Saving…" label, and after success we briefly show "Saved". If `onSave`
+// throws, the draft is reverted to the last-saved value so the user doesn't
+// end up staring at a value that was silently rejected.
+// -------------------------------------------------------------------
+
+type AutoSaveFieldProps = {
+  kind: 'input' | 'textarea';
+  id: string;
+  label: string;
+  placeholder?: string;
+  initialValue: string;
+  /** Returns the canonical value that was actually persisted (e.g. trimmed). */
+  onSave: (value: string) => Promise<string>;
+};
+
+function AutoSaveField({ kind, id, label, placeholder, initialValue, onSave }: AutoSaveFieldProps) {
+  const [value, setValue] = useState(initialValue);
+  const [savedValue, setSavedValue] = useState(initialValue);
+  const [status, setStatus] = useState<'idle' | 'saving' | 'saved'>('idle');
+  const savedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
-  // Sync profile metadata when loaded
   useEffect(() => {
-    if (profile) {
-      setProfileName(profile.name);
-      setProfileDescription(profile.description || '');
+    return () => {
+      if (savedTimerRef.current) clearTimeout(savedTimerRef.current);
+    };
+  }, []);
+
+  const commit = async () => {
+    if (value === savedValue) return;
+    setStatus('saving');
+    try {
+      const persisted = await onSave(value);
+      setSavedValue(persisted);
+      setValue(persisted);
+      setStatus('saved');
+      if (savedTimerRef.current) clearTimeout(savedTimerRef.current);
+      savedTimerRef.current = setTimeout(() => setStatus('idle'), 1500);
+    } catch {
+      // Revert on failure so the rendered value matches what's on the server.
+      // Error toast is surfaced by `onSave`.
+      setValue(savedValue);
+      setStatus('idle');
     }
-  }, [profile]);
-
-  const resetNewVarForm = () => {
-    setIsAddingVar(false);
-    setNewVarKey('');
-    setNewVarValue('');
-    setNewVarIsSecret(false);
-    setShowNewVarValue(false);
   };
 
-  const resetEditVarForm = () => {
-    setEditingVarKey(null);
-    setEditingVarValue('');
-    setShowEditingVarValue(false);
+  const commonProps = {
+    id,
+    value,
+    placeholder,
+    onChange: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) =>
+      setValue(e.target.value),
+    onBlur: () => {
+      void commit();
+    },
+    disabled: status === 'saving',
   };
 
-  const handleSaveMetadata = async () => {
-    if (!profileName.trim()) {
-      toast.error('Profile name is required');
-      return;
-    }
+  return (
+    <div className="grid gap-1.5">
+      <div className="flex items-center justify-between">
+        <Label htmlFor={id} className="text-xs">
+          {label}
+        </Label>
+        {status === 'saving' && <span className="text-muted-foreground text-[10px]">Saving…</span>}
+        {status === 'saved' && <span className="text-muted-foreground text-[10px]">Saved</span>}
+      </div>
+      {kind === 'input' ? (
+        <Input
+          {...commonProps}
+          className="h-8 text-sm"
+          onKeyDown={e => {
+            if (e.key === 'Enter') {
+              e.preventDefault();
+              e.currentTarget.blur();
+            }
+          }}
+        />
+      ) : (
+        <Textarea {...commonProps} rows={2} className="text-sm" />
+      )}
+    </div>
+  );
+}
+
+// -------------------------------------------------------------------
+// OverviewTab
+// -------------------------------------------------------------------
+
+type OverviewTabProps = {
+  profile: NonNullable<ReturnType<typeof useProfile>['data']>;
+  ownerType: ProfileOwnerType;
+  organizationId?: string;
+  isEffectiveDefault: boolean;
+  mutations:
+    | ReturnType<typeof useProfileMutations>
+    | ReturnType<typeof useCombinedProfileMutations>;
+  onDelete: () => void;
+  isDeleting: boolean;
+};
+
+function OverviewTab({
+  profile,
+  ownerType,
+  organizationId,
+  isEffectiveDefault,
+  mutations,
+  onDelete,
+  isDeleting,
+}: OverviewTabProps) {
+  const [togglingDefault, setTogglingDefault] = useState(false);
 
-    setSavingMetadata(true);
+  const handleToggleDefault = async () => {
+    setTogglingDefault(true);
     try {
-      await updateProfile.mutateAsync({
-        profileId,
-        name: profileName.trim(),
-        description: profileDescription.trim() || undefined,
-        organizationId,
-      });
-      toast.success('Profile updated');
-    } catch (err) {
-      console.error('Failed to update profile:', err);
-      toast.error('Failed to update profile');
+      if (profile.isDefault) {
+        await mutations.clearDefault.mutateAsync({ profileId: profile.id, organizationId });
+        toast.success(`"${profile.name}" is no longer the default`);
+      } else {
+        await mutations.setAsDefault.mutateAsync({ profileId: profile.id, organizationId });
+        toast.success(`"${profile.name}" is now the default`);
+      }
+    } catch {
+      toast.error('Failed to update default');
     } finally {
-      setSavingMetadata(false);
+      setTogglingDefault(false);
     }
   };
 
-  const handleAddVar = async () => {
-    if (!newVarKey.trim()) {
-      toast.error('Variable key is required');
-      return;
-    }
-    if (!newVarValue && !newVarIsSecret) {
-      toast.error('Variable value is required');
-      return;
-    }
+  return (
+    <div className="space-y-4 p-4">
+      {/* Name */}
+      <AutoSaveField
+        key={`name-${profile.id}`}
+        kind="input"
+        id={`name-${profile.id}`}
+        label="Name"
+        placeholder="Profile name"
+        initialValue={profile.name}
+        onSave={async value => {
+          const trimmed = value.trim();
+          if (!trimmed) {
+            toast.error('Name is required');
+            throw new Error('Name is required');
+          }
+          // Only send the changed field — sending stale `description`
+          // here can clobber a concurrent description autosave.
+          await mutations.updateProfile.mutateAsync({
+            profileId: profile.id,
+            name: trimmed,
+            organizationId,
+          });
+          return trimmed;
+        }}
+      />
+
+      {/* Description */}
+      <AutoSaveField
+        key={`desc-${profile.id}`}
+        kind="textarea"
+        id={`desc-${profile.id}`}
+        label="Description"
+        placeholder="Optional description"
+        initialValue={profile.description ?? ''}
+        onSave={async value => {
+          const trimmed = value.trim();
+          // Only send the changed field — sending stale `name` here
+          // can clobber a concurrent name autosave.
+          await mutations.updateProfile.mutateAsync({
+            profileId: profile.id,
+            description: trimmed || undefined,
+            organizationId,
+          });
+          return trimmed;
+        }}
+      />
+
+      {/* Default toggle */}
+      <div className="flex items-center justify-between rounded-lg border p-3">
+        <div>
+          <div className="flex items-center gap-2 text-sm font-medium">
+            <Star className={cn('h-4 w-4', isEffectiveDefault && 'text-primary fill-current')} />
+            {ownerType === 'organization' ? 'Organization default' : 'Personal default'}
+          </div>
+          <p className="text-muted-foreground mt-0.5 text-xs">
+            {ownerType === 'organization'
+              ? 'Auto-loaded for org members who have no personal default and no repo profile'
+              : 'Auto-loaded when no repo profile is set (overrides any org default)'}
+          </p>
+        </div>
+        <Switch
+          checked={profile.isDefault}
+          onCheckedChange={handleToggleDefault}
+          disabled={togglingDefault}
+        />
+      </div>
 
-    setSavingVarKey('__new__');
+      {/* Repo bindings */}
+      <RepoPinsSection profileId={profile.id} organizationId={organizationId} />
+
+      {/* Delete profile */}
+      <div className="flex items-center justify-between rounded-lg border p-3">
+        <div>
+          <div className="flex items-center gap-2 text-sm font-medium">
+            <Trash2 className="text-destructive h-4 w-4" />
+            Delete profile
+          </div>
+          <p className="text-muted-foreground mt-0.5 text-xs">
+            Permanently removes this profile and its settings. This cannot be undone.
+          </p>
+        </div>
+        <InlineDeleteConfirmation
+          onDelete={onDelete}
+          isLoading={isDeleting}
+          showAsButton
+          buttonText="Delete"
+        />
+      </div>
+    </div>
+  );
+}
+
+// -------------------------------------------------------------------
+// RepoPinsSection — shows repos this profile is bound to, with add/remove
+// -------------------------------------------------------------------
+
+type RepoOption = { id: number; fullName: string; private: boolean; platform: 'github' | 'gitlab' };
+
+function RepoPinsSection({
+  profileId,
+  organizationId,
+}: {
+  profileId: string;
+  organizationId?: string;
+}) {
+  const trpc = useTRPC();
+  const { data: bindings, isLoading } = useRepoBindings({ organizationId });
+  const unbind = useUnbindRepoMutation(organizationId);
+  const bind = useBindRepoMutation(organizationId);
+
+  const [isAdding, setIsAdding] = useState(false);
+  const [selectedRepo, setSelectedRepo] = useState('');
+  const [repoPopoverOpen, setRepoPopoverOpen] = useState(false);
+
+  const ghOptions = organizationId
+    ? trpc.organizations.cloudAgentNext.listGitHubRepositories.queryOptions({
+        organizationId,
+        forceRefresh: false,
+      })
+    : trpc.cloudAgentNext.listGitHubRepositories.queryOptions({ forceRefresh: false });
+  const glOptions = organizationId
+    ? trpc.organizations.cloudAgentNext.listGitLabRepositories.queryOptions({
+        organizationId,
+        forceRefresh: false,
+      })
+    : trpc.cloudAgentNext.listGitLabRepositories.queryOptions({ forceRefresh: false });
+
+  const { data: githubRepoData, isLoading: isLoadingGH } = useQuery({
+    ...ghOptions,
+    enabled: isAdding,
+  });
+  const { data: gitlabRepoData, isLoading: isLoadingGL } = useQuery({
+    ...glOptions,
+    enabled: isAdding,
+  });
+
+  const githubRepos = ((githubRepoData as { repositories?: unknown[] })?.repositories ?? []) as {
+    id: number;
+    fullName: string;
+    private: boolean;
+  }[];
+  const gitlabRepos = ((gitlabRepoData as { repositories?: unknown[] })?.repositories ?? []) as {
+    id: number;
+    fullName: string;
+    private: boolean;
+  }[];
+  const isLoadingRepos = isLoadingGH || isLoadingGL;
+  const hasMultiplePlatforms = githubRepos.length > 0 && gitlabRepos.length > 0;
+
+  const allRepos: RepoOption[] = [
+    ...githubRepos.map(r => ({ ...r, platform: 'github' as const })),
+    ...gitlabRepos.map(r => ({ ...r, platform: 'gitlab' as const })),
+  ];
+
+  const profileBindings = bindings?.filter(b => b.profileId === profileId) ?? [];
+
+  const handleBind = async () => {
+    if (!selectedRepo) return;
+    const [platform, fullName] = selectedRepo.split(':');
     try {
-      await setVar.mutateAsync({
-        profileId,
-        key: newVarKey.trim(),
-        value: newVarValue,
-        isSecret: newVarIsSecret,
+      await bind.mutateAsync({
         organizationId,
+        profileId,
+        repoFullName: fullName,
+        platform: platform as 'github' | 'gitlab',
       });
-      toast.success(`Variable "${newVarKey}" added`);
-      resetNewVarForm();
-    } catch (err) {
-      console.error('Failed to add variable:', err);
-      toast.error('Failed to add variable');
-    } finally {
-      setSavingVarKey(null);
+      toast.success(`Pinned to "${fullName}"`);
+      setSelectedRepo('');
+      setIsAdding(false);
+    } catch {
+      toast.error('Failed to pin repo');
     }
   };
 
-  const handleStartEditVar = (varItem: ProfileVar) => {
-    setEditingVarKey(varItem.key);
-    // For secrets, value is masked - user must enter new value
-    setEditingVarValue(varItem.isSecret ? '' : varItem.value);
-    setShowEditingVarValue(!varItem.isSecret);
+  if (isLoading) return null;
+
+  return (
+    <div className="space-y-3 rounded-lg border p-3">
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex items-center gap-2 text-sm font-medium">
+          <GitBranch className="h-4 w-4" />
+          Pinned to repositories
+        </div>
+        {!isAdding && (
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => setIsAdding(true)}
+            disabled={bind.isPending}
+          >
+            <Plus className="mr-1.5 h-3.5 w-3.5" />
+            Pin a repo
+          </Button>
+        )}
+      </div>
+
+      <p className="text-muted-foreground text-xs">
+        Auto-loaded whenever a session targets one of these repositories.
+      </p>
+
+      {/* Add binding form */}
+      {isAdding && (
+        <div className="flex items-center gap-2">
+          <Popover open={repoPopoverOpen} onOpenChange={setRepoPopoverOpen}>
+            <PopoverTrigger asChild>
+              <Button
+                variant="outline"
+                size="sm"
+                role="combobox"
+                className="flex-1 justify-between font-normal"
+                disabled={isLoadingRepos}
+              >
+                <span className="truncate">
+                  {selectedRepo ? (
+                    selectedRepo.split(':')[1]
+                  ) : (
+                    <span className="text-muted-foreground">Select repository…</span>
+                  )}
+                </span>
+                {isLoadingRepos ? (
+                  <Loader2 className="ml-2 h-3.5 w-3.5 animate-spin" />
+                ) : (
+                  <ChevronDown className="text-muted-foreground ml-2 h-3.5 w-3.5 shrink-0" />
+                )}
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent className="w-[--radix-popover-trigger-width] p-0">
+              <Command>
+                <CommandInput placeholder="Search repos..." />
+                <CommandEmpty>No repositories found</CommandEmpty>
+                <CommandList className="max-h-48 overflow-auto">
+                  {hasMultiplePlatforms ? (
+                    <>
+                      {githubRepos.length > 0 && (
+                        <CommandGroup heading="GitHub">
+                          {githubRepos.map(r => (
+                            <RepoPinCommandItem
+                              key={r.id}
+                              repo={{ ...r, platform: 'github' }}
+                              isSelected={`github:${r.fullName}` === selectedRepo}
+                              onSelect={v => {
+                                setSelectedRepo(v);
+                                setRepoPopoverOpen(false);
+                              }}
+                            />
+                          ))}
+                        </CommandGroup>
+                      )}
+                      {gitlabRepos.length > 0 && (
+                        <CommandGroup heading="GitLab">
+                          {gitlabRepos.map(r => (
+                            <RepoPinCommandItem
+                              key={r.id}
+                              repo={{ ...r, platform: 'gitlab' }}
+                              isSelected={`gitlab:${r.fullName}` === selectedRepo}
+                              onSelect={v => {
+                                setSelectedRepo(v);
+                                setRepoPopoverOpen(false);
+                              }}
+                            />
+                          ))}
+                        </CommandGroup>
+                      )}
+                    </>
+                  ) : (
+                    <CommandGroup>
+                      {allRepos.map(r => (
+                        <RepoPinCommandItem
+                          key={r.id}
+                          repo={r}
+                          isSelected={`${r.platform}:${r.fullName}` === selectedRepo}
+                          onSelect={v => {
+                            setSelectedRepo(v);
+                            setRepoPopoverOpen(false);
+                          }}
+                        />
+                      ))}
+                    </CommandGroup>
+                  )}
+                </CommandList>
+              </Command>
+            </PopoverContent>
+          </Popover>
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={() => {
+              setIsAdding(false);
+              setSelectedRepo('');
+            }}
+            disabled={bind.isPending}
+          >
+            Cancel
+          </Button>
+          <Button size="sm" onClick={handleBind} disabled={!selectedRepo || bind.isPending}>
+            {bind.isPending ? <Loader2 className="h-3.5 w-3.5 animate-spin" /> : 'Pin'}
+          </Button>
+        </div>
+      )}
+
+      {profileBindings.length === 0 && !isAdding ? (
+        <p className="text-muted-foreground text-xs italic">Not pinned to any repositories.</p>
+      ) : profileBindings.length > 0 ? (
+        <div className="space-y-1.5">
+          {profileBindings.map(binding => (
+            <div
+              key={`${binding.repoFullName}-${binding.platform}`}
+              className="bg-background flex items-center gap-2 rounded-md border px-3 py-2"
+            >
+              <Link2 className="text-muted-foreground h-3.5 w-3.5 shrink-0" />
+              <span className="flex-1 truncate font-mono text-xs">{binding.repoFullName}</span>
+              <span className="text-muted-foreground text-[10px] uppercase tracking-wider">
+                {binding.platform}
+              </span>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="text-muted-foreground hover:text-destructive h-7 w-7 shrink-0"
+                onClick={async () => {
+                  try {
+                    await unbind.mutateAsync({
+                      repoFullName: binding.repoFullName,
+                      platform: binding.platform as 'github' | 'gitlab',
+                      organizationId,
+                    });
+                    toast.success('Repo unbound');
+                  } catch {
+                    toast.error('Failed to unbind repo');
+                  }
+                }}
+                disabled={unbind.isPending}
+                title="Unbind repo"
+              >
+                <Link2Off className="h-3.5 w-3.5" />
+              </Button>
+            </div>
+          ))}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+function RepoPinCommandItem({
+  repo,
+  isSelected,
+  onSelect,
+}: {
+  repo: RepoOption;
+  isSelected: boolean;
+  onSelect: (v: string) => void;
+}) {
+  return (
+    <CommandItem
+      value={`${repo.platform}:${repo.fullName}`}
+      onSelect={onSelect}
+      className="flex items-center gap-2"
+    >
+      {repo.private ? (
+        <Lock className="h-3.5 w-3.5 text-yellow-500" />
+      ) : (
+        <Unlock className="text-muted-foreground h-3.5 w-3.5" />
+      )}
+      <span className="truncate text-xs">{repo.fullName}</span>
+      <Check className={cn('ml-auto h-3.5 w-3.5', isSelected ? 'opacity-100' : 'opacity-0')} />
+    </CommandItem>
+  );
+}
+
+// -------------------------------------------------------------------
+// VarsTab
+// -------------------------------------------------------------------
+
+type VarsTabProps = {
+  profileId: string;
+  organizationId?: string;
+  vars: ProfileVar[];
+  mutations:
+    | ReturnType<typeof useProfileMutations>
+    | ReturnType<typeof useCombinedProfileMutations>;
+};
+
+type DraftVar = { id: string; key: string; value: string; isSecret: boolean; showValue: boolean };
+
+const makeDraft = (partial?: Partial<DraftVar>): DraftVar => ({
+  id: crypto.randomUUID(),
+  key: '',
+  value: '',
+  isSecret: false,
+  showValue: false,
+  ...partial,
+});
+
+const cleanKey = (raw: string) => raw.toUpperCase().replace(/[^A-Z0-9_]/g, '_');
+
+function VarsTab({ profileId, organizationId, vars, mutations }: VarsTabProps) {
+  const [isAdding, setIsAdding] = useState(false);
+  const [drafts, setDrafts] = useState<DraftVar[]>([]);
+  const [editingKey, setEditingKey] = useState<string | null>(null);
+  const [editingValue, setEditingValue] = useState('');
+  const [showEditValue, setShowEditValue] = useState(false);
+  const [savingKey, setSavingKey] = useState<string | null>(null);
+  const [deletingKey, setDeletingKey] = useState<string | null>(null);
+
+  const startAdding = () => {
+    setIsAdding(true);
+    setDrafts([makeDraft()]);
+  };
+
+  const resetAdd = () => {
+    setIsAdding(false);
+    setDrafts([]);
+  };
+
+  const updateDraft = (id: string, patch: Partial<DraftVar>) => {
+    setDrafts(prev => prev.map(d => (d.id === id ? { ...d, ...patch } : d)));
+  };
+
+  const removeDraft = (id: string) => {
+    setDrafts(prev => {
+      const next = prev.filter(d => d.id !== id);
+      return next.length === 0 ? [makeDraft()] : next;
+    });
   };
 
-  const handleSaveVar = async (varItem: ProfileVar) => {
-    if (!editingVarValue && varItem.isSecret) {
-      // For secrets, if no new value entered, cancel edit
-      resetEditVarForm();
+  /** Handle paste into a draft row. Returns true if handled (caller should preventDefault). */
+  const handleDraftPaste = (id: string, text: string): boolean => {
+    const parsed = parseEnvText(text);
+    if (parsed.length === 0) return false;
+    setDrafts(prev => {
+      const idx = prev.findIndex(d => d.id === id);
+      if (idx === -1) return prev;
+      const target = prev[idx];
+      const targetIsEmpty = target.key === '' && target.value === '';
+      const newRows = parsed.map(p =>
+        makeDraft({ key: p.key, value: p.value, isSecret: target.isSecret })
+      );
+      // Replace the current row if it's empty; otherwise insert after it.
+      const before = prev.slice(0, idx);
+      const after = prev.slice(idx + 1);
+      if (targetIsEmpty) {
+        return [...before, ...newRows, ...after];
+      }
+      if (parsed.length === 1) {
+        // Single pair pasted into a populated field — let the browser handle it (overwrite just that field).
+        return prev;
+      }
+      return [...before, target, ...newRows, ...after];
+    });
+    return true;
+  };
+
+  const handleSaveAll = async () => {
+    const entries = drafts.map(d => ({ ...d, key: d.key.trim() })).filter(d => d.key !== '');
+    if (entries.length === 0) {
+      toast.error('Add at least one variable');
       return;
     }
+    const seen = new Set<string>();
+    for (const e of entries) {
+      if (seen.has(e.key)) {
+        toast.error(`Duplicate key "${e.key}" in drafts`);
+        return;
+      }
+      seen.add(e.key);
+    }
+    setSavingKey('__new__');
+    let succeeded = 0;
+    const failed: string[] = [];
+    try {
+      for (const entry of entries) {
+        try {
+          await mutations.setVar.mutateAsync({
+            profileId,
+            key: entry.key,
+            value: entry.value,
+            isSecret: entry.isSecret,
+            organizationId,
+          });
+          succeeded += 1;
+        } catch {
+          failed.push(entry.key);
+        }
+      }
+      if (failed.length === 0) {
+        toast.success(
+          succeeded === 1 ? `Variable "${entries[0].key}" added` : `Added ${succeeded} variables`
+        );
+        resetAdd();
+      } else {
+        toast.error(
+          `Added ${succeeded} of ${entries.length}. Failed: ${failed.slice(0, 3).join(', ')}${
+            failed.length > 3 ? '…' : ''
+          }`
+        );
+      }
+    } finally {
+      setSavingKey(null);
+    }
+  };
 
-    setSavingVarKey(varItem.key);
+  const handleSaveEdit = async (varItem: ProfileVar) => {
+    setSavingKey(varItem.key);
     try {
-      await setVar.mutateAsync({
+      await mutations.setVar.mutateAsync({
         profileId,
         key: varItem.key,
-        value: editingVarValue,
+        value: editingValue,
         isSecret: varItem.isSecret,
         organizationId,
       });
       toast.success(`Variable "${varItem.key}" updated`);
-      resetEditVarForm();
-    } catch (err) {
-      console.error('Failed to update variable:', err);
+      setEditingKey(null);
+    } catch {
       toast.error('Failed to update variable');
     } finally {
-      setSavingVarKey(null);
+      setSavingKey(null);
     }
   };
 
-  const handleDeleteVar = async (key: string) => {
-    setDeletingVarKey(key);
+  const handleDelete = async (key: string) => {
+    setDeletingKey(key);
     try {
-      await deleteVar.mutateAsync({ profileId, key, organizationId });
+      await mutations.deleteVar.mutateAsync({ profileId, key, organizationId });
       toast.success(`Variable "${key}" deleted`);
-    } catch (err) {
-      console.error('Failed to delete variable:', err);
+    } catch {
       toast.error('Failed to delete variable');
     } finally {
-      setDeletingVarKey(null);
+      setDeletingKey(null);
     }
   };
 
-  const handleAddCommand = async () => {
+  return (
+    <div className="space-y-2 p-4">
+      <div className="flex items-center gap-1.5">
+        <Key className="text-muted-foreground h-3.5 w-3.5" />
+        <span className="text-xs font-medium">Environment Variables</span>
+      </div>
+
+      {vars.map(varItem => (
+        <div
+          key={varItem.key}
+          className="hover:bg-accent/50 rounded-lg border p-2 transition-colors"
+        >
+          {editingKey === varItem.key ? (
+            <div className="space-y-2">
+              <code className="bg-muted rounded px-2 py-0.5 font-mono text-xs">{varItem.key}</code>
+              <div className="relative">
+                <Input
+                  type={showEditValue ? 'text' : 'password'}
+                  value={editingValue}
+                  onChange={e => setEditingValue(e.target.value)}
+                  placeholder={varItem.isSecret ? 'Enter new secret value' : 'Value'}
+                  className="pr-10 text-sm"
+                  autoComplete="new-password"
+                  data-1p-ignore="true"
+                  data-form-type="other"
+                />
+                <button
+                  type="button"
+                  className="text-muted-foreground hover:text-foreground absolute top-1/2 right-3 -translate-y-1/2"
+                  onClick={() => setShowEditValue(!showEditValue)}
+                >
+                  {showEditValue ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+                </button>
+              </div>
+              <div className="flex justify-end gap-2">
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  onClick={() => setEditingKey(null)}
+                  disabled={savingKey === varItem.key}
+                >
+                  Cancel
+                </Button>
+                <Button
+                  size="sm"
+                  onClick={() => handleSaveEdit(varItem)}
+                  disabled={savingKey === varItem.key}
+                >
+                  {savingKey === varItem.key ? (
+                    <Loader2 className="h-4 w-4 animate-spin" />
+                  ) : (
+                    'Save'
+                  )}
+                </Button>
+              </div>
+            </div>
+          ) : (
+            <div className="flex items-center justify-between gap-2">
+              <div className="flex min-w-0 flex-1 items-center gap-2">
+                <code className="bg-muted shrink-0 rounded px-2 py-0.5 font-mono text-xs">
+                  {varItem.key}
+                </code>
+                {varItem.isSecret ? (
+                  <span className="text-muted-foreground flex items-center gap-1 text-xs">
+                    <Lock className="h-3 w-3" />
+                    •••••••
+                  </span>
+                ) : (
+                  <span className="text-muted-foreground truncate text-xs">{varItem.value}</span>
+                )}
+              </div>
+              <div className="flex shrink-0 gap-1">
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="h-7"
+                  onClick={() => {
+                    setEditingKey(varItem.key);
+                    setEditingValue(varItem.isSecret ? '' : varItem.value);
+                    setShowEditValue(!varItem.isSecret);
+                  }}
+                  disabled={deletingKey === varItem.key}
+                >
+                  Edit
+                </Button>
+                <InlineDeleteConfirmation
+                  onDelete={() => handleDelete(varItem.key)}
+                  isLoading={deletingKey === varItem.key}
+                />
+              </div>
+            </div>
+          )}
+        </div>
+      ))}
+
+      {isAdding ? (
+        <div className="space-y-3 rounded-lg border border-dashed p-3">
+          <div className="flex items-center justify-between">
+            <Label className="text-xs">New variables</Label>
+            <p className="text-muted-foreground text-[11px]">
+              Tip: paste <code className="font-mono">KEY=VALUE</code> lines to add many at once.
+            </p>
+          </div>
+
+          <div className="space-y-2">
+            {drafts.map((draft, idx) => (
+              <div key={draft.id} className="flex items-center gap-2">
+                <Input
+                  value={draft.key}
+                  onChange={e => updateDraft(draft.id, { key: cleanKey(e.target.value) })}
+                  onPaste={e => {
+                    if (handleDraftPaste(draft.id, e.clipboardData.getData('text'))) {
+                      e.preventDefault();
+                    }
+                  }}
+                  placeholder="API_KEY"
+                  className="h-8 w-44 font-mono text-sm"
+                  autoFocus={idx === 0}
+                  disabled={savingKey === '__new__'}
+                />
+                <div className="relative flex-1">
+                  <Input
+                    type={draft.showValue || !draft.isSecret ? 'text' : 'password'}
+                    value={draft.value}
+                    onChange={e => updateDraft(draft.id, { value: e.target.value })}
+                    onPaste={e => {
+                      if (handleDraftPaste(draft.id, e.clipboardData.getData('text'))) {
+                        e.preventDefault();
+                      }
+                    }}
+                    placeholder={draft.isSecret ? 'Secret value (encrypted)' : 'Value'}
+                    className="h-8 pr-8 text-sm"
+                    autoComplete="new-password"
+                    data-1p-ignore="true"
+                    data-form-type="other"
+                    disabled={savingKey === '__new__'}
+                  />
+                  {draft.isSecret && (
+                    <button
+                      type="button"
+                      className="text-muted-foreground hover:text-foreground absolute top-1/2 right-2 -translate-y-1/2"
+                      onClick={() => updateDraft(draft.id, { showValue: !draft.showValue })}
+                      tabIndex={-1}
+                    >
+                      {draft.showValue ? (
+                        <EyeOff className="h-3.5 w-3.5" />
+                      ) : (
+                        <Eye className="h-3.5 w-3.5" />
+                      )}
+                    </button>
+                  )}
+                </div>
+                <button
+                  type="button"
+                  onClick={() => updateDraft(draft.id, { isSecret: !draft.isSecret })}
+                  className={cn(
+                    'hover:text-foreground flex h-8 w-8 items-center justify-center rounded-md border',
+                    draft.isSecret
+                      ? 'border-primary/40 text-primary'
+                      : 'text-muted-foreground border-input'
+                  )}
+                  title={draft.isSecret ? 'Encrypted secret' : 'Plain value — click to encrypt'}
+                  disabled={savingKey === '__new__'}
+                >
+                  <Lock className="h-3.5 w-3.5" />
+                </button>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="h-8 w-8 shrink-0 p-0"
+                  onClick={() => removeDraft(draft.id)}
+                  disabled={savingKey === '__new__'}
+                  aria-label="Remove row"
+                >
+                  <Trash2 className="h-3.5 w-3.5" />
+                </Button>
+              </div>
+            ))}
+          </div>
+
+          <Button
+            type="button"
+            variant="ghost"
+            size="sm"
+            onClick={() => setDrafts(prev => [...prev, makeDraft()])}
+            disabled={savingKey === '__new__'}
+          >
+            <Plus className="mr-1 h-3.5 w-3.5" />
+            Add another
+          </Button>
+
+          <div className="flex justify-end gap-2">
+            <Button variant="ghost" size="sm" onClick={resetAdd} disabled={savingKey === '__new__'}>
+              Cancel
+            </Button>
+            <Button size="sm" onClick={handleSaveAll} disabled={savingKey === '__new__'}>
+              {savingKey === '__new__' ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Save'}
+            </Button>
+          </div>
+        </div>
+      ) : (
+        <Button variant="outline" className="h-11 w-full border-dashed" onClick={startAdding}>
+          <Plus className="mr-2 h-4 w-4" />
+          Add Variable
+        </Button>
+      )}
+
+      {vars.length === 0 && !isAdding && (
+        <p className="text-muted-foreground py-2 text-center text-sm">No environment variables.</p>
+      )}
+    </div>
+  );
+}
+
+// -------------------------------------------------------------------
+// .env paste parsing
+// -------------------------------------------------------------------
+
+function stripEnvQuotes(value: string): string {
+  if (value.length >= 2 && value.startsWith('"') && value.endsWith('"')) {
+    return value.slice(1, -1).replace(/\\(["\\n])/g, (_m, ch: string) => (ch === 'n' ? '\n' : ch));
+  }
+  if (value.length >= 2 && value.startsWith("'") && value.endsWith("'")) {
+    return value.slice(1, -1);
+  }
+  return value;
+}
+
+function parseEnvText(content: string): { key: string; value: string }[] {
+  const out: { key: string; value: string }[] = [];
+  const seen = new Set<string>();
+  for (const rawLine of content.split(/\r?\n/)) {
+    let line = rawLine.trim();
+    if (line === '' || line.startsWith('#')) continue;
+    if (line.toLowerCase().startsWith('export ')) line = line.slice(7).trim();
+    const eqIdx = line.indexOf('=');
+    if (eqIdx === -1) continue;
+    const key = line.slice(0, eqIdx).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) continue;
+    let value = line.slice(eqIdx + 1).trim();
+    // Drop trailing unquoted inline comments (e.g. `VAL=foo # note`)
+    if (!value.startsWith('"') && !value.startsWith("'")) {
+      const hashIdx = value.indexOf(' #');
+      if (hashIdx !== -1) value = value.slice(0, hashIdx).trim();
+    }
+    value = stripEnvQuotes(value);
+    if (seen.has(key)) {
+      const prev = out.findIndex(e => e.key === key);
+      if (prev !== -1) out[prev] = { key, value };
+    } else {
+      seen.add(key);
+      out.push({ key, value });
+    }
+  }
+  return out;
+}
+
+// -------------------------------------------------------------------
+// CommandsTab
+// -------------------------------------------------------------------
+
+type CommandsTabProps = {
+  profileId: string;
+  organizationId?: string;
+  commands: { sequence: number; command: string }[];
+  mutations:
+    | ReturnType<typeof useProfileMutations>
+    | ReturnType<typeof useCombinedProfileMutations>;
+};
+
+function CommandsTab({ profileId, organizationId, commands, mutations }: CommandsTabProps) {
+  const [isAdding, setIsAdding] = useState(false);
+  const [newCommand, setNewCommand] = useState('');
+  const [saving, setSaving] = useState(false);
+
+  const handleAdd = async () => {
     if (!newCommand.trim()) {
       toast.error('Command is required');
       return;
     }
-
-    const currentCommands = profile?.commands.map(c => c.command) || [];
-    const updatedCommands = [...currentCommands, newCommand.trim()];
-
-    setSavingCommands(true);
+    const current = commands.map(c => c.command);
+    setSaving(true);
     try {
-      await setCommands.mutateAsync({
+      await mutations.setCommands.mutateAsync({
         profileId,
-        commands: updatedCommands,
+        commands: [...current, newCommand.trim()],
         organizationId,
       });
       toast.success('Command added');
-      setIsAddingCommand(false);
+      setIsAdding(false);
       setNewCommand('');
-    } catch (err) {
-      console.error('Failed to add command:', err);
+    } catch {
       toast.error('Failed to add command');
     } finally {
-      setSavingCommands(false);
+      setSaving(false);
     }
   };
 
-  const handleDeleteCommand = async (index: number) => {
-    const currentCommands = profile?.commands.map(c => c.command) || [];
-    const updatedCommands = currentCommands.filter((_, i) => i !== index);
-
-    setSavingCommands(true);
+  const handleDelete = async (index: number) => {
+    const updated = commands.filter((_, i) => i !== index).map(c => c.command);
+    setSaving(true);
     try {
-      await setCommands.mutateAsync({
-        profileId,
-        commands: updatedCommands,
-        organizationId,
-      });
+      await mutations.setCommands.mutateAsync({ profileId, commands: updated, organizationId });
       toast.success('Command deleted');
-    } catch (err) {
-      console.error('Failed to delete command:', err);
+    } catch {
       toast.error('Failed to delete command');
     } finally {
-      setSavingCommands(false);
+      setSaving(false);
     }
   };
 
-  if (isLoading) {
-    return (
-      <div className="border-t px-3 py-4">
-        <div className="flex items-center justify-center py-4">
-          <Loader2 className="h-5 w-5 animate-spin" />
-        </div>
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className="border-t px-3 py-4">
-        <div className="text-destructive flex items-center justify-center gap-2 py-4">
-          <AlertCircle className="h-4 w-4" />
-          <span className="text-sm">Failed to load profile details</span>
-        </div>
+  return (
+    <div className="space-y-2 p-4">
+      <div className="flex items-center gap-1.5">
+        <Terminal className="text-muted-foreground h-3.5 w-3.5" />
+        <span className="text-xs font-medium">Setup Commands</span>
       </div>
-    );
-  }
 
-  return (
-    <div className="border-t px-3 py-3">
-      {/* Editable name and description */}
-      <div className="space-y-3 border-b pb-3">
-        <div className="grid gap-2">
-          <Label htmlFor={`profile-name-${profileId}`}>Name</Label>
-          <Input
-            id={`profile-name-${profileId}`}
-            value={profileName}
-            onChange={e => setProfileName(e.target.value)}
-            placeholder="Profile name"
-            disabled={savingMetadata}
-          />
-        </div>
-        <div className="grid gap-2">
-          <Label htmlFor={`profile-description-${profileId}`}>Description</Label>
-          <Textarea
-            id={`profile-description-${profileId}`}
-            value={profileDescription}
-            onChange={e => setProfileDescription(e.target.value)}
-            placeholder="Optional description"
-            rows={2}
-            disabled={savingMetadata}
-          />
-        </div>
-        <div className="flex justify-end">
+      {commands.map((cmd, i) => (
+        <div
+          key={`${cmd.sequence}-${i}`}
+          className="hover:bg-accent/50 flex items-center gap-2 rounded-lg border p-2 transition-colors"
+        >
+          <span className="text-muted-foreground w-5 shrink-0 text-xs">{i + 1}.</span>
+          <code className="bg-muted flex-1 truncate rounded px-2 py-0.5 font-mono text-xs">
+            {cmd.command}
+          </code>
           <Button
-            size="sm"
-            onClick={handleSaveMetadata}
-            disabled={
-              savingMetadata ||
-              (profileName === profile?.name && profileDescription === (profile?.description || ''))
-            }
+            variant="ghost"
+            size="icon"
+            className="text-destructive hover:text-destructive h-7 w-7 shrink-0"
+            onClick={() => handleDelete(i)}
+            disabled={saving}
           >
-            {savingMetadata ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : null}
-            Save Changes
+            <Trash2 className="h-4 w-4" />
           </Button>
         </div>
-      </div>
-
-      {/* Tab navigation */}
-      <div className="flex gap-1 border-b">
-        <button
-          className={`border-b-2 px-3 py-2 text-sm font-medium transition-colors ${
-            activeTab === 'vars'
-              ? 'border-primary text-foreground'
-              : 'text-muted-foreground hover:text-foreground border-transparent'
-          }`}
-          onClick={() => setActiveTab('vars')}
-        >
-          <Key className="mr-1.5 inline-block h-4 w-4" />
-          Variables ({profile?.vars.length || 0})
-        </button>
-        <button
-          className={`border-b-2 px-3 py-2 text-sm font-medium transition-colors ${
-            activeTab === 'commands'
-              ? 'border-primary text-foreground'
-              : 'text-muted-foreground hover:text-foreground border-transparent'
-          }`}
-          onClick={() => setActiveTab('commands')}
-        >
-          <Terminal className="mr-1.5 inline-block h-4 w-4" />
-          Commands ({profile?.commands.length || 0})
-        </button>
-      </div>
-
-      {/* Tab content */}
-      <div className="py-2">
-        {activeTab === 'vars' ? (
-          /* Variables Tab */
-          <div className="space-y-2">
-            {profile?.vars.map(varItem => (
-              <div
-                key={varItem.key}
-                className="hover:bg-accent/50 rounded-lg border p-2 transition-colors"
-              >
-                {editingVarKey === varItem.key ? (
-                  // Edit mode
-                  <div className="space-y-2">
-                    <div className="flex items-center gap-2">
-                      <code className="bg-muted rounded px-2 py-1 font-mono text-sm">
-                        {varItem.key}
-                      </code>
-                      {varItem.isSecret && <Lock className="text-muted-foreground h-4 w-4" />}
-                    </div>
-                    <div className="relative">
-                      <Input
-                        type={showEditingVarValue ? 'text' : 'password'}
-                        value={editingVarValue}
-                        onChange={e => setEditingVarValue(e.target.value)}
-                        placeholder={varItem.isSecret ? 'Enter new secret value' : 'Value'}
-                        className="pr-10"
-                        autoComplete="new-password"
-                        autoCorrect="off"
-                        autoCapitalize="off"
-                        spellCheck={false}
-                        data-1p-ignore="true"
-                        data-lpignore="true"
-                        data-form-type="other"
-                      />
-                      <button
-                        type="button"
-                        className="text-muted-foreground hover:text-foreground absolute top-1/2 right-3 -translate-y-1/2"
-                        onClick={() => setShowEditingVarValue(!showEditingVarValue)}
-                      >
-                        {showEditingVarValue ? (
-                          <EyeOff className="h-4 w-4" />
-                        ) : (
-                          <Eye className="h-4 w-4" />
-                        )}
-                      </button>
-                    </div>
-                    <div className="flex justify-end gap-2">
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        onClick={resetEditVarForm}
-                        disabled={savingVarKey === varItem.key}
-                      >
-                        Cancel
-                      </Button>
-                      <Button
-                        size="sm"
-                        onClick={() => handleSaveVar(varItem)}
-                        disabled={savingVarKey === varItem.key}
-                      >
-                        {savingVarKey === varItem.key ? (
-                          <Loader2 className="h-4 w-4 animate-spin" />
-                        ) : (
-                          'Save'
-                        )}
-                      </Button>
-                    </div>
-                  </div>
-                ) : (
-                  // View mode
-                  <div className="flex items-center justify-between gap-2">
-                    <div className="flex min-w-0 flex-1 items-center gap-2">
-                      <code className="bg-muted shrink-0 rounded px-2 py-1 font-mono text-sm">
-                        {varItem.key}
-                      </code>
-                      {varItem.isSecret ? (
-                        <span className="text-muted-foreground flex items-center gap-1 text-sm">
-                          <Lock className="h-3 w-3" />
-                          •••••••
-                        </span>
-                      ) : (
-                        <span className="text-muted-foreground truncate text-sm">
-                          {varItem.value}
-                        </span>
-                      )}
-                    </div>
-                    <div className="flex shrink-0 items-center gap-1">
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => handleStartEditVar(varItem)}
-                        disabled={deletingVarKey === varItem.key}
-                      >
-                        Edit
-                      </Button>
-                      <InlineDeleteConfirmation
-                        onDelete={() => handleDeleteVar(varItem.key)}
-                        isLoading={deletingVarKey === varItem.key}
-                      />
-                    </div>
-                  </div>
-                )}
-              </div>
-            ))}
-
-            {/* Add new variable form */}
-            {isAddingVar ? (
-              <div className="space-y-3 rounded-lg border border-dashed p-2">
-                <div className="grid gap-2">
-                  <Label htmlFor={`new-var-key-${profileId}`}>Variable Name</Label>
-                  <Input
-                    id={`new-var-key-${profileId}`}
-                    value={newVarKey}
-                    onChange={e =>
-                      setNewVarKey(e.target.value.toUpperCase().replace(/[^A-Z0-9_]/g, '_'))
-                    }
-                    placeholder="API_KEY"
-                    className="font-mono"
-                    autoFocus
-                  />
-                </div>
-                <div className="grid gap-2">
-                  <Label htmlFor={`new-var-value-${profileId}`}>Value</Label>
-                  <div className="relative">
-                    <Input
-                      id={`new-var-value-${profileId}`}
-                      type={showNewVarValue ? 'text' : 'password'}
-                      value={newVarValue}
-                      onChange={e => setNewVarValue(e.target.value)}
-                      placeholder={newVarIsSecret ? 'Secret value (encrypted)' : 'Value'}
-                      className="pr-10"
-                      autoComplete="new-password"
-                      autoCorrect="off"
-                      autoCapitalize="off"
-                      spellCheck={false}
-                      data-1p-ignore="true"
-                      data-lpignore="true"
-                      data-form-type="other"
-                    />
-                    <button
-                      type="button"
-                      className="text-muted-foreground hover:text-foreground absolute top-1/2 right-3 -translate-y-1/2"
-                      onClick={() => setShowNewVarValue(!showNewVarValue)}
-                    >
-                      {showNewVarValue ? (
-                        <EyeOff className="h-4 w-4" />
-                      ) : (
-                        <Eye className="h-4 w-4" />
-                      )}
-                    </button>
-                  </div>
-                </div>
-                <div className="flex items-center gap-2">
-                  <Checkbox
-                    id={`new-var-secret-${profileId}`}
-                    checked={newVarIsSecret}
-                    onCheckedChange={checked => setNewVarIsSecret(checked === true)}
-                  />
-                  <Label
-                    htmlFor={`new-var-secret-${profileId}`}
-                    className="flex cursor-pointer items-center gap-1"
-                  >
-                    <Lock className="h-3 w-3" />
-                    Store as encrypted secret
-                  </Label>
-                </div>
-                <div className="flex justify-end gap-2">
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    onClick={resetNewVarForm}
-                    disabled={savingVarKey === '__new__'}
-                  >
-                    Cancel
-                  </Button>
-                  <Button size="sm" onClick={handleAddVar} disabled={savingVarKey === '__new__'}>
-                    {savingVarKey === '__new__' ? (
-                      <Loader2 className="h-4 w-4 animate-spin" />
-                    ) : (
-                      'Add Variable'
-                    )}
-                  </Button>
-                </div>
-              </div>
-            ) : (
-              <Button
-                variant="outline"
-                size="sm"
-                className="w-full border-dashed"
-                onClick={() => setIsAddingVar(true)}
-              >
-                <Plus className="mr-2 h-4 w-4" />
-                Add Variable
-              </Button>
-            )}
-
-            {profile?.vars.length === 0 && !isAddingVar && (
-              <p className="text-muted-foreground py-2 text-center text-sm">
-                No environment variables yet.
-              </p>
-            )}
+      ))}
+
+      {isAdding ? (
+        <div className="space-y-3 rounded-lg border border-dashed p-3">
+          <div className="grid gap-1.5">
+            <Label className="text-xs">Command</Label>
+            <Input
+              value={newCommand}
+              onChange={e => setNewCommand(e.target.value)}
+              placeholder="npm install"
+              className="font-mono text-sm"
+              autoFocus
+              onKeyDown={e => e.key === 'Enter' && !saving && handleAdd()}
+            />
           </div>
-        ) : (
-          /* Commands Tab */
-          <div className="space-y-2">
-            {profile?.commands.map((cmd, index) => (
-              <div
-                key={`${cmd.sequence}-${index}`}
-                className="hover:bg-accent/50 flex items-center gap-2 rounded-lg border p-2 transition-colors"
-              >
-                <span className="text-muted-foreground w-5 shrink-0 text-xs">{index + 1}.</span>
-                <code className="bg-muted flex-1 truncate rounded px-2 py-1 font-mono text-sm">
-                  {cmd.command}
-                </code>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="text-destructive hover:text-destructive h-7 w-7 shrink-0"
-                  onClick={() => handleDeleteCommand(index)}
-                  disabled={savingCommands}
-                >
-                  <Trash2 className="h-4 w-4" />
-                </Button>
-              </div>
-            ))}
-
-            {/* Add new command form */}
-            {isAddingCommand ? (
-              <div className="space-y-3 rounded-lg border border-dashed p-2">
-                <div className="grid gap-2">
-                  <Label htmlFor={`new-command-${profileId}`}>Command</Label>
-                  <Input
-                    id={`new-command-${profileId}`}
-                    value={newCommand}
-                    onChange={e => setNewCommand(e.target.value)}
-                    placeholder="npm install"
-                    className="font-mono"
-                    autoFocus
-                  />
-                </div>
-                <div className="flex justify-end gap-2">
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    onClick={() => {
-                      setIsAddingCommand(false);
-                      setNewCommand('');
-                    }}
-                    disabled={savingCommands}
-                  >
-                    Cancel
-                  </Button>
-                  <Button size="sm" onClick={handleAddCommand} disabled={savingCommands}>
-                    {savingCommands ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Add Command'}
-                  </Button>
-                </div>
-              </div>
-            ) : (
-              <Button
-                variant="outline"
-                size="sm"
-                className="w-full border-dashed"
-                onClick={() => setIsAddingCommand(true)}
-              >
-                <Plus className="mr-2 h-4 w-4" />
-                Add Command
-              </Button>
-            )}
-
-            {profile?.commands.length === 0 && !isAddingCommand && (
-              <p className="text-muted-foreground py-2 text-center text-sm">
-                No startup commands yet. Commands run in order when the session starts.
-              </p>
-            )}
+          <div className="flex justify-end gap-2">
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => {
+                setIsAdding(false);
+                setNewCommand('');
+              }}
+              disabled={saving}
+            >
+              Cancel
+            </Button>
+            <Button size="sm" onClick={handleAdd} disabled={saving}>
+              {saving ? <Loader2 className="h-4 w-4 animate-spin" /> : 'Add'}
+            </Button>
           </div>
-        )}
-      </div>
+        </div>
+      ) : (
+        <Button
+          variant="outline"
+          className="h-11 w-full border-dashed"
+          onClick={() => setIsAdding(true)}
+        >
+          <Plus className="mr-2 h-4 w-4" />
+          Add Command
+        </Button>
+      )}
+
+      {commands.length === 0 && !isAdding && (
+        <p className="text-muted-foreground py-2 text-center text-sm">
+          No startup commands. Commands run in order when the session starts.
+        </p>
+      )}
     </div>
   );
 }
diff --git a/apps/web/src/components/cloud-agent/RepoProfileBindingsDialog.tsx b/apps/web/src/components/cloud-agent/RepoProfileBindingsDialog.tsx
index a302de136f..1e0d3d5e9a 100644
--- a/apps/web/src/components/cloud-agent/RepoProfileBindingsDialog.tsx
+++ b/apps/web/src/components/cloud-agent/RepoProfileBindingsDialog.tsx
@@ -3,7 +3,7 @@
 
 import { useState, useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { GitBranch, Plus, Loader2, Trash2, Lock, Unlock, Check } from 'lucide-react';
+import { GitBranch, Plus, Loader2, Trash2, Lock, Unlock, Check, ChevronDown } from 'lucide-react';
 import { toast } from 'sonner';
 import { Button } from '@/components/ui/button';
 import {
@@ -229,17 +229,24 @@ export function RepoProfileBindingsDialog({
                       <PopoverTrigger asChild>
                         <Button
                           variant="outline"
+                          size="sm"
                           role="combobox"
                           aria-expanded={repoPopoverOpen}
-                          className="min-w-0 flex-1 justify-between"
+                          className="min-w-0 flex-1 justify-between font-normal"
                           disabled={isLoadingRepos}
                         >
                           <span className="truncate">
-                            {selectedRepo ? selectedRepo.split(':')[1] : 'Select repository...'}
+                            {selectedRepo ? (
+                              selectedRepo.split(':')[1]
+                            ) : (
+                              <span className="text-muted-foreground">Select repository…</span>
+                            )}
                           </span>
                           {isLoadingRepos ? (
-                            <Loader2 className="ml-2 h-4 w-4 shrink-0 animate-spin" />
-                          ) : null}
+                            <Loader2 className="ml-2 h-3.5 w-3.5 shrink-0 animate-spin" />
+                          ) : (
+                            <ChevronDown className="text-muted-foreground ml-2 h-3.5 w-3.5 shrink-0" />
+                          )}
                         </Button>
                       </PopoverTrigger>
                       <PopoverContent className="w-[--radix-popover-trigger-width] p-0">
@@ -320,6 +327,9 @@ export function RepoProfileBindingsDialog({
                   </div>
 
                   <div className="flex justify-end gap-2">
+                    <Button variant="ghost" size="sm" onClick={handleCancel}>
+                      Cancel
+                    </Button>
                     <Button
                       size="sm"
                       disabled={!selectedRepo || !selectedProfileId || bindRepo.isPending}
@@ -330,9 +340,6 @@ export function RepoProfileBindingsDialog({
                       ) : null}
                       Add
                     </Button>
-                    <Button variant="outline" size="sm" onClick={handleCancel}>
-                      Cancel
-                    </Button>
                   </div>
                 </div>
               )}
diff --git a/apps/web/src/components/cloud-agent/profile-editor/McpServersTab.tsx b/apps/web/src/components/cloud-agent/profile-editor/McpServersTab.tsx
new file mode 100644
index 0000000000..9e0509c57b
--- /dev/null
+++ b/apps/web/src/components/cloud-agent/profile-editor/McpServersTab.tsx
@@ -0,0 +1,494 @@
+/** MCP servers tab for the profile editor. */
+'use client';
+
+import { useState } from 'react';
+import { toast } from 'sonner';
+import {
+  Loader2,
+  Plus,
+  Server,
+  Lock,
+  AlertTriangle,
+  ShieldCheck,
+  AlertCircle,
+  Pencil,
+} from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Switch } from '@/components/ui/switch';
+import { InlineDeleteConfirmation } from '@/components/ui/inline-delete-confirmation';
+import { cn } from '@/lib/utils';
+import { MASKED_SECRET_VALUE } from '@kilocode/cloud-agent-profile';
+import { useProfileMutations, type ProfileMcpServer } from '@/hooks/useCloudAgentProfiles';
+import { MonacoJsonEditor } from '../MonacoJsonEditor';
+
+function countSecretValues(server: ProfileMcpServer): number {
+  if (server.type === 'local' && 'command' in server.config) {
+    return Object.keys(server.config.environment ?? {}).length;
+  }
+  if (server.type === 'remote' && 'url' in server.config) {
+    return Object.keys(server.config.headers ?? {}).length;
+  }
+  return 0;
+}
+
+type Props = {
+  profileId: string;
+  organizationId: string | undefined;
+  mcpServers: ProfileMcpServer[];
+};
+
+export function McpServersTab({ profileId, organizationId, mcpServers }: Props) {
+  const [isAdding, setIsAdding] = useState(false);
+  const [editingId, setEditingId] = useState<string | null>(null);
+
+  return (
+    <div className="space-y-2 p-4">
+      <div className="text-muted-foreground bg-muted/50 flex items-start gap-2 rounded-md border border-dashed p-3 text-xs">
+        <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+        <div>Only add servers you trust. Docker and absolute host paths are not supported.</div>
+      </div>
+
+      {mcpServers.map(server =>
+        editingId === server.id ? (
+          <McpForm
+            key={server.id}
+            mode="edit"
+            initial={server}
+            profileId={profileId}
+            organizationId={organizationId}
+            onDone={() => setEditingId(null)}
+          />
+        ) : (
+          <McpServerRow
+            key={server.id}
+            server={server}
+            profileId={profileId}
+            organizationId={organizationId}
+            onEdit={() => {
+              setEditingId(server.id);
+              setIsAdding(false);
+            }}
+          />
+        )
+      )}
+
+      {isAdding ? (
+        <McpForm
+          mode="create"
+          profileId={profileId}
+          organizationId={organizationId}
+          onDone={() => setIsAdding(false)}
+        />
+      ) : (
+        <Button
+          variant="outline"
+          className="h-11 w-full border-dashed"
+          onClick={() => {
+            setIsAdding(true);
+            setEditingId(null);
+          }}
+        >
+          <Plus className="mr-2 h-4 w-4" />
+          Add MCP server
+        </Button>
+      )}
+
+      {mcpServers.length === 0 && !isAdding && (
+        <p className="text-muted-foreground py-2 text-center text-sm">No MCP servers yet.</p>
+      )}
+    </div>
+  );
+}
+
+function McpServerRow({
+  server,
+  profileId,
+  organizationId,
+  onEdit,
+}: {
+  server: ProfileMcpServer;
+  profileId: string;
+  organizationId: string | undefined;
+  onEdit: () => void;
+}) {
+  const { deleteMcp } = useProfileMutations({ organizationId });
+  const [deleting, setDeleting] = useState(false);
+
+  const summary =
+    server.type === 'local' && 'command' in server.config
+      ? server.config.command.join(' ')
+      : server.type === 'remote' && 'url' in server.config
+        ? server.config.url
+        : '';
+
+  return (
+    <div
+      className={cn(
+        'hover:bg-accent/50 rounded-lg border p-3 transition-colors',
+        !server.enabled && 'opacity-60'
+      )}
+    >
+      <div className="flex items-start justify-between gap-2">
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <Server className="text-muted-foreground h-4 w-4" />
+            <code className="bg-muted rounded px-2 py-0.5 font-mono text-sm">{server.name}</code>
+            <span className="text-muted-foreground text-xs uppercase tracking-wide">
+              {server.type}
+            </span>
+            {!server.enabled && (
+              <span className="text-muted-foreground rounded border px-1.5 py-0.5 text-[10px] uppercase tracking-wider">
+                Disabled
+              </span>
+            )}
+            {countSecretValues(server) > 0 && (
+              <span className="text-muted-foreground flex items-center gap-0.5 text-xs">
+                <Lock className="h-3 w-3" />
+                {countSecretValues(server)}
+              </span>
+            )}
+          </div>
+          <p className="text-muted-foreground mt-0.5 truncate font-mono text-xs">{summary}</p>
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-7"
+            onClick={onEdit}
+            disabled={deleting}
+            aria-label="Edit MCP server"
+          >
+            <Pencil className="h-3.5 w-3.5" />
+          </Button>
+          <InlineDeleteConfirmation
+            onDelete={async () => {
+              setDeleting(true);
+              try {
+                await deleteMcp.mutateAsync({
+                  profileId,
+                  organizationId,
+                  mcpServerId: server.id,
+                });
+                toast.success(`MCP server "${server.name}" deleted`);
+              } catch (error) {
+                console.error('Failed to delete MCP server:', error);
+                toast.error('Failed to delete MCP server');
+              } finally {
+                setDeleting(false);
+              }
+            }}
+            isLoading={deleting}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+// -------------------------------------------------------------------
+// McpForm — shared create/edit form
+// -------------------------------------------------------------------
+
+type McpFormProps = {
+  profileId: string;
+  organizationId: string | undefined;
+  onDone: () => void;
+} & ({ mode: 'create'; initial?: undefined } | { mode: 'edit'; initial: ProfileMcpServer });
+
+type FormState = {
+  type: 'local' | 'remote';
+  name: string;
+  enabled: boolean;
+  commandText: string;
+  url: string;
+  envJson: string;
+};
+
+function initialFormState(initial: ProfileMcpServer | undefined): FormState {
+  if (!initial) {
+    return {
+      type: 'local',
+      name: '',
+      enabled: true,
+      commandText: '',
+      url: '',
+      envJson: '',
+    };
+  }
+  const { type, name, enabled, config } = initial;
+  if (type === 'local' && 'command' in config) {
+    const env = config.environment ?? {};
+    return {
+      type,
+      name,
+      enabled,
+      commandText: config.command.join(' '),
+      url: '',
+      envJson: Object.keys(env).length > 0 ? JSON.stringify(env, null, 2) : '',
+    };
+  }
+  if (type === 'remote' && 'url' in config) {
+    const headers = config.headers ?? {};
+    return {
+      type,
+      name,
+      enabled,
+      commandText: '',
+      url: config.url,
+      envJson: Object.keys(headers).length > 0 ? JSON.stringify(headers, null, 2) : '',
+    };
+  }
+  return { type: 'local', name, enabled, commandText: '', url: '', envJson: '' };
+}
+
+/** Parse JSON and validate it's a `Record<string,string>`. */
+function parseRecord(raw: string):
+  | {
+      ok: true;
+      value: Record<string, string> | undefined;
+    }
+  | { ok: false; error: string } {
+  const trimmed = raw.trim();
+  if (!trimmed) return { ok: true, value: undefined };
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(trimmed);
+  } catch (err) {
+    return { ok: false, error: err instanceof Error ? err.message : 'Invalid JSON' };
+  }
+  if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+    return { ok: false, error: 'Must be a JSON object of string → string' };
+  }
+  const out: Record<string, string> = {};
+  for (const [k, v] of Object.entries(parsed)) {
+    if (typeof v !== 'string') {
+      return { ok: false, error: `Value for "${k}" must be a string` };
+    }
+    out[k] = v;
+  }
+  return { ok: true, value: Object.keys(out).length > 0 ? out : undefined };
+}
+
+function McpForm(props: McpFormProps) {
+  const { profileId, organizationId, onDone, mode } = props;
+  const { createMcp, updateMcp } = useProfileMutations({ organizationId });
+  const [form, setForm] = useState<FormState>(() =>
+    initialFormState(mode === 'edit' ? props.initial : undefined)
+  );
+  const [saving, setSaving] = useState(false);
+  /** Only populated when the user attempts to save with invalid JSON; cleared on edit. */
+  const [jsonError, setJsonError] = useState<string | null>(null);
+
+  const update = <K extends keyof FormState>(key: K, value: FormState[K]) =>
+    setForm(prev => ({ ...prev, [key]: value }));
+
+  const handleSave = async () => {
+    if (!form.name.trim()) {
+      toast.error('MCP server name is required');
+      return;
+    }
+    const jsonCheck = parseRecord(form.envJson);
+    if (!jsonCheck.ok) {
+      setJsonError(jsonCheck.error);
+      return;
+    }
+    setJsonError(null);
+
+    setSaving(true);
+    try {
+      if (form.type === 'local') {
+        const parts = form.commandText
+          .split(/\s+/)
+          .map(p => p.trim())
+          .filter(Boolean);
+        if (parts.length === 0) {
+          toast.error('Command is required');
+          return;
+        }
+        const payload = {
+          profileId,
+          organizationId,
+          server: {
+            type: 'local' as const,
+            name: form.name.trim(),
+            enabled: form.enabled,
+            config: { command: parts, environment: jsonCheck.value },
+          },
+        };
+        if (mode === 'edit') {
+          await updateMcp.mutateAsync({ ...payload, mcpServerId: props.initial.id });
+        } else {
+          await createMcp.mutateAsync(payload);
+        }
+      } else {
+        if (!form.url.trim()) {
+          toast.error('URL is required');
+          return;
+        }
+        const payload = {
+          profileId,
+          organizationId,
+          server: {
+            type: 'remote' as const,
+            name: form.name.trim(),
+            enabled: form.enabled,
+            config: { url: form.url.trim(), headers: jsonCheck.value },
+          },
+        };
+        if (mode === 'edit') {
+          await updateMcp.mutateAsync({ ...payload, mcpServerId: props.initial.id });
+        } else {
+          await createMcp.mutateAsync(payload);
+        }
+      }
+      toast.success(
+        mode === 'edit' ? `MCP server "${form.name}" updated` : `MCP server "${form.name}" added`
+      );
+      onDone();
+    } catch (error) {
+      console.error('Failed to save MCP server:', error);
+      toast.error(error instanceof Error ? error.message : 'Failed to save MCP server');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  const jsonLabel = form.type === 'local' ? 'Environment (JSON)' : 'Headers (JSON)';
+  const jsonPlaceholder =
+    form.type === 'local' ? '{\n  "API_KEY": "sk-..."\n}' : '{\n  "Authorization": "Bearer ..."\n}';
+
+  return (
+    <div className="space-y-3 rounded-lg border border-dashed p-3">
+      {/* Header row: type toggle (create) / kind label (edit) + enabled switch.
+          Type toggle is hidden on edit so envelope preservation is unambiguous. */}
+      <div className="flex items-center justify-between gap-2">
+        {mode === 'create' ? (
+          <div className="flex gap-2">
+            <Button
+              size="sm"
+              variant={form.type === 'local' ? 'default' : 'outline'}
+              onClick={() => update('type', 'local')}
+              type="button"
+            >
+              Local
+            </Button>
+            <Button
+              size="sm"
+              variant={form.type === 'remote' ? 'default' : 'outline'}
+              onClick={() => update('type', 'remote')}
+              type="button"
+            >
+              Remote
+            </Button>
+          </div>
+        ) : (
+          <div className="text-muted-foreground text-xs uppercase tracking-wide">
+            Editing {form.type} MCP server
+          </div>
+        )}
+        <label className="flex cursor-pointer items-center gap-2 text-xs">
+          <span className="text-muted-foreground">{form.enabled ? 'Enabled' : 'Disabled'}</span>
+          <Switch
+            checked={form.enabled}
+            onCheckedChange={checked => update('enabled', checked)}
+            disabled={saving}
+          />
+        </label>
+      </div>
+
+      <div className="grid gap-2">
+        <Label htmlFor="mcp-name">Name</Label>
+        <Input
+          id="mcp-name"
+          value={form.name}
+          onChange={e => update('name', e.target.value)}
+          placeholder="my-server"
+          autoFocus={mode === 'create'}
+          disabled={saving}
+        />
+      </div>
+
+      {form.type === 'local' ? (
+        <div className="grid gap-2">
+          <Label htmlFor="mcp-command">Command</Label>
+          <Input
+            id="mcp-command"
+            value={form.commandText}
+            onChange={e => update('commandText', e.target.value)}
+            placeholder="npx @example/mcp-server --flag value"
+            className="font-mono"
+            disabled={saving}
+          />
+        </div>
+      ) : (
+        <div className="grid gap-2">
+          <Label htmlFor="mcp-url">URL</Label>
+          <Input
+            id="mcp-url"
+            value={form.url}
+            onChange={e => update('url', e.target.value)}
+            placeholder="https://example.com/mcp"
+            className="font-mono"
+            disabled={saving}
+          />
+        </div>
+      )}
+
+      <div className="grid gap-1.5">
+        <div className="flex items-center justify-between">
+          <Label>{jsonLabel}</Label>
+          {jsonError && (
+            <span className="text-destructive flex items-center gap-1 text-[11px]">
+              <AlertCircle className="h-3 w-3" />
+              {jsonError}
+            </span>
+          )}
+        </div>
+        <MonacoJsonEditor
+          value={form.envJson}
+          onChange={next => {
+            update('envJson', next);
+            if (jsonError) setJsonError(null);
+          }}
+          placeholder={jsonPlaceholder}
+          height="160px"
+        />
+        <p className="text-muted-foreground flex items-start gap-1.5 text-[11px]">
+          <ShieldCheck className="mt-0.5 h-3 w-3 shrink-0" />
+          <span>
+            Values are encrypted at rest (RSA-AES-256-GCM) and decrypted only inside your Cloud
+            Agent sandbox — they are never visible to us in plaintext.
+            {mode === 'edit' && (
+              <>
+                {' '}
+                Existing values show as{' '}
+                <code className="bg-muted rounded px-1 py-0.5 font-mono">
+                  {MASKED_SECRET_VALUE}
+                </code>
+                ; leave them to keep the secret, or replace to rotate.
+              </>
+            )}
+          </span>
+        </p>
+      </div>
+
+      <div className="flex justify-end gap-2">
+        <Button variant="ghost" size="sm" onClick={onDone} disabled={saving}>
+          Cancel
+        </Button>
+        <Button size="sm" onClick={handleSave} disabled={saving}>
+          {saving ? (
+            <Loader2 className="h-4 w-4 animate-spin" />
+          ) : mode === 'edit' ? (
+            'Save changes'
+          ) : (
+            'Add MCP server'
+          )}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/cloud-agent/profile-editor/ProfileAgentsTab.tsx b/apps/web/src/components/cloud-agent/profile-editor/ProfileAgentsTab.tsx
new file mode 100644
index 0000000000..04a795302b
--- /dev/null
+++ b/apps/web/src/components/cloud-agent/profile-editor/ProfileAgentsTab.tsx
@@ -0,0 +1,679 @@
+/** Agents tab for the profile editor (modern replacement for "custom modes"). */
+'use client';
+
+import { useMemo, useState } from 'react';
+import { toast } from 'sonner';
+import { Loader2, Plus, Bot, Pencil, ChevronDown, Info } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Textarea } from '@/components/ui/textarea';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import { InlineDeleteConfirmation } from '@/components/ui/inline-delete-confirmation';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
+import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
+import { VariantCombobox } from '@/components/shared/VariantCombobox';
+import { useModelSelectorList } from '@/app/api/openrouter/hooks';
+import { cn } from '@/lib/utils';
+import { useProfileMutations, type ProfileAgent } from '@/hooks/useCloudAgentProfiles';
+import type { AgentConfig, PermissionRule } from '@kilocode/db/schema-types';
+
+const SLUG_PATTERN = /^[a-z][a-z0-9-]*$/;
+const BUILTIN_SLUGS = new Set([
+  'code',
+  'plan',
+  'debug',
+  'orchestrator',
+  'ask',
+  'build',
+  'architect',
+  'custom',
+]);
+
+/**
+ * Tools the UI exposes as disableable per agent. Cloud sessions run in a
+ * sandbox where every tool is allowed by default; the only customization we
+ * surface is "turn this tool off for this agent", which emits `deny` for the
+ * tool. The CLI's richer permission shapes (per-pattern maps, ask, etc.) are
+ * preserved on save but not editable here.
+ */
+const PERMISSION_TOOLS = [
+  'read',
+  'edit',
+  'bash',
+  'glob',
+  'grep',
+  'list',
+  'task',
+  'skill',
+  'webfetch',
+  'websearch',
+  'codesearch',
+  'mcp',
+] as const;
+type PermissionTool = (typeof PERMISSION_TOOLS)[number];
+
+type Props = {
+  profileId: string;
+  organizationId: string | undefined;
+  agents: ProfileAgent[];
+};
+
+export function ProfileAgentsTab({ profileId, organizationId, agents }: Props) {
+  const [isAdding, setIsAdding] = useState(false);
+  const [editingId, setEditingId] = useState<string | null>(null);
+
+  return (
+    <div className="space-y-2 p-4">
+      {agents.map(agent =>
+        editingId === agent.id ? (
+          <AgentForm
+            key={agent.id}
+            profileId={profileId}
+            organizationId={organizationId}
+            agent={agent}
+            onDone={() => setEditingId(null)}
+          />
+        ) : (
+          <AgentRow
+            key={agent.id}
+            agent={agent}
+            profileId={profileId}
+            organizationId={organizationId}
+            onEdit={() => setEditingId(agent.id)}
+          />
+        )
+      )}
+
+      {isAdding ? (
+        <AgentForm
+          profileId={profileId}
+          organizationId={organizationId}
+          onDone={() => setIsAdding(false)}
+        />
+      ) : (
+        <Button
+          variant="outline"
+          className="h-11 w-full border-dashed"
+          onClick={() => setIsAdding(true)}
+        >
+          <Plus className="mr-2 h-4 w-4" />
+          Add agent
+        </Button>
+      )}
+
+      {agents.length === 0 && !isAdding && (
+        <p className="text-muted-foreground py-2 text-center text-sm">No agents yet.</p>
+      )}
+    </div>
+  );
+}
+
+function AgentRow({
+  agent,
+  profileId,
+  organizationId,
+  onEdit,
+}: {
+  agent: ProfileAgent;
+  profileId: string;
+  organizationId: string | undefined;
+  onEdit: () => void;
+}) {
+  const { deleteAgent } = useProfileMutations({ organizationId });
+  const [deleting, setDeleting] = useState(false);
+
+  const visibility = agent.config.mode ?? 'primary';
+
+  return (
+    <div className="hover:bg-accent/50 rounded-lg border p-3 transition-colors">
+      <div className="flex items-start justify-between gap-2">
+        <div className="min-w-0 flex-1">
+          <div className="flex flex-wrap items-center gap-2">
+            <Bot className="text-muted-foreground h-4 w-4" />
+            <span className="text-sm font-medium">{agent.name}</span>
+            <code className="bg-muted rounded px-2 py-0.5 font-mono text-xs">{agent.slug}</code>
+            <span className="text-muted-foreground text-xs uppercase tracking-wide">
+              {visibility}
+            </span>
+          </div>
+          {(agent.config.model || agent.config.variant) && (
+            <div className="text-muted-foreground mt-1 flex flex-wrap items-center gap-x-3 gap-y-0.5 text-xs">
+              {agent.config.model && (
+                <span>
+                  model: <code className="font-mono">{agent.config.model}</code>
+                </span>
+              )}
+              {agent.config.variant && (
+                <span>
+                  effort: <code className="font-mono">{agent.config.variant}</code>
+                </span>
+              )}
+            </div>
+          )}
+          {agent.config.description && (
+            <p className="text-muted-foreground mt-0.5 line-clamp-2 text-xs">
+              {agent.config.description}
+            </p>
+          )}
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          <Button variant="ghost" size="sm" onClick={onEdit} aria-label="Edit agent">
+            <Pencil className="h-3.5 w-3.5" />
+          </Button>
+          <InlineDeleteConfirmation
+            onDelete={async () => {
+              setDeleting(true);
+              try {
+                await deleteAgent.mutateAsync({
+                  profileId,
+                  organizationId,
+                  agentId: agent.id,
+                });
+                toast.success(`Agent "${agent.name}" deleted`);
+              } catch (error) {
+                console.error('Failed to delete agent:', error);
+                toast.error('Failed to delete agent');
+              } finally {
+                setDeleting(false);
+              }
+            }}
+            isLoading={deleting}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+type FormState = {
+  slug: string;
+  name: string;
+  prompt: string;
+  description: string;
+  visibility: 'primary' | 'subagent' | 'all';
+  model: string;
+  /**
+   * Thinking-effort variant name for models that support it (e.g.
+   * `"high"`, `"max"`). Empty string means "inherit the session default for
+   * this model". Ignored by the CLI on models without variants.
+   */
+  variant: string;
+  temperature: string;
+  topP: string;
+  steps: string;
+  /** Tools the user wants turned off for this agent. Everything else is allowed. */
+  disabledTools: Set<PermissionTool>;
+};
+
+function readDisabledTools(permission: AgentConfig['permission'] | undefined): Set<PermissionTool> {
+  const out = new Set<PermissionTool>();
+  if (!permission || typeof permission !== 'object') return out;
+  const map = permission as Record<string, PermissionRule>;
+  for (const tool of PERMISSION_TOOLS) {
+    if (map[tool] === 'deny') out.add(tool);
+  }
+  return out;
+}
+
+function buildInitialState(agent: ProfileAgent | undefined): FormState {
+  const c = agent?.config ?? {};
+  return {
+    slug: agent?.slug ?? '',
+    name: agent?.name ?? '',
+    prompt: c.prompt ?? '',
+    description: c.description ?? '',
+    visibility: c.mode ?? 'primary',
+    model: c.model ?? '',
+    variant: c.variant ?? '',
+    temperature: c.temperature !== undefined ? String(c.temperature) : '',
+    topP: c.top_p !== undefined ? String(c.top_p) : '',
+    steps: c.steps !== undefined ? String(c.steps) : '',
+    disabledTools: readDisabledTools(c.permission),
+  };
+}
+
+/**
+ * Apply UI disable toggles onto the existing permission map, preserving any
+ * non-string (per-pattern) rules and any unrelated tool keys a user may have
+ * imported. Toggling a tool off writes `deny`; toggling it back on clears a
+ * simple string rule but leaves per-pattern maps alone.
+ */
+function mergePermissions(
+  existing: AgentConfig['permission'] | undefined,
+  disabledTools: Set<PermissionTool>
+): AgentConfig['permission'] | undefined {
+  const base: Record<string, PermissionRule> =
+    existing && typeof existing === 'object' ? { ...existing } : {};
+  for (const tool of PERMISSION_TOOLS) {
+    if (disabledTools.has(tool)) {
+      base[tool] = 'deny';
+    } else if (typeof base[tool] === 'string') {
+      delete base[tool];
+    }
+  }
+  return Object.keys(base).length > 0 ? base : undefined;
+}
+
+function FieldHint({ hint }: { hint: string }) {
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <button
+          type="button"
+          aria-label="More info"
+          className="text-muted-foreground hover:text-foreground"
+        >
+          <Info className="h-3.5 w-3.5" />
+        </button>
+      </TooltipTrigger>
+      <TooltipContent side="top" className="max-w-xs text-xs">
+        {hint}
+      </TooltipContent>
+    </Tooltip>
+  );
+}
+
+function FieldLabel({
+  htmlFor,
+  children,
+  required,
+  hint,
+}: {
+  htmlFor?: string;
+  children: React.ReactNode;
+  required?: boolean;
+  hint?: string;
+}) {
+  return (
+    <div className="flex items-center gap-1.5">
+      <Label htmlFor={htmlFor}>
+        {children}
+        {required && <span className="ml-0.5 text-red-400">*</span>}
+      </Label>
+      {hint && <FieldHint hint={hint} />}
+    </div>
+  );
+}
+
+function AgentForm({
+  profileId,
+  organizationId,
+  agent,
+  onDone,
+}: {
+  profileId: string;
+  organizationId: string | undefined;
+  agent?: ProfileAgent;
+  onDone: () => void;
+}) {
+  const { createAgent, updateAgent } = useProfileMutations({ organizationId });
+  const [state, setState] = useState<FormState>(() => buildInitialState(agent));
+  const [saving, setSaving] = useState(false);
+  const [advancedOpen, setAdvancedOpen] = useState(false);
+
+  const { data: modelsData } = useModelSelectorList(organizationId);
+  const modelOptions = useMemo<ModelOption[]>(
+    () =>
+      (modelsData?.data ?? []).map(m => ({
+        id: m.id,
+        name: m.name,
+        variants: m.opencode?.variants ? Object.keys(m.opencode.variants) : undefined,
+      })),
+    [modelsData]
+  );
+  const availableVariants =
+    (state.model && modelOptions.find(m => m.id === state.model)?.variants) || [];
+
+  const handleSave = async () => {
+    const trimmedSlug = state.slug.trim();
+    const trimmedName = state.name.trim();
+
+    if (!SLUG_PATTERN.test(trimmedSlug)) {
+      toast.error('Slug must start with a letter and contain only letters, digits, and dashes');
+      return;
+    }
+    if (BUILTIN_SLUGS.has(trimmedSlug)) {
+      toast.error(`Slug "${trimmedSlug}" conflicts with a built-in agent; pick a different slug`);
+      return;
+    }
+    if (!trimmedName) {
+      toast.error('Display name is required');
+      return;
+    }
+
+    const parseNumber = (v: string): number | undefined => {
+      const t = v.trim();
+      if (!t) return undefined;
+      const n = parseFloat(t);
+      return Number.isFinite(n) ? n : undefined;
+    };
+    const parseInt10 = (v: string): number | undefined => {
+      const t = v.trim();
+      if (!t) return undefined;
+      const n = parseInt(t, 10);
+      return Number.isFinite(n) && n > 0 ? n : undefined;
+    };
+
+    // Only persist the effort variant when the selected model actually
+    // supports it — otherwise the CLI would silently ignore it, and users
+    // would be confused seeing a stale value next to a non-thinking model.
+    const variantAllowed = state.variant && availableVariants.includes(state.variant);
+
+    const config: AgentConfig = {
+      prompt: state.prompt.trim() || undefined,
+      description: state.description.trim() || undefined,
+      mode: state.visibility,
+      // Empty model string clears the override (undefined); users can also
+      // type `null` text, but we accept only empty-string as "inherit default".
+      model: state.model.trim() || undefined,
+      variant: variantAllowed ? state.variant : undefined,
+      temperature: parseNumber(state.temperature),
+      top_p: parseNumber(state.topP),
+      steps: parseInt10(state.steps),
+      // Preserve any `hidden` / `disable` values that were set outside this
+      // UI (e.g. imported from the kilocode extension). The cloud UI does not
+      // surface these flags directly — delete an agent instead of disabling it.
+      hidden: agent?.config.hidden,
+      disable: agent?.config.disable,
+      permission: mergePermissions(agent?.config.permission, state.disabledTools),
+    };
+
+    setSaving(true);
+    try {
+      if (agent) {
+        await updateAgent.mutateAsync({
+          profileId,
+          organizationId,
+          agentId: agent.id,
+          slug: trimmedSlug,
+          name: trimmedName,
+          config,
+        });
+        toast.success(`Agent "${trimmedName}" updated`);
+      } else {
+        await createAgent.mutateAsync({
+          profileId,
+          organizationId,
+          slug: trimmedSlug,
+          name: trimmedName,
+          config,
+        });
+        toast.success(`Agent "${trimmedName}" added`);
+      }
+      onDone();
+    } catch (error) {
+      console.error('Failed to save agent:', error);
+      toast.error(error instanceof Error ? error.message : 'Failed to save agent');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <div className="space-y-3 rounded-lg border border-dashed p-3">
+      <div className="grid gap-3 sm:grid-cols-2">
+        <div className="grid gap-2">
+          <FieldLabel
+            htmlFor="agent-slug"
+            required
+            hint="Short identifier used to select this agent (e.g. `my-reviewer`). Lowercase letters, digits, and dashes; must start with a letter. Cannot match a built-in slug."
+          >
+            Slug
+          </FieldLabel>
+          <Input
+            id="agent-slug"
+            value={state.slug}
+            onChange={e =>
+              setState({
+                ...state,
+                slug: e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ''),
+              })
+            }
+            placeholder="my-agent"
+            className="font-mono"
+            autoFocus
+          />
+        </div>
+        <div className="grid gap-2">
+          <FieldLabel
+            htmlFor="agent-name"
+            required
+            hint="Human-readable name shown in the agent picker."
+          >
+            Display name
+          </FieldLabel>
+          <Input
+            id="agent-name"
+            value={state.name}
+            onChange={e => setState({ ...state, name: e.target.value })}
+            placeholder="My Agent"
+          />
+        </div>
+      </div>
+
+      <div className="grid gap-2">
+        <FieldLabel
+          htmlFor="agent-prompt"
+          hint="Prepended to the system prompt whenever this agent runs. Leave empty to use the built-in prompt for the selected visibility."
+        >
+          System prompt
+        </FieldLabel>
+        <Textarea
+          id="agent-prompt"
+          value={state.prompt}
+          onChange={e => setState({ ...state, prompt: e.target.value })}
+          placeholder="You are a ..."
+          rows={6}
+          className="text-sm"
+        />
+      </div>
+
+      <div className="grid gap-2">
+        <FieldLabel
+          htmlFor="agent-description"
+          hint="Short blurb shown under the agent name in pickers and autocomplete."
+        >
+          Description
+        </FieldLabel>
+        <Input
+          id="agent-description"
+          value={state.description}
+          onChange={e => setState({ ...state, description: e.target.value })}
+          placeholder="Shown under the name in the picker"
+        />
+      </div>
+
+      <div className="grid gap-2">
+        <FieldLabel hint="Override the session's default model when this agent runs. Leave unset to inherit the session default. For models that support thinking effort, the picker on the right lets you override the effort level too.">
+          Model override
+        </FieldLabel>
+        <div className="flex gap-2">
+          <ModelCombobox
+            label=""
+            models={modelOptions}
+            value={state.model || undefined}
+            onValueChange={v => {
+              // Drop a stale effort value whenever the new model doesn't offer it.
+              const nextVariants = (v && modelOptions.find(m => m.id === v)?.variants) || [];
+              setState({
+                ...state,
+                model: v,
+                variant: nextVariants.includes(state.variant) ? state.variant : '',
+              });
+            }}
+            isLoading={!modelsData}
+            placeholder="Use session default"
+            variant="compact"
+            // `size="sm"` buttons use `text-xs`, which looks noticeably smaller
+            // than the form's `Input` fields (md:text-sm). Bump back up so the
+            // model picker reads at the same scale as Description / Slug / etc.
+            className="min-w-0 flex-1 text-sm"
+            // This editor lives inside a Radix Dialog; without `modal` the dialog
+            // intercepts wheel events and the model list cannot be scrolled.
+            modal
+          />
+          {availableVariants.length > 0 && (
+            <VariantCombobox
+              variants={availableVariants}
+              value={state.variant || undefined}
+              onValueChange={v => setState({ ...state, variant: v })}
+              className="shrink-0 text-sm"
+            />
+          )}
+        </div>
+        {(state.model || state.variant) && (
+          <button
+            type="button"
+            className="text-muted-foreground hover:text-foreground w-fit text-xs underline"
+            onClick={() => setState({ ...state, model: '', variant: '' })}
+          >
+            Clear model override
+          </button>
+        )}
+      </div>
+
+      <Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen} className="mt-1">
+        <CollapsibleTrigger asChild>
+          <button
+            type="button"
+            className={cn(
+              'text-muted-foreground hover:text-foreground hover:bg-muted/40',
+              'flex w-full items-center justify-between rounded-md px-2 py-1.5 text-sm transition-colors'
+            )}
+          >
+            <span className="flex items-center gap-1.5">
+              <ChevronDown
+                className={cn('h-4 w-4 transition-transform', advancedOpen && 'rotate-180')}
+              />
+              <span className="font-medium">Advanced</span>
+            </span>
+            <span className="text-muted-foreground/70 text-xs">visibility, sampling, tools</span>
+          </button>
+        </CollapsibleTrigger>
+        <CollapsibleContent className="data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0">
+          <div className="bg-muted/30 mt-2 space-y-5 rounded-md border p-4">
+            <div className="grid gap-4 sm:grid-cols-2">
+              <div className="grid gap-2">
+                <FieldLabel
+                  htmlFor="agent-visibility"
+                  hint="Primary: selectable from the picker. Subagent: only callable from another agent via the task tool. All: both."
+                >
+                  Visibility
+                </FieldLabel>
+                <Select
+                  value={state.visibility}
+                  onValueChange={v =>
+                    setState({ ...state, visibility: v as FormState['visibility'] })
+                  }
+                >
+                  <SelectTrigger id="agent-visibility">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="primary">Primary — shown in the picker</SelectItem>
+                    <SelectItem value="subagent">Subagent — only callable from others</SelectItem>
+                    <SelectItem value="all">All — both</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+              <div className="grid gap-2">
+                <FieldLabel
+                  htmlFor="agent-steps"
+                  hint="Maximum number of tool-use steps before the agent is forced to stop. Inherits the session limit if unset."
+                >
+                  Max steps
+                </FieldLabel>
+                <Input
+                  id="agent-steps"
+                  value={state.steps}
+                  onChange={e => setState({ ...state, steps: e.target.value })}
+                  placeholder="e.g. 50"
+                  inputMode="numeric"
+                />
+              </div>
+            </div>
+
+            <div className="grid gap-4 sm:grid-cols-2">
+              <div className="grid gap-2">
+                <FieldLabel
+                  htmlFor="agent-temperature"
+                  hint="Sampling temperature. Lower = more deterministic, higher = more creative. Typical range 0–1."
+                >
+                  Temperature
+                </FieldLabel>
+                <Input
+                  id="agent-temperature"
+                  value={state.temperature}
+                  onChange={e => setState({ ...state, temperature: e.target.value })}
+                  placeholder="e.g. 0.2"
+                  inputMode="decimal"
+                />
+              </div>
+              <div className="grid gap-2">
+                <FieldLabel
+                  htmlFor="agent-top-p"
+                  hint="Nucleus sampling cutoff. Only tokens within the top `p` probability mass are considered."
+                >
+                  top_p
+                </FieldLabel>
+                <Input
+                  id="agent-top-p"
+                  value={state.topP}
+                  onChange={e => setState({ ...state, topP: e.target.value })}
+                  placeholder="e.g. 0.95"
+                  inputMode="decimal"
+                />
+              </div>
+            </div>
+
+            <div className="grid gap-2">
+              <FieldLabel hint="Every tool is allowed by default. Uncheck a tool to deny it for this agent only.">
+                Tools
+              </FieldLabel>
+              <div className="bg-background/60 grid grid-cols-2 gap-2 rounded-md border p-3 sm:grid-cols-3">
+                {PERMISSION_TOOLS.map(tool => {
+                  const enabled = !state.disabledTools.has(tool);
+                  return (
+                    <label
+                      key={tool}
+                      className="hover:bg-muted/50 flex cursor-pointer items-center gap-2 rounded px-1.5 py-1 text-sm transition-colors"
+                    >
+                      <Checkbox
+                        checked={enabled}
+                        onCheckedChange={checked => {
+                          const next = new Set(state.disabledTools);
+                          if (checked) next.delete(tool);
+                          else next.add(tool);
+                          setState({ ...state, disabledTools: next });
+                        }}
+                      />
+                      <span className="font-mono text-xs">{tool}</span>
+                    </label>
+                  );
+                })}
+              </div>
+            </div>
+          </div>
+        </CollapsibleContent>
+      </Collapsible>
+
+      <div className="flex justify-end gap-2">
+        <Button variant="ghost" size="sm" onClick={onDone} disabled={saving}>
+          Cancel
+        </Button>
+        <Button size="sm" onClick={handleSave} disabled={saving}>
+          {saving ? <Loader2 className="h-4 w-4 animate-spin" /> : agent ? 'Save' : 'Add agent'}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/cloud-agent/profile-editor/SkillsTab.tsx b/apps/web/src/components/cloud-agent/profile-editor/SkillsTab.tsx
new file mode 100644
index 0000000000..6636064dad
--- /dev/null
+++ b/apps/web/src/components/cloud-agent/profile-editor/SkillsTab.tsx
@@ -0,0 +1,643 @@
+/** Skills tab for the profile editor. */
+'use client';
+
+import { useState, type DragEvent } from 'react';
+import { toast } from 'sonner';
+import { unzipSync, strFromU8 } from 'fflate';
+import { Loader2, Plus, Sparkles, Upload, FileText, X, Pencil } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Textarea } from '@/components/ui/textarea';
+import { InlineDeleteConfirmation } from '@/components/ui/inline-delete-confirmation';
+import { useProfileMutations, type ProfileSkill } from '@/hooks/useCloudAgentProfiles';
+import { cn } from '@/lib/utils';
+
+const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+const SKILL_FILE_PATH_PATTERN = /^[a-zA-Z0-9._\-/]+$/;
+
+// Keep in sync with apps/web/src/lib/agent/profile-skills-service.ts limits.
+const MAX_SKILL_MARKDOWN_LENGTH = 100_000;
+const MAX_COMPANION_FILES = 20;
+const MAX_COMPANION_FILE_SIZE = 100_000;
+const MAX_COMPANION_FILES_TOTAL = 500_000;
+const MAX_PATH_LENGTH = 200;
+
+type Props = {
+  profileId: string;
+  organizationId: string | undefined;
+  skills: ProfileSkill[];
+};
+
+export function SkillsTab({ profileId, organizationId, skills }: Props) {
+  const [isAdding, setIsAdding] = useState(false);
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [dragDepth, setDragDepth] = useState(0);
+  const [importing, setImporting] = useState(false);
+  const { createCustomSkill } = useProfileMutations({ organizationId });
+  const isDragging = dragDepth > 0;
+
+  const dragHasZip = (event: DragEvent<HTMLDivElement>) =>
+    Array.from(event.dataTransfer?.items ?? []).some(item => item.kind === 'file');
+
+  const handleDrop = async (event: DragEvent<HTMLDivElement>) => {
+    event.preventDefault();
+    setDragDepth(0);
+    const dropped = Array.from(event.dataTransfer.files).filter(f =>
+      f.name.toLowerCase().endsWith('.zip')
+    );
+    if (dropped.length === 0) {
+      toast.error('Drop a .zip of a skill folder');
+      return;
+    }
+
+    setImporting(true);
+    const existingNames = new Set(skills.map(s => s.name));
+    let succeeded = 0;
+    try {
+      for (const file of dropped) {
+        try {
+          const extracted = await extractSkillZip(file);
+          const baseSlug =
+            slugifySkillName(extracted.frontmatterName) ||
+            slugifySkillName(file.name.replace(/\.zip$/i, '')) ||
+            'skill';
+          const name = uniqueSkillName(baseSlug, existingNames);
+          existingNames.add(name);
+          await createCustomSkill.mutateAsync({
+            profileId,
+            organizationId,
+            name,
+            description: extracted.frontmatterDescription,
+            rawMarkdown: extracted.rawMarkdown,
+            files: extracted.fileCount > 0 ? extracted.files : undefined,
+          });
+          toast.success(`Skill "${name}" added`);
+          succeeded += 1;
+        } catch (error) {
+          toast.error(
+            `${file.name}: ${error instanceof Error ? error.message : 'failed to import'}`
+          );
+        }
+      }
+    } finally {
+      setImporting(false);
+    }
+    if (succeeded > 0 && isAdding) setIsAdding(false);
+  };
+
+  return (
+    <div
+      className={cn(
+        'relative flex min-h-full flex-col gap-2 p-4 transition-colors',
+        isDragging && 'border-primary bg-primary/5 border-2 border-dashed'
+      )}
+      onDragEnter={event => {
+        if (!dragHasZip(event)) return;
+        event.preventDefault();
+        setDragDepth(d => d + 1);
+      }}
+      onDragLeave={() => setDragDepth(d => Math.max(0, d - 1))}
+      onDragOver={event => {
+        if (!dragHasZip(event)) return;
+        event.preventDefault();
+        event.dataTransfer.dropEffect = 'copy';
+      }}
+      onDrop={handleDrop}
+    >
+      {skills.map(skill =>
+        editingId === skill.id ? (
+          <SkillForm
+            key={skill.id}
+            mode="edit"
+            initial={skill}
+            profileId={profileId}
+            organizationId={organizationId}
+            onDone={() => setEditingId(null)}
+          />
+        ) : (
+          <SkillRow
+            key={skill.id}
+            skill={skill}
+            profileId={profileId}
+            organizationId={organizationId}
+            onEdit={() => {
+              setEditingId(skill.id);
+              setIsAdding(false);
+            }}
+          />
+        )
+      )}
+
+      {isAdding ? (
+        <SkillForm
+          mode="create"
+          profileId={profileId}
+          organizationId={organizationId}
+          onDone={() => setIsAdding(false)}
+        />
+      ) : (
+        <Button
+          variant="outline"
+          className="h-11 w-full border-dashed"
+          onClick={() => {
+            setIsAdding(true);
+            setEditingId(null);
+          }}
+          disabled={importing}
+        >
+          <Plus className="mr-2 h-4 w-4" />
+          Add skill manually (or drop a .zip)
+        </Button>
+      )}
+
+      {skills.length === 0 && !isAdding && !importing && (
+        <p className="text-muted-foreground py-2 text-center text-sm">
+          No skills yet. Drop a skill folder .zip here to add one.
+        </p>
+      )}
+
+      {/* Spacer makes the rest of the tab a drop target too. */}
+      <div className="flex-1" />
+
+      {(isDragging || importing) && (
+        <div className="bg-background/80 pointer-events-none absolute inset-0 flex items-center justify-center rounded-md backdrop-blur-sm">
+          <div className="text-foreground flex items-center gap-2 text-sm font-medium">
+            {importing ? (
+              <>
+                <Loader2 className="h-4 w-4 animate-spin" />
+                Importing skill…
+              </>
+            ) : (
+              <>
+                <Upload className="h-4 w-4" />
+                Drop .zip to add as a new skill
+              </>
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+function slugifySkillName(value: string | undefined): string {
+  if (!value) return '';
+  return value
+    .toLowerCase()
+    .replace(/[^a-z0-9-]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .replace(/-{2,}/g, '-');
+}
+
+function uniqueSkillName(base: string, taken: Set<string>): string {
+  if (!taken.has(base)) return base;
+  for (let i = 2; i < 1000; i += 1) {
+    const candidate = `${base}-${i}`;
+    if (!taken.has(candidate)) return candidate;
+  }
+  return `${base}-${Date.now()}`;
+}
+
+function SkillRow({
+  skill,
+  profileId,
+  organizationId,
+  onEdit,
+}: {
+  skill: ProfileSkill;
+  profileId: string;
+  organizationId: string | undefined;
+  onEdit: () => void;
+}) {
+  const { deleteSkill } = useProfileMutations({ organizationId });
+  const [deleting, setDeleting] = useState(false);
+
+  const fileCount = Object.keys(skill.files ?? {}).length;
+  const companionBytes = Object.values(skill.files ?? {}).reduce((sum, c) => sum + c.length, 0);
+  const totalBytes = skill.rawMarkdown.length + companionBytes;
+  const sizeKb = (totalBytes / 1024).toFixed(1);
+
+  return (
+    <div className="hover:bg-accent/50 rounded-lg border p-3 transition-colors">
+      <div className="flex items-start justify-between gap-2">
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-2">
+            <Sparkles className="text-muted-foreground h-4 w-4" />
+            <code className="bg-muted rounded px-2 py-0.5 font-mono text-sm">{skill.name}</code>
+            <span className="text-muted-foreground text-xs uppercase tracking-wide">
+              {skill.sourceType}
+            </span>
+            <span className="text-muted-foreground text-xs">{sizeKb} KB</span>
+            {fileCount > 0 && (
+              <span className="text-muted-foreground text-xs">
+                +{fileCount} file{fileCount === 1 ? '' : 's'}
+              </span>
+            )}
+          </div>
+          {skill.description && (
+            <p className="text-muted-foreground mt-0.5 line-clamp-2 text-xs">{skill.description}</p>
+          )}
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-7"
+            onClick={onEdit}
+            disabled={deleting}
+            aria-label="Edit skill"
+          >
+            <Pencil className="h-3.5 w-3.5" />
+          </Button>
+          <InlineDeleteConfirmation
+            onDelete={async () => {
+              setDeleting(true);
+              try {
+                await deleteSkill.mutateAsync({
+                  profileId,
+                  organizationId,
+                  skillId: skill.id,
+                });
+                toast.success(`Skill "${skill.name}" deleted`);
+              } catch (error) {
+                console.error('Failed to delete skill:', error);
+                toast.error('Failed to delete skill');
+              } finally {
+                setDeleting(false);
+              }
+            }}
+            isLoading={deleting}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+/**
+ * Parse frontmatter `name` and `description` out of a SKILL.md body.
+ * Matches the minimal extension parser (only these two fields).
+ */
+function parseSkillFrontmatter(rawMarkdown: string): { name?: string; description?: string } {
+  const match = rawMarkdown.match(/^---\s*\r?\n([\s\S]*?)\r?\n---\s*\r?\n/);
+  if (!match) return {};
+  const strip = (v: string) => {
+    const t = v.trim();
+    if ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'"))) {
+      return t.slice(1, -1);
+    }
+    return t;
+  };
+  const nameMatch = match[1].match(/^name\s*:\s*(.+)$/m);
+  const descMatch = match[1].match(/^description\s*:\s*(.+)$/m);
+  return {
+    name: nameMatch ? strip(nameMatch[1]) : undefined,
+    description: descMatch ? strip(descMatch[1]) : undefined,
+  };
+}
+
+type ExtractedSkill = {
+  rawMarkdown: string;
+  files: Record<string, string>;
+  fileCount: number;
+  totalBytes: number;
+  frontmatterName?: string;
+  frontmatterDescription?: string;
+};
+
+/**
+ * Returns true for OS-generated metadata that shouldn't count as skill content:
+ * macOS `__MACOSX/...` and `._*` AppleDouble files, Finder `.DS_Store`,
+ * Windows `Thumbs.db` and `desktop.ini`. Matches at any depth.
+ */
+function isJunkEntry(path: string): boolean {
+  if (path.startsWith('__MACOSX/') || path.includes('/__MACOSX/')) return true;
+  const base = path.slice(path.lastIndexOf('/') + 1);
+  if (base.startsWith('._')) return true;
+  return base === '.DS_Store' || base === 'Thumbs.db' || base === 'desktop.ini';
+}
+
+/**
+ * Extract a skill bundle from a zip. Looks for `SKILL.md` at the root; if the
+ * archive uses a single top-level directory, strips it (matches the extension
+ * marketplace's `tar --strip-components=1` behavior).
+ *
+ * Throws an Error with a user-facing message on invalid archives.
+ */
+async function extractSkillZip(file: File): Promise<ExtractedSkill> {
+  if (!file.name.toLowerCase().endsWith('.zip')) {
+    throw new Error('Expected a .zip file');
+  }
+  const buf = new Uint8Array(await file.arrayBuffer());
+  if (buf.byteLength > 5 * 1024 * 1024) {
+    throw new Error('Zip file is larger than 5 MB');
+  }
+
+  let entries: Record<string, Uint8Array>;
+  try {
+    entries = unzipSync(buf, {
+      filter(entry) {
+        return entry.size <= MAX_COMPANION_FILE_SIZE * 2; // trust but verify below
+      },
+    });
+  } catch (error) {
+    throw new Error(`Unable to read zip: ${error instanceof Error ? error.message : 'unknown'}`);
+  }
+
+  // Drop directory entries (keys ending with '/') and OS-generated junk
+  // (Finder's __MACOSX/ + ._* AppleDouble files, Windows Thumbs.db / desktop.ini)
+  // so a folder zipped via Finder still has a single detectable top-level dir.
+  const filePaths = Object.keys(entries).filter(k => !k.endsWith('/') && !isJunkEntry(k));
+  if (filePaths.length === 0) {
+    throw new Error('Zip is empty');
+  }
+  // Detect a single top-level directory to strip. Allow a stray root file
+  // (e.g. a README sibling) to still trigger stripping when all *other* paths
+  // share one top dir.
+  const rootDirs = new Set<string>();
+  for (const p of filePaths) {
+    const slash = p.indexOf('/');
+    if (slash > 0) rootDirs.add(p.slice(0, slash));
+  }
+  const stripPrefix =
+    rootDirs.size === 1 && filePaths.every(p => p.startsWith(`${[...rootDirs][0]}/`))
+      ? `${[...rootDirs][0]}/`
+      : '';
+
+  let skillMd: string | null = null;
+  const files: Record<string, string> = {};
+  let totalBytes = 0;
+  let fileCount = 0;
+
+  for (const path of filePaths) {
+    const rel = stripPrefix && path.startsWith(stripPrefix) ? path.slice(stripPrefix.length) : path;
+    if (!rel || rel === '') continue;
+
+    if (rel.includes('..') || rel.startsWith('/') || rel.length > MAX_PATH_LENGTH) {
+      throw new Error(`Rejected file path "${rel}"`);
+    }
+    if (rel.toLowerCase() === 'skill.md') {
+      const content = strFromU8(entries[path]);
+      if (content.length > MAX_SKILL_MARKDOWN_LENGTH) {
+        throw new Error(`SKILL.md exceeds ${MAX_SKILL_MARKDOWN_LENGTH} bytes`);
+      }
+      skillMd = content;
+      continue;
+    }
+    if (!SKILL_FILE_PATH_PATTERN.test(rel)) {
+      throw new Error(`File "${rel}" contains disallowed characters`);
+    }
+
+    const content = strFromU8(entries[path]);
+    if (content.length > MAX_COMPANION_FILE_SIZE) {
+      throw new Error(`File "${rel}" exceeds ${MAX_COMPANION_FILE_SIZE} bytes`);
+    }
+    fileCount += 1;
+    totalBytes += content.length;
+    if (fileCount > MAX_COMPANION_FILES) {
+      throw new Error(`Skill may have at most ${MAX_COMPANION_FILES} companion files`);
+    }
+    if (totalBytes > MAX_COMPANION_FILES_TOTAL) {
+      throw new Error(`Companion files exceed ${MAX_COMPANION_FILES_TOTAL} bytes total`);
+    }
+    files[rel] = content;
+  }
+
+  if (!skillMd) {
+    throw new Error('Zip must contain SKILL.md at the root');
+  }
+
+  const frontmatter = parseSkillFrontmatter(skillMd);
+  return {
+    rawMarkdown: skillMd,
+    files,
+    fileCount,
+    totalBytes,
+    frontmatterName: frontmatter.name,
+    frontmatterDescription: frontmatter.description,
+  };
+}
+
+// -------------------------------------------------------------------
+// SkillForm — shared create/edit form
+// -------------------------------------------------------------------
+
+type SkillFormProps = {
+  profileId: string;
+  organizationId: string | undefined;
+  onDone: () => void;
+} & ({ mode: 'create'; initial?: undefined } | { mode: 'edit'; initial: ProfileSkill });
+
+/**
+ * Template shown in the editor when adding a new skill by hand.
+ * Matches Anthropic's SKILL.md format: YAML frontmatter with `name` + `description`,
+ * followed by the skill body.
+ */
+const NEW_SKILL_TEMPLATE = `---
+name: my-skill
+description: Describe when the agent should load this skill. Be specific — this is what the model reads to decide whether to use it (e.g. "Use when the user asks about X, Y, or Z.").
+---
+
+# My Skill
+
+Instructions the agent should follow when this skill is active.
+
+## When to use
+
+Explain in more detail when this skill applies.
+
+## Steps
+
+1. First step
+2. Second step
+`;
+
+/**
+ * Rebuild a SKILL.md so its frontmatter matches `name` / `description`. Any
+ * existing `---` block at the top is replaced; only `name` and `description`
+ * keys are kept (the schema doesn't use others). If there's no frontmatter,
+ * one is prepended.
+ */
+function writeFrontmatter(
+  rawMarkdown: string,
+  name: string,
+  description: string | null | undefined
+): string {
+  const match = rawMarkdown.match(/^---\s*\r?\n([\s\S]*?)\r?\n---\s*\r?\n?/);
+  const body = match ? rawMarkdown.slice(match[0].length) : rawMarkdown.replace(/^\s+/, '');
+  const descLine = description ? `\ndescription: ${description}` : '';
+  return `---\nname: ${name}${descLine}\n---\n\n${body}`;
+}
+
+/**
+ * Initial textarea content. For new skills, a template; for existing skills,
+ * the stored markdown with its frontmatter normalized to match the DB row so
+ * the user always sees the `name` / `description` that will be used.
+ */
+function initialSkillMarkdown(props: SkillFormProps): string {
+  if (props.mode === 'create') return NEW_SKILL_TEMPLATE;
+  const { name, description, rawMarkdown } = props.initial;
+  const parsed = parseSkillFrontmatter(rawMarkdown);
+  const frontmatterMatches =
+    parsed.name === name && (parsed.description ?? null) === (description ?? null);
+  return frontmatterMatches ? rawMarkdown : writeFrontmatter(rawMarkdown, name, description);
+}
+
+function SkillForm(props: SkillFormProps) {
+  const { profileId, organizationId, onDone, mode } = props;
+  const { createCustomSkill, updateSkill } = useProfileMutations({ organizationId });
+  const [rawMarkdown, setRawMarkdown] = useState(() => initialSkillMarkdown(props));
+  const [files, setFiles] = useState<Record<string, string>>(
+    mode === 'edit' ? { ...props.initial.files } : {}
+  );
+  const [saving, setSaving] = useState(false);
+
+  const fileCount = Object.keys(files).length;
+  const companionBytes = Object.values(files).reduce((sum, c) => sum + c.length, 0);
+
+  const parsed = parseSkillFrontmatter(rawMarkdown);
+  const parsedNameValid = !!parsed.name && SKILL_NAME_PATTERN.test(parsed.name);
+
+  const handleSave = async () => {
+    if (!rawMarkdown.trim()) {
+      toast.error('Skill content is required');
+      return;
+    }
+    const { name: parsedName, description: parsedDescription } = parseSkillFrontmatter(rawMarkdown);
+    if (!parsedName) {
+      toast.error('Add a `name:` line to the frontmatter at the top of SKILL.md');
+      return;
+    }
+    if (!SKILL_NAME_PATTERN.test(parsedName)) {
+      toast.error(
+        'Frontmatter `name` must be lowercase letters, digits, and dashes, starting with a letter or digit'
+      );
+      return;
+    }
+    const description = parsedDescription?.trim() || undefined;
+
+    setSaving(true);
+    try {
+      if (mode === 'edit') {
+        await updateSkill.mutateAsync({
+          profileId,
+          organizationId,
+          skillId: props.initial.id,
+          name: parsedName,
+          description: description ?? null,
+          rawMarkdown,
+          files,
+        });
+        toast.success(`Skill "${parsedName}" updated`);
+      } else {
+        await createCustomSkill.mutateAsync({
+          profileId,
+          organizationId,
+          name: parsedName,
+          description,
+          rawMarkdown,
+          files: fileCount > 0 ? files : undefined,
+        });
+        toast.success(`Skill "${parsedName}" added`);
+      }
+      onDone();
+    } catch (error) {
+      console.error('Failed to save skill:', error);
+      toast.error(error instanceof Error ? error.message : 'Failed to save skill');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <div className="space-y-3 rounded-lg border border-dashed p-3">
+      {mode === 'edit' && (
+        <div className="text-muted-foreground text-xs uppercase tracking-wide">Editing skill</div>
+      )}
+
+      <div className="grid gap-2">
+        <div className="flex items-baseline justify-between gap-2">
+          <Label htmlFor="skill-markdown">SKILL.md</Label>
+          <span className="font-mono text-xs">
+            <span className="text-muted-foreground">slug: </span>
+            <code
+              className={cn(
+                'rounded px-1.5 py-0.5',
+                parsed.name
+                  ? parsedNameValid
+                    ? 'bg-muted'
+                    : 'bg-destructive/10 text-destructive'
+                  : 'bg-destructive/10 text-destructive'
+              )}
+            >
+              {parsed.name ?? 'missing'}
+            </code>
+          </span>
+        </div>
+        <Textarea
+          id="skill-markdown"
+          value={rawMarkdown}
+          onChange={e => setRawMarkdown(e.target.value)}
+          rows={14}
+          className="font-mono text-xs"
+          autoFocus={mode === 'create'}
+          disabled={saving}
+        />
+        <span className="text-muted-foreground text-xs">
+          SKILL.md: {(rawMarkdown.length / 1024).toFixed(1)} KB · max 100 KB
+          {fileCount > 0 && (
+            <>
+              {' · '}
+              {fileCount} companion file{fileCount === 1 ? '' : 's'} (
+              {(companionBytes / 1024).toFixed(1)} KB)
+            </>
+          )}
+        </span>
+      </div>
+
+      {fileCount > 0 && (
+        <div className="space-y-1 rounded-md border p-2">
+          <div className="text-muted-foreground text-xs font-medium">Companion files</div>
+          {Object.entries(files).map(([path, content]) => (
+            <div
+              key={path}
+              className="bg-muted/30 flex items-center gap-2 rounded px-2 py-1 font-mono text-xs"
+            >
+              <FileText className="text-muted-foreground h-3.5 w-3.5 shrink-0" />
+              <span className="flex-1 truncate">{path}</span>
+              <span className="text-muted-foreground">{(content.length / 1024).toFixed(1)} KB</span>
+              <button
+                type="button"
+                className="text-muted-foreground hover:text-foreground cursor-pointer"
+                onClick={() => {
+                  const next = { ...files };
+                  delete next[path];
+                  setFiles(next);
+                }}
+                aria-label={`Remove ${path}`}
+                disabled={saving}
+              >
+                <X className="h-3.5 w-3.5" />
+              </button>
+            </div>
+          ))}
+        </div>
+      )}
+
+      <div className="flex justify-end gap-2">
+        <Button variant="ghost" size="sm" onClick={onDone} disabled={saving}>
+          Cancel
+        </Button>
+        <Button size="sm" onClick={handleSave} disabled={saving}>
+          {saving ? (
+            <Loader2 className="h-4 w-4 animate-spin" />
+          ) : mode === 'edit' ? (
+            'Save changes'
+          ) : (
+            'Add skill'
+          )}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/shared/ModeCombobox.tsx b/apps/web/src/components/shared/ModeCombobox.tsx
index a5b118bf3a..c1356c84c5 100644
--- a/apps/web/src/components/shared/ModeCombobox.tsx
+++ b/apps/web/src/components/shared/ModeCombobox.tsx
@@ -1,11 +1,17 @@
 'use client';
 
-import { useRef, useState } from 'react';
+import { useRef, useState, useMemo } from 'react';
 import { Label } from '@/components/ui/label';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Button } from '@/components/ui/button';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { Command, CommandGroup, CommandItem, CommandList } from '@/components/ui/command';
+import {
+  Command,
+  CommandGroup,
+  CommandItem,
+  CommandList,
+  CommandSeparator,
+} from '@/components/ui/command';
 import { ChevronsUpDown, Check } from 'lucide-react';
 import { cn } from '@/lib/utils';
 
@@ -56,6 +62,12 @@ export type ModeComboboxProps<T extends string = string> = {
   className?: string;
   /** Mode options to display. Defaults to LEGACY_MODE_OPTIONS for backward compatibility. */
   options?: ModeOption<T>[];
+  /**
+   * Additional custom mode options rendered below the built-ins under a
+   * "Custom modes" group. Used to surface a selected profile's modes in the
+   * session picker / chat input.
+   */
+  customOptions?: ModeOption<T>[];
 };
 
 export function ModeCombobox<T extends string = string>({
@@ -69,11 +81,21 @@ export function ModeCombobox<T extends string = string>({
   variant = 'full',
   className,
   options = LEGACY_MODE_OPTIONS as unknown as ModeOption<T>[],
+  customOptions,
 }: ModeComboboxProps<T>) {
   const [open, setOpen] = useState(false);
   const triggerRef = useRef<HTMLButtonElement>(null);
 
-  const selectedMode = options.find(mode => mode.value === value);
+  // Deduplicate custom options that collide with a built-in slug — the
+  // built-in wins (custom-mode slugs are rejected server-side for those).
+  const dedupedCustom = useMemo(() => {
+    if (!customOptions || customOptions.length === 0) return [];
+    const builtinSet = new Set(options.map(o => o.value));
+    return customOptions.filter(o => !builtinSet.has(o.value));
+  }, [options, customOptions]);
+
+  const allOptions = useMemo(() => [...options, ...dedupedCustom], [options, dedupedCustom]);
+  const selectedMode = allOptions.find(mode => mode.value === value);
   const isCompact = variant === 'compact';
   const showLabel = !isCompact && label;
 
@@ -111,33 +133,16 @@ export function ModeCombobox<T extends string = string>({
         </PopoverTrigger>
         <PopoverContent className="w-52 p-0" align="start">
           <Command>
-            <CommandList className="max-h-64 overflow-auto">
-              <CommandGroup>
-                {options.map(mode => (
-                  <CommandItem
-                    key={mode.value}
-                    value={mode.value}
-                    onSelect={() => {
-                      onValueChange(mode.value);
-                      setOpen(false);
-                    }}
-                    className="flex items-center gap-2"
-                  >
-                    <div className="flex flex-col truncate">
-                      <span className="truncate">{mode.label}</span>
-                      <span className="text-muted-foreground truncate text-xs">
-                        {mode.description}
-                      </span>
-                    </div>
-                    <Check
-                      className={cn(
-                        'ml-auto h-4 w-4 shrink-0',
-                        mode.value === value ? 'opacity-100' : 'opacity-0'
-                      )}
-                    />
-                  </CommandItem>
-                ))}
-              </CommandGroup>
+            <CommandList className="max-h-64 overflow-x-hidden overflow-y-auto">
+              <ModeComboboxGroups
+                options={options}
+                customOptions={dedupedCustom}
+                value={value}
+                onSelect={v => {
+                  onValueChange(v);
+                  setOpen(false);
+                }}
+              />
             </CommandList>
           </Command>
         </PopoverContent>
@@ -171,33 +176,16 @@ export function ModeCombobox<T extends string = string>({
           style={{ width: triggerRef.current?.offsetWidth }}
         >
           <Command>
-            <CommandList className="max-h-64 overflow-auto">
-              <CommandGroup>
-                {options.map(mode => (
-                  <CommandItem
-                    key={mode.value}
-                    value={mode.value}
-                    onSelect={() => {
-                      onValueChange(mode.value);
-                      setOpen(false);
-                    }}
-                    className="flex items-center gap-2"
-                  >
-                    <div className="flex flex-col truncate">
-                      <span className="truncate">{mode.label}</span>
-                      <span className="text-muted-foreground truncate text-xs">
-                        {mode.description}
-                      </span>
-                    </div>
-                    <Check
-                      className={cn(
-                        'ml-auto h-4 w-4 shrink-0',
-                        mode.value === value ? 'opacity-100' : 'opacity-0'
-                      )}
-                    />
-                  </CommandItem>
-                ))}
-              </CommandGroup>
+            <CommandList className="max-h-64 overflow-x-hidden overflow-y-auto">
+              <ModeComboboxGroups
+                options={options}
+                customOptions={dedupedCustom}
+                value={value}
+                onSelect={v => {
+                  onValueChange(v);
+                  setOpen(false);
+                }}
+              />
             </CommandList>
           </Command>
         </PopoverContent>
@@ -206,3 +194,49 @@ export function ModeCombobox<T extends string = string>({
     </div>
   );
 }
+
+function ModeComboboxGroups<T extends string>({
+  options,
+  customOptions,
+  value,
+  onSelect,
+}: {
+  options: ModeOption<T>[];
+  customOptions: ModeOption<T>[];
+  value: T | undefined;
+  onSelect: (value: T) => void;
+}) {
+  const renderItem = (mode: ModeOption<T>) => (
+    <CommandItem
+      key={mode.value}
+      value={mode.value}
+      onSelect={() => onSelect(mode.value)}
+      className="flex items-center gap-2"
+    >
+      <div className="flex min-w-0 flex-1 flex-col">
+        <span className="truncate">{mode.label}</span>
+        {mode.description && (
+          <span className="text-muted-foreground truncate text-xs">{mode.description}</span>
+        )}
+      </div>
+      <Check
+        className={cn(
+          'ml-auto h-4 w-4 shrink-0',
+          mode.value === value ? 'opacity-100' : 'opacity-0'
+        )}
+      />
+    </CommandItem>
+  );
+
+  return (
+    <>
+      <CommandGroup>{options.map(renderItem)}</CommandGroup>
+      {customOptions.length > 0 && (
+        <>
+          <CommandSeparator />
+          <CommandGroup heading="Custom modes">{customOptions.map(renderItem)}</CommandGroup>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/apps/web/src/components/shared/ModelCombobox.tsx b/apps/web/src/components/shared/ModelCombobox.tsx
index beba495292..2c8203149f 100644
--- a/apps/web/src/components/shared/ModelCombobox.tsx
+++ b/apps/web/src/components/shared/ModelCombobox.tsx
@@ -47,6 +47,13 @@ export type ModelComboboxProps = {
   className?: string;
   /** Whether the combobox is disabled */
   disabled?: boolean;
+  /**
+   * Render the popover as a modal layer. Required when the combobox is
+   * itself inside a Radix Dialog — without this, the dialog's focus/pointer
+   * scope intercepts wheel events on the portaled popover and the list
+   * cannot be scrolled.
+   */
+  modal?: boolean;
 };
 
 export function ModelCombobox({
@@ -66,6 +73,7 @@ export function ModelCombobox({
   variant = 'full',
   className,
   disabled = false,
+  modal = false,
 }: ModelComboboxProps) {
   const [open, setOpen] = useState(false);
   const triggerRef = useRef<HTMLButtonElement>(null);
@@ -185,7 +193,11 @@ export function ModelCombobox({
   // Compact variant - just the popover trigger without wrapper
   if (isCompact) {
     return (
-      <Popover open={disabled ? false : open} onOpenChange={disabled ? undefined : setOpen}>
+      <Popover
+        open={disabled ? false : open}
+        onOpenChange={disabled ? undefined : setOpen}
+        modal={modal}
+      >
         <PopoverTrigger asChild>
           <Button
             type="button"
@@ -296,7 +308,11 @@ export function ModelCombobox({
           {label} {required && <span className="text-red-400">*</span>}
         </Label>
       )}
-      <Popover open={disabled ? false : open} onOpenChange={disabled ? undefined : setOpen}>
+      <Popover
+        open={disabled ? false : open}
+        onOpenChange={disabled ? undefined : setOpen}
+        modal={modal}
+      >
         <PopoverTrigger asChild>
           <Button
             id="model-combobox"
diff --git a/apps/web/src/hooks/useCloudAgentProfiles.ts b/apps/web/src/hooks/useCloudAgentProfiles.ts
index f2adb85bd0..8c7ec611ae 100644
--- a/apps/web/src/hooks/useCloudAgentProfiles.ts
+++ b/apps/web/src/hooks/useCloudAgentProfiles.ts
@@ -2,6 +2,7 @@
 'use client';
 
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type { AgentConfig } from '@kilocode/db/schema-types';
 import { useTRPC } from '@/lib/trpc/utils';
 
 // Owner type for profiles
@@ -17,6 +18,9 @@ export type ProfileSummary = {
   updatedAt: string;
   varCount: number;
   commandCount: number;
+  mcpServerCount: number;
+  skillCount: number;
+  agentCount: number;
 };
 
 // Profile summary with owner type for combined listings
@@ -37,6 +41,43 @@ export type ProfileCommand = {
   command: string;
 };
 
+export type ProfileMcpServer = {
+  id: string;
+  name: string;
+  type: 'local' | 'remote';
+  enabled: boolean;
+  timeout: number | null;
+  /** env/header values are returned masked (never plaintext/ciphertext). */
+  config:
+    | { command: string[]; environment?: Record<string, string> }
+    | { url: string; headers?: Record<string, string> };
+  createdAt: string;
+  updatedAt: string;
+};
+
+export type ProfileSkill = {
+  id: string;
+  name: string;
+  description: string | null;
+  sourceType: 'marketplace' | 'custom';
+  sourceUrl: string | null;
+  rawMarkdown: string;
+  /** Companion files (excluding SKILL.md). Relative path → content. */
+  files: Record<string, string>;
+  enabled: boolean;
+  createdAt: string;
+  updatedAt: string;
+};
+
+export type ProfileAgent = {
+  id: string;
+  slug: string;
+  name: string;
+  config: AgentConfig;
+  createdAt: string;
+  updatedAt: string;
+};
+
 export type ProfileDetails = {
   id: string;
   name: string;
@@ -46,6 +87,9 @@ export type ProfileDetails = {
   updatedAt: string;
   vars: ProfileVar[];
   commands: ProfileCommand[];
+  mcpServers: ProfileMcpServer[];
+  skills: ProfileSkill[];
+  agents: ProfileAgent[];
 };
 
 // Combined profiles result for org context
@@ -155,6 +199,11 @@ export function useProfileMutations(options: UseProfileMutationsOptions = {}) {
   const setAsDefault = useMutation(
     trpc.agentProfiles.setAsDefault.mutationOptions({
       onSuccess: async () => {
+        // Setting a default flips isDefault on both the new and previous default,
+        // so invalidate every single-profile get query in addition to the list.
+        await queryClient.invalidateQueries({
+          queryKey: trpc.agentProfiles.get.queryKey(),
+        });
         await invalidateProfiles();
       },
     })
@@ -163,6 +212,9 @@ export function useProfileMutations(options: UseProfileMutationsOptions = {}) {
   const clearDefault = useMutation(
     trpc.agentProfiles.clearDefault.mutationOptions({
       onSuccess: async () => {
+        await queryClient.invalidateQueries({
+          queryKey: trpc.agentProfiles.get.queryKey(),
+        });
         await invalidateProfiles();
       },
     })
@@ -192,6 +244,86 @@ export function useProfileMutations(options: UseProfileMutationsOptions = {}) {
     })
   );
 
+  const createMcp = useMutation(
+    trpc.agentProfiles.createMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const updateMcp = useMutation(
+    trpc.agentProfiles.updateMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const deleteMcp = useMutation(
+    trpc.agentProfiles.deleteMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const setMcpEnabled = useMutation(
+    trpc.agentProfiles.setMcpEnabled.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+
+  const createCustomSkill = useMutation(
+    trpc.agentProfiles.createCustomSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const updateSkill = useMutation(
+    trpc.agentProfiles.updateSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const deleteSkill = useMutation(
+    trpc.agentProfiles.deleteSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const setSkillEnabled = useMutation(
+    trpc.agentProfiles.setSkillEnabled.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+
+  const createAgent = useMutation(
+    trpc.agentProfiles.createAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const updateAgent = useMutation(
+    trpc.agentProfiles.updateAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+  const deleteAgent = useMutation(
+    trpc.agentProfiles.deleteAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId);
+      },
+    })
+  );
+
   return {
     createProfile,
     updateProfile,
@@ -201,6 +333,17 @@ export function useProfileMutations(options: UseProfileMutationsOptions = {}) {
     setVar,
     deleteVar,
     setCommands,
+    createMcp,
+    updateMcp,
+    deleteMcp,
+    setMcpEnabled,
+    createCustomSkill,
+    updateSkill,
+    deleteSkill,
+    setSkillEnabled,
+    createAgent,
+    updateAgent,
+    deleteAgent,
     /** Manually invalidate profiles list */
     invalidateProfiles,
     /** Manually invalidate specific profile */
@@ -230,7 +373,7 @@ type UseCombinedProfilesOptions = {
 /**
  * Hook to fetch both org and personal profiles when in org context.
  * Returns profiles grouped by owner type with effective default resolution.
- * Org default takes precedence over personal default.
+ * Personal default takes precedence over org default.
  */
 export function useCombinedProfiles(options: UseCombinedProfilesOptions) {
   const { organizationId, enabled = true } = options;
@@ -311,6 +454,11 @@ export function useCombinedProfileMutations(options: UseCombinedProfileMutations
   const setAsDefault = useMutation(
     trpc.agentProfiles.setAsDefault.mutationOptions({
       onSuccess: async () => {
+        // Setting a default flips isDefault on both the new and previous default,
+        // so invalidate every single-profile get query in addition to the lists.
+        await queryClient.invalidateQueries({
+          queryKey: trpc.agentProfiles.get.queryKey(),
+        });
         await invalidateCombinedProfiles();
       },
     })
@@ -319,6 +467,9 @@ export function useCombinedProfileMutations(options: UseCombinedProfileMutations
   const clearDefault = useMutation(
     trpc.agentProfiles.clearDefault.mutationOptions({
       onSuccess: async () => {
+        await queryClient.invalidateQueries({
+          queryKey: trpc.agentProfiles.get.queryKey(),
+        });
         await invalidateCombinedProfiles();
       },
     })
@@ -348,6 +499,86 @@ export function useCombinedProfileMutations(options: UseCombinedProfileMutations
     })
   );
 
+  const createMcp = useMutation(
+    trpc.agentProfiles.createMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const updateMcp = useMutation(
+    trpc.agentProfiles.updateMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const deleteMcp = useMutation(
+    trpc.agentProfiles.deleteMcp.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const setMcpEnabled = useMutation(
+    trpc.agentProfiles.setMcpEnabled.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+
+  const createCustomSkill = useMutation(
+    trpc.agentProfiles.createCustomSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const updateSkill = useMutation(
+    trpc.agentProfiles.updateSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const deleteSkill = useMutation(
+    trpc.agentProfiles.deleteSkill.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const setSkillEnabled = useMutation(
+    trpc.agentProfiles.setSkillEnabled.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+
+  const createAgent = useMutation(
+    trpc.agentProfiles.createAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const updateAgent = useMutation(
+    trpc.agentProfiles.updateAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+  const deleteAgent = useMutation(
+    trpc.agentProfiles.deleteAgent.mutationOptions({
+      onSuccess: async (_data, variables) => {
+        await invalidateProfile(variables.profileId, variables.organizationId);
+      },
+    })
+  );
+
   return {
     createProfile,
     updateProfile,
@@ -357,6 +588,17 @@ export function useCombinedProfileMutations(options: UseCombinedProfileMutations
     setVar,
     deleteVar,
     setCommands,
+    createMcp,
+    updateMcp,
+    deleteMcp,
+    setMcpEnabled,
+    createCustomSkill,
+    updateSkill,
+    deleteSkill,
+    setSkillEnabled,
+    createAgent,
+    updateAgent,
+    deleteAgent,
     /** Manually invalidate combined profiles */
     invalidateCombinedProfiles,
     /** Manually invalidate specific profile */
diff --git a/apps/web/src/lib/agent/profile-session-config.test.ts b/apps/web/src/lib/agent/profile-session-config.test.ts
deleted file mode 100644
index 2156cfcf9a..0000000000
--- a/apps/web/src/lib/agent/profile-session-config.test.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-import { db } from '@/lib/drizzle';
-import {
-  agent_environment_profiles,
-  agent_environment_profile_vars,
-  agent_environment_profile_commands,
-  agent_environment_profile_repo_bindings,
-} from '@kilocode/db/schema';
-import { insertTestUser } from '@/tests/helpers/user.helper';
-import { createTestOrganization } from '@/tests/helpers/organization.helper';
-import { mergeProfileConfiguration, ProfileNotFoundError } from './profile-session-config';
-import type { ProfileOwner } from './types';
-
-// A valid encrypted envelope JSON that satisfies the zod schema
-const fakeEnvelope = JSON.stringify({
-  encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
-  encryptedDEK: 'dGVzdC1lbmNyeXB0ZWQtZGVr',
-  algorithm: 'rsa-aes-256-gcm',
-  version: 1,
-});
-
-async function createProfile(
-  owner: ProfileOwner,
-  name: string,
-  opts: { isDefault?: boolean } = {}
-): Promise<string> {
-  const [row] = await db
-    .insert(agent_environment_profiles)
-    .values({
-      owned_by_user_id: owner.type === 'user' ? owner.id : null,
-      owned_by_organization_id: owner.type === 'organization' ? owner.id : null,
-      name,
-      is_default: opts.isDefault ?? false,
-    })
-    .returning({ id: agent_environment_profiles.id });
-  return row.id;
-}
-
-async function addVar(
-  profileId: string,
-  key: string,
-  value: string,
-  isSecret = false
-): Promise<void> {
-  await db.insert(agent_environment_profile_vars).values({
-    profile_id: profileId,
-    key,
-    value,
-    is_secret: isSecret,
-  });
-}
-
-async function addCommands(profileId: string, commands: string[]): Promise<void> {
-  if (commands.length === 0) return;
-  await db.insert(agent_environment_profile_commands).values(
-    commands.map((command, i) => ({
-      profile_id: profileId,
-      sequence: i,
-      command,
-    }))
-  );
-}
-
-async function bindRepo(
-  owner: ProfileOwner,
-  repoFullName: string,
-  platform: 'github' | 'gitlab',
-  profileId: string
-): Promise<void> {
-  await db.insert(agent_environment_profile_repo_bindings).values({
-    repo_full_name: repoFullName,
-    platform,
-    profile_id: profileId,
-    owned_by_user_id: owner.type === 'user' ? owner.id : null,
-    owned_by_organization_id: owner.type === 'organization' ? owner.id : null,
-  });
-}
-
-describe('mergeProfileConfiguration', () => {
-  afterEach(async () => {
-    // eslint-disable-next-line drizzle/enforce-delete-with-where
-    await db.delete(agent_environment_profile_repo_bindings);
-    // eslint-disable-next-line drizzle/enforce-delete-with-where
-    await db.delete(agent_environment_profile_commands);
-    // eslint-disable-next-line drizzle/enforce-delete-with-where
-    await db.delete(agent_environment_profile_vars);
-    // eslint-disable-next-line drizzle/enforce-delete-with-where
-    await db.delete(agent_environment_profiles);
-  });
-
-  test('returns all undefined when no profiles and no manual args', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    const result = await mergeProfileConfiguration({ owner });
-
-    expect(result).toEqual({
-      envVars: undefined,
-      setupCommands: undefined,
-      encryptedSecrets: undefined,
-    });
-  });
-
-  test('passes through manual envVars only', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      envVars: { FOO: 'bar' },
-    });
-
-    expect(result.envVars).toEqual({ FOO: 'bar' });
-    expect(result.setupCommands).toBeUndefined();
-    expect(result.encryptedSecrets).toBeUndefined();
-  });
-
-  test('passes through manual setupCommands only', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      setupCommands: ['npm install'],
-    });
-
-    expect(result.envVars).toBeUndefined();
-    expect(result.setupCommands).toEqual(['npm install']);
-    expect(result.encryptedSecrets).toBeUndefined();
-  });
-
-  test('loads default profile for user owner', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'my-default', { isDefault: true });
-    await addVar(profileId, 'DB_HOST', 'localhost');
-    await addCommands(profileId, ['echo hello']);
-
-    const result = await mergeProfileConfiguration({ owner });
-
-    expect(result.envVars).toEqual({ DB_HOST: 'localhost' });
-    expect(result.setupCommands).toEqual(['echo hello']);
-  });
-
-  test('loads named profile by name', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'staging');
-    await addVar(profileId, 'ENV', 'staging');
-    await addCommands(profileId, ['setup.sh']);
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      profileName: 'staging',
-    });
-
-    expect(result.envVars).toEqual({ ENV: 'staging' });
-    expect(result.setupCommands).toEqual(['setup.sh']);
-  });
-
-  test('throws ProfileNotFoundError for unknown profile name', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    await expect(mergeProfileConfiguration({ owner, profileName: 'nonexistent' })).rejects.toThrow(
-      ProfileNotFoundError
-    );
-  });
-
-  test('loads repo binding profile as base layer', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'repo-profile');
-    await addVar(profileId, 'REPO_VAR', 'bound');
-    await addCommands(profileId, ['repo-setup']);
-    await bindRepo(owner, 'org/repo', 'github', profileId);
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      repoFullName: 'org/repo',
-      platform: 'github',
-    });
-
-    expect(result.envVars).toEqual({ REPO_VAR: 'bound' });
-    expect(result.setupCommands).toEqual(['repo-setup']);
-  });
-
-  test('merges repo binding (base) with override profile and manual args', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    // Base: repo binding profile
-    const baseProfileId = await createProfile(owner, 'base-profile');
-    await addVar(baseProfileId, 'SHARED', 'from-base');
-    await addVar(baseProfileId, 'BASE_ONLY', 'base-val');
-    await addCommands(baseProfileId, ['base-cmd']);
-    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
-
-    // Override: default profile
-    const overrideProfileId = await createProfile(owner, 'override-profile', { isDefault: true });
-    await addVar(overrideProfileId, 'SHARED', 'from-override');
-    await addVar(overrideProfileId, 'OVERRIDE_ONLY', 'override-val');
-    await addCommands(overrideProfileId, ['override-cmd']);
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      repoFullName: 'org/repo',
-      platform: 'github',
-      envVars: { SHARED: 'from-manual', MANUAL: 'manual-val' },
-      setupCommands: ['manual-cmd'],
-    });
-
-    // Env vars: base < override < manual
-    expect(result.envVars).toEqual({
-      BASE_ONLY: 'base-val',
-      OVERRIDE_ONLY: 'override-val',
-      SHARED: 'from-manual',
-      MANUAL: 'manual-val',
-    });
-    // Commands: base, override, manual (concatenated)
-    expect(result.setupCommands).toEqual(['base-cmd', 'override-cmd', 'manual-cmd']);
-  });
-
-  test('deduplicates when repo binding and override resolve to same profile', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'shared-profile', { isDefault: true });
-    await addVar(profileId, 'KEY', 'val');
-    await addCommands(profileId, ['cmd']);
-    await bindRepo(owner, 'org/repo', 'github', profileId);
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      repoFullName: 'org/repo',
-      platform: 'github',
-    });
-
-    // Should not duplicate vars/commands
-    expect(result.envVars).toEqual({ KEY: 'val' });
-    expect(result.setupCommands).toEqual(['cmd']);
-  });
-
-  test('handles secret vars as encryptedSecrets', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'with-secrets', { isDefault: true });
-    await addVar(profileId, 'PLAIN', 'plaintext');
-    await addVar(profileId, 'SECRET_KEY', fakeEnvelope, true);
-
-    const result = await mergeProfileConfiguration({ owner });
-
-    expect(result.envVars).toEqual({ PLAIN: 'plaintext' });
-    expect(result.encryptedSecrets).toEqual({
-      SECRET_KEY: {
-        encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
-        encryptedDEK: 'dGVzdC1lbmNyeXB0ZWQtZGVr',
-        algorithm: 'rsa-aes-256-gcm',
-        version: 1,
-      },
-    });
-  });
-
-  test('merges secrets from base and override profiles (override wins)', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-
-    const baseEnvelope = JSON.stringify({
-      encryptedData: 'YmFzZS1kYXRh',
-      encryptedDEK: 'YmFzZS1kZWs=',
-      algorithm: 'rsa-aes-256-gcm',
-      version: 1,
-    });
-    const overrideEnvelope = JSON.stringify({
-      encryptedData: 'b3ZlcnJpZGUtZGF0YQ==',
-      encryptedDEK: 'b3ZlcnJpZGUtZGVr',
-      algorithm: 'rsa-aes-256-gcm',
-      version: 1,
-    });
-
-    const baseProfileId = await createProfile(owner, 'base');
-    await addVar(baseProfileId, 'SHARED_SECRET', baseEnvelope, true);
-    await addVar(baseProfileId, 'BASE_SECRET', baseEnvelope, true);
-    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
-
-    const overrideProfileId = await createProfile(owner, 'override', { isDefault: true });
-    await addVar(overrideProfileId, 'SHARED_SECRET', overrideEnvelope, true);
-
-    const result = await mergeProfileConfiguration({
-      owner,
-      repoFullName: 'org/repo',
-      platform: 'github',
-    });
-
-    expect(result.encryptedSecrets).toEqual({
-      BASE_SECRET: JSON.parse(baseEnvelope),
-      SHARED_SECRET: JSON.parse(overrideEnvelope), // override wins
-    });
-  });
-
-  describe('organization context', () => {
-    test('org default profile takes precedence via getEffectiveDefaultProfileId', async () => {
-      const user = await insertTestUser();
-      const org = await createTestOrganization('test-org', user.id, 0);
-      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
-      const userOwner: ProfileOwner = { type: 'user', id: user.id };
-
-      // Personal default
-      const personalProfileId = await createProfile(userOwner, 'personal-default', {
-        isDefault: true,
-      });
-      await addVar(personalProfileId, 'SOURCE', 'personal');
-
-      // Org default
-      const orgProfileId = await createProfile(orgOwner, 'org-default', { isDefault: true });
-      await addVar(orgProfileId, 'SOURCE', 'org');
-
-      const result = await mergeProfileConfiguration({
-        owner: orgOwner,
-        userId: user.id,
-      });
-
-      // Org default wins
-      expect(result.envVars).toEqual({ SOURCE: 'org' });
-    });
-
-    test('falls back to personal default when org has no default', async () => {
-      const user = await insertTestUser();
-      const org = await createTestOrganization('test-org', user.id, 0);
-      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
-      const userOwner: ProfileOwner = { type: 'user', id: user.id };
-
-      // Personal default only
-      const personalProfileId = await createProfile(userOwner, 'personal-default', {
-        isDefault: true,
-      });
-      await addVar(personalProfileId, 'SOURCE', 'personal');
-
-      const result = await mergeProfileConfiguration({
-        owner: orgOwner,
-        userId: user.id,
-      });
-
-      expect(result.envVars).toEqual({ SOURCE: 'personal' });
-    });
-
-    test('named profile resolves from org first, then falls back to personal', async () => {
-      const user = await insertTestUser();
-      const org = await createTestOrganization('test-org', user.id, 0);
-      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
-      const userOwner: ProfileOwner = { type: 'user', id: user.id };
-
-      // Only exists as a personal profile
-      const personalProfileId = await createProfile(userOwner, 'my-profile');
-      await addVar(personalProfileId, 'SOURCE', 'personal');
-
-      const result = await mergeProfileConfiguration({
-        owner: orgOwner,
-        userId: user.id,
-        profileName: 'my-profile',
-      });
-
-      expect(result.envVars).toEqual({ SOURCE: 'personal' });
-    });
-
-    test('named profile prefers org when both org and personal have same name', async () => {
-      const user = await insertTestUser();
-      const org = await createTestOrganization('test-org', user.id, 0);
-      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
-      const userOwner: ProfileOwner = { type: 'user', id: user.id };
-
-      await createProfile(userOwner, 'shared-name');
-      const orgProfileId = await createProfile(orgOwner, 'shared-name');
-      await addVar(orgProfileId, 'SOURCE', 'org');
-
-      const result = await mergeProfileConfiguration({
-        owner: orgOwner,
-        userId: user.id,
-        profileName: 'shared-name',
-      });
-
-      expect(result.envVars).toEqual({ SOURCE: 'org' });
-    });
-  });
-
-  test('no repo binding when repoFullName is provided without platform', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'repo-profile');
-    await addVar(profileId, 'REPO_VAR', 'bound');
-    await bindRepo(owner, 'org/repo', 'github', profileId);
-
-    // repoFullName without platform => no repo binding lookup
-    const result = await mergeProfileConfiguration({
-      owner,
-      repoFullName: 'org/repo',
-    });
-
-    // Should not apply repo binding vars
-    expect(result.envVars).toBeUndefined();
-  });
-
-  test('returns undefined for empty envVars after merge', async () => {
-    const user = await insertTestUser();
-    const owner: ProfileOwner = { type: 'user', id: user.id };
-    const profileId = await createProfile(owner, 'commands-only', { isDefault: true });
-    await addCommands(profileId, ['setup.sh']);
-
-    const result = await mergeProfileConfiguration({ owner });
-
-    expect(result.envVars).toBeUndefined();
-    expect(result.setupCommands).toEqual(['setup.sh']);
-  });
-});
diff --git a/apps/web/src/lib/agent/profile-session-config.ts b/apps/web/src/lib/agent/profile-session-config.ts
deleted file mode 100644
index 3f53c7d2da..0000000000
--- a/apps/web/src/lib/agent/profile-session-config.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import * as z from 'zod';
-import {
-  getProfileIdByName,
-  getEffectiveDefaultProfileId,
-  getDefaultProfile,
-} from './profile-service';
-import { getBindingForRepo } from './repo-binding-service';
-import { getVarsForSession } from './profile-vars-service';
-import { getCommandsForSession } from './profile-commands-service';
-import type { EncryptedEnvelope } from '@/lib/encryption';
-import type { ProfileOwner } from './types';
-
-// Schema to validate encrypted envelope structure from database
-const encryptedEnvelopeSchema = z.object({
-  encryptedData: z.string(),
-  encryptedDEK: z.string(),
-  algorithm: z.literal('rsa-aes-256-gcm'),
-  version: z.literal(1),
-});
-
-export class ProfileNotFoundError extends Error {
-  constructor(public profileName: string) {
-    super(`Profile '${profileName}' not found`);
-    this.name = 'ProfileNotFoundError';
-  }
-}
-
-export type MergeProfileConfigurationArgs = {
-  profileName?: string;
-  owner: ProfileOwner;
-  /** When in org context, enables searching personal profiles and using effective default. */
-  userId?: string;
-  repoFullName?: string;
-  platform?: 'github' | 'gitlab';
-  envVars?: Record<string, string>;
-  setupCommands?: string[];
-};
-
-export type MergeProfileConfigurationResult = {
-  envVars?: Record<string, string>;
-  setupCommands?: string[];
-  encryptedSecrets?: Record<string, EncryptedEnvelope>;
-};
-
-export async function mergeProfileConfiguration({
-  profileName,
-  owner,
-  userId,
-  repoFullName,
-  platform,
-  envVars = {},
-  setupCommands = [],
-}: MergeProfileConfigurationArgs): Promise<MergeProfileConfigurationResult> {
-  let mergedEnvVars = { ...envVars };
-  let mergedSetupCommands = [...setupCommands];
-  let encryptedSecrets: Record<string, EncryptedEnvelope> | undefined;
-
-  // Layer 1: Repo binding profile (base)
-  let repoBindingProfileId: string | null = null;
-  if (repoFullName && platform) {
-    repoBindingProfileId = await getBindingForRepo(owner, repoFullName, platform);
-  }
-
-  // Layer 2: User-selected or default profile (override)
-  let overrideProfileId: string | null = null;
-  if (profileName) {
-    // Explicit profile name — resolve it
-    if (owner.type === 'organization' && userId) {
-      overrideProfileId = await getProfileIdByName(profileName, owner);
-      if (!overrideProfileId) {
-        overrideProfileId = await getProfileIdByName(profileName, { type: 'user', id: userId });
-      }
-    } else {
-      overrideProfileId = await getProfileIdByName(profileName, owner);
-    }
-
-    if (!overrideProfileId) {
-      throw new ProfileNotFoundError(profileName);
-    }
-  } else {
-    // No explicit profile — fall back to default
-    if (owner.type === 'organization' && userId) {
-      overrideProfileId = await getEffectiveDefaultProfileId(userId, owner.id);
-    } else {
-      const defaultProfile = await getDefaultProfile(owner);
-      overrideProfileId = defaultProfile?.id ?? null;
-    }
-  }
-
-  // Deduplicate: if both layers resolve to the same profile, skip the base layer
-  if (repoBindingProfileId && repoBindingProfileId === overrideProfileId) {
-    repoBindingProfileId = null;
-  }
-
-  // Load all profile data in parallel
-  const profilesToLoad: string[] = [];
-  if (repoBindingProfileId) profilesToLoad.push(repoBindingProfileId);
-  if (overrideProfileId) profilesToLoad.push(overrideProfileId);
-
-  const profileData = await Promise.all(
-    profilesToLoad.map(async profileId => {
-      const [vars, commands] = await Promise.all([
-        getVarsForSession(profileId),
-        getCommandsForSession(profileId),
-      ]);
-      return { profileId, vars, commands };
-    })
-  );
-
-  // Build the layered result: repo binding vars < override vars < manual vars
-  const repoBindingData = repoBindingProfileId
-    ? profileData.find(d => d.profileId === repoBindingProfileId)
-    : null;
-  const overrideData = overrideProfileId
-    ? profileData.find(d => d.profileId === overrideProfileId)
-    : null;
-
-  // Process repo binding profile (base layer)
-  const baseEnvVars: Record<string, string> = {};
-  const baseSecrets: Record<string, EncryptedEnvelope> = {};
-  const baseCommands: string[] = [];
-
-  if (repoBindingData) {
-    for (const variable of repoBindingData.vars) {
-      if (variable.isSecret) {
-        const parsed = encryptedEnvelopeSchema.parse(JSON.parse(variable.value));
-        baseSecrets[variable.key] = parsed;
-      } else {
-        baseEnvVars[variable.key] = variable.value;
-      }
-    }
-    baseCommands.push(...repoBindingData.commands);
-  }
-
-  // Process override profile
-  const overrideEnvVars: Record<string, string> = {};
-  const overrideSecrets: Record<string, EncryptedEnvelope> = {};
-  const overrideCommands: string[] = [];
-
-  if (overrideData) {
-    for (const variable of overrideData.vars) {
-      if (variable.isSecret) {
-        const parsed = encryptedEnvelopeSchema.parse(JSON.parse(variable.value));
-        overrideSecrets[variable.key] = parsed;
-      } else {
-        overrideEnvVars[variable.key] = variable.value;
-      }
-    }
-    overrideCommands.push(...overrideData.commands);
-  }
-
-  // Merge env vars: base < override < manual
-  mergedEnvVars = { ...baseEnvVars, ...overrideEnvVars, ...envVars };
-  // Merge commands: base, then override, then manual
-  mergedSetupCommands = [...baseCommands, ...overrideCommands, ...setupCommands];
-  // Merge secrets: base < override (override wins on key collision)
-  const allSecrets = { ...baseSecrets, ...overrideSecrets };
-  if (Object.keys(allSecrets).length > 0) {
-    encryptedSecrets = allSecrets;
-  }
-
-  return {
-    envVars: Object.keys(mergedEnvVars).length > 0 ? mergedEnvVars : undefined,
-    setupCommands: mergedSetupCommands.length > 0 ? mergedSetupCommands : undefined,
-    encryptedSecrets,
-  };
-}
diff --git a/apps/web/src/lib/agent/types.ts b/apps/web/src/lib/agent/types.ts
deleted file mode 100644
index 6e258f628e..0000000000
--- a/apps/web/src/lib/agent/types.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/** Owner type for agent environment profiles - exactly one of organizationId or userId must be set. */
-export type ProfileOwner = { type: 'organization'; id: string } | { type: 'user'; id: string };
-
-/** Owner type discriminator for UI display. */
-export type ProfileOwnerType = ProfileOwner['type'];
-
-/** Profile variable response type (for API responses). Secret values are masked. */
-export type ProfileVarResponse = {
-  key: string;
-  value: string; // Masked as '***' for secrets
-  isSecret: boolean;
-  createdAt: string;
-  updatedAt: string;
-};
-
-/** Profile command response type. */
-export type ProfileCommandResponse = {
-  sequence: number;
-  command: string;
-};
-
-/** Profile response type for list/get operations. */
-export type ProfileResponse = {
-  id: string;
-  name: string;
-  description: string | null;
-  isDefault: boolean;
-  createdAt: string;
-  updatedAt: string;
-  vars: ProfileVarResponse[];
-  commands: ProfileCommandResponse[];
-};
-
-/** Profile response with owner type for combined listings. */
-export type ProfileResponseWithOwner = ProfileResponse & {
-  ownerType: ProfileOwnerType;
-};
-
-/** Profile summary for list operations (without vars/commands). */
-export type ProfileSummary = {
-  id: string;
-  name: string;
-  description: string | null;
-  isDefault: boolean;
-  createdAt: string;
-  updatedAt: string;
-  varCount: number;
-  commandCount: number;
-};
-
-/** Profile summary with owner type for combined listings. */
-export type ProfileSummaryWithOwner = ProfileSummary & {
-  ownerType: ProfileOwnerType;
-};
-
-/** Combined profiles result for org context - returns both org and personal profiles with effective default. */
-export type CombinedProfilesResult = {
-  orgProfiles: ProfileSummaryWithOwner[];
-  personalProfiles: ProfileSummaryWithOwner[];
-  effectiveDefaultId: string | null;
-};
diff --git a/apps/web/src/lib/app-builder/app-builder-service.ts b/apps/web/src/lib/app-builder/app-builder-service.ts
index 7fb2a2f5d0..4be5ab2257 100644
--- a/apps/web/src/lib/app-builder/app-builder-service.ts
+++ b/apps/web/src/lib/app-builder/app-builder-service.ts
@@ -27,6 +27,8 @@ import { generateImageMCPToken } from '@/lib/app-builder/image-mcp-token';
 import { buildImageContextFromAttachments } from '@/lib/app-builder/image-context';
 import { deleteProjectAssets } from '@/lib/r2/app-builder-assets';
 import { getEnvVariable } from '@/lib/dotenvx';
+import { AGENT_ENV_VARS_PUBLIC_KEY } from '@/lib/config.server';
+import { encryptWithPublicKey, type EncryptedEnvelope } from '@/lib/encryption';
 import { modelSupportsImages } from '@/lib/ai-gateway/providers/model-capabilities';
 import { errorExceptInTest } from '@/lib/utils.server';
 
@@ -194,18 +196,25 @@ function buildMCPServersConfig(params: {
   userId: string;
   projectId: string;
   owner: Owner;
-}): Record<string, { type: 'remote'; url: string; headers: Record<string, string> }> | undefined {
+}):
+  | Record<string, { type: 'remote'; url: string; headers: Record<string, EncryptedEnvelope> }>
+  | undefined {
   const mcpUrl = getEnvVariable('CLOUD_AGENT_IMAGES_MCP_URL');
   if (!mcpUrl) return undefined;
+  if (!AGENT_ENV_VARS_PUBLIC_KEY) {
+    console.error('AGENT_ENV_VARS_PUBLIC_KEY not configured; cannot encrypt MCP headers');
+    return undefined;
+  }
 
   try {
     const token = generateImageMCPToken(params);
+    const publicKey = Buffer.from(AGENT_ENV_VARS_PUBLIC_KEY, 'base64');
     return {
       'app-builder-images': {
         type: 'remote',
         url: mcpUrl,
         headers: {
-          Authorization: `Bearer ${token}`,
+          Authorization: encryptWithPublicKey(`Bearer ${token}`, publicKey),
         },
       },
     };
diff --git a/apps/web/src/lib/bot/tools/resolve-bot-session-profile.test.ts b/apps/web/src/lib/bot/tools/resolve-bot-session-profile.test.ts
index e0399e2176..15f5a335d3 100644
--- a/apps/web/src/lib/bot/tools/resolve-bot-session-profile.test.ts
+++ b/apps/web/src/lib/bot/tools/resolve-bot-session-profile.test.ts
@@ -11,7 +11,7 @@ import { insertTestUser } from '@/tests/helpers/user.helper';
 import { createTestOrganization } from '@/tests/helpers/organization.helper';
 import { resolveBotSessionProfile } from './resolve-bot-session-profile';
 import { ownerFromIntegration } from '@/lib/integrations/core/owner';
-import type { ProfileOwner } from '@/lib/agent/types';
+import type { ProfileOwner } from '@kilocode/cloud-agent-profile';
 
 const fakeEnvelope = JSON.stringify({
   encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
@@ -147,7 +147,7 @@ describe('resolveBotSessionProfile', () => {
     });
   });
 
-  test('org-owned integration: effective default falls back to ticket user personal default', async () => {
+  test('org-owned integration: ticket user personal default fills the effective default', async () => {
     const user = await insertTestUser();
     const org = await createTestOrganization('test-org', user.id, 0);
     const userOwner: ProfileOwner = { type: 'user', id: user.id };
@@ -169,7 +169,7 @@ describe('resolveBotSessionProfile', () => {
     expect(result.envVars).toEqual({ SOURCE: 'personal' });
   });
 
-  test('org-owned integration: org default takes precedence over user personal default', async () => {
+  test('org-owned integration: personal default takes precedence over org default', async () => {
     const user = await insertTestUser();
     const org = await createTestOrganization('test-org', user.id, 0);
     const userOwner: ProfileOwner = { type: 'user', id: user.id };
@@ -192,10 +192,33 @@ describe('resolveBotSessionProfile', () => {
       githubRepo: 'org/repo',
     });
 
+    expect(result.envVars).toEqual({ SOURCE: 'personal' });
+  });
+
+  test('org-owned integration: falls back to org default when ticket user has no personal default', async () => {
+    const user = await insertTestUser();
+    const org = await createTestOrganization('test-org', user.id, 0);
+    const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
+
+    const orgProfileId = await createProfile(orgOwner, 'org-default', { isDefault: true });
+    await addVar(orgProfileId, 'SOURCE', 'org');
+
+    const integration = await insertPlatformIntegration({
+      organizationId: org.id,
+      platform: 'github',
+    });
+
+    const result = await resolveBotSessionProfile(ownerFromIntegration(integration), user.id, {
+      githubRepo: 'org/repo',
+    });
+
     expect(result.envVars).toEqual({ SOURCE: 'org' });
   });
 
-  test('layers repo-binding profile (base) under default profile (override)', async () => {
+  test('repo binding (base) layers under the effective default (top)', async () => {
+    // A repo binding claims the base slot; the effective default fills the
+    // top slot and layers over it. The bot flow never supplies a `profileId`,
+    // so there is no explicit override — the default is the top layer.
     const user = await insertTestUser();
     const owner: ProfileOwner = { type: 'user', id: user.id };
 
@@ -205,10 +228,10 @@ describe('resolveBotSessionProfile', () => {
     await addCommands(baseProfileId, ['base-cmd']);
     await bindRepo(owner, 'org/repo', 'github', baseProfileId);
 
-    const overrideProfileId = await createProfile(owner, 'override', { isDefault: true });
-    await addVar(overrideProfileId, 'SHARED', 'from-override');
-    await addVar(overrideProfileId, 'OVERRIDE_ONLY', 'override-val');
-    await addCommands(overrideProfileId, ['override-cmd']);
+    const defaultProfileId = await createProfile(owner, 'default', { isDefault: true });
+    await addVar(defaultProfileId, 'SHARED', 'from-default');
+    await addVar(defaultProfileId, 'DEFAULT_ONLY', 'default-val');
+    await addCommands(defaultProfileId, ['default-cmd']);
 
     const integration = await insertPlatformIntegration({ userId: user.id, platform: 'github' });
 
@@ -218,10 +241,10 @@ describe('resolveBotSessionProfile', () => {
 
     expect(result.envVars).toEqual({
       BASE_ONLY: 'base-val',
-      OVERRIDE_ONLY: 'override-val',
-      SHARED: 'from-override',
+      DEFAULT_ONLY: 'default-val',
+      SHARED: 'from-default',
     });
-    expect(result.setupCommands).toEqual(['base-cmd', 'override-cmd']);
+    expect(result.setupCommands).toEqual(['base-cmd', 'default-cmd']);
   });
 
   test('gitlabProject: uses platform=gitlab when resolving repo binding', async () => {
diff --git a/apps/web/src/lib/bot/tools/resolve-bot-session-profile.ts b/apps/web/src/lib/bot/tools/resolve-bot-session-profile.ts
index 55786f9b5e..87c9156ca1 100644
--- a/apps/web/src/lib/bot/tools/resolve-bot-session-profile.ts
+++ b/apps/web/src/lib/bot/tools/resolve-bot-session-profile.ts
@@ -1,8 +1,9 @@
 import {
   mergeProfileConfiguration,
   type MergeProfileConfigurationResult,
-} from '@/lib/agent/profile-session-config';
-import type { ProfileOwner } from '@/lib/agent/types';
+  type ProfileOwner,
+} from '@kilocode/cloud-agent-profile';
+import { db } from '@/lib/drizzle';
 import type { Owner } from '@/lib/integrations/core/types';
 
 export type BotSessionProfileArgs = {
@@ -18,8 +19,8 @@ export type BotSessionProfileArgs = {
  *   - Layer 1: repo-binding profile (if any)
  *   - Layer 2: owner's default profile (effective default for orgs)
  *
- * The bot never supplies a `profileName`, so the explicit-name resolution path
- * in `mergeProfileConfiguration` is not used.
+ * The bot never supplies a `profileId`, so the caller always gets the
+ * default-resolution path.
  */
 export async function resolveBotSessionProfile(
   owner: Owner,
@@ -33,7 +34,7 @@ export async function resolveBotSessionProfile(
   const repoFullName = args.gitlabProject ?? args.githubRepo;
   const platform: 'github' | 'gitlab' = args.gitlabProject ? 'gitlab' : 'github';
 
-  return mergeProfileConfiguration({
+  return mergeProfileConfiguration(db, {
     owner: profileOwner,
     userId: userIdForMerge,
     repoFullName,
diff --git a/apps/web/src/lib/bot/tools/spawn-cloud-agent-session.ts b/apps/web/src/lib/bot/tools/spawn-cloud-agent-session.ts
index 4fd7f8e5de..ea08a5b678 100644
--- a/apps/web/src/lib/bot/tools/spawn-cloud-agent-session.ts
+++ b/apps/web/src/lib/bot/tools/spawn-cloud-agent-session.ts
@@ -22,7 +22,10 @@ import { parseBotCallbackStep } from '@/lib/bot/step-budget';
 import { resolveBotSessionProfile } from '@/lib/bot/tools/resolve-bot-session-profile';
 import { ownerFromIntegration } from '@/lib/integrations/core/owner';
 import type { Owner } from '@/lib/integrations/core/types';
-import type { MergeProfileConfigurationResult } from '@/lib/agent/profile-session-config';
+import {
+  profileMcpServersToClientRecord,
+  type MergeProfileConfigurationResult,
+} from '@kilocode/cloud-agent-profile';
 import { createHmac } from 'crypto';
 import { captureException } from '@sentry/nextjs';
 import type { PlatformIntegration } from '@kilocode/db';
@@ -177,6 +180,9 @@ export default async function spawnCloudAgentSession(
       envVars: profileConfig.envVars,
       encryptedSecrets: profileConfig.encryptedSecrets,
       setupCommands: profileConfig.setupCommands,
+      mcpServers: profileMcpServersToClientRecord(profileConfig.mcpServers),
+      runtimeSkills: profileConfig.skills,
+      runtimeAgents: profileConfig.agents,
     };
     initiateInput = { kilocodeOrganizationId };
   } else {
@@ -206,6 +212,9 @@ export default async function spawnCloudAgentSession(
       envVars: profileConfig.envVars,
       encryptedSecrets: profileConfig.encryptedSecrets,
       setupCommands: profileConfig.setupCommands,
+      mcpServers: profileMcpServersToClientRecord(profileConfig.mcpServers),
+      runtimeSkills: profileConfig.skills,
+      runtimeAgents: profileConfig.agents,
     };
     initiateInput = { githubToken, kilocodeOrganizationId };
   }
diff --git a/apps/web/src/lib/cloud-agent-next/cloud-agent-client.ts b/apps/web/src/lib/cloud-agent-next/cloud-agent-client.ts
index 1ab35bd569..d842d5c3f9 100644
--- a/apps/web/src/lib/cloud-agent-next/cloud-agent-client.ts
+++ b/apps/web/src/lib/cloud-agent-next/cloud-agent-client.ts
@@ -1,6 +1,7 @@
 import 'server-only';
 import { createTRPCClient, httpLink, TRPCClientError } from '@trpc/client';
 import { TRPCError } from '@trpc/server';
+import type { AgentConfig } from '@kilocode/db/schema-types';
 import type { EncryptedEnvelope } from '@/lib/encryption';
 import type { Images } from '@/lib/images-schema';
 import { getEnvVariable } from '@/lib/dotenvx';
@@ -19,11 +20,17 @@ import { INTERNAL_API_SECRET } from '@/lib/config.server';
 // TODO: Update this URL when the new cloud-agent-next worker is deployed
 const CLOUD_AGENT_NEXT_API_URL = getEnvVariable('CLOUD_AGENT_NEXT_API_URL') || '';
 
-// MCP server config types — CLI-native local/remote format
+// MCP server config types — CLI-native local/remote format.
+// Each env/header value is either a plain string (passed through verbatim)
+// or an RSA+AES envelope (decrypted per-value by the worker when
+// materializing `KILO_CONFIG_CONTENT.mcp`). Callers mix the two per key:
+// secrets travel as envelopes, non-sensitive config as plain strings.
+type MCPSecretValue = string | EncryptedEnvelope;
+
 type MCPLocalServerConfig = {
   type: 'local';
   command: string[];
-  environment?: Record<string, string>;
+  environment?: Record<string, MCPSecretValue>;
   enabled?: boolean;
   timeout?: number;
 };
@@ -31,13 +38,31 @@ type MCPLocalServerConfig = {
 type MCPRemoteServerConfig = {
   type: 'remote';
   url: string;
-  headers?: Record<string, string>;
+  headers?: Record<string, MCPSecretValue>;
   enabled?: boolean;
   timeout?: number;
 };
 
 type MCPServerConfig = MCPLocalServerConfig | MCPRemoteServerConfig;
 
+/** Runtime skill materialized into the sandbox. `rawMarkdown` is written verbatim to SKILL.md;
+ * `files` holds companion files keyed by relative path (excluding SKILL.md). */
+export type RuntimeSkillInput = {
+  name: string;
+  rawMarkdown: string;
+  files?: Record<string, string>;
+};
+
+/**
+ * Custom kilo agent materialized into `KILO_CONFIG_CONTENT.agent.<slug>`.
+ * Mirrors the CLI's AgentConfig shape from `@kilocode/db/schema-types`.
+ */
+export type RuntimeAgentInput = {
+  slug: string;
+  name: string;
+  config: AgentConfig;
+};
+
 /**
  * Type definitions for cloud-agent-next API procedures
  */
@@ -49,20 +74,18 @@ export type CallbackTarget = {
 };
 
 /**
- * Agent modes accepted by the API.
- * - code, plan, debug, orchestrator, ask: CLI agent modes
+ * Agent slug selected for a session. Built-in slugs plus `custom` plus any
+ * custom slug defined in the session's `runtimeAgents`.
+ *
+ * - code, plan, debug, orchestrator, ask: built-in agents
  * - build, architect: Backward-compatible aliases (build → code, architect → plan)
- * - custom: Custom mode (requires appendSystemPrompt)
+ * - custom: one-off mode (requires appendSystemPrompt)
+ * - any other slug: must match a slug in this session's runtimeAgents
+ *
+ * Kept as `AgentMode` rather than `AgentSlug` to avoid a cross-cutting rename
+ * of the API-level `mode` field.
  */
-export type AgentMode =
-  | 'code'
-  | 'plan'
-  | 'debug'
-  | 'orchestrator'
-  | 'ask'
-  | 'build'
-  | 'architect'
-  | 'custom';
+export type AgentMode = string;
 
 /** Input for prepareSession procedure */
 export type PrepareSessionInput = {
@@ -81,10 +104,20 @@ export type PrepareSessionInput = {
   platform?: 'github' | 'gitlab';
   // Common params
   kilocodeOrganizationId?: string;
+  /** Profile ID forwarded to cloud-agent-next for server-side merge. */
+  profileId?: string;
   envVars?: Record<string, string>;
   encryptedSecrets?: Record<string, EncryptedEnvelope>;
   setupCommands?: string[];
   mcpServers?: Record<string, MCPServerConfig>;
+  /**
+   * Runtime skills materialized from the merged profile stack. The worker
+   * writes each entry's SKILL.md (and any companion files) to
+   * `${SESSION_HOME}/.kilocode/skills/<name>/`.
+   */
+  runtimeSkills?: RuntimeSkillInput[];
+  /** Custom agents materialized from the merged profile stack. */
+  runtimeAgents?: RuntimeAgentInput[];
   upstreamBranch?: string;
   autoCommit?: boolean;
   condenseOnComplete?: boolean;
@@ -119,7 +152,8 @@ export type InitiateFromPreparedSessionInput = {
 export type SendMessageInput = {
   cloudAgentSessionId: string;
   prompt: string;
-  mode: 'code' | 'plan' | 'debug' | 'orchestrator' | 'ask';
+  /** Built-in slug or a slug in the session's runtimeAgents. `custom` is rejected here. */
+  mode: AgentMode;
   model: string;
   variant?: string;
   autoCommit?: boolean;
@@ -187,10 +221,8 @@ export type GetSessionOutput = {
   autoCommit?: boolean;
   upstreamBranch?: string;
 
-  // Configuration metadata (counts only, no values)
-  envVarCount?: number;
-  setupCommandCount?: number;
-  mcpServerCount?: number;
+  /** Custom agents stored on this session (slug + name, plus optional model and thinking-effort overrides). */
+  runtimeAgents?: Array<{ slug: string; name: string; model?: string; variant?: string }>;
 
   // Execution status (grouped for cleaner API)
   execution: ExecutionStatus;
@@ -235,6 +267,8 @@ export type UpdateSessionInput = {
   encryptedSecrets?: Record<string, EncryptedEnvelope>;
   setupCommands?: string[];
   mcpServers?: Record<string, MCPServerConfig>;
+  runtimeSkills?: RuntimeSkillInput[];
+  runtimeAgents?: RuntimeAgentInput[];
   callbackTarget?: CallbackTarget | null;
 };
 
diff --git a/apps/web/src/lib/cloud-agent-sdk/session-manager.test.ts b/apps/web/src/lib/cloud-agent-sdk/session-manager.test.ts
index 9ed25f4974..dbe32f2d5b 100644
--- a/apps/web/src/lib/cloud-agent-sdk/session-manager.test.ts
+++ b/apps/web/src/lib/cloud-agent-sdk/session-manager.test.ts
@@ -995,6 +995,40 @@ describe('createSessionManager', () => {
       const sc = atomValue<{ variant?: string | null }>(config.store, mgr.atoms.sessionConfig);
       expect(sc?.variant).toBe(null);
     });
+
+    it('updates sessionConfig.mode from assistant agent slug, not visibility mode', async () => {
+      const config = createMockConfig();
+      const mgr = createSessionManager(config);
+
+      const mockedCreate = jest.mocked(createCloudAgentSession);
+
+      await mgr.switchSession(kiloId('ses-1'));
+
+      const sessionConfig = mockedCreate.mock.calls[0][0];
+
+      // Custom agents always carry `mode: 'primary' | 'subagent' | 'all'` as
+      // visibility; the slug lives on `agent`. The picker must track the slug.
+      sessionConfig.onEvent?.({
+        type: 'message.updated',
+        info: {
+          id: 'msg-1',
+          sessionID: 'ses-1',
+          role: 'assistant',
+          modelID: 'claude-3-5-sonnet',
+          providerID: 'test',
+          mode: 'primary',
+          time: { created: 1 },
+          agent: 'e-code',
+          cost: 0,
+          parentID: '',
+          path: { cwd: '', root: '' },
+          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        },
+      });
+
+      const sc = atomValue<{ mode?: string }>(config.store, mgr.atoms.sessionConfig);
+      expect(sc?.mode).toBe('e-code');
+    });
   });
 
   // -------------------------------------------------------------------------
diff --git a/apps/web/src/lib/cloud-agent-sdk/session-manager.ts b/apps/web/src/lib/cloud-agent-sdk/session-manager.ts
index 4ca14342d1..2b353fb2a6 100644
--- a/apps/web/src/lib/cloud-agent-sdk/session-manager.ts
+++ b/apps/web/src/lib/cloud-agent-sdk/session-manager.ts
@@ -45,6 +45,8 @@ type SessionConfig = {
   mode: string;
   model: string;
   variant?: string | null;
+  /** Custom modes exposed by this session's profile stack (slug + name, plus optional model and thinking-effort overrides). */
+  runtimeAgents?: Array<{ slug: string; name: string; model?: string; variant?: string }>;
 };
 type ActiveSessionType = 'cloud-agent' | 'remote';
 type StandaloneQuestion = { requestId: string; questions: QuestionInfo[] };
@@ -79,6 +81,8 @@ type FetchedSessionData = {
   isPreparingAsync: boolean;
   prompt: string | null;
   initialMessageId: string | null;
+  /** Custom modes exposed by this session's profile stack (slug + name, plus optional model and thinking-effort overrides). */
+  runtimeAgents?: Array<{ slug: string; name: string; model?: string; variant?: string }>;
 };
 
 type PrepareInput = {
@@ -92,7 +96,7 @@ type PrepareInput = {
   setupCommands?: string[];
   upstreamBranch?: string;
   autoCommit?: boolean;
-  profileName?: string;
+  profileId?: string;
 };
 
 type SessionManagerConfig = {
@@ -537,6 +541,7 @@ function createSessionManager(config: SessionManagerConfig): SessionManager {
       mode: data.mode ?? '',
       model: data.model ?? '',
       variant: data.variant ?? null,
+      runtimeAgents: data.runtimeAgents,
     });
     store.set(sessionIdAtom, data.cloudAgentSessionId);
 
@@ -612,17 +617,20 @@ function createSessionManager(config: SessionManagerConfig): SessionManager {
       onError: message => store.set(errorAtom, message),
       onEvent: event => {
         if (event.type === 'message.updated' && event.info.role === 'assistant') {
+          // `info.agent` is the agent slug (e.g. 'code', 'e-code'); `info.mode`
+          // is the visibility ('primary'|'subagent'|'all') and must not be used
+          // as the picker's selected mode.
           const currentConfig = store.get(sessionConfigAtom);
           if (
             currentConfig &&
             (currentConfig.model !== event.info.modelID ||
-              currentConfig.mode !== event.info.mode ||
+              currentConfig.mode !== event.info.agent ||
               currentConfig.variant !== (event.info.variant ?? null))
           ) {
             store.set(sessionConfigAtom, {
               ...currentConfig,
               model: event.info.modelID,
-              mode: event.info.mode,
+              mode: event.info.agent,
               variant: event.info.variant ?? null,
             });
           }
diff --git a/apps/web/src/lib/cloud-agent/cloud-agent-client.ts b/apps/web/src/lib/cloud-agent/cloud-agent-client.ts
index ddd0a1b7cf..ad33697939 100644
--- a/apps/web/src/lib/cloud-agent/cloud-agent-client.ts
+++ b/apps/web/src/lib/cloud-agent/cloud-agent-client.ts
@@ -65,7 +65,7 @@ export type InitiateSessionInput = {
   githubRepo?: string;
   kilocodeOrganizationId?: string;
   prompt: string;
-  mode: 'architect' | 'code' | 'ask' | 'debug' | 'orchestrator';
+  mode: string;
   model: string;
   githubToken?: string;
   gitUrl?: string;
@@ -98,7 +98,7 @@ export type InitiateSessionAsyncInput = InitiateSessionInput & {
 export type SendMessageInput = {
   sessionId: string;
   prompt: string;
-  mode: 'architect' | 'code' | 'ask' | 'debug' | 'orchestrator';
+  mode: string;
   model: string;
   autoCommit?: boolean;
   githubToken?: string;
@@ -111,7 +111,7 @@ export type SendMessageInput = {
 export type SendMessageV2Input = {
   cloudAgentSessionId: string;
   prompt: string;
-  mode: 'architect' | 'code' | 'ask' | 'debug' | 'orchestrator';
+  mode: string;
   model: string;
   autoCommit?: boolean;
   githubToken?: string;
@@ -128,7 +128,7 @@ export type InitiateFromKilocodeSessionLegacyInput = {
   kiloSessionId: string; // UUID of existing cli_session
   githubRepo: string; // Required: org/repo format
   prompt: string;
-  mode: 'architect' | 'code' | 'ask' | 'debug' | 'orchestrator';
+  mode: string;
   model: string;
   kilocodeOrganizationId?: string;
   githubToken?: string;
@@ -153,7 +153,7 @@ export type InitiateFromKilocodeSessionInput =
 /** Input for prepareSession procedure */
 export type PrepareSessionInput = {
   prompt: string;
-  mode: 'architect' | 'code' | 'ask' | 'debug' | 'orchestrator';
+  mode: string;
   model: string;
   // GitHub-specific params
   githubRepo?: string;
@@ -168,6 +168,8 @@ export type PrepareSessionInput = {
   platform?: 'github' | 'gitlab';
   // Common params
   kilocodeOrganizationId?: string;
+  /** Profile ID forwarded to cloud-agent-next for server-side merge. */
+  profileId?: string;
   envVars?: Record<string, string>;
   encryptedSecrets?: Record<string, EncryptedEnvelope>;
   setupCommands?: string[];
diff --git a/apps/web/src/lib/user.test.ts b/apps/web/src/lib/user.test.ts
index b7a4b39b2b..ba11e01f9b 100644
--- a/apps/web/src/lib/user.test.ts
+++ b/apps/web/src/lib/user.test.ts
@@ -49,6 +49,9 @@ import {
   user_push_tokens,
   security_advisor_scans,
   credit_campaigns,
+  agent_environment_profiles,
+  agent_environment_profile_mcp_servers,
+  agent_environment_profile_skills,
 } from '@kilocode/db/schema';
 import { eq, count } from 'drizzle-orm';
 import {
@@ -1128,6 +1131,66 @@ describe('User', () => {
       expect(pms[0].stripe_fingerprint).toBe(pm.stripe_fingerprint);
     });
 
+    it('should cascade-delete agent environment profile MCPs and skills', async () => {
+      const user = await insertTestUser();
+
+      const [profile] = await db
+        .insert(agent_environment_profiles)
+        .values({
+          owned_by_user_id: user.id,
+          name: 'test-profile',
+        })
+        .returning();
+
+      const [mcpServer] = await db
+        .insert(agent_environment_profile_mcp_servers)
+        .values({
+          profile_id: profile.id,
+          name: 'demo',
+          type: 'local',
+          enabled: true,
+          config: {
+            command: ['node', 'server.js'],
+            environment: {
+              API_KEY: {
+                encryptedData: 'ciphertext',
+                encryptedDEK: 'key',
+                algorithm: 'rsa-aes-256-gcm',
+                version: 1,
+              },
+            },
+          },
+        })
+        .returning();
+
+      await db.insert(agent_environment_profile_skills).values({
+        profile_id: profile.id,
+        name: 'test-skill',
+        source_type: 'custom',
+        raw_markdown: '---\nname: test-skill\n---\nBody',
+      });
+
+      await softDeleteUser(user.id);
+
+      const profiles = await db
+        .select()
+        .from(agent_environment_profiles)
+        .where(eq(agent_environment_profiles.owned_by_user_id, user.id));
+      expect(profiles).toHaveLength(0);
+
+      const mcpServers = await db
+        .select()
+        .from(agent_environment_profile_mcp_servers)
+        .where(eq(agent_environment_profile_mcp_servers.id, mcpServer.id));
+      expect(mcpServers).toHaveLength(0);
+
+      const skills = await db
+        .select()
+        .from(agent_environment_profile_skills)
+        .where(eq(agent_environment_profile_skills.profile_id, profile.id));
+      expect(skills).toHaveLength(0);
+    });
+
     it('should nullify user_feedback FK', async () => {
       const user = await insertTestUser();
       await db.insert(user_feedback).values({
diff --git a/apps/web/src/routers/agent-profiles-router.ts b/apps/web/src/routers/agent-profiles-router.ts
index af89448290..3e6ab89a55 100644
--- a/apps/web/src/routers/agent-profiles-router.ts
+++ b/apps/web/src/routers/agent-profiles-router.ts
@@ -2,11 +2,17 @@ import { createTRPCRouter, baseProcedure } from '@/lib/trpc/init';
 import { ensureOrganizationAccess } from '@/routers/organizations/utils';
 import { TRPCError } from '@trpc/server';
 import * as z from 'zod';
-import * as profileService from '@/lib/agent/profile-service';
-import * as profileVarsService from '@/lib/agent/profile-vars-service';
-import * as profileCommandsService from '@/lib/agent/profile-commands-service';
-import * as repoBindingService from '@/lib/agent/repo-binding-service';
-import type { ProfileOwner } from '@/lib/agent/types';
+import * as profileService from '@kilocode/cloud-agent-profile';
+import * as profileVarsService from '@kilocode/cloud-agent-profile';
+import * as profileCommandsService from '@kilocode/cloud-agent-profile';
+import * as profileMcpService from '@kilocode/cloud-agent-profile';
+import * as profileSkillsService from '@kilocode/cloud-agent-profile';
+import * as profileAgentsService from '@kilocode/cloud-agent-profile';
+import * as repoBindingService from '@kilocode/cloud-agent-profile';
+import { AgentConfigSchema } from '@kilocode/db/schema-types';
+import type { ProfileOwner } from '@kilocode/cloud-agent-profile';
+import { db } from '@/lib/drizzle';
+import { AGENT_ENV_VARS_PUBLIC_KEY } from '@/lib/config.server';
 
 function isForeignKeyViolation(error: unknown): boolean {
   return (
@@ -50,6 +56,9 @@ const ProfileSummarySchema = z.object({
   updatedAt: z.string(),
   varCount: z.number(),
   commandCount: z.number(),
+  mcpServerCount: z.number(),
+  skillCount: z.number(),
+  agentCount: z.number(),
 });
 
 const ProfileSummaryWithOwnerSchema = ProfileSummarySchema.extend({
@@ -69,6 +78,50 @@ const ProfileCommandResponseSchema = z.object({
   command: z.string(),
 });
 
+const McpServerLocalConfigSchema = z.object({
+  command: z.array(z.string()),
+  environment: z.record(z.string(), z.string()).optional(),
+});
+
+const McpServerRemoteConfigSchema = z.object({
+  url: z.string(),
+  headers: z.record(z.string(), z.string()).optional(),
+});
+
+const ProfileMcpServerResponseSchema = z.object({
+  id: z.uuid(),
+  name: z.string(),
+  type: z.enum(['local', 'remote']),
+  enabled: z.boolean(),
+  timeout: z.number().nullable(),
+  /** env/header values are always the masked placeholder on GET responses. */
+  config: z.union([McpServerLocalConfigSchema, McpServerRemoteConfigSchema]),
+  createdAt: z.string(),
+  updatedAt: z.string(),
+});
+
+const ProfileSkillResponseSchema = z.object({
+  id: z.uuid(),
+  name: z.string(),
+  description: z.string().nullable(),
+  sourceType: z.enum(['marketplace', 'custom']),
+  sourceUrl: z.string().nullable(),
+  rawMarkdown: z.string(),
+  files: z.record(z.string(), z.string()),
+  enabled: z.boolean(),
+  createdAt: z.string(),
+  updatedAt: z.string(),
+});
+
+const ProfileAgentResponseSchema = z.object({
+  id: z.uuid(),
+  slug: z.string(),
+  name: z.string(),
+  config: AgentConfigSchema,
+  createdAt: z.string(),
+  updatedAt: z.string(),
+});
+
 const ProfileResponseSchema = z.object({
   id: z.uuid(),
   name: z.string(),
@@ -78,6 +131,9 @@ const ProfileResponseSchema = z.object({
   updatedAt: z.string(),
   vars: z.array(ProfileVarResponseSchema),
   commands: z.array(ProfileCommandResponseSchema),
+  mcpServers: z.array(ProfileMcpServerResponseSchema),
+  skills: z.array(ProfileSkillResponseSchema),
+  agents: z.array(ProfileAgentResponseSchema),
 });
 
 /**
@@ -91,6 +147,13 @@ function getOwner(organizationId: string | undefined, userId: string): ProfileOw
   return { type: 'user', id: userId };
 }
 
+/**
+ * The agent env vars public key, base64-encoded. Empty string when not
+ * configured — the package helpers throw a clear error if encryption is
+ * attempted in that case, matching the pre-refactor behavior.
+ */
+const publicKey = AGENT_ENV_VARS_PUBLIC_KEY ?? '';
+
 /**
  * Agent Environment Profiles Router
  *
@@ -110,13 +173,13 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      return profileService.listProfiles(owner);
+      return profileService.listProfiles(db, owner);
     }),
 
   /**
    * List both org and personal profiles when in org context.
    * Returns profiles grouped by owner type with effective default resolution.
-   * Org default takes precedence over personal default.
+   * Personal default takes precedence over org default.
    */
   listCombined: baseProcedure
     .input(z.object({ organizationId: z.uuid() }))
@@ -131,13 +194,13 @@ export const agentProfilesRouter = createTRPCRouter({
       await ensureOrganizationAccess(ctx, input.organizationId);
 
       const [orgProfiles, personalProfiles] = await Promise.all([
-        profileService.listProfiles({ type: 'organization', id: input.organizationId }),
-        profileService.listProfiles({ type: 'user', id: ctx.user.id }),
+        profileService.listProfiles(db, { type: 'organization', id: input.organizationId }),
+        profileService.listProfiles(db, { type: 'user', id: ctx.user.id }),
       ]);
 
-      // Effective default: org default takes precedence over personal default
+      // Effective default: personal default takes precedence over org default
       const effectiveDefault =
-        orgProfiles.find(p => p.isDefault) ?? personalProfiles.find(p => p.isDefault);
+        personalProfiles.find(p => p.isDefault) ?? orgProfiles.find(p => p.isDefault);
 
       return {
         orgProfiles: orgProfiles.map(p => ({ ...p, ownerType: 'organization' as const })),
@@ -157,7 +220,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      return profileService.getProfile(input.profileId, owner);
+      return profileService.getProfile(db, input.profileId, owner);
     }),
 
   /**
@@ -171,7 +234,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      return profileService.createProfile(owner, input.name, input.description);
+      return profileService.createProfile(db, owner, ctx.user.id, input.name, input.description);
     }),
 
   /**
@@ -191,7 +254,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await profileService.updateProfile(input.profileId, owner, {
+      await profileService.updateProfile(db, input.profileId, owner, {
         name: input.name,
         description: input.description,
       });
@@ -211,7 +274,7 @@ export const agentProfilesRouter = createTRPCRouter({
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
       try {
-        await profileService.deleteProfile(input.profileId, owner);
+        await profileService.deleteProfile(db, input.profileId, owner);
         return { success: true };
       } catch (error) {
         // Check for FK violation (profile referenced by webhook triggers)
@@ -237,7 +300,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await profileService.setDefaultProfile(input.profileId, owner);
+      await profileService.setDefaultProfile(db, input.profileId, owner);
       return { success: true };
     }),
 
@@ -252,7 +315,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await profileService.clearDefaultProfile(input.profileId, owner);
+      await profileService.clearDefaultProfile(db, input.profileId, owner);
       return { success: true };
     }),
 
@@ -273,6 +336,8 @@ export const agentProfilesRouter = createTRPCRouter({
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
       await profileVarsService.setVar(
+        db,
+        publicKey,
         input.profileId,
         input.key,
         input.value,
@@ -298,7 +363,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await profileVarsService.deleteVar(input.profileId, input.key, owner);
+      await profileVarsService.deleteVar(db, input.profileId, input.key, owner);
       return { success: true };
     }),
 
@@ -317,7 +382,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await profileCommandsService.setCommands(input.profileId, input.commands, owner);
+      await profileCommandsService.setCommands(db, input.profileId, input.commands, owner);
       return { success: true };
     }),
 
@@ -339,6 +404,7 @@ export const agentProfilesRouter = createTRPCRouter({
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
       await repoBindingService.bindProfileToRepo(
+        db,
         owner,
         input.repoFullName,
         input.platform,
@@ -362,7 +428,7 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      await repoBindingService.unbindRepo(owner, input.repoFullName, input.platform);
+      await repoBindingService.unbindRepo(db, owner, input.repoFullName, input.platform);
     }),
 
   /**
@@ -379,6 +445,296 @@ export const agentProfilesRouter = createTRPCRouter({
         await ensureOrganizationAccess(ctx, input.organizationId);
       }
       const owner = getOwner(input.organizationId, ctx.user.id);
-      return repoBindingService.listBindings(owner);
+      return repoBindingService.listBindings(db, owner);
+    }),
+
+  // ============ MCP SERVERS ============
+
+  /**
+   * Create an MCP server on a profile from a CLI-native input (local or remote).
+   * Each env/header value is encrypted at-rest with the agent env vars public key
+   * and stored inline in the server's config jsonb.
+   */
+  createMcp: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        server: profileMcpService.mcpServerFullInputSchema,
+      })
+    )
+    .output(z.object({ id: z.uuid() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      return profileMcpService.createMcpServer(db, publicKey, input.profileId, input.server, owner);
+    }),
+
+  /**
+   * Update an MCP server (replaces its config). Env/header values in the
+   * input are plaintext; they are encrypted before write.
+   */
+  updateMcp: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        mcpServerId: z.uuid(),
+        server: profileMcpService.mcpServerFullInputSchema,
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileMcpService.updateMcpServer(
+        db,
+        publicKey,
+        input.profileId,
+        input.mcpServerId,
+        input.server,
+        owner
+      );
+      return { success: true };
+    }),
+
+  /**
+   * Delete an MCP server.
+   */
+  deleteMcp: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        mcpServerId: z.uuid(),
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileMcpService.deleteMcpServer(db, input.profileId, input.mcpServerId, owner);
+      return { success: true };
+    }),
+
+  /**
+   * Toggle an MCP server's enabled flag.
+   */
+  setMcpEnabled: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        mcpServerId: z.uuid(),
+        enabled: z.boolean(),
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileMcpService.setMcpEnabled(
+        db,
+        input.profileId,
+        input.mcpServerId,
+        input.enabled,
+        owner
+      );
+      return { success: true };
+    }),
+
+  // ============ SKILLS ============
+
+  /**
+   * Create a custom skill by pasting SKILL.md directly (optionally with
+   * companion files extracted from an uploaded archive by the client).
+   */
+  createCustomSkill: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+      }).merge(profileSkillsService.skillCustomInputSchema)
+    )
+    .output(z.object({ id: z.uuid() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      return profileSkillsService.createCustomSkill(
+        db,
+        input.profileId,
+        {
+          name: input.name,
+          description: input.description,
+          rawMarkdown: input.rawMarkdown,
+          files: input.files,
+          enabled: input.enabled,
+        },
+        owner
+      );
+    }),
+
+  /**
+   * Update a skill's fields (name, description, rawMarkdown, files, enabled).
+   */
+  updateSkill: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        skillId: z.uuid(),
+      }).merge(profileSkillsService.skillUpdateInputSchema)
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileSkillsService.updateSkill(
+        db,
+        input.profileId,
+        input.skillId,
+        {
+          name: input.name,
+          description: input.description,
+          rawMarkdown: input.rawMarkdown,
+          files: input.files,
+          enabled: input.enabled,
+        },
+        owner
+      );
+      return { success: true };
+    }),
+
+  /**
+   * Delete a skill from a profile.
+   */
+  deleteSkill: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        skillId: z.uuid(),
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileSkillsService.deleteSkill(db, input.profileId, input.skillId, owner);
+      return { success: true };
+    }),
+
+  /**
+   * Toggle a skill's enabled flag.
+   */
+  setSkillEnabled: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        skillId: z.uuid(),
+        enabled: z.boolean(),
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileSkillsService.setSkillEnabled(
+        db,
+        input.profileId,
+        input.skillId,
+        input.enabled,
+        owner
+      );
+      return { success: true };
+    }),
+
+  // ============ AGENTS ============
+
+  /**
+   * Create an agent on a profile. The agent config is injected into
+   * `KILO_CONFIG_CONTENT.agent.<slug>` at session preparation time.
+   */
+  createAgent: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+      }).merge(profileAgentsService.agentCreateInputSchema)
+    )
+    .output(z.object({ id: z.uuid() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      return profileAgentsService.createAgent(
+        db,
+        input.profileId,
+        {
+          slug: input.slug,
+          name: input.name,
+          config: input.config,
+        },
+        owner
+      );
+    }),
+
+  /**
+   * Update an agent's fields (slug, name, config).
+   */
+  updateAgent: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        agentId: z.uuid(),
+      }).merge(profileAgentsService.agentUpdateInputSchema)
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileAgentsService.updateAgent(
+        db,
+        input.profileId,
+        input.agentId,
+        {
+          slug: input.slug,
+          name: input.name,
+          config: input.config,
+        },
+        owner
+      );
+      return { success: true };
+    }),
+
+  /**
+   * Delete an agent from a profile.
+   */
+  deleteAgent: baseProcedure
+    .input(
+      ProfileIdSchema.extend({
+        organizationId: z.uuid().optional(),
+        agentId: z.uuid(),
+      })
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      if (input.organizationId) {
+        await ensureOrganizationAccess(ctx, input.organizationId);
+      }
+      const owner = getOwner(input.organizationId, ctx.user.id);
+      await profileAgentsService.deleteAgent(db, input.profileId, input.agentId, owner);
+      return { success: true };
     }),
 });
diff --git a/apps/web/src/routers/cli-sessions-router.test.ts b/apps/web/src/routers/cli-sessions-router.test.ts
index efbba5a2f3..13e5143e34 100644
--- a/apps/web/src/routers/cli-sessions-router.test.ts
+++ b/apps/web/src/routers/cli-sessions-router.test.ts
@@ -12,12 +12,7 @@ import {
 import { CliSessionSharedState } from '@/types/cli-session-shared-state';
 import { eq, and } from 'drizzle-orm';
 import type { User, Organization } from '@kilocode/db/schema';
-import {
-  sanitizeGitUrl,
-  isValidGitUrl,
-  parseGitUrl,
-  sanitizeForPostgres,
-} from './cli-sessions-router';
+import { sanitizeGitUrl, isValidGitUrl, sanitizeForPostgres } from './cli-sessions-router';
 
 jest.mock('@/lib/r2/cli-sessions', () => ({
   generateSignedUrls: jest.fn().mockResolvedValue({
@@ -1686,28 +1681,6 @@ describe('cli-sessions-router', () => {
         expect(sanitizeGitUrl('http://github.com/org/repo')).toBe('http://github.com/org/repo');
       });
     });
-
-    describe('parseGitUrl', () => {
-      it('should return sanitized URL for valid HTTPS', () => {
-        expect(parseGitUrl('https://user:pass@github.com/org/repo?token=abc')).toBe(
-          'https://github.com/org/repo'
-        );
-      });
-
-      it('should return sanitized URL for valid SSH', () => {
-        expect(parseGitUrl('git@github.com:org/repo.git?ref=main')).toBe(
-          'git@github.com:org/repo.git'
-        );
-      });
-
-      it('should return undefined for invalid URLs', () => {
-        expect(parseGitUrl('not-a-valid-url')).toBeUndefined();
-      });
-
-      it('should return undefined for non-http protocols', () => {
-        expect(parseGitUrl('ftp://github.com/repo')).toBeUndefined();
-      });
-    });
   });
 
   describe('linkCloudAgent procedure', () => {
diff --git a/apps/web/src/routers/cli-sessions-router.ts b/apps/web/src/routers/cli-sessions-router.ts
index 90835407a6..1c323b294a 100644
--- a/apps/web/src/routers/cli-sessions-router.ts
+++ b/apps/web/src/routers/cli-sessions-router.ts
@@ -16,6 +16,7 @@ import {
   type SQL,
 } from 'drizzle-orm';
 import { TRPCError } from '@trpc/server';
+import { isValidGitUrl, sanitizeGitUrl } from '@kilocode/worker-utils/git-url';
 import { cliSessions, sharedCliSessions } from '@kilocode/db/schema';
 import { CliSessionSharedState } from '@/types/cli-session-shared-state';
 import {
@@ -77,42 +78,14 @@ export function sanitizeForPostgres(str: string): string {
 
 const titleField = z.string().transform(sanitizeForPostgres);
 
-export function isValidGitUrl(url: string): boolean {
-  if (url.startsWith('git@') && url.includes(':')) return true;
-  try {
-    const parsed = new URL(url);
-    return ['http:', 'https:'].includes(parsed.protocol);
-  } catch {
-    return false;
-  }
-}
-
-export function sanitizeGitUrl(url: string): string {
-  const sshMatch = url.match(/^git@([^:]+):(.+)$/);
-  if (sshMatch) {
-    const host = sshMatch[1];
-    const path = sshMatch[2].split('?')[0];
-    return `git@${host}:${path}`;
-  }
-
-  try {
-    const parsed = new URL(url);
-    parsed.username = '';
-    parsed.password = '';
-    parsed.search = '';
-    parsed.hash = '';
-    return parsed.toString();
-  } catch {
-    return url;
-  }
-}
-
-export function parseGitUrl(url: string): string | undefined {
-  if (!isValidGitUrl(url)) return undefined;
-  return sanitizeGitUrl(url);
-}
+// Re-export the shared git URL helpers for callers within apps/web that
+// currently import them from this router module.
+export { isValidGitUrl, sanitizeGitUrl };
 
-const gitUrlField = z.string().transform(parseGitUrl).optional();
+const gitUrlField = z
+  .string()
+  .transform(url => (isValidGitUrl(url) ? sanitizeGitUrl(url) : undefined))
+  .optional();
 
 const createdOnPlatformField = z.string().min(1).max(100);
 
diff --git a/apps/web/src/routers/cloud-agent-next-router.ts b/apps/web/src/routers/cloud-agent-next-router.ts
index 8429c8d8de..f12bdfa332 100644
--- a/apps/web/src/routers/cloud-agent-next-router.ts
+++ b/apps/web/src/routers/cloud-agent-next-router.ts
@@ -1,15 +1,10 @@
 import 'server-only';
-import { TRPCError } from '@trpc/server';
 import { baseProcedure, createTRPCRouter } from '@/lib/trpc/init';
 import {
   createCloudAgentNextClient,
   rethrowAsPaymentRequired,
 } from '@/lib/cloud-agent-next/cloud-agent-client';
 import { generateCloudAgentToken } from '@/lib/tokens';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-} from '@/lib/agent/profile-session-config';
 import { fetchGitHubRepositoriesForUser } from '@/lib/cloud-agent/github-integration-helpers';
 import {
   getGitLabInstanceUrlForUser,
@@ -60,52 +55,34 @@ export const cloudAgentNextRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudAgentNextClient(authToken);
 
-      const { envVars, setupCommands, profileName, gitlabProject, githubRepo, ...restInput } =
-        input;
-
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'user', id: ctx.user.id },
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
+      const { gitlabProject, githubRepo, ...restInput } = input;
 
-        // Determine git source: GitLab uses gitUrl, GitHub uses githubRepo.
-        // Tokens are resolved inside cloud-agent-next via GIT_TOKEN_SERVICE.
-        let gitParams: {
-          githubRepo?: string;
-          gitUrl?: string;
-          platform?: 'github' | 'gitlab';
-        };
+      // Determine git source: GitLab uses gitUrl, GitHub uses githubRepo.
+      // Tokens are resolved inside cloud-agent-next via GIT_TOKEN_SERVICE.
+      // Profile resolution (repo binding + default + explicit override) also
+      // happens in cloud-agent-next; we just forward profileId and any inline
+      // envVars/setupCommands/mcpServers overrides.
+      let gitParams: {
+        githubRepo?: string;
+        gitUrl?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        if (gitlabProject) {
-          const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, platform: PLATFORM.GITLAB };
-        } else {
-          gitParams = { githubRepo, platform: PLATFORM.GITHUB };
-        }
+      if (gitlabProject) {
+        const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, platform: PLATFORM.GITLAB };
+      } else {
+        gitParams = { githubRepo, platform: PLATFORM.GITHUB };
+      }
 
-        const result = await client.prepareSession({
+      try {
+        return await client.prepareSession({
           ...restInput,
           ...gitParams,
           createdOnPlatform: 'cloud-agent-web',
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
         });
-
-        return result;
       } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
-        }
         rethrowAsPaymentRequired(error);
         throw error;
       }
diff --git a/apps/web/src/routers/cloud-agent-next-schemas.ts b/apps/web/src/routers/cloud-agent-next-schemas.ts
index d0cc65ccc6..d685ac23e0 100644
--- a/apps/web/src/routers/cloud-agent-next-schemas.ts
+++ b/apps/web/src/routers/cloud-agent-next-schemas.ts
@@ -48,28 +48,109 @@ export const agentModeNextSchema = z.enum([
   'custom',
 ]);
 
-// Local MCP server configuration (runs a command)
+// Encrypted envelope shape (re-defined here to avoid importing server-only code).
+const encryptedEnvelopeInputSchema = z.object({
+  encryptedData: z.string(),
+  encryptedDEK: z.string(),
+  algorithm: z.literal('rsa-aes-256-gcm'),
+  version: z.literal(1),
+});
+
+// MCP env / remote-header value: plain string or encrypted envelope. Plain
+// strings pass straight through to the sandbox; envelopes are decrypted
+// per key by the worker before materializing KILO_CONFIG_CONTENT.mcp.
+const mcpSecretValueSchema = z.union([z.string().max(4096), encryptedEnvelopeInputSchema]);
+
+// Local MCP server configuration (runs a command).
 const mcpLocalServerConfigSchema = z
   .object({
     type: z.literal('local'),
     command: z.string().array().min(1, 'Command array must have at least one element'),
-    environment: z.record(z.string(), z.string()).optional(),
+    environment: z.record(z.string(), mcpSecretValueSchema).optional(),
     enabled: z.boolean().optional(),
     timeout: z.number().min(1).max(3_600_000).optional(),
   })
   .strict();
 
-// Remote MCP server configuration (connects to a URL)
+// Remote MCP server configuration (connects to a URL).
 const mcpRemoteServerConfigSchema = z
   .object({
     type: z.literal('remote'),
     url: z.string().url('URL must be a valid URL format'),
-    headers: z.record(z.string(), z.string()).optional(),
+    headers: z.record(z.string(), mcpSecretValueSchema).optional(),
     enabled: z.boolean().optional(),
     timeout: z.number().min(1).max(3_600_000).optional(),
   })
   .strict();
 
+// Runtime skill input (materialized to SKILL.md + companion files in the sandbox)
+const runtimeSkillSchemaMax = 100_000;
+export const runtimeSkillInputSchema = z.object({
+  name: z
+    .string()
+    .min(1)
+    .max(100)
+    .regex(/^[a-z0-9][a-z0-9-]*$/, 'Skill name must be a slug'),
+  rawMarkdown: z.string().min(1).max(runtimeSkillSchemaMax),
+  /** Companion files keyed by relative path, excluding SKILL.md. */
+  files: z.record(z.string().max(200), z.string().max(runtimeSkillSchemaMax)).optional(),
+});
+
+/** Permission schema — mirrors the CLI's AgentConfig.permission shape. */
+const permissionActionSchema = z.enum(['allow', 'ask', 'deny']);
+const permissionActionOrNullSchema = z.union([permissionActionSchema, z.null()]);
+const permissionRuleSchema = z.union([
+  permissionActionOrNullSchema,
+  z.record(z.string(), permissionActionOrNullSchema),
+]);
+const permissionConfigSchema = z.union([
+  permissionActionSchema,
+  z.record(z.string(), permissionRuleSchema),
+]);
+
+/** Runtime agent input (materialized to KILO_CONFIG_CONTENT.agent.<slug>) */
+export const runtimeAgentInputSchema = z.object({
+  slug: z
+    .string()
+    .min(1)
+    .max(50)
+    .regex(/^[a-z][a-z0-9-]*$/, 'Agent slug must start with a letter'),
+  name: z.string().min(1).max(100),
+  config: z
+    .object({
+      prompt: z.string().max(50_000).optional(),
+      description: z.string().max(2_000).optional(),
+      mode: z.enum(['subagent', 'primary', 'all']).optional(),
+      model: z.string().max(200).nullable().optional(),
+      variant: z.string().max(50).optional(),
+      temperature: z.number().optional(),
+      top_p: z.number().optional(),
+      steps: z.number().int().positive().optional(),
+      hidden: z.boolean().optional(),
+      disable: z.boolean().optional(),
+      color: z.string().max(50).optional(),
+      permission: permissionConfigSchema.optional(),
+      options: z.record(z.string(), z.unknown()).optional(),
+    })
+    // Variant keys are model-specific, so a variant without a model has no
+    // anchor — mirror the AgentConfigSchema invariant from @kilocode/db.
+    .refine(c => !c.variant || (typeof c.model === 'string' && c.model.length > 0), {
+      message: 'variant requires a model — variants are model-specific',
+      path: ['variant'],
+    }),
+});
+
+/**
+ * Mode field accepted by prepare/update-session calls. Allows built-in
+ * enum values plus any custom slug — cloud-agent-next cross-validates the
+ * slug against the session's `runtimeAgents` list.
+ */
+export const preparedSessionModeSchema = z
+  .string()
+  .min(1)
+  .max(50)
+  .regex(/^[a-z][a-z0-9-]*$/, 'Mode must be a slug');
+
 // Combined MCP server configuration schema — CLI-native local/remote format
 export const mcpServerConfigNextSchema = z.discriminatedUnion('type', [
   mcpLocalServerConfigSchema,
@@ -95,7 +176,7 @@ export const basePrepareSessionNextSchema = z
 
     // Execution params (required)
     prompt: z.string().min(1).max(100_000),
-    mode: agentModeNextSchema,
+    mode: preparedSessionModeSchema,
     model: z.string().min(1),
     variant: z
       .string()
@@ -103,13 +184,18 @@ export const basePrepareSessionNextSchema = z
       .regex(/^[a-zA-Z]+$/)
       .optional(),
 
-    // Optional environment profile name (resolved server-side)
-    profileName: z.string().max(100).optional(),
+    /**
+     * Optional environment profile id. When omitted, the effective default
+     * profile (personal default wins over org default) is used.
+     */
+    profileId: z.uuid().optional(),
 
     // Optional configuration
     envVars: z.record(z.string().max(256), z.string().max(256)).optional(),
     setupCommands: z.array(z.string().max(500)).max(20).optional(),
     mcpServers: z.record(z.string(), mcpServerConfigNextSchema).optional(),
+    runtimeSkills: z.array(runtimeSkillInputSchema).max(50).optional(),
+    runtimeAgents: z.array(runtimeAgentInputSchema).max(20).optional(),
     upstreamBranch: z.string().optional(),
     autoCommit: z.boolean().optional(),
     autoInitiate: z.boolean().optional(),
@@ -135,11 +221,21 @@ export const baseInitiateFromPreparedSessionNextSchema = z.object({
   cloudAgentSessionId: z.string(),
 });
 
-// Agent mode for sendMessage (excludes custom - use prepareSession/updateSession for custom mode)
-export const agentModeSendMessageSchema = z.enum(['code', 'plan', 'debug', 'orchestrator', 'ask']);
+/**
+ * Mode field for sendMessage. Built-in enum slugs plus any custom slug —
+ * cloud-agent-next cross-validates against the session's stored runtimeAgents.
+ * The reserved slug `custom` is still rejected here (requires prepare).
+ */
+export const agentModeSendMessageSchema = z
+  .string()
+  .min(1)
+  .max(50)
+  .regex(/^[a-z][a-z0-9-]*$/, 'Mode must be a slug')
+  .refine(mode => mode !== 'custom', {
+    message: 'Custom mode requires prepareSession/updateSession, not sendMessage',
+  });
 
 // Schema for sending a message (V2 - uses cloudAgentSessionId)
-// Note: custom mode is not allowed for sendMessage - use prepareSession/updateSession instead
 export const baseSendMessageNextSchema = z.object({
   cloudAgentSessionId: z.string(),
   prompt: z.string().min(1),
@@ -200,16 +296,25 @@ export const baseGetSessionNextOutputSchema = z.object({
 
   // Execution params
   prompt: z.string().optional(),
-  mode: agentModeNextSchema.optional(),
+  mode: z.string().optional(),
   model: z.string().optional(),
   variant: z.string().optional(),
   autoCommit: z.boolean().optional(),
   upstreamBranch: z.string().optional(),
 
-  // Configuration metadata (counts only, no values)
-  envVarCount: z.number().optional(),
-  setupCommandCount: z.number().optional(),
-  mcpServerCount: z.number().optional(),
+  /** Custom agents stored on this session (shown in the chat picker). */
+  runtimeAgents: z
+    .array(
+      z.object({
+        slug: z.string(),
+        name: z.string(),
+        /** Optional model override so the chat UI can lock its model picker. */
+        model: z.string().optional(),
+        /** Optional thinking-effort variant override so the chat UI can lock its variant picker. */
+        variant: z.string().optional(),
+      })
+    )
+    .optional(),
 
   // Execution status (grouped for cleaner API)
   execution: executionStatusNextSchema,
diff --git a/apps/web/src/routers/cloud-agent-router.ts b/apps/web/src/routers/cloud-agent-router.ts
index feb9fab61f..175dadc1d3 100644
--- a/apps/web/src/routers/cloud-agent-router.ts
+++ b/apps/web/src/routers/cloud-agent-router.ts
@@ -6,10 +6,6 @@ import {
   rethrowAsPaymentRequired,
 } from '@/lib/cloud-agent/cloud-agent-client';
 import { generateCloudAgentToken } from '@/lib/tokens';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-} from '@/lib/agent/profile-session-config';
 import {
   getGitHubTokenForUser,
   fetchGitHubRepositoriesForUser,
@@ -122,62 +118,39 @@ export const cloudAgentRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudChatClient(authToken);
 
-      const { envVars, setupCommands, profileName, gitlabProject, githubRepo, ...restInput } =
-        input;
-
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'user', id: ctx.user.id },
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
-
-        // Determine git source: GitLab uses gitUrl/gitToken, GitHub uses githubRepo/githubToken
-        let gitParams: {
-          githubRepo?: string;
-          githubToken?: string;
-          gitUrl?: string;
-          gitToken?: string;
-          platform?: 'github' | 'gitlab';
-        };
-
-        if (gitlabProject) {
-          // GitLab flow: convert gitlabProject to gitUrl + gitToken
-          const gitToken = await getGitLabTokenForUser(ctx.user.id);
-          if (!gitToken) {
-            throw new TRPCError({
-              code: 'BAD_REQUEST',
-              message: 'No GitLab integration found. Please connect your GitLab account first.',
-            });
-          }
-          const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
-        } else {
-          // GitHub flow: use githubRepo + githubToken
-          const githubToken = await getGitHubTokenForUser(ctx.user.id);
-          gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
-        }
+      const { gitlabProject, githubRepo, ...restInput } = input;
+
+      // Determine git source: GitLab uses gitUrl/gitToken, GitHub uses githubRepo/githubToken.
+      // Profile resolution happens inside cloud-agent-next; we just forward profileId
+      // together with inline envVars/setupCommands/mcpServers overrides.
+      let gitParams: {
+        githubRepo?: string;
+        githubToken?: string;
+        gitUrl?: string;
+        gitToken?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        return await client.prepareSession({
-          ...restInput,
-          ...gitParams,
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
-        });
-      } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
+      if (gitlabProject) {
+        const gitToken = await getGitLabTokenForUser(ctx.user.id);
+        if (!gitToken) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'No GitLab integration found. Please connect your GitLab account first.',
+          });
         }
-        throw error;
+        const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
+      } else {
+        const githubToken = await getGitHubTokenForUser(ctx.user.id);
+        gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
       }
+
+      return await client.prepareSession({
+        ...restInput,
+        ...gitParams,
+      });
     }),
 
   /**
@@ -193,59 +166,36 @@ export const cloudAgentRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudChatClient(authToken);
 
-      const { envVars, setupCommands, profileName, gitlabProject, githubRepo, ...restInput } =
-        input;
-
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'user', id: ctx.user.id },
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
+      const { gitlabProject, githubRepo, ...restInput } = input;
 
-        let gitParams: {
-          githubRepo?: string;
-          githubToken?: string;
-          gitUrl?: string;
-          gitToken?: string;
-          platform?: 'github' | 'gitlab';
-        };
-
-        if (gitlabProject) {
-          const gitToken = await getGitLabTokenForUser(ctx.user.id);
-          if (!gitToken) {
-            throw new TRPCError({
-              code: 'BAD_REQUEST',
-              message: 'No GitLab integration found. Please connect your GitLab account first.',
-            });
-          }
-          const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
-        } else {
-          const githubToken = await getGitHubTokenForUser(ctx.user.id);
-          gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
-        }
+      let gitParams: {
+        githubRepo?: string;
+        githubToken?: string;
+        gitUrl?: string;
+        gitToken?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        return await client.prepareLegacySession({
-          ...restInput,
-          ...gitParams,
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
-        });
-      } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
+      if (gitlabProject) {
+        const gitToken = await getGitLabTokenForUser(ctx.user.id);
+        if (!gitToken) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'No GitLab integration found. Please connect your GitLab account first.',
+          });
         }
-        throw error;
+        const instanceUrl = await getGitLabInstanceUrlForUser(ctx.user.id);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
+      } else {
+        const githubToken = await getGitHubTokenForUser(ctx.user.id);
+        gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
       }
+
+      return await client.prepareLegacySession({
+        ...restInput,
+        ...gitParams,
+      });
     }),
 
   /**
diff --git a/apps/web/src/routers/cloud-agent-schemas.ts b/apps/web/src/routers/cloud-agent-schemas.ts
index e0e3caed15..c647af9619 100644
--- a/apps/web/src/routers/cloud-agent-schemas.ts
+++ b/apps/web/src/routers/cloud-agent-schemas.ts
@@ -4,8 +4,19 @@ import * as z from 'zod';
  * Shared schemas for cloud agent routers
  */
 
-// Agent mode enum
-export const agentModeSchema = z.enum(['architect', 'code', 'ask', 'debug', 'orchestrator']);
+/**
+ * Agent mode slug accepted by session endpoints.
+ *
+ * Built-in slugs (code, ask, architect, debug, orchestrator, build, plan, custom)
+ * or any custom agent slug defined on the session's profile. cloud-agent-next
+ * cross-validates custom slugs against the session's stored `runtimeAgents`, so
+ * we accept any slug-shaped string here.
+ */
+export const agentModeSchema = z
+  .string()
+  .min(1)
+  .max(50)
+  .regex(/^[a-z][a-z0-9-]*$/, 'Mode must be a slug');
 
 // Base configuration shared by all MCP server types
 const mcpServerBaseConfigSchema = z.object({
@@ -149,8 +160,11 @@ export const basePrepareSessionSchema = z
       .regex(/^[a-zA-Z]+$/)
       .optional(),
 
-    // Optional environment profile name (resolved server-side)
-    profileName: z.string().max(100).optional(),
+    /**
+     * Optional environment profile id. When omitted, the effective default
+     * profile (personal default wins over org default) is used.
+     */
+    profileId: z.uuid().optional(),
 
     // Optional configuration
     envVars: z.record(z.string().max(256), z.string().max(256)).optional(),
diff --git a/apps/web/src/routers/organizations/organization-cloud-agent-next-router.ts b/apps/web/src/routers/organizations/organization-cloud-agent-next-router.ts
index 75477e2dd8..ea8bf725bf 100644
--- a/apps/web/src/routers/organizations/organization-cloud-agent-next-router.ts
+++ b/apps/web/src/routers/organizations/organization-cloud-agent-next-router.ts
@@ -1,15 +1,10 @@
 import 'server-only';
-import { TRPCError } from '@trpc/server';
 import { createTRPCRouter } from '@/lib/trpc/init';
 import {
   createCloudAgentNextClient,
   rethrowAsPaymentRequired,
 } from '@/lib/cloud-agent-next/cloud-agent-client';
 import { generateCloudAgentToken } from '@/lib/tokens';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-} from '@/lib/agent/profile-session-config';
 import {
   organizationMemberProcedure,
   organizationMemberMutationProcedure,
@@ -113,61 +108,33 @@ export const organizationCloudAgentNextRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudAgentNextClient(authToken);
 
-      const {
-        envVars,
-        setupCommands,
-        profileName,
-        gitlabProject,
-        githubRepo,
-        organizationId,
-        ...restInput
-      } = input;
-
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'organization', id: organizationId },
-          userId: ctx.user.id,
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
+      const { gitlabProject, githubRepo, organizationId, ...restInput } = input;
 
-        // Determine git source: GitLab uses gitUrl, GitHub uses githubRepo.
-        // Tokens are resolved inside cloud-agent-next via GIT_TOKEN_SERVICE.
-        let gitParams: {
-          githubRepo?: string;
-          gitUrl?: string;
-          platform?: 'github' | 'gitlab';
-        };
+      // Profile resolution happens inside cloud-agent-next. Tokens are resolved
+      // there as well via GIT_TOKEN_SERVICE. We forward profileId + inline
+      // envVars/setupCommands/mcpServers overrides unchanged.
+      let gitParams: {
+        githubRepo?: string;
+        gitUrl?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        if (gitlabProject) {
-          const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, platform: PLATFORM.GITLAB };
-        } else {
-          gitParams = { githubRepo, platform: PLATFORM.GITHUB };
-        }
+      if (gitlabProject) {
+        const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, platform: PLATFORM.GITLAB };
+      } else {
+        gitParams = { githubRepo, platform: PLATFORM.GITHUB };
+      }
 
-        const result = await client.prepareSession({
+      try {
+        return await client.prepareSession({
           ...restInput,
           ...gitParams,
           createdOnPlatform: 'cloud-agent-web',
           kilocodeOrganizationId: organizationId,
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
         });
-
-        return result;
       } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
-        }
         rethrowAsPaymentRequired(error);
         throw error;
       }
diff --git a/apps/web/src/routers/organizations/organization-cloud-agent-router.ts b/apps/web/src/routers/organizations/organization-cloud-agent-router.ts
index 10d28d8235..a14d3df9bb 100644
--- a/apps/web/src/routers/organizations/organization-cloud-agent-router.ts
+++ b/apps/web/src/routers/organizations/organization-cloud-agent-router.ts
@@ -7,10 +7,6 @@ import {
 } from '@/lib/cloud-agent/cloud-agent-client';
 import * as z from 'zod';
 import { generateCloudAgentToken } from '@/lib/tokens';
-import {
-  mergeProfileConfiguration,
-  ProfileNotFoundError,
-} from '@/lib/agent/profile-session-config';
 import {
   organizationMemberProcedure,
   organizationMemberMutationProcedure,
@@ -192,71 +188,38 @@ export const organizationCloudAgentRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudChatClient(authToken);
 
-      const {
-        organizationId,
-        envVars,
-        setupCommands,
-        profileName,
-        gitlabProject,
-        githubRepo,
-        ...restInput
-      } = input;
-
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'organization', id: organizationId },
-          userId: ctx.user.id,
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
+      const { organizationId, gitlabProject, githubRepo, ...restInput } = input;
 
-        // Determine git source: GitLab uses gitUrl/gitToken, GitHub uses githubRepo/githubToken
-        let gitParams: {
-          githubRepo?: string;
-          githubToken?: string;
-          gitUrl?: string;
-          gitToken?: string;
-          platform?: 'github' | 'gitlab';
-        };
-
-        if (gitlabProject) {
-          // GitLab flow: convert gitlabProject to gitUrl + gitToken
-          const gitToken = await getGitLabTokenForOrganization(organizationId);
-          if (!gitToken) {
-            throw new TRPCError({
-              code: 'BAD_REQUEST',
-              message: 'No GitLab integration found. Please connect your GitLab account first.',
-            });
-          }
-          const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
-        } else {
-          // GitHub flow: use githubRepo + githubToken
-          const githubToken = await getGitHubTokenForOrganization(organizationId);
-          gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
-        }
+      // Profile resolution happens in cloud-agent-next; forward profileId + inline fields.
+      let gitParams: {
+        githubRepo?: string;
+        githubToken?: string;
+        gitUrl?: string;
+        gitToken?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        return await client.prepareSession({
-          ...restInput,
-          ...gitParams,
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
-          kilocodeOrganizationId: organizationId,
-        });
-      } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
+      if (gitlabProject) {
+        const gitToken = await getGitLabTokenForOrganization(organizationId);
+        if (!gitToken) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'No GitLab integration found. Please connect your GitLab account first.',
+          });
         }
-        throw error;
+        const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
+      } else {
+        const githubToken = await getGitHubTokenForOrganization(organizationId);
+        gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
       }
+
+      return await client.prepareSession({
+        ...restInput,
+        ...gitParams,
+        kilocodeOrganizationId: organizationId,
+      });
     }),
 
   /**
@@ -271,68 +234,37 @@ export const organizationCloudAgentRouter = createTRPCRouter({
       const authToken = generateCloudAgentToken(ctx.user);
       const client = createCloudChatClient(authToken);
 
-      const {
-        organizationId,
-        envVars,
-        setupCommands,
-        profileName,
-        gitlabProject,
-        githubRepo,
-        ...restInput
-      } = input;
+      const { organizationId, gitlabProject, githubRepo, ...restInput } = input;
 
-      try {
-        const repoFullName = githubRepo ?? gitlabProject;
-        const platform = gitlabProject ? PLATFORM.GITLAB : PLATFORM.GITHUB;
-
-        const merged = await mergeProfileConfiguration({
-          profileName,
-          owner: { type: 'organization', id: organizationId },
-          userId: ctx.user.id,
-          repoFullName,
-          platform,
-          envVars,
-          setupCommands,
-        });
-
-        let gitParams: {
-          githubRepo?: string;
-          githubToken?: string;
-          gitUrl?: string;
-          gitToken?: string;
-          platform?: 'github' | 'gitlab';
-        };
-
-        if (gitlabProject) {
-          const gitToken = await getGitLabTokenForOrganization(organizationId);
-          if (!gitToken) {
-            throw new TRPCError({
-              code: 'BAD_REQUEST',
-              message: 'No GitLab integration found. Please connect your GitLab account first.',
-            });
-          }
-          const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
-          const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
-          gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
-        } else {
-          const githubToken = await getGitHubTokenForOrganization(organizationId);
-          gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
-        }
+      let gitParams: {
+        githubRepo?: string;
+        githubToken?: string;
+        gitUrl?: string;
+        gitToken?: string;
+        platform?: 'github' | 'gitlab';
+      };
 
-        return await client.prepareLegacySession({
-          ...restInput,
-          ...gitParams,
-          envVars: merged.envVars,
-          encryptedSecrets: merged.encryptedSecrets,
-          setupCommands: merged.setupCommands,
-          kilocodeOrganizationId: organizationId,
-        });
-      } catch (error) {
-        if (error instanceof ProfileNotFoundError) {
-          throw new TRPCError({ code: 'NOT_FOUND', message: error.message });
+      if (gitlabProject) {
+        const gitToken = await getGitLabTokenForOrganization(organizationId);
+        if (!gitToken) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'No GitLab integration found. Please connect your GitLab account first.',
+          });
         }
-        throw error;
+        const instanceUrl = await getGitLabInstanceUrlForOrganization(organizationId);
+        const gitUrl = buildGitLabCloneUrl(gitlabProject, instanceUrl);
+        gitParams = { gitUrl, gitToken, platform: PLATFORM.GITLAB };
+      } else {
+        const githubToken = await getGitHubTokenForOrganization(organizationId);
+        gitParams = { githubRepo, githubToken, platform: PLATFORM.GITHUB };
       }
+
+      return await client.prepareLegacySession({
+        ...restInput,
+        ...gitParams,
+        kilocodeOrganizationId: organizationId,
+      });
     }),
 
   /**
diff --git a/apps/web/src/tests/cloud-agent-profile/profile-session-config.test.ts b/apps/web/src/tests/cloud-agent-profile/profile-session-config.test.ts
new file mode 100644
index 0000000000..8c465c731d
--- /dev/null
+++ b/apps/web/src/tests/cloud-agent-profile/profile-session-config.test.ts
@@ -0,0 +1,808 @@
+/**
+ * Integration test for `mergeProfileConfiguration` from
+ * `@kilocode/cloud-agent-profile`, exercised against the web Postgres test
+ * harness because that's where the Drizzle migrations, seed helpers, and
+ * Jest setup already live.
+ */
+import { db } from '@/lib/drizzle';
+import {
+  agent_environment_profiles,
+  agent_environment_profile_vars,
+  agent_environment_profile_commands,
+  agent_environment_profile_repo_bindings,
+  agent_environment_profile_mcp_servers,
+  agent_environment_profile_skills,
+  agent_environment_profile_agents,
+} from '@kilocode/db/schema';
+import { insertTestUser } from '@/tests/helpers/user.helper';
+import { createTestOrganization } from '@/tests/helpers/organization.helper';
+import {
+  mergeProfileConfiguration,
+  ProfileNotFoundError,
+  profileMcpServersToClientRecord,
+  type ProfileOwner,
+} from '@kilocode/cloud-agent-profile';
+
+// A valid encrypted envelope JSON that satisfies the zod schema
+const fakeEnvelope = JSON.stringify({
+  encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
+  encryptedDEK: 'dGVzdC1lbmNyeXB0ZWQtZGVr',
+  algorithm: 'rsa-aes-256-gcm',
+  version: 1,
+});
+
+const fakeEnvelopeObject = {
+  encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
+  encryptedDEK: 'dGVzdC1lbmNyeXB0ZWQtZGVr',
+  algorithm: 'rsa-aes-256-gcm' as const,
+  version: 1 as const,
+};
+
+async function createProfile(
+  owner: ProfileOwner,
+  name: string,
+  opts: { isDefault?: boolean } = {}
+): Promise<string> {
+  const [row] = await db
+    .insert(agent_environment_profiles)
+    .values({
+      owned_by_user_id: owner.type === 'user' ? owner.id : null,
+      owned_by_organization_id: owner.type === 'organization' ? owner.id : null,
+      name,
+      is_default: opts.isDefault ?? false,
+    })
+    .returning({ id: agent_environment_profiles.id });
+  return row.id;
+}
+
+async function addVar(
+  profileId: string,
+  key: string,
+  value: string,
+  isSecret = false
+): Promise<void> {
+  await db.insert(agent_environment_profile_vars).values({
+    profile_id: profileId,
+    key,
+    value,
+    is_secret: isSecret,
+  });
+}
+
+async function addCommands(profileId: string, commands: string[]): Promise<void> {
+  if (commands.length === 0) return;
+  await db.insert(agent_environment_profile_commands).values(
+    commands.map((command, i) => ({
+      profile_id: profileId,
+      sequence: i,
+      command,
+    }))
+  );
+}
+
+async function bindRepo(
+  owner: ProfileOwner,
+  repoFullName: string,
+  platform: 'github' | 'gitlab',
+  profileId: string
+): Promise<void> {
+  await db.insert(agent_environment_profile_repo_bindings).values({
+    repo_full_name: repoFullName,
+    platform,
+    profile_id: profileId,
+    owned_by_user_id: owner.type === 'user' ? owner.id : null,
+    owned_by_organization_id: owner.type === 'organization' ? owner.id : null,
+  });
+}
+
+async function addMcpLocal(
+  profileId: string,
+  name: string,
+  command: string[],
+  opts: {
+    enabled?: boolean;
+    /**
+     * Stored env values keyed by env var name. Each value is either a plain
+     * string (for non-secret config) or an encrypted envelope (for secrets).
+     */
+    environment?: Record<string, string | typeof fakeEnvelopeObject>;
+  } = {}
+): Promise<string> {
+  const [server] = await db
+    .insert(agent_environment_profile_mcp_servers)
+    .values({
+      profile_id: profileId,
+      name,
+      type: 'local',
+      enabled: opts.enabled ?? true,
+      config: { command, environment: opts.environment },
+    })
+    .returning({ id: agent_environment_profile_mcp_servers.id });
+
+  return server.id;
+}
+
+async function addSkill(
+  profileId: string,
+  name: string,
+  rawMarkdown: string,
+  opts: { enabled?: boolean } = {}
+): Promise<void> {
+  await db.insert(agent_environment_profile_skills).values({
+    profile_id: profileId,
+    name,
+    source_type: 'custom',
+    raw_markdown: rawMarkdown,
+    enabled: opts.enabled ?? true,
+  });
+}
+
+async function addAgent(
+  profileId: string,
+  slug: string,
+  name: string,
+  prompt: string
+): Promise<void> {
+  await db.insert(agent_environment_profile_agents).values({
+    profile_id: profileId,
+    slug,
+    name,
+    config: { prompt },
+  });
+}
+
+describe('mergeProfileConfiguration', () => {
+  afterEach(async () => {
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_repo_bindings);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_mcp_servers);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_skills);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_agents);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_commands);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profile_vars);
+    // eslint-disable-next-line drizzle/enforce-delete-with-where
+    await db.delete(agent_environment_profiles);
+  });
+
+  test('returns all undefined when no profiles and no manual args', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result).toEqual({
+      envVars: undefined,
+      setupCommands: undefined,
+      encryptedSecrets: undefined,
+    });
+  });
+
+  test('passes through manual envVars only', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      envVars: { FOO: 'bar' },
+    });
+
+    expect(result.envVars).toEqual({ FOO: 'bar' });
+    expect(result.setupCommands).toBeUndefined();
+    expect(result.encryptedSecrets).toBeUndefined();
+  });
+
+  test('passes through manual setupCommands only', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      setupCommands: ['npm install'],
+    });
+
+    expect(result.envVars).toBeUndefined();
+    expect(result.setupCommands).toEqual(['npm install']);
+    expect(result.encryptedSecrets).toBeUndefined();
+  });
+
+  test('loads default profile for user owner', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'my-default', { isDefault: true });
+    await addVar(profileId, 'DB_HOST', 'localhost');
+    await addCommands(profileId, ['echo hello']);
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result.envVars).toEqual({ DB_HOST: 'localhost' });
+    expect(result.setupCommands).toEqual(['echo hello']);
+  });
+
+  test('loads profile by id', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'staging');
+    await addVar(profileId, 'ENV', 'staging');
+    await addCommands(profileId, ['setup.sh']);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId,
+    });
+
+    expect(result.envVars).toEqual({ ENV: 'staging' });
+    expect(result.setupCommands).toEqual(['setup.sh']);
+  });
+
+  test('throws ProfileNotFoundError for unknown profile id', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const unknownId = 'aaaaaaaa-aaaa-4aaa-aaaa-aaaaaaaaaaaa';
+
+    await expect(mergeProfileConfiguration(db, { owner, profileId: unknownId })).rejects.toThrow(
+      ProfileNotFoundError
+    );
+  });
+
+  test('loads repo binding profile as base layer', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'repo-profile');
+    await addVar(profileId, 'REPO_VAR', 'bound');
+    await addCommands(profileId, ['repo-setup']);
+    await bindRepo(owner, 'org/repo', 'github', profileId);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    expect(result.envVars).toEqual({ REPO_VAR: 'bound' });
+    expect(result.setupCommands).toEqual(['repo-setup']);
+  });
+
+  test('merges repo binding (base) with explicit override and manual args', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    // Base: repo binding profile
+    const baseProfileId = await createProfile(owner, 'base-profile');
+    await addVar(baseProfileId, 'SHARED', 'from-base');
+    await addVar(baseProfileId, 'BASE_ONLY', 'base-val');
+    await addCommands(baseProfileId, ['base-cmd']);
+    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
+
+    // Override: explicitly picked by the caller
+    const overrideProfileId = await createProfile(owner, 'override-profile');
+    await addVar(overrideProfileId, 'SHARED', 'from-override');
+    await addVar(overrideProfileId, 'OVERRIDE_ONLY', 'override-val');
+    await addCommands(overrideProfileId, ['override-cmd']);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId: overrideProfileId,
+      repoFullName: 'org/repo',
+      platform: 'github',
+      envVars: { SHARED: 'from-manual', MANUAL: 'manual-val' },
+      setupCommands: ['manual-cmd'],
+    });
+
+    // Env vars: base < override < manual
+    expect(result.envVars).toEqual({
+      BASE_ONLY: 'base-val',
+      OVERRIDE_ONLY: 'override-val',
+      SHARED: 'from-manual',
+      MANUAL: 'manual-val',
+    });
+    // Commands: base, override, manual (concatenated)
+    expect(result.setupCommands).toEqual(['base-cmd', 'override-cmd', 'manual-cmd']);
+  });
+
+  test('repo binding (base) and effective default (top) are co-applied; default wins on collision', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const repoProfileId = await createProfile(owner, 'repo-profile');
+    await addVar(repoProfileId, 'FROM', 'repo');
+    await addVar(repoProfileId, 'REPO_ONLY', 'repo-val');
+    await bindRepo(owner, 'org/repo', 'github', repoProfileId);
+
+    // Default layers on top of the repo binding.
+    const defaultProfileId = await createProfile(owner, 'default-profile', { isDefault: true });
+    await addVar(defaultProfileId, 'FROM', 'default');
+    await addVar(defaultProfileId, 'DEFAULT_ONLY', 'default-val');
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    expect(result.envVars).toEqual({
+      REPO_ONLY: 'repo-val',
+      DEFAULT_ONLY: 'default-val',
+      FROM: 'default',
+    });
+  });
+
+  test('explicit pick suppresses the default (default is only a fallback)', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const defaultProfileId = await createProfile(owner, 'default-profile', { isDefault: true });
+    await addVar(defaultProfileId, 'FROM', 'default');
+
+    const pickedProfileId = await createProfile(owner, 'picked-profile');
+    await addVar(pickedProfileId, 'FROM', 'picked');
+
+    const result = await mergeProfileConfiguration(db, { owner, profileId: pickedProfileId });
+
+    expect(result.envVars).toEqual({ FROM: 'picked' });
+  });
+
+  test('deduplicates when explicit override equals the repo binding', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'shared-profile');
+    await addVar(profileId, 'KEY', 'val');
+    await addCommands(profileId, ['cmd']);
+    await bindRepo(owner, 'org/repo', 'github', profileId);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    // Should not duplicate vars/commands
+    expect(result.envVars).toEqual({ KEY: 'val' });
+    expect(result.setupCommands).toEqual(['cmd']);
+  });
+
+  test('handles secret vars as encryptedSecrets', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'with-secrets', { isDefault: true });
+    await addVar(profileId, 'PLAIN', 'plaintext');
+    await addVar(profileId, 'SECRET_KEY', fakeEnvelope, true);
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result.envVars).toEqual({ PLAIN: 'plaintext' });
+    expect(result.encryptedSecrets).toEqual({
+      SECRET_KEY: {
+        encryptedData: 'dGVzdC1lbmNyeXB0ZWQtZGF0YQ==',
+        encryptedDEK: 'dGVzdC1lbmNyeXB0ZWQtZGVr',
+        algorithm: 'rsa-aes-256-gcm',
+        version: 1,
+      },
+    });
+  });
+
+  test('merges secrets from base and override profiles (override wins)', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const baseEnvelope = JSON.stringify({
+      encryptedData: 'YmFzZS1kYXRh',
+      encryptedDEK: 'YmFzZS1kZWs=',
+      algorithm: 'rsa-aes-256-gcm',
+      version: 1,
+    });
+    const overrideEnvelope = JSON.stringify({
+      encryptedData: 'b3ZlcnJpZGUtZGF0YQ==',
+      encryptedDEK: 'b3ZlcnJpZGUtZGVr',
+      algorithm: 'rsa-aes-256-gcm',
+      version: 1,
+    });
+
+    const baseProfileId = await createProfile(owner, 'base');
+    await addVar(baseProfileId, 'SHARED_SECRET', baseEnvelope, true);
+    await addVar(baseProfileId, 'BASE_SECRET', baseEnvelope, true);
+    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
+
+    const overrideProfileId = await createProfile(owner, 'override');
+    await addVar(overrideProfileId, 'SHARED_SECRET', overrideEnvelope, true);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId: overrideProfileId,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    expect(result.encryptedSecrets).toEqual({
+      BASE_SECRET: JSON.parse(baseEnvelope),
+      SHARED_SECRET: JSON.parse(overrideEnvelope), // override wins
+    });
+  });
+
+  describe('organization context', () => {
+    test('personal default profile takes precedence via getEffectiveDefaultProfileId', async () => {
+      const user = await insertTestUser();
+      const org = await createTestOrganization('test-org', user.id, 0);
+      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
+      const userOwner: ProfileOwner = { type: 'user', id: user.id };
+
+      // Personal default
+      const personalProfileId = await createProfile(userOwner, 'personal-default', {
+        isDefault: true,
+      });
+      await addVar(personalProfileId, 'SOURCE', 'personal');
+
+      // Org default
+      const orgProfileId = await createProfile(orgOwner, 'org-default', { isDefault: true });
+      await addVar(orgProfileId, 'SOURCE', 'org');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner: orgOwner,
+        userId: user.id,
+      });
+
+      // Personal default wins — user-specific preference overrides org baseline
+      expect(result.envVars).toEqual({ SOURCE: 'personal' });
+    });
+
+    test('falls back to org default when user has no personal default', async () => {
+      const user = await insertTestUser();
+      const org = await createTestOrganization('test-org', user.id, 0);
+      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
+
+      // Org default only
+      const orgProfileId = await createProfile(orgOwner, 'org-default', { isDefault: true });
+      await addVar(orgProfileId, 'SOURCE', 'org');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner: orgOwner,
+        userId: user.id,
+      });
+
+      expect(result.envVars).toEqual({ SOURCE: 'org' });
+    });
+
+    test('member can select a personal profile in org context via profileId', async () => {
+      const user = await insertTestUser();
+      const org = await createTestOrganization('test-org', user.id, 0);
+      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
+      const userOwner: ProfileOwner = { type: 'user', id: user.id };
+
+      const personalProfileId = await createProfile(userOwner, 'my-profile');
+      await addVar(personalProfileId, 'SOURCE', 'personal');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner: orgOwner,
+        userId: user.id,
+        profileId: personalProfileId,
+      });
+
+      expect(result.envVars).toEqual({ SOURCE: 'personal' });
+    });
+
+    test('member can select an org profile in org context via profileId', async () => {
+      const user = await insertTestUser();
+      const org = await createTestOrganization('test-org', user.id, 0);
+      const orgOwner: ProfileOwner = { type: 'organization', id: org.id };
+
+      const orgProfileId = await createProfile(orgOwner, 'shared-name');
+      await addVar(orgProfileId, 'SOURCE', 'org');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner: orgOwner,
+        userId: user.id,
+        profileId: orgProfileId,
+      });
+
+      expect(result.envVars).toEqual({ SOURCE: 'org' });
+    });
+  });
+
+  test('no repo binding when repoFullName is provided without platform', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'repo-profile');
+    await addVar(profileId, 'REPO_VAR', 'bound');
+    await bindRepo(owner, 'org/repo', 'github', profileId);
+
+    // repoFullName without platform => no repo binding lookup
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      repoFullName: 'org/repo',
+    });
+
+    // Should not apply repo binding vars
+    expect(result.envVars).toBeUndefined();
+  });
+
+  test('returns undefined for empty envVars after merge', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'commands-only', { isDefault: true });
+    await addCommands(profileId, ['setup.sh']);
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result.envVars).toBeUndefined();
+    expect(result.setupCommands).toEqual(['setup.sh']);
+  });
+
+  test('resolves profile by profileId', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'by-id');
+    await addVar(profileId, 'KEY', 'value');
+
+    const result = await mergeProfileConfiguration(db, { owner, profileId });
+
+    expect(result.envVars).toEqual({ KEY: 'value' });
+  });
+
+  test('throws ProfileNotFoundError when profileId is not owned by the caller', async () => {
+    const user = await insertTestUser();
+    const other = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const otherProfileId = await createProfile({ type: 'user', id: other.id }, 'others');
+
+    await expect(
+      mergeProfileConfiguration(db, { owner, profileId: otherProfileId })
+    ).rejects.toThrow(ProfileNotFoundError);
+  });
+
+  test('includes MCP servers from the selected profile with encrypted env values', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'with-mcp', { isDefault: true });
+    await addMcpLocal(profileId, 'demo', ['node', 'server.js'], {
+      environment: { PORT: fakeEnvelopeObject },
+    });
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result.mcpServers).toHaveLength(1);
+    const [server] = result.mcpServers ?? [];
+    expect(server).toMatchObject({
+      name: 'demo',
+      type: 'local',
+      enabled: true,
+      command: ['node', 'server.js'],
+    });
+    expect(server?.environment?.PORT).toMatchObject({ algorithm: 'rsa-aes-256-gcm', version: 1 });
+  });
+
+  test('omits disabled MCP servers from merged result', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'with-disabled', { isDefault: true });
+    await addMcpLocal(profileId, 'off', ['node', 'off.js'], { enabled: false });
+
+    const result = await mergeProfileConfiguration(db, { owner });
+
+    expect(result.mcpServers).toBeUndefined();
+  });
+
+  test('merges MCP servers across profile layers — later wins by name', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const baseProfileId = await createProfile(owner, 'base');
+    await addMcpLocal(baseProfileId, 'shared', ['node', 'base.js']);
+    await addMcpLocal(baseProfileId, 'base-only', ['node', 'base-only.js']);
+    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
+
+    const overrideId = await createProfile(owner, 'override');
+    await addMcpLocal(overrideId, 'shared', ['node', 'override.js']);
+    await addMcpLocal(overrideId, 'override-only', ['node', 'override-only.js']);
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId: overrideId,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    expect(result.mcpServers?.map(s => s.name).sort()).toEqual([
+      'base-only',
+      'override-only',
+      'shared',
+    ]);
+    const shared = result.mcpServers?.find(s => s.name === 'shared');
+    expect(shared).toMatchObject({ type: 'local', command: ['node', 'override.js'] });
+  });
+
+  test('includes only enabled skills, merged by name across profile layers', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+
+    const baseProfileId = await createProfile(owner, 'base');
+    await addSkill(baseProfileId, 'alpha', '---\nname: alpha\n---\nbase body');
+    await addSkill(baseProfileId, 'disabled', '---\nname: disabled\n---\nbody', { enabled: false });
+    await bindRepo(owner, 'org/repo', 'github', baseProfileId);
+
+    const overrideId = await createProfile(owner, 'override');
+    await addSkill(overrideId, 'alpha', '---\nname: alpha\n---\noverride body');
+    await addSkill(overrideId, 'beta', '---\nname: beta\n---\nbody');
+
+    const result = await mergeProfileConfiguration(db, {
+      owner,
+      profileId: overrideId,
+      repoFullName: 'org/repo',
+      platform: 'github',
+    });
+
+    expect(result.skills?.map(s => s.name).sort()).toEqual(['alpha', 'beta']);
+    expect(result.skills?.find(s => s.name === 'alpha')?.rawMarkdown).toContain('override body');
+  });
+
+  test('MCP env values travel as encrypted envelopes in the client record', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'with-secrets', { isDefault: true });
+    await addMcpLocal(profileId, 'demo', ['node', 'server.js'], {
+      environment: { API_KEY: fakeEnvelopeObject },
+    });
+
+    const result = await mergeProfileConfiguration(db, { owner });
+    const record = profileMcpServersToClientRecord(result.mcpServers);
+
+    expect(record).toBeDefined();
+    const demo = record?.demo;
+    expect(demo).toBeDefined();
+    if (demo && demo.type === 'local') {
+      expect(demo.environment).toBeDefined();
+      expect(demo.environment?.API_KEY).toMatchObject({
+        algorithm: 'rsa-aes-256-gcm',
+        version: 1,
+      });
+    } else {
+      throw new Error('Expected local MCP server in record');
+    }
+  });
+
+  test('plain-string MCP env values round-trip through the client record verbatim', async () => {
+    const user = await insertTestUser();
+    const owner: ProfileOwner = { type: 'user', id: user.id };
+    const profileId = await createProfile(owner, 'with-mixed', { isDefault: true });
+    await addMcpLocal(profileId, 'demo', ['node', 'server.js'], {
+      environment: { LOCALE: 'en-US', API_KEY: fakeEnvelopeObject },
+    });
+
+    const result = await mergeProfileConfiguration(db, { owner });
+    const record = profileMcpServersToClientRecord(result.mcpServers);
+
+    const demo = record?.demo;
+    if (demo && demo.type === 'local') {
+      expect(demo.environment?.LOCALE).toBe('en-US');
+      expect(demo.environment?.API_KEY).toMatchObject({
+        algorithm: 'rsa-aes-256-gcm',
+        version: 1,
+      });
+    } else {
+      throw new Error('Expected local MCP server in record');
+    }
+  });
+
+  describe('inline layer', () => {
+    test('inline mcpServers layer on top of profile — inline wins on name', async () => {
+      const user = await insertTestUser();
+      const owner: ProfileOwner = { type: 'user', id: user.id };
+      const profileId = await createProfile(owner, 'with-mcp', { isDefault: true });
+      await addMcpLocal(profileId, 'shared', ['node', 'profile.js']);
+      await addMcpLocal(profileId, 'profile-only', ['node', 'profile-only.js']);
+
+      const result = await mergeProfileConfiguration(db, {
+        owner,
+        mcpServers: {
+          shared: { type: 'local', command: ['node', 'inline.js'] },
+          'inline-only': { type: 'local', command: ['node', 'inline-only.js'] },
+        },
+      });
+
+      expect(result.mcpServers?.map(s => s.name).sort()).toEqual([
+        'inline-only',
+        'profile-only',
+        'shared',
+      ]);
+      const shared = result.mcpServers?.find(s => s.name === 'shared');
+      expect(shared).toMatchObject({ type: 'local', command: ['node', 'inline.js'] });
+    });
+
+    test('disabled inline MCP server does not shadow an enabled profile entry', async () => {
+      const user = await insertTestUser();
+      const owner: ProfileOwner = { type: 'user', id: user.id };
+      const profileId = await createProfile(owner, 'with-mcp', { isDefault: true });
+      await addMcpLocal(profileId, 'demo', ['node', 'profile.js']);
+
+      const result = await mergeProfileConfiguration(db, {
+        owner,
+        mcpServers: {
+          demo: { type: 'local', command: ['node', 'inline.js'], enabled: false },
+        },
+      });
+
+      // Profile's enabled `demo` survives — disabled inline entries are skipped, not delete-keys.
+      const demo = result.mcpServers?.find(s => s.name === 'demo');
+      expect(demo).toMatchObject({ type: 'local', command: ['node', 'profile.js'] });
+    });
+
+    test('inline runtimeSkills layer on top of profile — inline wins on name', async () => {
+      const user = await insertTestUser();
+      const owner: ProfileOwner = { type: 'user', id: user.id };
+      const profileId = await createProfile(owner, 'with-skills', { isDefault: true });
+      await addSkill(profileId, 'shared', '---\nname: shared\n---\nprofile body');
+      await addSkill(profileId, 'profile-only', '---\nname: profile-only\n---\nbody');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner,
+        runtimeSkills: [
+          { name: 'shared', rawMarkdown: 'inline body for shared' },
+          { name: 'inline-only', rawMarkdown: 'inline-only body', files: { 'a.md': 'a' } },
+        ],
+      });
+
+      expect(result.skills?.map(s => s.name).sort()).toEqual([
+        'inline-only',
+        'profile-only',
+        'shared',
+      ]);
+      expect(result.skills?.find(s => s.name === 'shared')?.rawMarkdown).toBe(
+        'inline body for shared'
+      );
+      expect(result.skills?.find(s => s.name === 'inline-only')?.files).toEqual({ 'a.md': 'a' });
+    });
+
+    test('inline runtimeAgents layer on top of profile — inline wins on slug', async () => {
+      const user = await insertTestUser();
+      const owner: ProfileOwner = { type: 'user', id: user.id };
+      const profileId = await createProfile(owner, 'with-agents', { isDefault: true });
+      await addAgent(profileId, 'reviewer', 'Reviewer', 'profile reviewer prompt');
+      await addAgent(profileId, 'profile-only', 'Profile Only', 'profile-only prompt');
+
+      const result = await mergeProfileConfiguration(db, {
+        owner,
+        runtimeAgents: [
+          { slug: 'reviewer', name: 'Reviewer', config: { prompt: 'inline reviewer prompt' } },
+          { slug: 'inline-only', name: 'Inline Only', config: { prompt: 'inline-only prompt' } },
+        ],
+      });
+
+      expect(result.agents?.map(a => a.slug).sort()).toEqual([
+        'inline-only',
+        'profile-only',
+        'reviewer',
+      ]);
+      expect(result.agents?.find(a => a.slug === 'reviewer')?.config.prompt).toBe(
+        'inline reviewer prompt'
+      );
+    });
+
+    test('inline encryptedSecrets layer on top of profile — inline wins on key', async () => {
+      const user = await insertTestUser();
+      const owner: ProfileOwner = { type: 'user', id: user.id };
+      const profileId = await createProfile(owner, 'with-secrets', { isDefault: true });
+      await addVar(profileId, 'API_KEY', fakeEnvelope, true);
+
+      const inlineEnvelope = {
+        encryptedData: 'aW5saW5lLWRhdGE=',
+        encryptedDEK: 'aW5saW5lLWRlaw==',
+        algorithm: 'rsa-aes-256-gcm' as const,
+        version: 1 as const,
+      };
+
+      const result = await mergeProfileConfiguration(db, {
+        owner,
+        encryptedSecrets: { API_KEY: inlineEnvelope, INLINE_ONLY: inlineEnvelope },
+      });
+
+      expect(result.encryptedSecrets).toEqual({
+        API_KEY: inlineEnvelope, // inline wins over profile envelope
+        INLINE_ONLY: inlineEnvelope,
+      });
+    });
+  });
+});
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 110ce722c0..f58f9267a3 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -12,6 +12,7 @@
       "@/*": ["./src/*"],
       "@kilocode/db": ["../../packages/db/src/index.ts"],
       "@kilocode/db/*": ["../../packages/db/src/*"],
+      "@kilocode/cloud-agent-profile": ["../../packages/cloud-agent-profile/src/index.ts"],
       "@kilocode/encryption": ["../../packages/encryption/src/index.ts"],
       "@kilocode/worker-utils": ["../../packages/worker-utils/src/index.ts"],
       "@kilocode/worker-utils/*": ["../../packages/worker-utils/src/*"]
diff --git a/packages/cloud-agent-profile/package.json b/packages/cloud-agent-profile/package.json
new file mode 100644
index 0000000000..2b86388265
--- /dev/null
+++ b/packages/cloud-agent-profile/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@kilocode/cloud-agent-profile",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsgo --noEmit",
+    "lint": "pnpm -w exec oxlint --config .oxlintrc.json packages/cloud-agent-profile/src"
+  },
+  "dependencies": {
+    "@kilocode/db": "workspace:*",
+    "@kilocode/encryption": "workspace:*",
+    "drizzle-orm": "catalog:",
+    "zod": "catalog:"
+  },
+  "devDependencies": {
+    "@trpc/server": "catalog:",
+    "@types/node": ">=24 <25",
+    "@typescript/native-preview": "catalog:",
+    "typescript": "catalog:",
+    "vitest": "~3.2.4"
+  }
+}
diff --git a/packages/cloud-agent-profile/src/index.ts b/packages/cloud-agent-profile/src/index.ts
new file mode 100644
index 0000000000..0be78c9f4c
--- /dev/null
+++ b/packages/cloud-agent-profile/src/index.ts
@@ -0,0 +1,145 @@
+// Types
+export type {
+  ProfileOwner,
+  ProfileOwnerType,
+  ProfileVarResponse,
+  ProfileCommandResponse,
+  ProfileMcpServerResponse,
+  McpServerConfigFragment,
+  ProfileSkillResponse,
+  ProfileAgentResponse,
+  ProfileResponse,
+  ProfileResponseWithOwner,
+  ProfileSummary,
+  ProfileSummaryWithOwner,
+  CombinedProfilesResult,
+} from './types';
+export { MASKED_SECRET_VALUE } from './types';
+
+// Pure resolution helpers
+export {
+  resolveProfileLayers,
+  type ProfileLayer,
+  type ProfileLayerSource,
+  type ResolvedProfileLayers,
+  type ResolveProfileLayersInput,
+} from './profile-resolution';
+
+// Session-config merge (main entry point for callers)
+export {
+  mergeProfileConfiguration,
+  profileMcpServersToClientRecord,
+  ProfileNotFoundError,
+  type MergeProfileConfigurationArgs,
+  type MergeProfileConfigurationResult,
+  type MergedSkillForSession,
+  type MergedAgentForSession,
+  type ClientMcpServerValue,
+  type InlineSkillInput,
+  type InlineAgentInput,
+} from './profile-session-config';
+
+// Utilities
+export { buildOwnershipCondition, verifyProfileOwnership } from './profile-utils';
+
+// Profile CRUD + lookups
+export {
+  createProfile,
+  updateProfile,
+  deleteProfile,
+  listProfiles,
+  getProfile,
+  setDefaultProfile,
+  clearDefaultProfile,
+  getDefaultProfile,
+  getProfileByName,
+  getProfileIdByName,
+  getEffectiveDefaultProfileId,
+} from './profile-service';
+
+// Var CRUD
+export {
+  setVar,
+  deleteVar,
+  listVars,
+  getVarsForSession,
+  setVars,
+  type VarForSession,
+} from './profile-vars-service';
+
+// Command CRUD
+export { setCommands, listCommands, getCommandsForSession } from './profile-commands-service';
+
+// MCP server CRUD + session helpers
+export {
+  MAX_PROFILE_MCP_SERVERS,
+  MAX_MCP_SERVER_NAME_LENGTH,
+  MAX_MCP_ENV_OR_HEADERS,
+  mcpLocalConfigInputSchema,
+  mcpRemoteConfigInputSchema,
+  mcpLocalServerInputSchema,
+  mcpRemoteServerInputSchema,
+  mcpServerFullInputSchema,
+  listMcpServersForProfile,
+  createMcpServer,
+  updateMcpServer,
+  deleteMcpServer,
+  setMcpEnabled,
+  getMcpServersForSession,
+  type McpServerInput,
+  type McpServerForSession,
+} from './profile-mcp-service';
+
+// Skill CRUD + session helpers
+export {
+  MAX_PROFILE_SKILLS,
+  MAX_SKILL_NAME_LENGTH,
+  MAX_SKILL_MARKDOWN_LENGTH,
+  MAX_SKILL_DESCRIPTION_LENGTH,
+  MAX_SKILL_COMPANION_FILES,
+  MAX_SKILL_COMPANION_FILE_SIZE,
+  MAX_SKILL_COMPANION_FILES_TOTAL,
+  MAX_SKILL_COMPANION_PATH_LENGTH,
+  skillNameSchema,
+  skillFilesSchema,
+  skillCustomInputSchema,
+  skillUpdateInputSchema,
+  parseSkillFrontmatter,
+  listSkillsForProfile,
+  createCustomSkill,
+  updateSkill,
+  deleteSkill,
+  setSkillEnabled,
+  getSkillsForSession,
+  type SkillCustomInput,
+  type SkillUpdateInput,
+  type SkillForSession,
+} from './profile-skills-service';
+
+// Agent CRUD + session helpers
+export {
+  MAX_PROFILE_AGENTS,
+  MAX_AGENT_NAME_LENGTH,
+  MAX_AGENT_SLUG_LENGTH,
+  BUILTIN_AGENT_SLUGS,
+  agentSlugSchema,
+  agentNameSchema,
+  agentCreateInputSchema,
+  agentUpdateInputSchema,
+  listAgentsForProfile,
+  createAgent,
+  updateAgent,
+  deleteAgent,
+  getAgentsForSession,
+  type AgentCreateInput,
+  type AgentUpdateInput,
+  type AgentForSession,
+} from './profile-agents-service';
+
+// Repo binding CRUD
+export {
+  bindProfileToRepo,
+  unbindRepo,
+  getBindingForRepo,
+  listBindings,
+} from './repo-binding-service';
diff --git a/packages/cloud-agent-profile/src/profile-agents-service.ts b/packages/cloud-agent-profile/src/profile-agents-service.ts
new file mode 100644
index 0000000000..ea0cd298a3
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-agents-service.ts
@@ -0,0 +1,215 @@
+import type { WorkerDb } from '@kilocode/db';
+import {
+  agent_environment_profile_agents,
+  type AgentEnvironmentProfileAgent,
+} from '@kilocode/db/schema';
+import { AgentConfigSchema, type AgentConfig } from '@kilocode/db/schema-types';
+import { and, eq, count } from 'drizzle-orm';
+import { TRPCError } from '@trpc/server';
+import * as z from 'zod';
+import type { ProfileOwner, ProfileAgentResponse } from './types';
+import { verifyProfileOwnership } from './profile-utils';
+
+export const MAX_PROFILE_AGENTS = 20;
+export const MAX_AGENT_NAME_LENGTH = 100;
+export const MAX_AGENT_SLUG_LENGTH = 50;
+
+/**
+ * Built-in kilo agent slugs reserved by cloud-agent-next. Profile-scoped
+ * agents must not collide with these to keep the picker unambiguous.
+ */
+export const BUILTIN_AGENT_SLUGS = new Set([
+  'code',
+  'plan',
+  'debug',
+  'orchestrator',
+  'ask',
+  'build',
+  'architect',
+  'custom',
+]);
+
+// First char must be a letter — matches the kilocode extension's import
+// validator (`/^[a-z][a-z0-9-]*$/`) so agents round-trip cleanly.
+const AGENT_SLUG_PATTERN = /^[a-z][a-z0-9-]*$/;
+
+export const agentSlugSchema = z
+  .string()
+  .min(1)
+  .max(MAX_AGENT_SLUG_LENGTH)
+  .regex(
+    AGENT_SLUG_PATTERN,
+    'Agent slug must start with a lowercase letter and contain only lowercase letters, digits, and dashes'
+  )
+  .refine((slug: string) => !BUILTIN_AGENT_SLUGS.has(slug), {
+    message: 'Slug conflicts with a built-in agent; choose a different slug',
+  });
+
+export const agentNameSchema = z.string().min(1).max(MAX_AGENT_NAME_LENGTH);
+
+export const agentCreateInputSchema = z.object({
+  slug: agentSlugSchema,
+  name: agentNameSchema,
+  config: AgentConfigSchema,
+});
+
+export const agentUpdateInputSchema = z.object({
+  slug: agentSlugSchema.optional(),
+  name: agentNameSchema.optional(),
+  config: AgentConfigSchema.optional(),
+});
+
+export type AgentCreateInput = z.infer<typeof agentCreateInputSchema>;
+export type AgentUpdateInput = z.infer<typeof agentUpdateInputSchema>;
+
+function toResponse(row: AgentEnvironmentProfileAgent): ProfileAgentResponse {
+  // Parse rather than cast so a malformed stored row surfaces as a clear
+  // validation error instead of crashing downstream consumers.
+  const config = AgentConfigSchema.parse(row.config ?? {});
+  return {
+    id: row.id,
+    slug: row.slug,
+    name: row.name,
+    config,
+    createdAt: row.created_at,
+    updatedAt: row.updated_at,
+  };
+}
+
+async function assertAgentLimit(db: WorkerDb, profileId: string): Promise<void> {
+  const [row] = await db
+    .select({ n: count() })
+    .from(agent_environment_profile_agents)
+    .where(eq(agent_environment_profile_agents.profile_id, profileId));
+  if (Number(row.n) >= MAX_PROFILE_AGENTS) {
+    throw new TRPCError({
+      code: 'PRECONDITION_FAILED',
+      message: `Profiles are limited to ${MAX_PROFILE_AGENTS} agents`,
+    });
+  }
+}
+
+async function fetchAgent(
+  db: WorkerDb,
+  agentId: string,
+  profileId: string
+): Promise<AgentEnvironmentProfileAgent> {
+  const [row] = await db
+    .select()
+    .from(agent_environment_profile_agents)
+    .where(
+      and(
+        eq(agent_environment_profile_agents.id, agentId),
+        eq(agent_environment_profile_agents.profile_id, profileId)
+      )
+    )
+    .limit(1);
+  if (!row) {
+    throw new TRPCError({ code: 'NOT_FOUND', message: 'Agent not found' });
+  }
+  return row;
+}
+
+/**
+ * List all agents for a profile in slug order.
+ * Internal: no ownership check; used by `profile-service.getProfile`.
+ */
+export async function listAgentsForProfile(
+  db: WorkerDb,
+  profileId: string
+): Promise<ProfileAgentResponse[]> {
+  const rows = await db
+    .select()
+    .from(agent_environment_profile_agents)
+    .where(eq(agent_environment_profile_agents.profile_id, profileId))
+    .orderBy(agent_environment_profile_agents.slug);
+  return rows.map(toResponse);
+}
+
+export async function createAgent(
+  db: WorkerDb,
+  profileId: string,
+  input: AgentCreateInput,
+  owner: ProfileOwner
+): Promise<{ id: string }> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await assertAgentLimit(db, profileId);
+
+  const [row] = await db
+    .insert(agent_environment_profile_agents)
+    .values({
+      profile_id: profileId,
+      slug: input.slug,
+      name: input.name,
+      config: input.config,
+    })
+    .returning({ id: agent_environment_profile_agents.id });
+
+  return { id: row.id };
+}
+
+export async function updateAgent(
+  db: WorkerDb,
+  profileId: string,
+  agentId: string,
+  input: AgentUpdateInput,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchAgent(db, agentId, profileId);
+
+  const updates: Partial<AgentEnvironmentProfileAgent> = {};
+  if (input.slug !== undefined) updates.slug = input.slug;
+  if (input.name !== undefined) updates.name = input.name;
+  if (input.config !== undefined) updates.config = input.config;
+
+  if (Object.keys(updates).length === 0) return;
+
+  await db
+    .update(agent_environment_profile_agents)
+    .set(updates)
+    .where(eq(agent_environment_profile_agents.id, agentId));
+}
+
+export async function deleteAgent(
+  db: WorkerDb,
+  profileId: string,
+  agentId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchAgent(db, agentId, profileId);
+  await db
+    .delete(agent_environment_profile_agents)
+    .where(eq(agent_environment_profile_agents.id, agentId));
+}
+
+/**
+ * Shape used for session materialization.
+ * Internal: no ownership check.
+ */
+export type AgentForSession = {
+  slug: string;
+  name: string;
+  config: AgentConfig;
+};
+
+export async function getAgentsForSession(
+  db: WorkerDb,
+  profileId: string
+): Promise<AgentForSession[]> {
+  const rows = await db
+    .select({
+      slug: agent_environment_profile_agents.slug,
+      name: agent_environment_profile_agents.name,
+      config: agent_environment_profile_agents.config,
+    })
+    .from(agent_environment_profile_agents)
+    .where(eq(agent_environment_profile_agents.profile_id, profileId))
+    .orderBy(agent_environment_profile_agents.slug);
+  return rows.map(row => ({
+    slug: row.slug,
+    name: row.name,
+    config: AgentConfigSchema.parse(row.config ?? {}),
+  }));
+}
diff --git a/apps/web/src/lib/agent/profile-commands-service.ts b/packages/cloud-agent-profile/src/profile-commands-service.ts
similarity index 87%
rename from apps/web/src/lib/agent/profile-commands-service.ts
rename to packages/cloud-agent-profile/src/profile-commands-service.ts
index 37dfc16b95..cd0082b425 100644
--- a/apps/web/src/lib/agent/profile-commands-service.ts
+++ b/packages/cloud-agent-profile/src/profile-commands-service.ts
@@ -1,5 +1,4 @@
-import 'server-only';
-import { db } from '@/lib/drizzle';
+import type { WorkerDb } from '@kilocode/db';
 import { agent_environment_profile_commands } from '@kilocode/db/schema';
 import { eq } from 'drizzle-orm';
 import type { ProfileOwner, ProfileCommandResponse } from './types';
@@ -10,11 +9,12 @@ import { verifyProfileOwnership } from './profile-utils';
  * Replaces all existing commands with the new list.
  */
 export async function setCommands(
+  db: WorkerDb,
   profileId: string,
   commands: string[],
   owner: ProfileOwner
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   await db.transaction(async tx => {
     // Delete existing commands
@@ -39,10 +39,11 @@ export async function setCommands(
  * List commands for a profile in order.
  */
 export async function listCommands(
+  db: WorkerDb,
   profileId: string,
   owner: ProfileOwner
 ): Promise<ProfileCommandResponse[]> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   const commands = await db
     .select({
@@ -61,7 +62,7 @@ export async function listCommands(
  * Returns just the command strings in order.
  * This is an internal function - no ownership check.
  */
-export async function getCommandsForSession(profileId: string): Promise<string[]> {
+export async function getCommandsForSession(db: WorkerDb, profileId: string): Promise<string[]> {
   const commands = await db
     .select({
       command: agent_environment_profile_commands.command,
diff --git a/packages/cloud-agent-profile/src/profile-mcp-service.ts b/packages/cloud-agent-profile/src/profile-mcp-service.ts
new file mode 100644
index 0000000000..27e08c62a1
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-mcp-service.ts
@@ -0,0 +1,426 @@
+import type { WorkerDb } from '@kilocode/db';
+import {
+  agent_environment_profile_mcp_servers,
+  type AgentEnvironmentProfileMcpServer,
+} from '@kilocode/db/schema';
+import { and, eq, count } from 'drizzle-orm';
+import { TRPCError } from '@trpc/server';
+import * as z from 'zod';
+import { encryptWithPublicKey, type EncryptedEnvelope } from '@kilocode/encryption';
+import {
+  MASKED_SECRET_VALUE,
+  type McpServerConfigFragment,
+  type ProfileMcpServerResponse,
+  type ProfileOwner,
+} from './types';
+import { verifyProfileOwnership } from './profile-utils';
+
+export const MAX_PROFILE_MCP_SERVERS = 20;
+export const MAX_MCP_SERVER_NAME_LENGTH = 100;
+export const MAX_MCP_ENV_OR_HEADERS = 50;
+
+/** Zod-validated encrypted envelope (matches the shape stored in the DB). */
+const encryptedEnvelopeSchema = z.object({
+  encryptedData: z.string(),
+  encryptedDEK: z.string(),
+  algorithm: z.literal('rsa-aes-256-gcm'),
+  version: z.literal(1),
+});
+
+/** User-supplied local MCP config: env values are plaintext strings, encrypted at-rest on write. */
+export const mcpLocalConfigInputSchema = z.object({
+  command: z.array(z.string().max(500)).min(1).max(50),
+  environment: z
+    .record(z.string().max(128), z.string().max(4096))
+    .refine(
+      obj => Object.keys(obj).length <= MAX_MCP_ENV_OR_HEADERS,
+      `Maximum ${MAX_MCP_ENV_OR_HEADERS} environment entries per MCP server`
+    )
+    .optional(),
+});
+
+export const mcpRemoteConfigInputSchema = z.object({
+  url: z.string().url().max(2048),
+  headers: z
+    .record(z.string().max(128), z.string().max(4096))
+    .refine(
+      obj => Object.keys(obj).length <= MAX_MCP_ENV_OR_HEADERS,
+      `Maximum ${MAX_MCP_ENV_OR_HEADERS} header entries per MCP server`
+    )
+    .optional(),
+});
+
+const mcpServerInputBase = z.object({
+  name: z
+    .string()
+    .min(1)
+    .max(MAX_MCP_SERVER_NAME_LENGTH)
+    .regex(/^[a-zA-Z0-9_-]+$/, 'Name must contain only letters, numbers, underscores, and dashes'),
+  enabled: z.boolean().optional(),
+  timeout: z.number().int().min(1).max(3_600_000).optional(),
+});
+
+export const mcpLocalServerInputSchema = mcpServerInputBase.extend({
+  type: z.literal('local'),
+  config: mcpLocalConfigInputSchema,
+});
+
+export const mcpRemoteServerInputSchema = mcpServerInputBase.extend({
+  type: z.literal('remote'),
+  config: mcpRemoteConfigInputSchema,
+});
+
+export const mcpServerFullInputSchema = z.discriminatedUnion('type', [
+  mcpLocalServerInputSchema,
+  mcpRemoteServerInputSchema,
+]);
+
+export type McpServerInput = z.infer<typeof mcpServerFullInputSchema>;
+
+/**
+ * A single env/header value as stored in the DB jsonb. Encrypted envelopes
+ * carry secrets; plain strings carry non-sensitive config (locale, paths,
+ * public IDs, …) that doesn't need encryption.
+ */
+export type StoredMcpSecretValue = string | EncryptedEnvelope;
+
+/**
+ * Shape persisted in the `agent_environment_profile_mcp_servers.config` jsonb.
+ * Env/header values are encrypted envelopes for secrets and plain strings
+ * for non-secret config.
+ */
+type StoredMcpLocalConfig = {
+  command: string[];
+  environment?: Record<string, StoredMcpSecretValue>;
+};
+type StoredMcpRemoteConfig = {
+  url: string;
+  headers?: Record<string, StoredMcpSecretValue>;
+};
+type StoredMcpConfig = StoredMcpLocalConfig | StoredMcpRemoteConfig;
+
+function encryptValue(publicKeyBase64: string, value: string): EncryptedEnvelope {
+  if (!publicKeyBase64) {
+    throw new TRPCError({
+      code: 'INTERNAL_SERVER_ERROR',
+      message: 'Agent environment encryption key not configured',
+    });
+  }
+  const publicKey = Buffer.from(publicKeyBase64, 'base64');
+  return encryptWithPublicKey(value, publicKey);
+}
+
+/**
+ * Encrypt plaintext values, but reuse an existing stored value for any key
+ * whose input value is exactly `MASKED_SECRET_VALUE`. This lets the edit UI
+ * surface existing keys with the placeholder so the user can decide per-key
+ * whether to rotate or keep the secret — a replace-everything update would
+ * otherwise force re-entering all values.
+ *
+ * Today the user-facing tRPC schema treats every value as a secret (see
+ * `mcpLocalConfigInputSchema.environment`), so this function always emits
+ * envelopes for fresh values. The `existing` record is typed as the
+ * persisted union (`string | EncryptedEnvelope`) because legacy rows or a
+ * future "non-secret" code path may have plaintext entries that need to
+ * round-trip past the masked placeholder unchanged.
+ */
+function encryptRecord(
+  publicKeyBase64: string,
+  values: Record<string, string> | undefined,
+  existing?: Record<string, StoredMcpSecretValue>
+): Record<string, StoredMcpSecretValue> | undefined {
+  if (!values) return undefined;
+  const out: Record<string, StoredMcpSecretValue> = {};
+  for (const [key, value] of Object.entries(values)) {
+    if (value === MASKED_SECRET_VALUE && existing?.[key] !== undefined) {
+      out[key] = existing[key];
+    } else {
+      out[key] = encryptValue(publicKeyBase64, value);
+    }
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+
+/**
+ * Convert user input → config shape with encrypted env/header values.
+ * On update, `existing` carries the previously stored encrypted envelopes
+ * so keys left as the masked placeholder round-trip unchanged.
+ */
+function buildStoredConfig(
+  publicKeyBase64: string,
+  input: McpServerInput,
+  existing?: StoredMcpConfig
+): StoredMcpConfig {
+  if (input.type === 'local') {
+    const existingEnv = existing && 'command' in existing ? existing.environment : undefined;
+    return {
+      command: input.config.command,
+      environment: encryptRecord(publicKeyBase64, input.config.environment, existingEnv),
+    };
+  }
+  const existingHeaders = existing && 'url' in existing ? existing.headers : undefined;
+  return {
+    url: input.config.url,
+    headers: encryptRecord(publicKeyBase64, input.config.headers, existingHeaders),
+  };
+}
+
+/**
+ * Replace every value with the masked placeholder for GET responses,
+ * regardless of whether the stored entry is an envelope or a plain string.
+ * Plain-string entries are still masked because the GET response is a
+ * uniform UI surface — the edit UI doesn't distinguish "literal" from
+ * "secret" today, so masking everything keeps round-trip semantics simple.
+ */
+function maskValues(
+  values: Record<string, StoredMcpSecretValue> | undefined
+): Record<string, string> | undefined {
+  if (!values) return undefined;
+  const out: Record<string, string> = {};
+  for (const key of Object.keys(values)) {
+    out[key] = MASKED_SECRET_VALUE;
+  }
+  return out;
+}
+
+/**
+ * Convert persisted (envelope-valued) config → sanitized response with values masked.
+ */
+function toMaskedConfig(
+  type: 'local' | 'remote',
+  config: StoredMcpConfig
+): McpServerConfigFragment {
+  if (type === 'local') {
+    const c = config as StoredMcpLocalConfig;
+    return {
+      command: c.command,
+      environment: maskValues(c.environment),
+    };
+  }
+  const c = config as StoredMcpRemoteConfig;
+  return {
+    url: c.url,
+    headers: maskValues(c.headers),
+  };
+}
+
+async function assertMcpServerLimit(db: WorkerDb, profileId: string): Promise<void> {
+  const [row] = await db
+    .select({ n: count() })
+    .from(agent_environment_profile_mcp_servers)
+    .where(eq(agent_environment_profile_mcp_servers.profile_id, profileId));
+  if (Number(row.n) >= MAX_PROFILE_MCP_SERVERS) {
+    throw new TRPCError({
+      code: 'PRECONDITION_FAILED',
+      message: `Profiles are limited to ${MAX_PROFILE_MCP_SERVERS} MCP servers`,
+    });
+  }
+}
+
+async function fetchMcpServer(
+  db: WorkerDb,
+  mcpServerId: string,
+  profileId: string
+): Promise<AgentEnvironmentProfileMcpServer> {
+  const [server] = await db
+    .select()
+    .from(agent_environment_profile_mcp_servers)
+    .where(
+      and(
+        eq(agent_environment_profile_mcp_servers.id, mcpServerId),
+        eq(agent_environment_profile_mcp_servers.profile_id, profileId)
+      )
+    )
+    .limit(1);
+  if (!server) {
+    throw new TRPCError({ code: 'NOT_FOUND', message: 'MCP server not found' });
+  }
+  return server;
+}
+
+function toResponse(server: AgentEnvironmentProfileMcpServer): ProfileMcpServerResponse {
+  return {
+    id: server.id,
+    name: server.name,
+    type: server.type,
+    enabled: server.enabled,
+    timeout: server.timeout,
+    config: toMaskedConfig(server.type, server.config as StoredMcpConfig),
+    createdAt: server.created_at,
+    updatedAt: server.updated_at,
+  };
+}
+
+/**
+ * List all MCP servers for a profile.
+ * Secret env/header values are masked in the response.
+ * Internal: no ownership check; used by `profile-service.getProfile` which has already verified.
+ */
+export async function listMcpServersForProfile(
+  db: WorkerDb,
+  profileId: string
+): Promise<ProfileMcpServerResponse[]> {
+  const servers = await db
+    .select()
+    .from(agent_environment_profile_mcp_servers)
+    .where(eq(agent_environment_profile_mcp_servers.profile_id, profileId))
+    .orderBy(agent_environment_profile_mcp_servers.name);
+
+  return servers.map(toResponse);
+}
+
+export async function createMcpServer(
+  db: WorkerDb,
+  publicKeyBase64: string,
+  profileId: string,
+  input: McpServerInput,
+  owner: ProfileOwner
+): Promise<{ id: string }> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await assertMcpServerLimit(db, profileId);
+
+  const config = buildStoredConfig(publicKeyBase64, input);
+
+  const [server] = await db
+    .insert(agent_environment_profile_mcp_servers)
+    .values({
+      profile_id: profileId,
+      name: input.name,
+      type: input.type,
+      enabled: input.enabled ?? true,
+      timeout: input.timeout ?? null,
+      config,
+    })
+    .returning({ id: agent_environment_profile_mcp_servers.id });
+
+  return { id: server.id };
+}
+
+export async function updateMcpServer(
+  db: WorkerDb,
+  publicKeyBase64: string,
+  profileId: string,
+  mcpServerId: string,
+  input: McpServerInput,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  const existing = await fetchMcpServer(db, mcpServerId, profileId);
+
+  const config = buildStoredConfig(publicKeyBase64, input, existing.config as StoredMcpConfig);
+
+  await db
+    .update(agent_environment_profile_mcp_servers)
+    .set({
+      name: input.name,
+      type: input.type,
+      enabled: input.enabled ?? true,
+      timeout: input.timeout ?? null,
+      config,
+    })
+    .where(eq(agent_environment_profile_mcp_servers.id, mcpServerId));
+}
+
+export async function deleteMcpServer(
+  db: WorkerDb,
+  profileId: string,
+  mcpServerId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchMcpServer(db, mcpServerId, profileId);
+  await db
+    .delete(agent_environment_profile_mcp_servers)
+    .where(eq(agent_environment_profile_mcp_servers.id, mcpServerId));
+}
+
+export async function setMcpEnabled(
+  db: WorkerDb,
+  profileId: string,
+  mcpServerId: string,
+  enabled: boolean,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchMcpServer(db, mcpServerId, profileId);
+  await db
+    .update(agent_environment_profile_mcp_servers)
+    .set({ enabled })
+    .where(eq(agent_environment_profile_mcp_servers.id, mcpServerId));
+}
+
+/**
+ * Shape used for session materialization. Each env/header value is either a
+ * plain string or an encrypted envelope and travels straight through the
+ * wire to the cloud-agent-next worker, which decrypts envelope-shaped
+ * entries per key before writing KILO_CONFIG_CONTENT.
+ */
+export type McpServerForSession = {
+  name: string;
+  type: 'local' | 'remote';
+  enabled: boolean;
+  timeout?: number;
+  command?: string[];
+  url?: string;
+  /** Env values (local): plain strings or encrypted envelopes per key. */
+  environment?: Record<string, StoredMcpSecretValue>;
+  /** Header values (remote): plain strings or encrypted envelopes per key. */
+  headers?: Record<string, StoredMcpSecretValue>;
+};
+
+/**
+ * Parse a stored env/header record, accepting plain strings and encrypted
+ * envelopes per key. Drops malformed entries (objects that match neither
+ * shape) so a single bad value never poisons the whole record.
+ */
+function parseSecretValueRecord(raw: unknown): Record<string, StoredMcpSecretValue> | undefined {
+  if (!raw || typeof raw !== 'object') return undefined;
+  const out: Record<string, StoredMcpSecretValue> = {};
+  for (const [key, value] of Object.entries(raw as Record<string, unknown>)) {
+    if (typeof value === 'string') {
+      out[key] = value;
+      continue;
+    }
+    const parsed = encryptedEnvelopeSchema.safeParse(value);
+    if (parsed.success) out[key] = parsed.data;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+
+/**
+ * Internal: load MCP servers (with encrypted envelopes intact) for session preparation.
+ * No ownership check — the caller must have already verified.
+ */
+export async function getMcpServersForSession(
+  db: WorkerDb,
+  profileId: string
+): Promise<McpServerForSession[]> {
+  const servers = await db
+    .select()
+    .from(agent_environment_profile_mcp_servers)
+    .where(eq(agent_environment_profile_mcp_servers.profile_id, profileId));
+
+  return servers.map(server => {
+    const config = server.config as StoredMcpConfig;
+    if (server.type === 'local') {
+      const c = config as StoredMcpLocalConfig;
+      return {
+        name: server.name,
+        type: 'local' as const,
+        enabled: server.enabled,
+        timeout: server.timeout ?? undefined,
+        command: c.command,
+        environment: parseSecretValueRecord(c.environment),
+      };
+    }
+    const c = config as StoredMcpRemoteConfig;
+    return {
+      name: server.name,
+      type: 'remote' as const,
+      enabled: server.enabled,
+      timeout: server.timeout ?? undefined,
+      url: c.url,
+      headers: parseSecretValueRecord(c.headers),
+    };
+  });
+}
diff --git a/packages/cloud-agent-profile/src/profile-resolution.test.ts b/packages/cloud-agent-profile/src/profile-resolution.test.ts
new file mode 100644
index 0000000000..9978d294f5
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-resolution.test.ts
@@ -0,0 +1,149 @@
+import { describe, test, expect } from 'vitest';
+import { resolveProfileLayers } from './profile-resolution';
+
+// Short fake UUIDs, only identity matters in this pure-logic test.
+const REPO_P = 'repo-profile';
+const DEFAULT_P = 'default-profile';
+const EXPLICIT_P = 'explicit-profile';
+
+describe('resolveProfileLayers', () => {
+  test('nothing picked and no fallbacks: nothing applies', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: null,
+        effectiveDefaultProfileId: null,
+        explicitOverrideProfileId: null,
+      })
+    ).toEqual({ base: null, top: null });
+  });
+
+  test('only effective default: default fills the top slot', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: null,
+        effectiveDefaultProfileId: DEFAULT_P,
+        explicitOverrideProfileId: null,
+      })
+    ).toEqual({
+      base: null,
+      top: { profileId: DEFAULT_P, source: 'default' },
+    });
+  });
+
+  test('only repo binding: repo binding fills the base slot', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: null,
+        explicitOverrideProfileId: null,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: null,
+    });
+  });
+
+  test('repo binding + effective default: both apply (default on top of repo)', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: DEFAULT_P,
+        explicitOverrideProfileId: null,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: { profileId: DEFAULT_P, source: 'default' },
+    });
+  });
+
+  test('repo binding + explicit override: both apply (override on top of repo)', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: null,
+        explicitOverrideProfileId: EXPLICIT_P,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: { profileId: EXPLICIT_P, source: 'explicit' },
+    });
+  });
+
+  test('repo binding + default + explicit: explicit replaces default in the top slot', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: DEFAULT_P,
+        explicitOverrideProfileId: EXPLICIT_P,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: { profileId: EXPLICIT_P, source: 'explicit' },
+    });
+  });
+
+  test('explicit pick replaces the default in the top slot (no repo binding)', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: null,
+        effectiveDefaultProfileId: DEFAULT_P,
+        explicitOverrideProfileId: EXPLICIT_P,
+      })
+    ).toEqual({
+      base: null,
+      top: { profileId: EXPLICIT_P, source: 'explicit' },
+    });
+  });
+
+  test('explicit pick equal to the repo binding is deduped to a no-op top', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: null,
+        explicitOverrideProfileId: REPO_P,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: null,
+    });
+  });
+
+  test('default equal to the repo binding is deduped to a no-op top', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: REPO_P,
+        effectiveDefaultProfileId: REPO_P,
+        explicitOverrideProfileId: null,
+      })
+    ).toEqual({
+      base: { profileId: REPO_P, source: 'repo-binding' },
+      top: null,
+    });
+  });
+
+  test('explicit pick equal to the effective default: explicit alone in top slot', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: null,
+        effectiveDefaultProfileId: DEFAULT_P,
+        explicitOverrideProfileId: DEFAULT_P,
+      })
+    ).toEqual({
+      base: null,
+      top: { profileId: DEFAULT_P, source: 'explicit' },
+    });
+  });
+
+  test('explicit pick with no repo binding and no default: explicit alone in top slot', () => {
+    expect(
+      resolveProfileLayers({
+        repoBindingProfileId: null,
+        effectiveDefaultProfileId: null,
+        explicitOverrideProfileId: EXPLICIT_P,
+      })
+    ).toEqual({
+      base: null,
+      top: { profileId: EXPLICIT_P, source: 'explicit' },
+    });
+  });
+});
diff --git a/packages/cloud-agent-profile/src/profile-resolution.ts b/packages/cloud-agent-profile/src/profile-resolution.ts
new file mode 100644
index 0000000000..7b82abb13b
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-resolution.ts
@@ -0,0 +1,79 @@
+/**
+ * Shared, pure resolution of which profile(s) apply to a session.
+ *
+ * Used by both the server-side merge (`mergeProfileConfiguration`) and the
+ * client-side profile picker UI so the two always agree on what is applied.
+ *
+ * Conceptually there are up to two profile layers, applied bottom-up:
+ *   - base: the repo-bound profile (when the session targets a repo with a
+ *     binding). Always applied as the base when present.
+ *   - top:  the user's explicit pick if they made one for this task,
+ *     otherwise the effective default (personal default, falling back to the
+ *     org default in an org context). The explicit pick *replaces* the
+ *     default in this slot — it does not replace the repo base.
+ *
+ * If `top` would be the same profile as `base`, it is dropped to avoid
+ * applying the same profile twice.
+ */
+
+export type ProfileLayerSource = 'repo-binding' | 'default' | 'explicit';
+
+export type ProfileLayer = {
+  profileId: string;
+  source: ProfileLayerSource;
+};
+
+export type ResolvedProfileLayers = {
+  /** Repo-bound profile, if any. Always the base layer when present. */
+  base: ProfileLayer | null;
+  /**
+   * Top layer applied on top of `base`. Filled by the explicit pick if any,
+   * otherwise by the effective default. `null` when neither applies, or when
+   * it would duplicate the base (same profile id).
+   */
+  top: ProfileLayer | null;
+};
+
+export type ResolveProfileLayersInput = {
+  /** The profile bound to the current repo, if any. */
+  repoBindingProfileId: string | null;
+  /**
+   * The effective default profile for the caller (personal default beats org
+   * default in an org context). Used when no explicit pick was made.
+   */
+  effectiveDefaultProfileId: string | null;
+  /** The profile the user explicitly selected for this task, if any. */
+  explicitOverrideProfileId: string | null;
+};
+
+/**
+ * Resolve which profile(s) apply for this session.
+ *
+ * Rules:
+ *  - A repo binding always claims the `base` slot.
+ *  - The `top` slot is the explicit pick if any, else the effective default.
+ *  - `top` is dropped when it equals `base` to avoid applying the same
+ *    profile twice.
+ */
+export function resolveProfileLayers({
+  repoBindingProfileId,
+  effectiveDefaultProfileId,
+  explicitOverrideProfileId,
+}: ResolveProfileLayersInput): ResolvedProfileLayers {
+  const base: ProfileLayer | null = repoBindingProfileId
+    ? { profileId: repoBindingProfileId, source: 'repo-binding' }
+    : null;
+
+  let top: ProfileLayer | null = null;
+  if (explicitOverrideProfileId) {
+    top = { profileId: explicitOverrideProfileId, source: 'explicit' };
+  } else if (effectiveDefaultProfileId) {
+    top = { profileId: effectiveDefaultProfileId, source: 'default' };
+  }
+
+  if (top && base && top.profileId === base.profileId) {
+    top = null;
+  }
+
+  return { base, top };
+}
diff --git a/apps/web/src/lib/agent/profile-service.ts b/packages/cloud-agent-profile/src/profile-service.ts
similarity index 58%
rename from apps/web/src/lib/agent/profile-service.ts
rename to packages/cloud-agent-profile/src/profile-service.ts
index 54337aa857..d72c212c68 100644
--- a/apps/web/src/lib/agent/profile-service.ts
+++ b/packages/cloud-agent-profile/src/profile-service.ts
@@ -1,20 +1,31 @@
-import 'server-only';
-import { db } from '@/lib/drizzle';
+import type { WorkerDb } from '@kilocode/db';
 import {
   agent_environment_profiles,
   agent_environment_profile_vars,
   agent_environment_profile_commands,
+  agent_environment_profile_mcp_servers,
+  agent_environment_profile_skills,
+  agent_environment_profile_agents,
   type AgentEnvironmentProfile,
 } from '@kilocode/db/schema';
 import { eq, and, sql, count, inArray } from 'drizzle-orm';
 import type { ProfileOwner, ProfileSummary, ProfileResponse } from './types';
 import { buildOwnershipCondition, verifyProfileOwnership } from './profile-utils';
+import { listMcpServersForProfile } from './profile-mcp-service';
+import { listSkillsForProfile } from './profile-skills-service';
+import { listAgentsForProfile } from './profile-agents-service';
 
 /**
  * Create a new environment profile.
+ *
+ * `createdByUserId` records the user who initiated the creation. For
+ * user-owned profiles this matches `owner.id`; for org-owned profiles it
+ * identifies the member who authored the shared profile.
  */
 export async function createProfile(
+  db: WorkerDb,
   owner: ProfileOwner,
+  createdByUserId: string,
   name: string,
   description?: string
 ): Promise<{ id: string }> {
@@ -23,6 +34,7 @@ export async function createProfile(
     .values({
       owned_by_organization_id: owner.type === 'organization' ? owner.id : null,
       owned_by_user_id: owner.type === 'user' ? owner.id : null,
+      created_by_user_id: createdByUserId,
       name,
       description: description ?? null,
     })
@@ -35,11 +47,12 @@ export async function createProfile(
  * Update profile metadata (name, description).
  */
 export async function updateProfile(
+  db: WorkerDb,
   profileId: string,
   owner: ProfileOwner,
   updates: { name?: string; description?: string }
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   const updateData: Partial<Pick<AgentEnvironmentProfile, 'name' | 'description'>> = {};
   if (updates.name !== undefined) {
@@ -62,8 +75,12 @@ export async function updateProfile(
 /**
  * Delete a profile and cascade to vars and commands.
  */
-export async function deleteProfile(profileId: string, owner: ProfileOwner): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+export async function deleteProfile(
+  db: WorkerDb,
+  profileId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
 
   await db.delete(agent_environment_profiles).where(eq(agent_environment_profiles.id, profileId));
 }
@@ -71,7 +88,7 @@ export async function deleteProfile(profileId: string, owner: ProfileOwner): Pro
 /**
  * List all profiles for an owner with summary info.
  */
-export async function listProfiles(owner: ProfileOwner): Promise<ProfileSummary[]> {
+export async function listProfiles(db: WorkerDb, owner: ProfileOwner): Promise<ProfileSummary[]> {
   const profiles = await db
     .select({
       id: agent_environment_profiles.id,
@@ -92,7 +109,7 @@ export async function listProfiles(owner: ProfileOwner): Promise<ProfileSummary[
     return [];
   }
 
-  const [varCounts, commandCounts] = await Promise.all([
+  const [varCounts, commandCounts, mcpServerCounts, skillCounts, agentCounts] = await Promise.all([
     db
       .select({
         profileId: agent_environment_profile_vars.profile_id,
@@ -109,10 +126,37 @@ export async function listProfiles(owner: ProfileOwner): Promise<ProfileSummary[
       .from(agent_environment_profile_commands)
       .where(inArray(agent_environment_profile_commands.profile_id, profileIds))
       .groupBy(agent_environment_profile_commands.profile_id),
+    db
+      .select({
+        profileId: agent_environment_profile_mcp_servers.profile_id,
+        count: count(),
+      })
+      .from(agent_environment_profile_mcp_servers)
+      .where(inArray(agent_environment_profile_mcp_servers.profile_id, profileIds))
+      .groupBy(agent_environment_profile_mcp_servers.profile_id),
+    db
+      .select({
+        profileId: agent_environment_profile_skills.profile_id,
+        count: count(),
+      })
+      .from(agent_environment_profile_skills)
+      .where(inArray(agent_environment_profile_skills.profile_id, profileIds))
+      .groupBy(agent_environment_profile_skills.profile_id),
+    db
+      .select({
+        profileId: agent_environment_profile_agents.profile_id,
+        count: count(),
+      })
+      .from(agent_environment_profile_agents)
+      .where(inArray(agent_environment_profile_agents.profile_id, profileIds))
+      .groupBy(agent_environment_profile_agents.profile_id),
   ]);
 
   const varCountMap = new Map(varCounts.map(v => [v.profileId, Number(v.count)]));
   const commandCountMap = new Map(commandCounts.map(c => [c.profileId, Number(c.count)]));
+  const mcpServerCountMap = new Map(mcpServerCounts.map(m => [m.profileId, Number(m.count)]));
+  const skillCountMap = new Map(skillCounts.map(s => [s.profileId, Number(s.count)]));
+  const agentCountMap = new Map(agentCounts.map(a => [a.profileId, Number(a.count)]));
 
   return profiles.map(p => ({
     id: p.id,
@@ -123,6 +167,9 @@ export async function listProfiles(owner: ProfileOwner): Promise<ProfileSummary[
     updatedAt: p.updatedAt,
     varCount: varCountMap.get(p.id) ?? 0,
     commandCount: commandCountMap.get(p.id) ?? 0,
+    mcpServerCount: mcpServerCountMap.get(p.id) ?? 0,
+    skillCount: skillCountMap.get(p.id) ?? 0,
+    agentCount: agentCountMap.get(p.id) ?? 0,
   }));
 }
 
@@ -130,37 +177,43 @@ export async function listProfiles(owner: ProfileOwner): Promise<ProfileSummary[
  * Get a single profile with vars and commands.
  * Secret values are masked.
  */
-export async function getProfile(profileId: string, owner: ProfileOwner): Promise<ProfileResponse> {
-  const profile = await verifyProfileOwnership(profileId, owner);
-
-  // Get vars with masked secret values
-  const vars = await db
-    .select({
-      key: agent_environment_profile_vars.key,
-      value: sql<string>`
-        CASE
-          WHEN ${agent_environment_profile_vars.is_secret} = true
-          THEN '***'
-          ELSE ${agent_environment_profile_vars.value}
-        END
-      `.as('value'),
-      isSecret: agent_environment_profile_vars.is_secret,
-      createdAt: agent_environment_profile_vars.created_at,
-      updatedAt: agent_environment_profile_vars.updated_at,
-    })
-    .from(agent_environment_profile_vars)
-    .where(eq(agent_environment_profile_vars.profile_id, profileId))
-    .orderBy(agent_environment_profile_vars.key);
+export async function getProfile(
+  db: WorkerDb,
+  profileId: string,
+  owner: ProfileOwner
+): Promise<ProfileResponse> {
+  const profile = await verifyProfileOwnership(db, profileId, owner);
 
-  // Get commands in order
-  const commands = await db
-    .select({
-      sequence: agent_environment_profile_commands.sequence,
-      command: agent_environment_profile_commands.command,
-    })
-    .from(agent_environment_profile_commands)
-    .where(eq(agent_environment_profile_commands.profile_id, profileId))
-    .orderBy(agent_environment_profile_commands.sequence);
+  const [vars, commands, mcpServers, skills, agents] = await Promise.all([
+    db
+      .select({
+        key: agent_environment_profile_vars.key,
+        value: sql<string>`
+          CASE
+            WHEN ${agent_environment_profile_vars.is_secret} = true
+            THEN '***'
+            ELSE ${agent_environment_profile_vars.value}
+          END
+        `.as('value'),
+        isSecret: agent_environment_profile_vars.is_secret,
+        createdAt: agent_environment_profile_vars.created_at,
+        updatedAt: agent_environment_profile_vars.updated_at,
+      })
+      .from(agent_environment_profile_vars)
+      .where(eq(agent_environment_profile_vars.profile_id, profileId))
+      .orderBy(agent_environment_profile_vars.key),
+    db
+      .select({
+        sequence: agent_environment_profile_commands.sequence,
+        command: agent_environment_profile_commands.command,
+      })
+      .from(agent_environment_profile_commands)
+      .where(eq(agent_environment_profile_commands.profile_id, profileId))
+      .orderBy(agent_environment_profile_commands.sequence),
+    listMcpServersForProfile(db, profileId),
+    listSkillsForProfile(db, profileId),
+    listAgentsForProfile(db, profileId),
+  ]);
 
   return {
     id: profile.id,
@@ -171,6 +224,9 @@ export async function getProfile(profileId: string, owner: ProfileOwner): Promis
     updatedAt: profile.updated_at,
     vars,
     commands,
+    mcpServers,
+    skills,
+    agents,
   };
 }
 
@@ -178,8 +234,12 @@ export async function getProfile(profileId: string, owner: ProfileOwner): Promis
  * Set a profile as the default for an owner.
  * Clears any existing default first.
  */
-export async function setDefaultProfile(profileId: string, owner: ProfileOwner): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+export async function setDefaultProfile(
+  db: WorkerDb,
+  profileId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
 
   await db.transaction(async tx => {
     // Clear existing default
@@ -199,8 +259,12 @@ export async function setDefaultProfile(profileId: string, owner: ProfileOwner):
 /**
  * Clear the default profile for an owner.
  */
-export async function clearDefaultProfile(profileId: string, owner: ProfileOwner): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+export async function clearDefaultProfile(
+  db: WorkerDb,
+  profileId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
 
   await db
     .update(agent_environment_profiles)
@@ -212,7 +276,10 @@ export async function clearDefaultProfile(profileId: string, owner: ProfileOwner
  * Get the default profile for an owner.
  * Returns null if no default is set.
  */
-export async function getDefaultProfile(owner: ProfileOwner): Promise<ProfileResponse | null> {
+export async function getDefaultProfile(
+  db: WorkerDb,
+  owner: ProfileOwner
+): Promise<ProfileResponse | null> {
   const [profile] = await db
     .select()
     .from(agent_environment_profiles)
@@ -223,7 +290,7 @@ export async function getDefaultProfile(owner: ProfileOwner): Promise<ProfileRes
     return null;
   }
 
-  return getProfile(profile.id, owner);
+  return getProfile(db, profile.id, owner);
 }
 
 /**
@@ -231,6 +298,7 @@ export async function getDefaultProfile(owner: ProfileOwner): Promise<ProfileRes
  * Used for profile resolution in the prepare session API.
  */
 export async function getProfileByName(
+  db: WorkerDb,
   name: string,
   owner: ProfileOwner
 ): Promise<ProfileResponse | null> {
@@ -244,7 +312,7 @@ export async function getProfileByName(
     return null;
   }
 
-  return getProfile(profile.id, owner);
+  return getProfile(db, profile.id, owner);
 }
 
 /**
@@ -252,6 +320,7 @@ export async function getProfileByName(
  * Returns null if not found.
  */
 export async function getProfileIdByName(
+  db: WorkerDb,
   name: string,
   owner: ProfileOwner
 ): Promise<string | null> {
@@ -266,39 +335,41 @@ export async function getProfileIdByName(
 
 /**
  * Get the effective default profile ID for a user in org context.
- * Org default takes precedence over personal default.
+ * Personal default takes precedence over org default — a user-specific
+ * preference overrides the org-wide baseline.
  */
 export async function getEffectiveDefaultProfileId(
+  db: WorkerDb,
   userId: string,
   organizationId: string
 ): Promise<string | null> {
-  // Try org default first
-  const [orgDefault] = await db
+  // Try personal default first
+  const [userDefault] = await db
     .select({ id: agent_environment_profiles.id })
     .from(agent_environment_profiles)
     .where(
       and(
-        eq(agent_environment_profiles.owned_by_organization_id, organizationId),
+        eq(agent_environment_profiles.owned_by_user_id, userId),
         eq(agent_environment_profiles.is_default, true)
       )
     )
     .limit(1);
 
-  if (orgDefault) {
-    return orgDefault.id;
+  if (userDefault) {
+    return userDefault.id;
   }
 
-  // Fall back to personal default
-  const [userDefault] = await db
+  // Fall back to org default
+  const [orgDefault] = await db
     .select({ id: agent_environment_profiles.id })
     .from(agent_environment_profiles)
     .where(
       and(
-        eq(agent_environment_profiles.owned_by_user_id, userId),
+        eq(agent_environment_profiles.owned_by_organization_id, organizationId),
         eq(agent_environment_profiles.is_default, true)
       )
     )
     .limit(1);
 
-  return userDefault?.id ?? null;
+  return orgDefault?.id ?? null;
 }
diff --git a/packages/cloud-agent-profile/src/profile-session-config.ts b/packages/cloud-agent-profile/src/profile-session-config.ts
new file mode 100644
index 0000000000..fa019f1bb1
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-session-config.ts
@@ -0,0 +1,383 @@
+import * as z from 'zod';
+import type { WorkerDb } from '@kilocode/db';
+import { agent_environment_profiles } from '@kilocode/db/schema';
+import { and, eq } from 'drizzle-orm';
+import type { EncryptedEnvelope } from '@kilocode/encryption';
+import type { AgentConfig } from '@kilocode/db/schema-types';
+import { getEffectiveDefaultProfileId, getDefaultProfile } from './profile-service';
+import { getBindingForRepo } from './repo-binding-service';
+import { getVarsForSession } from './profile-vars-service';
+import { getCommandsForSession } from './profile-commands-service';
+import {
+  getMcpServersForSession,
+  type McpServerForSession,
+  type StoredMcpSecretValue,
+} from './profile-mcp-service';
+import { getSkillsForSession, type SkillForSession } from './profile-skills-service';
+import { getAgentsForSession, type AgentForSession } from './profile-agents-service';
+import { resolveProfileLayers } from './profile-resolution';
+import { buildOwnershipCondition } from './profile-utils';
+import type { ProfileOwner } from './types';
+
+// Schema to validate encrypted envelope structure from database
+const encryptedEnvelopeSchema = z.object({
+  encryptedData: z.string(),
+  encryptedDEK: z.string(),
+  algorithm: z.literal('rsa-aes-256-gcm'),
+  version: z.literal(1),
+});
+
+export class ProfileNotFoundError extends Error {
+  constructor(public profileId: string) {
+    super(`Profile '${profileId}' not found`);
+    this.name = 'ProfileNotFoundError';
+  }
+}
+
+export type MergedSkillForSession = {
+  name: string;
+  rawMarkdown: string;
+  files: Record<string, string>;
+};
+
+export type MergedAgentForSession = AgentForSession;
+
+/**
+ * Permissive shape for an inline runtime skill supplied by the caller. The
+ * cloud-agent-next service validates a stricter shape at its API boundary;
+ * this type stays loose so the package does not depend on service-side
+ * schemas.
+ */
+export type InlineSkillInput = {
+  name: string;
+  rawMarkdown: string;
+  files?: Record<string, string>;
+};
+
+/**
+ * Permissive shape for an inline runtime agent. `config` aliases the
+ * authoritative `AgentConfig` from the db package — runtime configs that
+ * round-trip through cloud-agent-next are structurally compatible.
+ */
+export type InlineAgentInput = {
+  slug: string;
+  name: string;
+  config: AgentConfig;
+};
+
+export type MergeProfileConfigurationArgs = {
+  /** Unambiguous profile identifier selected by the caller. */
+  profileId?: string;
+  owner: ProfileOwner;
+  /** When in org context, enables selecting a personal profile and using effective default. */
+  userId?: string;
+  repoFullName?: string;
+  platform?: 'github' | 'gitlab';
+  /**
+   * Inline values supplied alongside the profile stack. They form a single
+   * implicit "inline layer" applied on top of the resolved profile layers,
+   * so each collection follows the same precedence: repo-binding base <
+   * effective default / explicit override (top) < inline.
+   */
+  envVars?: Record<string, string>;
+  setupCommands?: string[];
+  encryptedSecrets?: Record<string, EncryptedEnvelope>;
+  mcpServers?: Record<string, ClientMcpServerValue>;
+  runtimeSkills?: InlineSkillInput[];
+  runtimeAgents?: InlineAgentInput[];
+};
+
+export type MergeProfileConfigurationResult = {
+  envVars?: Record<string, string>;
+  setupCommands?: string[];
+  encryptedSecrets?: Record<string, EncryptedEnvelope>;
+  mcpServers?: McpServerForSession[];
+  skills?: MergedSkillForSession[];
+  agents?: MergedAgentForSession[];
+};
+
+/** Ensure a profileId belongs to the given owner (or, for org context, to the user personally). */
+async function verifyProfileIdAccessible(
+  db: WorkerDb,
+  profileId: string,
+  owner: ProfileOwner,
+  userId?: string
+): Promise<void> {
+  // Check direct ownership.
+  const [asOwner] = await db
+    .select({ id: agent_environment_profiles.id })
+    .from(agent_environment_profiles)
+    .where(and(eq(agent_environment_profiles.id, profileId), buildOwnershipCondition(owner)))
+    .limit(1);
+  if (asOwner) return;
+
+  // In org context, a user may also select their personal profile.
+  if (owner.type === 'organization' && userId) {
+    const [asPersonal] = await db
+      .select({ id: agent_environment_profiles.id })
+      .from(agent_environment_profiles)
+      .where(
+        and(
+          eq(agent_environment_profiles.id, profileId),
+          buildOwnershipCondition({ type: 'user', id: userId })
+        )
+      )
+      .limit(1);
+    if (asPersonal) return;
+  }
+
+  throw new ProfileNotFoundError(profileId);
+}
+
+/**
+ * Normalized per-source contribution. Profile rows and inline args are both
+ * shaped into this so the merge becomes a single reduce.
+ */
+type Layer = {
+  envVars: Record<string, string>;
+  secrets: Record<string, EncryptedEnvelope>;
+  commands: string[];
+  mcpServers: McpServerForSession[];
+  skills: SkillForSession[];
+  agents: AgentForSession[];
+};
+
+type ProfileLayerData = {
+  vars: Awaited<ReturnType<typeof getVarsForSession>>;
+  commands: string[];
+  mcpServers: McpServerForSession[];
+  skills: SkillForSession[];
+  agents: AgentForSession[];
+};
+
+function profileToLayer(data: ProfileLayerData): Layer {
+  const envVars: Record<string, string> = {};
+  const secrets: Record<string, EncryptedEnvelope> = {};
+  for (const variable of data.vars) {
+    if (variable.isSecret) {
+      secrets[variable.key] = encryptedEnvelopeSchema.parse(JSON.parse(variable.value));
+    } else {
+      envVars[variable.key] = variable.value;
+    }
+  }
+  return {
+    envVars,
+    secrets,
+    commands: [...data.commands],
+    mcpServers: [...data.mcpServers],
+    skills: [...data.skills],
+    agents: [...data.agents],
+  };
+}
+
+function clientRecordToMcpServers(
+  record: Record<string, ClientMcpServerValue>
+): McpServerForSession[] {
+  return Object.entries(record).map(([name, server]) => {
+    if (server.type === 'local') {
+      return {
+        name,
+        type: 'local',
+        enabled: server.enabled ?? true,
+        timeout: server.timeout,
+        command: server.command,
+        environment: server.environment,
+      };
+    }
+    return {
+      name,
+      type: 'remote',
+      enabled: server.enabled ?? true,
+      timeout: server.timeout,
+      url: server.url,
+      headers: server.headers,
+    };
+  });
+}
+
+function inlineToLayer(args: MergeProfileConfigurationArgs): Layer | null {
+  const { envVars, encryptedSecrets, setupCommands, mcpServers, runtimeSkills, runtimeAgents } =
+    args;
+  const hasInline =
+    !!envVars ||
+    !!encryptedSecrets ||
+    (setupCommands?.length ?? 0) > 0 ||
+    !!mcpServers ||
+    (runtimeSkills?.length ?? 0) > 0 ||
+    (runtimeAgents?.length ?? 0) > 0;
+  if (!hasInline) return null;
+
+  return {
+    envVars: { ...(envVars ?? {}) },
+    secrets: { ...(encryptedSecrets ?? {}) },
+    commands: setupCommands ? [...setupCommands] : [],
+    mcpServers: mcpServers ? clientRecordToMcpServers(mcpServers) : [],
+    skills: (runtimeSkills ?? []).map(s => ({
+      name: s.name,
+      rawMarkdown: s.rawMarkdown,
+      files: s.files ?? {},
+    })),
+    agents: runtimeAgents ? [...runtimeAgents] : [],
+  };
+}
+
+/**
+ * Reduce layers into a single result. Precedence: later layer wins per key.
+ *
+ * Disabled MCP servers (`enabled === false`) are skipped — they neither
+ * contribute nor shadow an enabled entry of the same name in an earlier
+ * layer. This matches the per-profile behavior so the inline layer behaves
+ * symmetrically.
+ */
+function mergeLayers(layers: Layer[]): MergeProfileConfigurationResult {
+  const envVars: Record<string, string> = {};
+  const secrets: Record<string, EncryptedEnvelope> = {};
+  const commands: string[] = [];
+  const mcpByName = new Map<string, McpServerForSession>();
+  const skillByName = new Map<string, MergedSkillForSession>();
+  const agentBySlug = new Map<string, MergedAgentForSession>();
+
+  for (const layer of layers) {
+    Object.assign(envVars, layer.envVars);
+    Object.assign(secrets, layer.secrets);
+    commands.push(...layer.commands);
+    for (const server of layer.mcpServers) {
+      if (!server.enabled) continue;
+      mcpByName.set(server.name, server);
+    }
+    for (const skill of layer.skills) {
+      skillByName.set(skill.name, {
+        name: skill.name,
+        rawMarkdown: skill.rawMarkdown,
+        files: skill.files,
+      });
+    }
+    for (const agent of layer.agents) {
+      agentBySlug.set(agent.slug, agent);
+    }
+  }
+
+  return {
+    envVars: Object.keys(envVars).length > 0 ? envVars : undefined,
+    setupCommands: commands.length > 0 ? commands : undefined,
+    encryptedSecrets: Object.keys(secrets).length > 0 ? secrets : undefined,
+    mcpServers: mcpByName.size > 0 ? Array.from(mcpByName.values()) : undefined,
+    skills: skillByName.size > 0 ? Array.from(skillByName.values()) : undefined,
+    agents: agentBySlug.size > 0 ? Array.from(agentBySlug.values()) : undefined,
+  };
+}
+
+export async function mergeProfileConfiguration(
+  db: WorkerDb,
+  args: MergeProfileConfigurationArgs
+): Promise<MergeProfileConfigurationResult> {
+  const { profileId, owner, userId, repoFullName, platform } = args;
+
+  // Look up the inputs to resolution.
+  const repoBindingProfileId =
+    repoFullName && platform ? await getBindingForRepo(db, owner, repoFullName, platform) : null;
+
+  let explicitOverrideProfileId: string | null = null;
+  if (profileId) {
+    await verifyProfileIdAccessible(db, profileId, owner, userId);
+    explicitOverrideProfileId = profileId;
+  }
+
+  // Default fills the top slot when no explicit pick is made — even if a
+  // repo binding is also present, in which case the default layers on top.
+  const effectiveDefaultProfileId = explicitOverrideProfileId
+    ? null
+    : owner.type === 'organization' && userId
+      ? await getEffectiveDefaultProfileId(db, userId, owner.id)
+      : ((await getDefaultProfile(db, owner))?.id ?? null);
+
+  const { base, top } = resolveProfileLayers({
+    repoBindingProfileId,
+    effectiveDefaultProfileId,
+    explicitOverrideProfileId,
+  });
+
+  // Load profile data for the resolved layers in parallel.
+  const profilesToLoad: string[] = [];
+  if (base) profilesToLoad.push(base.profileId);
+  if (top) profilesToLoad.push(top.profileId);
+
+  const profileData = await Promise.all(
+    profilesToLoad.map(async id => {
+      const [vars, commands, mcpServers, skills, agents] = await Promise.all([
+        getVarsForSession(db, id),
+        getCommandsForSession(db, id),
+        getMcpServersForSession(db, id),
+        getSkillsForSession(db, id),
+        getAgentsForSession(db, id),
+      ]);
+      return { profileId: id, vars, commands, mcpServers, skills, agents };
+    })
+  );
+
+  // Stack layers in precedence order: repo-binding base < explicit/default
+  // top < inline. The inline layer is built from the args and treated as
+  // just one more profile so the merge logic does not branch on its source.
+  const layers: Layer[] = [];
+  const baseData = base ? profileData.find(d => d.profileId === base.profileId) : null;
+  const topData = top ? profileData.find(d => d.profileId === top.profileId) : null;
+  if (baseData) layers.push(profileToLayer(baseData));
+  if (topData) layers.push(profileToLayer(topData));
+  const inline = inlineToLayer(args);
+  if (inline) layers.push(inline);
+
+  return mergeLayers(layers);
+}
+
+/**
+ * Shape the cloud-agent-next client accepts for each MCP server in the
+ * `mcpServers` record. Each env/header value is either a plain string or an
+ * encrypted envelope; the worker decrypts envelope-shaped entries per key
+ * just before writing KILO_CONFIG_CONTENT.
+ */
+export type ClientMcpServerValue =
+  | {
+      type: 'local';
+      command: string[];
+      environment?: Record<string, StoredMcpSecretValue>;
+      enabled?: boolean;
+      timeout?: number;
+    }
+  | {
+      type: 'remote';
+      url: string;
+      headers?: Record<string, StoredMcpSecretValue>;
+      enabled?: boolean;
+      timeout?: number;
+    };
+
+/**
+ * Convert the merged profile MCP servers into the Record<name, value>
+ * shape accepted by the cloud-agent-next client.
+ */
+export function profileMcpServersToClientRecord(
+  servers: McpServerForSession[] | undefined
+): Record<string, ClientMcpServerValue> | undefined {
+  if (!servers || servers.length === 0) return undefined;
+  const out: Record<string, ClientMcpServerValue> = {};
+  for (const server of servers) {
+    if (server.type === 'local') {
+      out[server.name] = {
+        type: 'local',
+        command: server.command ?? [],
+        environment: server.environment,
+        enabled: server.enabled,
+        timeout: server.timeout,
+      };
+    } else {
+      out[server.name] = {
+        type: 'remote',
+        url: server.url ?? '',
+        headers: server.headers,
+        enabled: server.enabled,
+        timeout: server.timeout,
+      };
+    }
+  }
+  return out;
+}
diff --git a/packages/cloud-agent-profile/src/profile-skills-service.ts b/packages/cloud-agent-profile/src/profile-skills-service.ts
new file mode 100644
index 0000000000..0873a3be94
--- /dev/null
+++ b/packages/cloud-agent-profile/src/profile-skills-service.ts
@@ -0,0 +1,324 @@
+import type { WorkerDb } from '@kilocode/db';
+import {
+  agent_environment_profile_skills,
+  type AgentEnvironmentProfileSkill,
+} from '@kilocode/db/schema';
+import { and, eq, count } from 'drizzle-orm';
+import { TRPCError } from '@trpc/server';
+import * as z from 'zod';
+import type { ProfileOwner, ProfileSkillResponse } from './types';
+import { verifyProfileOwnership } from './profile-utils';
+
+export const MAX_PROFILE_SKILLS = 50;
+export const MAX_SKILL_NAME_LENGTH = 100;
+export const MAX_SKILL_MARKDOWN_LENGTH = 100_000; // ~100 KB
+export const MAX_SKILL_DESCRIPTION_LENGTH = 2000;
+/** Companion-file limits for multi-file skills (SKILL.md itself is stored in raw_markdown). */
+export const MAX_SKILL_COMPANION_FILES = 20;
+export const MAX_SKILL_COMPANION_FILE_SIZE = 100_000; // ~100 KB per file
+export const MAX_SKILL_COMPANION_FILES_TOTAL = 500_000; // ~500 KB across all companion files
+export const MAX_SKILL_COMPANION_PATH_LENGTH = 200;
+
+const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+const SKILL_FILE_PATH_PATTERN = /^[a-zA-Z0-9._\-/]+$/;
+
+export const skillNameSchema = z
+  .string()
+  .min(1)
+  .max(MAX_SKILL_NAME_LENGTH)
+  .regex(
+    SKILL_NAME_PATTERN,
+    'Skill name must be lowercase, start with a letter or digit, and contain only letters, digits, and dashes'
+  );
+
+/**
+ * Validate a map of companion files. Keys are relative paths inside the skill
+ * directory, values are the file contents. `SKILL.md` itself is stored in
+ * `raw_markdown` and must not appear here.
+ */
+export const skillFilesSchema = z
+  .record(z.string(), z.string())
+  .refine(
+    files => Object.keys(files).length <= MAX_SKILL_COMPANION_FILES,
+    `Skill may have at most ${MAX_SKILL_COMPANION_FILES} companion files`
+  )
+  .superRefine((files, ctx) => {
+    let total = 0;
+    for (const [path, content] of Object.entries(files)) {
+      if (path.length === 0 || path.length > MAX_SKILL_COMPANION_PATH_LENGTH) {
+        ctx.addIssue({
+          code: 'custom',
+          message: `Invalid skill file path length: ${path.slice(0, 80)}`,
+        });
+        return;
+      }
+      if (!SKILL_FILE_PATH_PATTERN.test(path)) {
+        ctx.addIssue({
+          code: 'custom',
+          message: `Skill file path contains invalid characters: ${path}`,
+        });
+        return;
+      }
+      if (path.startsWith('/') || path.includes('..') || path.includes('//')) {
+        ctx.addIssue({ code: 'custom', message: `Skill file path rejected: ${path}` });
+        return;
+      }
+      if (path === 'SKILL.md' || path.toLowerCase() === 'skill.md') {
+        ctx.addIssue({
+          code: 'custom',
+          message: 'SKILL.md must be supplied as rawMarkdown, not in files',
+        });
+        return;
+      }
+      if (content.length > MAX_SKILL_COMPANION_FILE_SIZE) {
+        ctx.addIssue({
+          code: 'custom',
+          message: `Skill companion file ${path} exceeds ${MAX_SKILL_COMPANION_FILE_SIZE} bytes`,
+        });
+        return;
+      }
+      total += content.length;
+    }
+    if (total > MAX_SKILL_COMPANION_FILES_TOTAL) {
+      ctx.addIssue({
+        code: 'custom',
+        message: `Skill companion files total ${total} bytes, exceeds ${MAX_SKILL_COMPANION_FILES_TOTAL}`,
+      });
+    }
+  });
+
+/** Input for creating a custom skill by pasting SKILL.md directly. */
+export const skillCustomInputSchema = z.object({
+  name: skillNameSchema,
+  description: z.string().max(MAX_SKILL_DESCRIPTION_LENGTH).optional(),
+  rawMarkdown: z
+    .string()
+    .min(1)
+    .max(MAX_SKILL_MARKDOWN_LENGTH, `Skill markdown exceeds ${MAX_SKILL_MARKDOWN_LENGTH} bytes`),
+  files: skillFilesSchema.optional(),
+  enabled: z.boolean().optional(),
+});
+
+/** Input for updating a skill. */
+export const skillUpdateInputSchema = z.object({
+  name: skillNameSchema.optional(),
+  description: z.string().max(MAX_SKILL_DESCRIPTION_LENGTH).nullable().optional(),
+  rawMarkdown: z
+    .string()
+    .min(1)
+    .max(MAX_SKILL_MARKDOWN_LENGTH, `Skill markdown exceeds ${MAX_SKILL_MARKDOWN_LENGTH} bytes`)
+    .optional(),
+  files: skillFilesSchema.optional(),
+  enabled: z.boolean().optional(),
+});
+
+export type SkillCustomInput = z.infer<typeof skillCustomInputSchema>;
+export type SkillUpdateInput = z.infer<typeof skillUpdateInputSchema>;
+
+/**
+ * Extract YAML frontmatter `name` and `description` from SKILL.md.
+ * Supports both --- and +++ delimiters. Returns `null` if no frontmatter.
+ */
+export function parseSkillFrontmatter(rawMarkdown: string): {
+  name: string | null;
+  description: string | null;
+} {
+  const match = rawMarkdown.match(/^---\s*\r?\n([\s\S]*?)\r?\n---\s*\r?\n/);
+  if (!match) {
+    return { name: null, description: null };
+  }
+  const frontmatter = match[1];
+  const nameMatch = frontmatter.match(/^name\s*:\s*(.+)$/m);
+  const descMatch = frontmatter.match(/^description\s*:\s*(.+)$/m);
+  const stripQuotes = (v: string): string => {
+    const trimmed = v.trim();
+    if (
+      (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+      (trimmed.startsWith("'") && trimmed.endsWith("'"))
+    ) {
+      return trimmed.slice(1, -1);
+    }
+    return trimmed;
+  };
+  return {
+    name: nameMatch ? stripQuotes(nameMatch[1]) : null,
+    description: descMatch ? stripQuotes(descMatch[1]) : null,
+  };
+}
+
+function toResponse(skill: AgentEnvironmentProfileSkill): ProfileSkillResponse {
+  return {
+    id: skill.id,
+    name: skill.name,
+    description: skill.description,
+    sourceType: skill.source_type,
+    sourceUrl: skill.source_url,
+    rawMarkdown: skill.raw_markdown,
+    files: skill.files ?? {},
+    enabled: skill.enabled,
+    createdAt: skill.created_at,
+    updatedAt: skill.updated_at,
+  };
+}
+
+async function assertSkillLimit(db: WorkerDb, profileId: string): Promise<void> {
+  const [row] = await db
+    .select({ n: count() })
+    .from(agent_environment_profile_skills)
+    .where(eq(agent_environment_profile_skills.profile_id, profileId));
+  if (Number(row.n) >= MAX_PROFILE_SKILLS) {
+    throw new TRPCError({
+      code: 'PRECONDITION_FAILED',
+      message: `Profiles are limited to ${MAX_PROFILE_SKILLS} skills`,
+    });
+  }
+}
+
+async function fetchSkill(
+  db: WorkerDb,
+  skillId: string,
+  profileId: string
+): Promise<AgentEnvironmentProfileSkill> {
+  const [skill] = await db
+    .select()
+    .from(agent_environment_profile_skills)
+    .where(
+      and(
+        eq(agent_environment_profile_skills.id, skillId),
+        eq(agent_environment_profile_skills.profile_id, profileId)
+      )
+    )
+    .limit(1);
+  if (!skill) {
+    throw new TRPCError({ code: 'NOT_FOUND', message: 'Skill not found' });
+  }
+  return skill;
+}
+
+/**
+ * List all skills for a profile in name order.
+ * Internal: no ownership check; used by `profile-service.getProfile`.
+ */
+export async function listSkillsForProfile(
+  db: WorkerDb,
+  profileId: string
+): Promise<ProfileSkillResponse[]> {
+  const skills = await db
+    .select()
+    .from(agent_environment_profile_skills)
+    .where(eq(agent_environment_profile_skills.profile_id, profileId))
+    .orderBy(agent_environment_profile_skills.name);
+  return skills.map(toResponse);
+}
+
+export async function createCustomSkill(
+  db: WorkerDb,
+  profileId: string,
+  input: SkillCustomInput,
+  owner: ProfileOwner
+): Promise<{ id: string }> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await assertSkillLimit(db, profileId);
+
+  const [row] = await db
+    .insert(agent_environment_profile_skills)
+    .values({
+      profile_id: profileId,
+      name: input.name,
+      description: input.description ?? null,
+      source_type: 'custom',
+      source_url: null,
+      raw_markdown: input.rawMarkdown,
+      files: input.files ?? {},
+      enabled: input.enabled ?? true,
+    })
+    .returning({ id: agent_environment_profile_skills.id });
+
+  return { id: row.id };
+}
+
+export async function updateSkill(
+  db: WorkerDb,
+  profileId: string,
+  skillId: string,
+  input: SkillUpdateInput,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchSkill(db, skillId, profileId);
+
+  const updates: Partial<AgentEnvironmentProfileSkill> = {};
+  if (input.name !== undefined) updates.name = input.name;
+  if (input.description !== undefined) updates.description = input.description;
+  if (input.rawMarkdown !== undefined) updates.raw_markdown = input.rawMarkdown;
+  if (input.files !== undefined) updates.files = input.files;
+  if (input.enabled !== undefined) updates.enabled = input.enabled;
+
+  if (Object.keys(updates).length === 0) {
+    return;
+  }
+
+  await db
+    .update(agent_environment_profile_skills)
+    .set(updates)
+    .where(eq(agent_environment_profile_skills.id, skillId));
+}
+
+export async function deleteSkill(
+  db: WorkerDb,
+  profileId: string,
+  skillId: string,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchSkill(db, skillId, profileId);
+  await db
+    .delete(agent_environment_profile_skills)
+    .where(eq(agent_environment_profile_skills.id, skillId));
+}
+
+export async function setSkillEnabled(
+  db: WorkerDb,
+  profileId: string,
+  skillId: string,
+  enabled: boolean,
+  owner: ProfileOwner
+): Promise<void> {
+  await verifyProfileOwnership(db, profileId, owner);
+  await fetchSkill(db, skillId, profileId);
+  await db
+    .update(agent_environment_profile_skills)
+    .set({ enabled })
+    .where(eq(agent_environment_profile_skills.id, skillId));
+}
+
+/**
+ * Shape used for session materialization. Only enabled skills are returned.
+ * Internal: no ownership check.
+ */
+export type SkillForSession = {
+  name: string;
+  rawMarkdown: string;
+  files: Record<string, string>;
+};
+
+export async function getSkillsForSession(
+  db: WorkerDb,
+  profileId: string
+): Promise<SkillForSession[]> {
+  const skills = await db
+    .select({
+      name: agent_environment_profile_skills.name,
+      rawMarkdown: agent_environment_profile_skills.raw_markdown,
+      files: agent_environment_profile_skills.files,
+    })
+    .from(agent_environment_profile_skills)
+    .where(
+      and(
+        eq(agent_environment_profile_skills.profile_id, profileId),
+        eq(agent_environment_profile_skills.enabled, true)
+      )
+    )
+    .orderBy(agent_environment_profile_skills.name);
+  return skills.map(s => ({ ...s, files: s.files ?? {} }));
+}
diff --git a/apps/web/src/lib/agent/profile-utils.ts b/packages/cloud-agent-profile/src/profile-utils.ts
similarity index 86%
rename from apps/web/src/lib/agent/profile-utils.ts
rename to packages/cloud-agent-profile/src/profile-utils.ts
index e7ffa3af6a..7669c51bfd 100644
--- a/apps/web/src/lib/agent/profile-utils.ts
+++ b/packages/cloud-agent-profile/src/profile-utils.ts
@@ -1,5 +1,4 @@
-import 'server-only';
-import { db } from '@/lib/drizzle';
+import type { WorkerDb } from '@kilocode/db';
 import { agent_environment_profiles } from '@kilocode/db/schema';
 import { eq, and } from 'drizzle-orm';
 import { TRPCError } from '@trpc/server';
@@ -18,7 +17,7 @@ export function buildOwnershipCondition(owner: ProfileOwner) {
  * Verify that a profile exists and is owned by the specified owner.
  * @throws TRPCError with NOT_FOUND if profile doesn't exist or isn't owned by the owner
  */
-export async function verifyProfileOwnership(profileId: string, owner: ProfileOwner) {
+export async function verifyProfileOwnership(db: WorkerDb, profileId: string, owner: ProfileOwner) {
   const [profile] = await db
     .select()
     .from(agent_environment_profiles)
diff --git a/apps/web/src/lib/agent/profile-vars-service.ts b/packages/cloud-agent-profile/src/profile-vars-service.ts
similarity index 82%
rename from apps/web/src/lib/agent/profile-vars-service.ts
rename to packages/cloud-agent-profile/src/profile-vars-service.ts
index a637be408a..fcfaf76908 100644
--- a/apps/web/src/lib/agent/profile-vars-service.ts
+++ b/packages/cloud-agent-profile/src/profile-vars-service.ts
@@ -1,25 +1,23 @@
-import 'server-only';
-import { db } from '@/lib/drizzle';
+import type { WorkerDb } from '@kilocode/db';
 import { agent_environment_profile_vars } from '@kilocode/db/schema';
 import { eq, and, sql } from 'drizzle-orm';
 import { TRPCError } from '@trpc/server';
-import { encryptWithPublicKey } from '@/lib/encryption';
-import { AGENT_ENV_VARS_PUBLIC_KEY } from '@/lib/config.server';
+import { encryptWithPublicKey } from '@kilocode/encryption';
 import type { ProfileOwner, ProfileVarResponse } from './types';
 import { verifyProfileOwnership } from './profile-utils';
 
 /**
- * Encrypt a value using the agent env vars public key.
+ * Encrypt a value using the agent env vars public key (base64-encoded).
  */
-function encryptValue(value: string): string {
-  if (!AGENT_ENV_VARS_PUBLIC_KEY) {
+function encryptValue(publicKeyBase64: string, value: string): string {
+  if (!publicKeyBase64) {
     throw new TRPCError({
       code: 'INTERNAL_SERVER_ERROR',
       message: 'Agent environment encryption key not configured',
     });
   }
 
-  const publicKey = Buffer.from(AGENT_ENV_VARS_PUBLIC_KEY, 'base64');
+  const publicKey = Buffer.from(publicKeyBase64, 'base64');
   const envelope = encryptWithPublicKey(value, publicKey);
   return JSON.stringify(envelope);
 }
@@ -29,15 +27,17 @@ function encryptValue(value: string): string {
  * If isSecret is true, the value is encrypted before storage.
  */
 export async function setVar(
+  db: WorkerDb,
+  publicKeyBase64: string,
   profileId: string,
   key: string,
   value: string,
   isSecret: boolean,
   owner: ProfileOwner
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
-  const storedValue = isSecret ? encryptValue(value) : value;
+  const storedValue = isSecret ? encryptValue(publicKeyBase64, value) : value;
 
   await db
     .insert(agent_environment_profile_vars)
@@ -61,11 +61,12 @@ export async function setVar(
  * Delete an environment variable from a profile.
  */
 export async function deleteVar(
+  db: WorkerDb,
   profileId: string,
   key: string,
   owner: ProfileOwner
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   const result = await db
     .delete(agent_environment_profile_vars)
@@ -90,10 +91,11 @@ export async function deleteVar(
  * Secret values are masked as '***'.
  */
 export async function listVars(
+  db: WorkerDb,
   profileId: string,
   owner: ProfileOwner
 ): Promise<ProfileVarResponse[]> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   const vars = await db
     .select({
@@ -130,7 +132,7 @@ export type VarForSession = {
  * Returns encrypted envelopes for secrets (not decrypted).
  * This is an internal function - no ownership check.
  */
-export async function getVarsForSession(profileId: string): Promise<VarForSession[]> {
+export async function getVarsForSession(db: WorkerDb, profileId: string): Promise<VarForSession[]> {
   const vars = await db
     .select({
       key: agent_environment_profile_vars.key,
@@ -152,11 +154,13 @@ export async function getVarsForSession(profileId: string): Promise<VarForSessio
  * Useful for importing or updating multiple vars at once.
  */
 export async function setVars(
+  db: WorkerDb,
+  publicKeyBase64: string,
   profileId: string,
   vars: Array<{ key: string; value: string; isSecret: boolean }>,
   owner: ProfileOwner
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
+  await verifyProfileOwnership(db, profileId, owner);
 
   if (vars.length === 0) {
     return;
@@ -165,7 +169,7 @@ export async function setVars(
   const values = vars.map(v => ({
     profile_id: profileId,
     key: v.key,
-    value: v.isSecret ? encryptValue(v.value) : v.value,
+    value: v.isSecret ? encryptValue(publicKeyBase64, v.value) : v.value,
     is_secret: v.isSecret,
   }));
 
diff --git a/apps/web/src/lib/agent/repo-binding-db.ts b/packages/cloud-agent-profile/src/repo-binding-db.ts
similarity index 93%
rename from apps/web/src/lib/agent/repo-binding-db.ts
rename to packages/cloud-agent-profile/src/repo-binding-db.ts
index bff3d9830b..7e6d6de433 100644
--- a/apps/web/src/lib/agent/repo-binding-db.ts
+++ b/packages/cloud-agent-profile/src/repo-binding-db.ts
@@ -1,5 +1,4 @@
-import 'server-only';
-import { db } from '@/lib/drizzle';
+import type { WorkerDb } from '@kilocode/db';
 import {
   agent_environment_profiles,
   agent_environment_profile_repo_bindings,
@@ -30,6 +29,7 @@ function ownerColumns(owner: ProfileOwner) {
  * Uses ON CONFLICT on the partial unique index to atomically resolve races.
  */
 export async function upsertBinding(
+  db: WorkerDb,
   owner: ProfileOwner,
   repoFullName: string,
   platform: 'github' | 'gitlab',
@@ -72,6 +72,7 @@ export async function upsertBinding(
  * Find a binding by repo+platform+owner.
  */
 export async function findBinding(
+  db: WorkerDb,
   owner: ProfileOwner,
   repoFullName: string,
   platform: 'github' | 'gitlab'
@@ -97,7 +98,7 @@ export async function findBinding(
 /**
  * Delete a binding by ID.
  */
-export async function deleteBinding(bindingId: string): Promise<void> {
+export async function deleteBinding(db: WorkerDb, bindingId: string): Promise<void> {
   await db
     .delete(agent_environment_profile_repo_bindings)
     .where(eq(agent_environment_profile_repo_bindings.id, bindingId));
@@ -106,7 +107,7 @@ export async function deleteBinding(bindingId: string): Promise<void> {
 /**
  * List all bindings for an owner, joined with profile names.
  */
-export async function selectBindingsWithProfiles(owner: ProfileOwner) {
+export async function selectBindingsWithProfiles(db: WorkerDb, owner: ProfileOwner) {
   return db
     .select({
       repoFullName: agent_environment_profile_repo_bindings.repo_full_name,
diff --git a/apps/web/src/lib/agent/repo-binding-service.ts b/packages/cloud-agent-profile/src/repo-binding-service.ts
similarity index 72%
rename from apps/web/src/lib/agent/repo-binding-service.ts
rename to packages/cloud-agent-profile/src/repo-binding-service.ts
index 1d98d18a25..22235bbe91 100644
--- a/apps/web/src/lib/agent/repo-binding-service.ts
+++ b/packages/cloud-agent-profile/src/repo-binding-service.ts
@@ -1,4 +1,4 @@
-import 'server-only';
+import type { WorkerDb } from '@kilocode/db';
 import { TRPCError } from '@trpc/server';
 import type { ProfileOwner } from './types';
 import { verifyProfileOwnership } from './profile-utils';
@@ -21,25 +21,27 @@ type RepoBinding = {
  * Atomic upsert — safe against concurrent calls for the same owner+repo+platform.
  */
 export async function bindProfileToRepo(
+  db: WorkerDb,
   owner: ProfileOwner,
   repoFullName: string,
   platform: 'github' | 'gitlab',
   profileId: string
 ): Promise<void> {
-  await verifyProfileOwnership(profileId, owner);
-  await upsertBinding(owner, repoFullName.toLowerCase(), platform, profileId);
+  await verifyProfileOwnership(db, profileId, owner);
+  await upsertBinding(db, owner, repoFullName.toLowerCase(), platform, profileId);
 }
 
 /**
  * Remove the profile binding for a repository.
  */
 export async function unbindRepo(
+  db: WorkerDb,
   owner: ProfileOwner,
   repoFullName: string,
   platform: 'github' | 'gitlab'
 ): Promise<void> {
   const repoLower = repoFullName.toLowerCase();
-  const binding = await findBinding(owner, repoLower, platform);
+  const binding = await findBinding(db, owner, repoLower, platform);
 
   if (!binding) {
     throw new TRPCError({
@@ -48,7 +50,7 @@ export async function unbindRepo(
     });
   }
 
-  await deleteBinding(binding.bindingId);
+  await deleteBinding(db, binding.bindingId);
 }
 
 /**
@@ -56,18 +58,19 @@ export async function unbindRepo(
  * Returns the profile_id if found, null otherwise.
  */
 export async function getBindingForRepo(
+  db: WorkerDb,
   owner: ProfileOwner,
   repoFullName: string,
   platform: 'github' | 'gitlab'
 ): Promise<string | null> {
   const repoLower = repoFullName.toLowerCase();
-  const binding = await findBinding(owner, repoLower, platform);
+  const binding = await findBinding(db, owner, repoLower, platform);
   return binding?.profileId ?? null;
 }
 
 /**
  * List all repo-profile bindings for the given owner.
  */
-export async function listBindings(owner: ProfileOwner): Promise<RepoBinding[]> {
-  return selectBindingsWithProfiles(owner);
+export async function listBindings(db: WorkerDb, owner: ProfileOwner): Promise<RepoBinding[]> {
+  return selectBindingsWithProfiles(db, owner);
 }
diff --git a/packages/cloud-agent-profile/src/types.ts b/packages/cloud-agent-profile/src/types.ts
new file mode 100644
index 0000000000..6a02dcdc41
--- /dev/null
+++ b/packages/cloud-agent-profile/src/types.ts
@@ -0,0 +1,130 @@
+import type { AgentConfig } from '@kilocode/db/schema-types';
+
+/** Owner type for agent environment profiles - exactly one of organizationId or userId must be set. */
+export type ProfileOwner = { type: 'organization'; id: string } | { type: 'user'; id: string };
+
+/** Owner type discriminator for UI display. */
+export type ProfileOwnerType = ProfileOwner['type'];
+
+/** Profile variable response type (for API responses). Secret values are masked. */
+export type ProfileVarResponse = {
+  key: string;
+  value: string; // Masked as '***' for secrets
+  isSecret: boolean;
+  createdAt: string;
+  updatedAt: string;
+};
+
+/** Profile command response type. */
+export type ProfileCommandResponse = {
+  sequence: number;
+  command: string;
+};
+
+/**
+ * Sanitized representation of an MCP server on a profile. Secret env/header
+ * values are masked as the placeholder string `"••••"` so the UI can show
+ * key names and count without ever exposing plaintext or ciphertext to the
+ * browser.
+ */
+export type ProfileMcpServerResponse = {
+  id: string;
+  name: string;
+  type: 'local' | 'remote';
+  enabled: boolean;
+  timeout: number | null;
+  /** CLI-native config with env/header values masked. */
+  config: McpServerConfigFragment;
+  createdAt: string;
+  updatedAt: string;
+};
+
+/**
+ * CLI-native MCP config fragment with env/header values always as strings.
+ * On GET responses the strings are the masked placeholder; in request inputs
+ * they are the plaintext value the caller wants encrypted at-rest.
+ */
+export type McpServerConfigFragment =
+  | {
+      command: string[];
+      environment?: Record<string, string>;
+    }
+  | {
+      url: string;
+      headers?: Record<string, string>;
+    };
+
+/** Placeholder returned in place of encrypted env/header values on GET responses. */
+export const MASKED_SECRET_VALUE = '\u2022\u2022\u2022\u2022';
+
+/** Skill response (as returned from the API). Includes raw markdown since the markdown *is* the artifact. */
+export type ProfileSkillResponse = {
+  id: string;
+  name: string;
+  description: string | null;
+  sourceType: 'marketplace' | 'custom';
+  sourceUrl: string | null;
+  rawMarkdown: string;
+  /** Companion files (excluding SKILL.md). Relative path → content. */
+  files: Record<string, string>;
+  enabled: boolean;
+  createdAt: string;
+  updatedAt: string;
+};
+
+/** Agent response (as returned from the API). Mirrors the kilocode CLI's AgentConfig shape. */
+export type ProfileAgentResponse = {
+  id: string;
+  slug: string;
+  name: string;
+  config: AgentConfig;
+  createdAt: string;
+  updatedAt: string;
+};
+
+/** Profile response type for list/get operations. */
+export type ProfileResponse = {
+  id: string;
+  name: string;
+  description: string | null;
+  isDefault: boolean;
+  createdAt: string;
+  updatedAt: string;
+  vars: ProfileVarResponse[];
+  commands: ProfileCommandResponse[];
+  mcpServers: ProfileMcpServerResponse[];
+  skills: ProfileSkillResponse[];
+  agents: ProfileAgentResponse[];
+};
+
+/** Profile response with owner type for combined listings. */
+export type ProfileResponseWithOwner = ProfileResponse & {
+  ownerType: ProfileOwnerType;
+};
+
+/** Profile summary for list operations (without vars/commands). */
+export type ProfileSummary = {
+  id: string;
+  name: string;
+  description: string | null;
+  isDefault: boolean;
+  createdAt: string;
+  updatedAt: string;
+  varCount: number;
+  commandCount: number;
+  mcpServerCount: number;
+  skillCount: number;
+  agentCount: number;
+};
+
+/** Profile summary with owner type for combined listings. */
+export type ProfileSummaryWithOwner = ProfileSummary & {
+  ownerType: ProfileOwnerType;
+};
+
+/** Combined profiles result for org context - returns both org and personal profiles with effective default. */
+export type CombinedProfilesResult = {
+  orgProfiles: ProfileSummaryWithOwner[];
+  personalProfiles: ProfileSummaryWithOwner[];
+  effectiveDefaultId: string | null;
+};
diff --git a/packages/cloud-agent-profile/tsconfig.json b/packages/cloud-agent-profile/tsconfig.json
new file mode 100644
index 0000000000..755a33ad75
--- /dev/null
+++ b/packages/cloud-agent-profile/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["esnext"],
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "isolatedModules": true,
+    "resolveJsonModule": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/db/src/migrations/0116_regular_molly_hayes.sql b/packages/db/src/migrations/0116_regular_molly_hayes.sql
new file mode 100644
index 0000000000..fa312caa03
--- /dev/null
+++ b/packages/db/src/migrations/0116_regular_molly_hayes.sql
@@ -0,0 +1,47 @@
+CREATE TABLE "agent_environment_profile_agents" (
+	"id" uuid PRIMARY KEY DEFAULT pg_catalog.gen_random_uuid() NOT NULL,
+	"profile_id" uuid NOT NULL,
+	"slug" text NOT NULL,
+	"name" text NOT NULL,
+	"config" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "UQ_agent_env_profile_agents_profile_slug" UNIQUE("profile_id","slug")
+);
+--> statement-breakpoint
+CREATE TABLE "agent_environment_profile_mcp_servers" (
+	"id" uuid PRIMARY KEY DEFAULT pg_catalog.gen_random_uuid() NOT NULL,
+	"profile_id" uuid NOT NULL,
+	"name" text NOT NULL,
+	"type" text NOT NULL,
+	"enabled" boolean DEFAULT true NOT NULL,
+	"timeout" integer,
+	"config" jsonb NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "UQ_agent_env_profile_mcp_servers_profile_name" UNIQUE("profile_id","name")
+);
+--> statement-breakpoint
+CREATE TABLE "agent_environment_profile_skills" (
+	"id" uuid PRIMARY KEY DEFAULT pg_catalog.gen_random_uuid() NOT NULL,
+	"profile_id" uuid NOT NULL,
+	"name" text NOT NULL,
+	"description" text,
+	"source_type" text NOT NULL,
+	"source_url" text,
+	"raw_markdown" text NOT NULL,
+	"files" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	"enabled" boolean DEFAULT true NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "UQ_agent_env_profile_skills_profile_name" UNIQUE("profile_id","name")
+);
+--> statement-breakpoint
+ALTER TABLE "agent_environment_profiles" ADD COLUMN "created_by_user_id" text;--> statement-breakpoint
+ALTER TABLE "agent_environment_profile_agents" ADD CONSTRAINT "agent_environment_profile_agents_profile_id_agent_environment_profiles_id_fk" FOREIGN KEY ("profile_id") REFERENCES "public"."agent_environment_profiles"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "agent_environment_profile_mcp_servers" ADD CONSTRAINT "agent_environment_profile_mcp_servers_profile_id_agent_environment_profiles_id_fk" FOREIGN KEY ("profile_id") REFERENCES "public"."agent_environment_profiles"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "agent_environment_profile_skills" ADD CONSTRAINT "agent_environment_profile_skills_profile_id_agent_environment_profiles_id_fk" FOREIGN KEY ("profile_id") REFERENCES "public"."agent_environment_profiles"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "IDX_agent_env_profile_agents_profile_id" ON "agent_environment_profile_agents" USING btree ("profile_id");--> statement-breakpoint
+CREATE INDEX "IDX_agent_env_profile_mcp_servers_profile_id" ON "agent_environment_profile_mcp_servers" USING btree ("profile_id");--> statement-breakpoint
+CREATE INDEX "IDX_agent_env_profile_skills_profile_id" ON "agent_environment_profile_skills" USING btree ("profile_id");--> statement-breakpoint
+CREATE INDEX "IDX_agent_env_profiles_created_by_user_id" ON "agent_environment_profiles" USING btree ("created_by_user_id");
\ No newline at end of file
diff --git a/packages/db/src/migrations/meta/0110_snapshot.json b/packages/db/src/migrations/meta/0116_snapshot.json
similarity index 97%
rename from packages/db/src/migrations/meta/0110_snapshot.json
rename to packages/db/src/migrations/meta/0116_snapshot.json
index 4f17b21879..dc4e8352ee 100644
--- a/packages/db/src/migrations/meta/0110_snapshot.json
+++ b/packages/db/src/migrations/meta/0116_snapshot.json
@@ -1,6 +1,6 @@
 {
-  "id": "b5dec53e-5f7f-46a2-9620-afadcf3f6acc",
-  "prevId": "4c1ec3c4-df75-4028-a0ab-68a0ad3c1c4d",
+  "id": "77e54b52-7043-45fc-9f33-4db6d18e08ed",
+  "prevId": "70ee6c69-9e0a-45f9-b7ba-bec85b66ca81",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
@@ -205,6 +205,104 @@
       },
       "isRLSEnabled": false
     },
+    "public.agent_environment_profile_agents": {
+      "name": "agent_environment_profile_agents",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "pg_catalog.gen_random_uuid()"
+        },
+        "profile_id": {
+          "name": "profile_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "IDX_agent_env_profile_agents_profile_id": {
+          "name": "IDX_agent_env_profile_agents_profile_id",
+          "columns": [
+            {
+              "expression": "profile_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "agent_environment_profile_agents_profile_id_agent_environment_profiles_id_fk": {
+          "name": "agent_environment_profile_agents_profile_id_agent_environment_profiles_id_fk",
+          "tableFrom": "agent_environment_profile_agents",
+          "tableTo": "agent_environment_profiles",
+          "columnsFrom": [
+            "profile_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "UQ_agent_env_profile_agents_profile_slug": {
+          "name": "UQ_agent_env_profile_agents_profile_slug",
+          "nullsNotDistinct": false,
+          "columns": [
+            "profile_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.agent_environment_profile_commands": {
       "name": "agent_environment_profile_commands",
       "schema": "",
@@ -289,6 +387,116 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
+    "public.agent_environment_profile_mcp_servers": {
+      "name": "agent_environment_profile_mcp_servers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "pg_catalog.gen_random_uuid()"
+        },
+        "profile_id": {
+          "name": "profile_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "IDX_agent_env_profile_mcp_servers_profile_id": {
+          "name": "IDX_agent_env_profile_mcp_servers_profile_id",
+          "columns": [
+            {
+              "expression": "profile_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "agent_environment_profile_mcp_servers_profile_id_agent_environment_profiles_id_fk": {
+          "name": "agent_environment_profile_mcp_servers_profile_id_agent_environment_profiles_id_fk",
+          "tableFrom": "agent_environment_profile_mcp_servers",
+          "tableTo": "agent_environment_profiles",
+          "columnsFrom": [
+            "profile_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "UQ_agent_env_profile_mcp_servers_profile_name": {
+          "name": "UQ_agent_env_profile_mcp_servers_profile_name",
+          "nullsNotDistinct": false,
+          "columns": [
+            "profile_id",
+            "name"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.agent_environment_profile_repo_bindings": {
       "name": "agent_environment_profile_repo_bindings",
       "schema": "",
@@ -449,6 +657,129 @@
       },
       "isRLSEnabled": false
     },
+    "public.agent_environment_profile_skills": {
+      "name": "agent_environment_profile_skills",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "pg_catalog.gen_random_uuid()"
+        },
+        "profile_id": {
+          "name": "profile_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_type": {
+          "name": "source_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_url": {
+          "name": "source_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "raw_markdown": {
+          "name": "raw_markdown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "files": {
+          "name": "files",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "IDX_agent_env_profile_skills_profile_id": {
+          "name": "IDX_agent_env_profile_skills_profile_id",
+          "columns": [
+            {
+              "expression": "profile_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "agent_environment_profile_skills_profile_id_agent_environment_profiles_id_fk": {
+          "name": "agent_environment_profile_skills_profile_id_agent_environment_profiles_id_fk",
+          "tableFrom": "agent_environment_profile_skills",
+          "tableTo": "agent_environment_profiles",
+          "columnsFrom": [
+            "profile_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "UQ_agent_env_profile_skills_profile_name": {
+          "name": "UQ_agent_env_profile_skills_profile_name",
+          "nullsNotDistinct": false,
+          "columns": [
+            "profile_id",
+            "name"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.agent_environment_profile_vars": {
       "name": "agent_environment_profile_vars",
       "schema": "",
@@ -570,6 +901,12 @@
           "primaryKey": false,
           "notNull": false
         },
+        "created_by_user_id": {
+          "name": "created_by_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
         "name": {
           "name": "name",
           "type": "text",
@@ -710,6 +1047,21 @@
           "concurrently": false,
           "method": "btree",
           "with": {}
+        },
+        "IDX_agent_env_profiles_created_by_user_id": {
+          "name": "IDX_agent_env_profiles_created_by_user_id",
+          "columns": [
+            {
+              "expression": "created_by_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
         }
       },
       "foreignKeys": {
@@ -1083,7 +1435,7 @@
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "default": "'v1'"
+          "default": "'v2'"
         }
       },
       "indexes": {
@@ -3218,67 +3570,6 @@
       },
       "isRLSEnabled": false
     },
-    "public.channel_badge_counts": {
-      "name": "channel_badge_counts",
-      "schema": "",
-      "columns": {
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "channel_id": {
-          "name": "channel_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "badge_count": {
-          "name": "badge_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp with time zone",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "channel_badge_counts_user_id_kilocode_users_id_fk": {
-          "name": "channel_badge_counts_user_id_kilocode_users_id_fk",
-          "tableFrom": "channel_badge_counts",
-          "tableTo": "kilocode_users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "channel_badge_counts_user_id_channel_id_pk": {
-          "name": "channel_badge_counts_user_id_channel_id_pk",
-          "columns": [
-            "user_id",
-            "channel_id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
     "public.cli_sessions": {
       "name": "cli_sessions",
       "schema": "",
@@ -9020,6 +9311,13 @@
           "primaryKey": false,
           "notNull": true
         },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'epoch'"
+        },
         "sent_at": {
           "name": "sent_at",
           "type": "timestamp with time zone",
@@ -9051,8 +9349,8 @@
           "method": "btree",
           "with": {}
         },
-        "UQ_kiloclaw_email_log_user_instance_type": {
-          "name": "UQ_kiloclaw_email_log_user_instance_type",
+        "UQ_kiloclaw_email_log_user_instance_type_period": {
+          "name": "UQ_kiloclaw_email_log_user_instance_type_period",
           "columns": [
             {
               "expression": "user_id",
@@ -9071,6 +9369,12 @@
               "isExpression": false,
               "asc": true,
               "nulls": "last"
+            },
+            {
+              "expression": "period_start",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
             }
           ],
           "isUnique": true,
@@ -17036,8 +17340,8 @@
           "method": "btree",
           "with": {}
         },
-        "idx_reasons": {
-          "name": "idx_reasons",
+        "idx_stytch_fingerprints_reasons_gin": {
+          "name": "idx_stytch_fingerprints_reasons_gin",
           "columns": [
             {
               "expression": "reasons",
@@ -17048,7 +17352,7 @@
           ],
           "isUnique": false,
           "concurrently": false,
-          "method": "btree",
+          "method": "gin",
           "with": {}
         },
         "idx_verdict_action": {
@@ -17130,6 +17434,102 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
+    "public.transactional_email_log": {
+      "name": "transactional_email_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_type": {
+          "name": "email_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "UQ_transactional_email_log_type_idempotency_key": {
+          "name": "UQ_transactional_email_log_type_idempotency_key",
+          "columns": [
+            {
+              "expression": "email_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "IDX_transactional_email_log_user_id": {
+          "name": "IDX_transactional_email_log_user_id",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "transactional_email_log_user_id_kilocode_users_id_fk": {
+          "name": "transactional_email_log_user_id_kilocode_users_id_fk",
+          "tableFrom": "transactional_email_log",
+          "tableTo": "kilocode_users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
     "public.user_admin_notes": {
       "name": "user_admin_notes",
       "schema": "",
diff --git a/packages/db/src/migrations/meta/_journal.json b/packages/db/src/migrations/meta/_journal.json
index 01392929b6..f22e798132 100644
--- a/packages/db/src/migrations/meta/_journal.json
+++ b/packages/db/src/migrations/meta/_journal.json
@@ -813,6 +813,13 @@
       "when": 1778063303197,
       "tag": "0115_real_energizer",
       "breakpoints": true
+    },
+    {
+      "idx": 116,
+      "version": "7",
+      "when": 1778068581602,
+      "tag": "0116_regular_molly_hayes",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/schema-types.ts b/packages/db/src/schema-types.ts
index 0ceab425c6..e72f2def12 100644
--- a/packages/db/src/schema-types.ts
+++ b/packages/db/src/schema-types.ts
@@ -421,6 +421,106 @@ export const OrganizationModeConfigSchema = z.object({
 export type OrganizationModeConfig = z.infer<typeof OrganizationModeConfigSchema>;
 export type EditGroupConfig = z.infer<typeof EditGroupConfigSchema>;
 
+// ============================================================================
+// Agent (modern replacement for legacy `customModes`)
+// ============================================================================
+//
+// Mirrors the kilocode CLI's `AgentConfig` shape — see
+// `packages/opencode/src/config/agent.ts` and
+// `packages/opencode/src/config/permission.ts` in the kilocode repo. The
+// stored config is passed through to `KILO_CONFIG_CONTENT.agent.<slug>`
+// almost verbatim; no runtime migration is needed.
+
+/** Permission action — `null` is the CLI's "delete" sentinel. */
+const PermissionActionSchema = z.enum(['allow', 'ask', 'deny']);
+const PermissionActionOrNullSchema = z.union([PermissionActionSchema, z.null()]);
+
+/**
+ * Permission rule: either a single action, or a per-pattern map of glob →
+ * action. Used for tools like `read`, `edit`, `bash` that accept per-path
+ * restrictions.
+ */
+const PermissionRuleSchema = z.union([
+  PermissionActionOrNullSchema,
+  z.record(z.string(), PermissionActionOrNullSchema),
+]);
+
+/**
+ * Permission config. Either a bare action (shorthand for "all tools at this
+ * level") or a per-tool map. Accepts unknown tool keys so new CLI tools
+ * don't immediately fail validation.
+ */
+export const PermissionConfigSchema = z.union([
+  PermissionActionSchema,
+  z
+    .object({
+      read: PermissionRuleSchema.optional(),
+      edit: PermissionRuleSchema.optional(),
+      glob: PermissionRuleSchema.optional(),
+      grep: PermissionRuleSchema.optional(),
+      list: PermissionRuleSchema.optional(),
+      bash: PermissionRuleSchema.optional(),
+      task: PermissionRuleSchema.optional(),
+      external_directory: PermissionRuleSchema.optional(),
+      // Action-only (no per-pattern sub-targets) — matches CLI shape.
+      todowrite: PermissionActionOrNullSchema.optional(),
+      question: PermissionActionOrNullSchema.optional(),
+      webfetch: PermissionActionOrNullSchema.optional(),
+      websearch: PermissionActionOrNullSchema.optional(),
+      codesearch: PermissionActionOrNullSchema.optional(),
+      doom_loop: PermissionActionOrNullSchema.optional(),
+      lsp: PermissionRuleSchema.optional(),
+      skill: PermissionRuleSchema.optional(),
+      agent_manager: PermissionRuleSchema.optional(),
+    })
+    .catchall(PermissionRuleSchema),
+]);
+
+export type PermissionAction = z.infer<typeof PermissionActionSchema>;
+export type PermissionRule = z.infer<typeof PermissionRuleSchema>;
+export type PermissionConfig = z.infer<typeof PermissionConfigSchema>;
+
+const AgentVisibilitySchema = z.enum(['subagent', 'primary', 'all']);
+
+/** Hex `#RRGGBB` or one of the CLI's theme literals. */
+const AgentColorSchema = z.union([
+  z.string().regex(/^#[0-9a-fA-F]{6}$/),
+  z.enum(['primary', 'secondary', 'accent', 'success', 'warning', 'error', 'info']),
+]);
+
+/**
+ * Authoritative validator for a profile-scoped Agent's `config` jsonb column.
+ * All fields optional — the CLI pulls defaults from the model and profile
+ * layers. An empty `{}` is a valid agent.
+ */
+export const AgentConfigSchema = z
+  .object({
+    prompt: z.string().max(50_000).optional(),
+    description: z.string().max(2_000).optional(),
+    mode: AgentVisibilitySchema.optional(),
+    model: z.string().max(200).nullable().optional(),
+    variant: z.string().max(50).optional(),
+    temperature: z.number().optional(),
+    top_p: z.number().optional(),
+    steps: z.number().int().positive().optional(),
+    hidden: z.boolean().optional(),
+    disable: z.boolean().optional(),
+    color: AgentColorSchema.optional(),
+    permission: PermissionConfigSchema.optional(),
+    /** Freeform bag — CLI rolls unknown top-level keys into here. */
+    options: z.record(z.string(), z.unknown()).optional(),
+  })
+  // Variant keys are model-specific (each model defines its own
+  // `opencode.variants` map), so a `variant` without a `model` has no
+  // anchor — reject it instead of silently dropping it at runtime.
+  .refine(c => !c.variant || (typeof c.model === 'string' && c.model.length > 0), {
+    message: 'variant requires a model — variants are model-specific',
+    path: ['variant'],
+  });
+
+export type AgentVisibility = z.infer<typeof AgentVisibilitySchema>;
+export type AgentConfig = z.infer<typeof AgentConfigSchema>;
+
 export { OrganizationSettingsSchema };
 
 // --- AuditLogAction ---
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index f48f441ffd..d9c3df9cc5 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -3560,6 +3560,7 @@ export const agent_environment_profiles = pgTable(
     // Ownership: exactly one must be set (org OR user) - matches platform_integrations pattern
     owned_by_organization_id: uuid().references(() => organizations.id, { onDelete: 'cascade' }),
     owned_by_user_id: text().references(() => kilocode_users.id, { onDelete: 'cascade' }),
+    created_by_user_id: text(), // Audit trail: the user who created this profile (useful for org-owned profiles)
 
     name: text().notNull(),
     description: text(),
@@ -3589,6 +3590,7 @@ export const agent_environment_profiles = pgTable(
     // Indexes
     index('IDX_agent_env_profiles_org_id').on(table.owned_by_organization_id),
     index('IDX_agent_env_profiles_user_id').on(table.owned_by_user_id),
+    index('IDX_agent_env_profiles_created_by_user_id').on(table.created_by_user_id),
     // Owner check constraint (exactly one must be set)
     check(
       'agent_env_profiles_owner_check',
@@ -3699,6 +3701,123 @@ export type AgentEnvironmentProfileRepoBinding =
 export type NewAgentEnvironmentProfileRepoBinding =
   typeof agent_environment_profile_repo_bindings.$inferInsert;
 
+// ============ AGENT ENVIRONMENT PROFILE MCP SERVERS ============
+// MCP servers configured on an environment profile. Materialized into the
+// CLI-native KILO_CONFIG_CONTENT.mcp block at session preparation time.
+
+export const agent_environment_profile_mcp_servers = pgTable(
+  'agent_environment_profile_mcp_servers',
+  {
+    id: uuid()
+      .default(sql`pg_catalog.gen_random_uuid()`)
+      .primaryKey()
+      .notNull(),
+    profile_id: uuid()
+      .notNull()
+      .references(() => agent_environment_profiles.id, { onDelete: 'cascade' }),
+    name: text().notNull(),
+    type: text({ enum: ['local', 'remote'] }).notNull(),
+    enabled: boolean().notNull().default(true),
+    timeout: integer(),
+    // CLI-native MCP config as jsonb. Non-secret fields (command, args, url, env/header keys)
+    // are stored as plain values. Each env/header *value* is stored as an RSA+AES envelope
+    // object ({ encryptedData, encryptedDEK, algorithm, version }) using the same format as
+    // agent_environment_profile_vars. Decryption happens only on the cloud-agent-next worker
+    // at session preparation time.
+    config: jsonb().notNull(),
+    created_at: timestamp({ withTimezone: true, mode: 'string' }).defaultNow().notNull(),
+    updated_at: timestamp({ withTimezone: true, mode: 'string' })
+      .defaultNow()
+      .notNull()
+      .$onUpdateFn(() => sql`now()`),
+  },
+  table => [
+    index('IDX_agent_env_profile_mcp_servers_profile_id').on(table.profile_id),
+    unique('UQ_agent_env_profile_mcp_servers_profile_name').on(table.profile_id, table.name),
+  ]
+);
+
+export type AgentEnvironmentProfileMcpServer =
+  typeof agent_environment_profile_mcp_servers.$inferSelect;
+
+// ============ AGENT ENVIRONMENT PROFILE SKILLS ============
+// Kilo Code skills attached to an environment profile. Materialized into
+// ${SESSION_HOME}/.kilocode/skills/<name>/SKILL.md at session preparation time.
+
+export const agent_environment_profile_skills = pgTable(
+  'agent_environment_profile_skills',
+  {
+    id: uuid()
+      .default(sql`pg_catalog.gen_random_uuid()`)
+      .primaryKey()
+      .notNull(),
+    profile_id: uuid()
+      .notNull()
+      .references(() => agent_environment_profiles.id, { onDelete: 'cascade' }),
+    // Skill slug — must match the frontmatter `name` and is used as the directory name
+    name: text().notNull(),
+    description: text(),
+    source_type: text({ enum: ['marketplace', 'custom'] }).notNull(),
+    // URL the skill was imported from (marketplace entry URL, or null for 'custom')
+    source_url: text(),
+    raw_markdown: text().notNull(),
+    // Companion files for a multi-file skill. Map of relative path → file
+    // contents (text). Excludes SKILL.md itself (lives in raw_markdown).
+    // Materialized under ${sessionHome}/.kilocode/skills/<name>/<relativePath>.
+    files: jsonb().$type<Record<string, string>>().notNull().default({}),
+    enabled: boolean().notNull().default(true),
+    created_at: timestamp({ withTimezone: true, mode: 'string' }).defaultNow().notNull(),
+    updated_at: timestamp({ withTimezone: true, mode: 'string' })
+      .defaultNow()
+      .notNull()
+      .$onUpdateFn(() => sql`now()`),
+  },
+  table => [
+    index('IDX_agent_env_profile_skills_profile_id').on(table.profile_id),
+    unique('UQ_agent_env_profile_skills_profile_name').on(table.profile_id, table.name),
+  ]
+);
+
+export type AgentEnvironmentProfileSkill = typeof agent_environment_profile_skills.$inferSelect;
+
+// ============ AGENT ENVIRONMENT PROFILE AGENTS ============
+// Kilo "agents" (the modern successor to legacy custom modes) attached to an
+// environment profile. Materialized into KILO_CONFIG_CONTENT.agent.<slug> at
+// session preparation time; the stored `config` jsonb already matches the
+// CLI's AgentConfig shape so we pass through untransformed.
+
+export const agent_environment_profile_agents = pgTable(
+  'agent_environment_profile_agents',
+  {
+    id: uuid()
+      .default(sql`pg_catalog.gen_random_uuid()`)
+      .primaryKey()
+      .notNull(),
+    profile_id: uuid()
+      .notNull()
+      .references(() => agent_environment_profiles.id, { onDelete: 'cascade' }),
+    // Agent slug — used as KILO_CONFIG_CONTENT.agent.<slug>.
+    slug: text().notNull(),
+    // Display name shown in the picker.
+    name: text().notNull(),
+    // AgentConfig shape: prompt, description, mode, model, temperature, top_p,
+    // steps, hidden, disable, color, variant, permission, options. See
+    // AgentConfigSchema in schema-types.ts for the authoritative validator.
+    config: jsonb().notNull().default({}),
+    created_at: timestamp({ withTimezone: true, mode: 'string' }).defaultNow().notNull(),
+    updated_at: timestamp({ withTimezone: true, mode: 'string' })
+      .defaultNow()
+      .notNull()
+      .$onUpdateFn(() => sql`now()`),
+  },
+  table => [
+    index('IDX_agent_env_profile_agents_profile_id').on(table.profile_id),
+    unique('UQ_agent_env_profile_agents_profile_slug').on(table.profile_id, table.slug),
+  ]
+);
+
+export type AgentEnvironmentProfileAgent = typeof agent_environment_profile_agents.$inferSelect;
+
 // ============ APP BUILDER FEEDBACK ============
 
 export const app_builder_feedback = pgTable(
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index 1a9b6c71b9..61c0ce8eec 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -21,6 +21,7 @@
     "zod": "catalog:"
   },
   "devDependencies": {
+    "@kilocode/cloud-agent-profile": "workspace:*",
     "@kilocode/db": "workspace:*",
     "@kilocode/encryption": "workspace:*",
     "@sentry/nextjs": "^10.43.0",
diff --git a/packages/trpc/rollup.config.mjs b/packages/trpc/rollup.config.mjs
index 0081c176fc..6732d9eda4 100644
--- a/packages/trpc/rollup.config.mjs
+++ b/packages/trpc/rollup.config.mjs
@@ -16,7 +16,11 @@ function resolveDts(base) {
 }
 
 export default {
-  external: ['pg', '@tanstack/react-query', '@trpc/client', 'next/server'],
+  // @kilocode/encryption is type-only and never exposed in router I/O, so we
+  // externalize it to avoid relying on tsgo emitting its transitive d.ts files
+  // (which has been flaky in CI). Any unused imports get pruned by rollup's
+  // tree-shaking, so the final bundle is unchanged.
+  external: ['pg', '@tanstack/react-query', '@trpc/client', 'next/server', '@kilocode/encryption'],
   input: './dist/tsc/packages/trpc/src/index.d.ts',
   output: {
     file: './dist/index.d.ts',
@@ -36,10 +40,6 @@ export default {
           const subpath = source === '@kilocode/db' ? 'index' : source.replace('@kilocode/db/', '');
           return resolveDts(path.resolve(tscOut, 'packages/db/src', subpath));
         }
-        // Resolve @kilocode/encryption
-        if (source === '@kilocode/encryption') {
-          return resolveDts(path.resolve(tscOut, 'packages/encryption/src/index'));
-        }
         return null;
       },
     },
diff --git a/packages/worker-utils/package.json b/packages/worker-utils/package.json
index 329c3f3e2d..224f8852ba 100644
--- a/packages/worker-utils/package.json
+++ b/packages/worker-utils/package.json
@@ -10,7 +10,8 @@
     "./sandbox-id": "./src/sandbox-id.ts",
     "./hostname-label": "./src/hostname-label.ts",
     "./redact-headers": "./src/redact-headers.ts",
-    "./kiloclaw-billing-observability": "./src/kiloclaw-billing-observability.ts"
+    "./kiloclaw-billing-observability": "./src/kiloclaw-billing-observability.ts",
+    "./git-url": "./src/git-url.ts"
   },
   "scripts": {
     "test": "vitest run",
diff --git a/packages/worker-utils/src/git-url.test.ts b/packages/worker-utils/src/git-url.test.ts
new file mode 100644
index 0000000000..3a2667b018
--- /dev/null
+++ b/packages/worker-utils/src/git-url.test.ts
@@ -0,0 +1,198 @@
+import { describe, it, expect } from 'vitest';
+import { isValidGitUrl, sanitizeGitUrl, parseGitUrl, repoFullNameFromGitUrl } from './git-url.js';
+
+describe('isValidGitUrl', () => {
+  it('accepts HTTPS URLs', () => {
+    expect(isValidGitUrl('https://github.com/org/repo')).toBe(true);
+  });
+
+  it('accepts HTTP URLs', () => {
+    expect(isValidGitUrl('http://github.com/org/repo')).toBe(true);
+  });
+
+  it('accepts SSH URLs', () => {
+    expect(isValidGitUrl('git@github.com:org/repo.git')).toBe(true);
+  });
+
+  it('rejects malformed strings', () => {
+    expect(isValidGitUrl('not-a-valid-url')).toBe(false);
+  });
+
+  it('rejects non-http protocols', () => {
+    expect(isValidGitUrl('ftp://github.com/repo')).toBe(false);
+  });
+});
+
+describe('sanitizeGitUrl', () => {
+  it('strips credentials from HTTPS URLs', () => {
+    expect(sanitizeGitUrl('https://user:pass@github.com/org/repo')).toBe(
+      'https://github.com/org/repo'
+    );
+  });
+
+  it('strips query params and fragments from HTTPS URLs', () => {
+    expect(sanitizeGitUrl('https://github.com/org/repo?token=abc#readme')).toBe(
+      'https://github.com/org/repo'
+    );
+  });
+
+  it('strips credentials, query, and fragments together', () => {
+    expect(sanitizeGitUrl('https://user:pass@github.com/org/repo.git?ref=main#L10')).toBe(
+      'https://github.com/org/repo.git'
+    );
+  });
+
+  it('preserves SSH URLs without query params', () => {
+    expect(sanitizeGitUrl('git@github.com:org/repo.git')).toBe('git@github.com:org/repo.git');
+  });
+
+  it('strips query params from SSH URLs', () => {
+    expect(sanitizeGitUrl('git@github.com:org/repo.git?ref=main')).toBe(
+      'git@github.com:org/repo.git'
+    );
+  });
+
+  it('handles GitLab subgroups in SSH URLs', () => {
+    expect(sanitizeGitUrl('git@gitlab.com:group/subgroup/repo.git')).toBe(
+      'git@gitlab.com:group/subgroup/repo.git'
+    );
+  });
+
+  it('returns input unchanged for unparseable URLs', () => {
+    expect(sanitizeGitUrl('some-random-string')).toBe('some-random-string');
+  });
+
+  it('preserves HTTP URLs', () => {
+    expect(sanitizeGitUrl('http://github.com/org/repo')).toBe('http://github.com/org/repo');
+  });
+});
+
+describe('parseGitUrl', () => {
+  it('parses GitHub HTTPS URLs', () => {
+    expect(parseGitUrl('https://github.com/org/repo.git')).toEqual({
+      platform: 'github',
+      owner: 'org',
+      repo: 'repo',
+    });
+  });
+
+  it('parses GitHub HTTPS URLs without .git suffix', () => {
+    expect(parseGitUrl('https://github.com/org/repo')).toEqual({
+      platform: 'github',
+      owner: 'org',
+      repo: 'repo',
+    });
+  });
+
+  it('parses GitHub SSH URLs', () => {
+    expect(parseGitUrl('git@github.com:org/repo.git')).toEqual({
+      platform: 'github',
+      owner: 'org',
+      repo: 'repo',
+    });
+  });
+
+  it('parses gitlab.com HTTPS URLs', () => {
+    expect(parseGitUrl('https://gitlab.com/group/project.git')).toEqual({
+      platform: 'gitlab',
+      owner: 'group',
+      repo: 'project',
+    });
+  });
+
+  it('parses self-hosted GitLab HTTPS URLs when instance URL is provided', () => {
+    expect(
+      parseGitUrl('https://gitlab.example.com/team/repo.git', 'https://gitlab.example.com')
+    ).toEqual({
+      platform: 'gitlab',
+      owner: 'team',
+      repo: 'repo',
+    });
+  });
+
+  it('parses gitlab.com SSH URLs', () => {
+    expect(parseGitUrl('git@gitlab.com:team/repo.git')).toEqual({
+      platform: 'gitlab',
+      owner: 'team',
+      repo: 'repo',
+    });
+  });
+
+  it('parses self-hosted GitLab SSH URLs when instance URL is provided', () => {
+    expect(
+      parseGitUrl('git@gitlab.example.com:team/repo.git', 'https://gitlab.example.com')
+    ).toEqual({
+      platform: 'gitlab',
+      owner: 'team',
+      repo: 'repo',
+    });
+  });
+
+  it('returns null for SSH URLs from unknown non-GitHub hosts', () => {
+    expect(parseGitUrl('git@bitbucket.org:team/repo.git')).toBeNull();
+  });
+
+  it('returns null for unrecognizable HTTPS URLs without instance URL', () => {
+    expect(parseGitUrl('https://example.com/team/repo.git')).toBeNull();
+  });
+
+  it('handles GitLab subgroups in HTTPS URLs', () => {
+    expect(parseGitUrl('https://gitlab.com/group/subgroup/project.git')).toEqual({
+      platform: 'gitlab',
+      owner: 'group/subgroup',
+      repo: 'project',
+    });
+  });
+
+  it('handles deep GitLab subgroups in SSH URLs', () => {
+    expect(parseGitUrl('git@gitlab.com:group/subgroup/deep/project.git')).toEqual({
+      platform: 'gitlab',
+      owner: 'group/subgroup/deep',
+      repo: 'project',
+    });
+  });
+
+  it('strips embedded credentials from GitHub HTTPS URLs', () => {
+    expect(parseGitUrl('https://x-access-token:ghp_abc123@github.com/org/repo.git')).toEqual({
+      platform: 'github',
+      owner: 'org',
+      repo: 'repo',
+    });
+  });
+
+  it('strips embedded credentials from GitLab HTTPS URLs', () => {
+    expect(parseGitUrl('https://oauth2:token@gitlab.com/group/project.git')).toEqual({
+      platform: 'gitlab',
+      owner: 'group',
+      repo: 'project',
+    });
+  });
+
+  it('does not false-positive on substring hostname match', () => {
+    expect(
+      parseGitUrl('https://example.com/team/repo.git', 'https://gitlab.example.com')
+    ).toBeNull();
+  });
+
+  it('handles trailing .git in all formats', () => {
+    expect(parseGitUrl('https://github.com/a/b.git')?.repo).toBe('b');
+    expect(parseGitUrl('https://github.com/a/b')?.repo).toBe('b');
+    expect(parseGitUrl('git@github.com:a/b.git')?.repo).toBe('b');
+  });
+});
+
+describe('repoFullNameFromGitUrl', () => {
+  it('returns owner/repo for GitHub', () => {
+    expect(repoFullNameFromGitUrl('https://github.com/org/repo.git')).toBe('org/repo');
+  });
+
+  it('returns full subgroup path for GitLab', () => {
+    expect(repoFullNameFromGitUrl('https://gitlab.com/group/subgroup/project.git')).toBe(
+      'group/subgroup/project'
+    );
+  });
+
+  it('returns undefined for unrecognized URLs', () => {
+    expect(repoFullNameFromGitUrl('https://example.com/team/repo.git')).toBeUndefined();
+  });
+});
diff --git a/packages/worker-utils/src/git-url.ts b/packages/worker-utils/src/git-url.ts
new file mode 100644
index 0000000000..6b81632526
--- /dev/null
+++ b/packages/worker-utils/src/git-url.ts
@@ -0,0 +1,144 @@
+/**
+ * Shared utilities for parsing, validating, and sanitizing git remote URLs.
+ *
+ * Supports both HTTPS (`https://host/owner/repo[.git]`) and SSH
+ * (`git@host:owner/repo[.git]`) forms across GitHub, gitlab.com, and
+ * self-hosted GitLab instances.
+ */
+
+export type RepoCoordinates = {
+  platform: 'github' | 'gitlab';
+  /**
+   * Repository owner. For GitLab subgroups this is the full group path
+   * (e.g. `group/subgroup`), since GitLab uses the entire path as the
+   * project namespace.
+   */
+  owner: string;
+  repo: string;
+};
+
+function hostnameOf(urlStr: string): string | null {
+  try {
+    return new URL(urlStr).hostname;
+  } catch {
+    return null;
+  }
+}
+
+function isGitLabHost(host: string, gitlabInstanceUrl?: string): boolean {
+  if (host === 'gitlab.com') return true;
+  if (gitlabInstanceUrl && hostnameOf(gitlabInstanceUrl) === host) return true;
+  return false;
+}
+
+/**
+ * Returns true when `url` is a syntactically valid HTTPS or SSH git URL.
+ *
+ * Does not validate that the host is a known git platform — use
+ * `parseGitUrl` for that.
+ */
+export function isValidGitUrl(url: string): boolean {
+  if (url.startsWith('git@') && url.includes(':')) return true;
+  try {
+    const parsed = new URL(url);
+    return ['http:', 'https:'].includes(parsed.protocol);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Strip embedded credentials, query parameters, and fragments from a git URL
+ * so it is safe to log or display.
+ *
+ * Returns the input unchanged when parsing fails. Call `isValidGitUrl` first
+ * if you want to reject malformed URLs.
+ */
+export function sanitizeGitUrl(url: string): string {
+  const sshMatch = url.match(/^git@([^:]+):(.+)$/);
+  if (sshMatch) {
+    const host = sshMatch[1];
+    const path = sshMatch[2].split('?')[0];
+    return `git@${host}:${path}`;
+  }
+
+  try {
+    const parsed = new URL(url);
+    parsed.username = '';
+    parsed.password = '';
+    parsed.search = '';
+    parsed.hash = '';
+    return parsed.toString();
+  } catch {
+    return url;
+  }
+}
+
+/**
+ * Parse a git URL into platform/owner/repo coordinates. Supports HTTPS and
+ * SSH formats, GitHub, gitlab.com, and self-hosted GitLab when the instance
+ * URL is provided. Returns `null` when the URL doesn't match a recognized
+ * platform.
+ *
+ * GitLab subgroups are flattened into `owner` (e.g. `group/subgroup`) with
+ * `repo` set to the final path segment.
+ */
+export function parseGitUrl(gitUrl: string, gitlabInstanceUrl?: string): RepoCoordinates | null {
+  // Normalize: strip trailing .git and embedded credentials (e.g. https://token@github.com/...)
+  const url = gitUrl.replace(/\.git$/, '').replace(/\/\/[^@]+@/, '//');
+
+  const httpsMatch = url.match(/^https?:\/\/([^/]+)\/(.+)/);
+  if (httpsMatch) {
+    return coordinatesFromHostAndPath(httpsMatch[1], httpsMatch[2], gitlabInstanceUrl);
+  }
+
+  const sshMatch = url.match(/^git@([^:]+):(.+)/);
+  if (sshMatch) {
+    return coordinatesFromHostAndPath(sshMatch[1], sshMatch[2], gitlabInstanceUrl);
+  }
+
+  return null;
+}
+
+function coordinatesFromHostAndPath(
+  host: string,
+  fullPath: string,
+  gitlabInstanceUrl?: string
+): RepoCoordinates | null {
+  if (host === 'github.com') {
+    // GitHub clone URLs always have exactly two segments (owner/repo).
+    const parts = fullPath.split('/');
+    if (parts.length >= 2) {
+      return { platform: 'github', owner: parts[0], repo: parts[1] };
+    }
+    return null;
+  }
+
+  if (isGitLabHost(host, gitlabInstanceUrl)) {
+    // GitLab supports subgroups; owner is everything except the last segment.
+    const lastSlash = fullPath.lastIndexOf('/');
+    if (lastSlash > 0) {
+      return {
+        platform: 'gitlab',
+        owner: fullPath.slice(0, lastSlash),
+        repo: fullPath.slice(lastSlash + 1),
+      };
+    }
+    return null;
+  }
+
+  return null;
+}
+
+/**
+ * Compose a `${owner}/${repo}` string suitable for repo-binding lookups.
+ * Returns `undefined` when the URL can't be matched against a known platform.
+ */
+export function repoFullNameFromGitUrl(
+  gitUrl: string,
+  gitlabInstanceUrl?: string
+): string | undefined {
+  const coords = parseGitUrl(gitUrl, gitlabInstanceUrl);
+  if (!coords) return undefined;
+  return `${coords.owner}/${coords.repo}`;
+}
diff --git a/packages/worker-utils/src/index.ts b/packages/worker-utils/src/index.ts
index 35e7bc7893..85b5a6479a 100644
--- a/packages/worker-utils/src/index.ts
+++ b/packages/worker-utils/src/index.ts
@@ -79,3 +79,6 @@ export type {
   KiloclawStopReason,
   KiloclawDestroyReason,
 } from './kiloclaw-lifecycle-reasons.js';
+
+export { isValidGitUrl, sanitizeGitUrl, parseGitUrl, repoFullNameFromGitUrl } from './git-url.js';
+export type { RepoCoordinates } from './git-url.js';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4127c8720e..5d9c0bf53d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -497,6 +497,9 @@ importers:
       '@emoji-mart/react':
         specifier: ^1.1.1
         version: 1.1.1(emoji-mart@5.6.0)(react@19.2.4)
+      '@kilocode/cloud-agent-profile':
+        specifier: workspace:*
+        version: link:../../packages/cloud-agent-profile
       '@kilocode/db':
         specifier: workspace:*
         version: link:../../packages/db
@@ -919,6 +922,37 @@ importers:
         specifier: 'catalog:'
         version: 5.9.3
 
+  packages/cloud-agent-profile:
+    dependencies:
+      '@kilocode/db':
+        specifier: workspace:*
+        version: link:../db
+      '@kilocode/encryption':
+        specifier: workspace:*
+        version: link:../encryption
+      drizzle-orm:
+        specifier: 'catalog:'
+        version: 0.45.1(@cloudflare/workers-types@4.20260430.1)(@opentelemetry/api@1.9.0)(@types/pg@8.18.0)(bun-types@1.3.13)(pg@8.20.0)
+      zod:
+        specifier: 'catalog:'
+        version: 4.3.6
+    devDependencies:
+      '@trpc/server':
+        specifier: 'catalog:'
+        version: 11.13.0(typescript@5.9.3)
+      '@types/node':
+        specifier: '>=24 <25'
+        version: 24.12.0
+      '@typescript/native-preview':
+        specifier: 'catalog:'
+        version: 7.0.0-dev.20260319.1
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+      vitest:
+        specifier: ~3.2.4
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.12.0)(@vitest/ui@3.2.4)(esbuild@0.27.4)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+
   packages/db:
     dependencies:
       drizzle-orm:
@@ -1081,6 +1115,9 @@ importers:
         specifier: 'catalog:'
         version: 4.3.6
     devDependencies:
+      '@kilocode/cloud-agent-profile':
+        specifier: workspace:*
+        version: link:../cloud-agent-profile
       '@kilocode/db':
         specifier: workspace:*
         version: link:../db
@@ -1351,6 +1388,12 @@ importers:
       '@hono/trpc-server':
         specifier: ^0.4.2
         version: 0.4.2(@trpc/server@11.13.0(typescript@5.9.3))(hono@4.12.8)
+      '@kilocode/cloud-agent-profile':
+        specifier: workspace:*
+        version: link:../../packages/cloud-agent-profile
+      '@kilocode/db':
+        specifier: workspace:*
+        version: link:../../packages/db
       '@kilocode/encryption':
         specifier: workspace:*
         version: link:../../packages/encryption
diff --git a/services/app-builder/src/git-repository-do.ts b/services/app-builder/src/git-repository-do.ts
index 93f6f3652a..e342b70101 100644
--- a/services/app-builder/src/git-repository-do.ts
+++ b/services/app-builder/src/git-repository-do.ts
@@ -11,7 +11,7 @@ import { migrate } from 'drizzle-orm/durable-sqlite/migrator';
 import migrations from '../drizzle/migrations';
 import git from '@ashishkumar472/cf-git';
 import http from '@ashishkumar472/cf-git/http/web';
-import { sanitizeGitUrl } from './utils/git-url';
+import { sanitizeGitUrl } from '@kilocode/worker-utils/git-url';
 import { SqliteFS } from './git/fs-adapter';
 import { MemFS } from './git/memfs';
 import { logger, withLogTags, formatError } from './utils/logger';
diff --git a/services/app-builder/src/utils/git-url.ts b/services/app-builder/src/utils/git-url.ts
deleted file mode 100644
index dc28bd8aef..0000000000
--- a/services/app-builder/src/utils/git-url.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Sanitize a git URL for safe logging by stripping credentials, query params, and fragments.
- * Handles both HTTPS and SSH (`git@host:path`) URLs.
- */
-export function sanitizeGitUrl(url: string): string {
-  const sshMatch = url.match(/^git@([^:]+):(.+)$/);
-  if (sshMatch) {
-    const host = sshMatch[1];
-    const path = sshMatch[2].split('?')[0];
-    return `git@${host}:${path}`;
-  }
-
-  try {
-    const parsed = new URL(url);
-    parsed.username = '';
-    parsed.password = '';
-    parsed.search = '';
-    parsed.hash = '';
-    return parsed.toString();
-  } catch {
-    return url;
-  }
-}
diff --git a/services/cloud-agent-next/package.json b/services/cloud-agent-next/package.json
index 1022f3298d..cfdab3c637 100644
--- a/services/cloud-agent-next/package.json
+++ b/services/cloud-agent-next/package.json
@@ -29,6 +29,8 @@
   "dependencies": {
     "@cloudflare/sandbox": "0.9.2",
     "@hono/trpc-server": "^0.4.2",
+    "@kilocode/cloud-agent-profile": "workspace:*",
+    "@kilocode/db": "workspace:*",
     "@kilocode/encryption": "workspace:*",
     "@kilocode/worker-utils": "workspace:*",
     "@trpc/server": "catalog:",
diff --git a/services/cloud-agent-next/src/db/pg.ts b/services/cloud-agent-next/src/db/pg.ts
new file mode 100644
index 0000000000..7da30b10a5
--- /dev/null
+++ b/services/cloud-agent-next/src/db/pg.ts
@@ -0,0 +1,13 @@
+import { getWorkerDb, type WorkerDb } from '@kilocode/db/client';
+
+/**
+ * Return a Drizzle client bound to the Postgres instance reachable via the
+ * worker's `HYPERDRIVE` binding.
+ *
+ * `getWorkerDb` creates a new pool per call with `max: 1` — callers should
+ * cache the returned client per-request (inside a handler), not at module
+ * scope, to match the Workers isolate lifecycle.
+ */
+export function getPgDb(env: Pick<Env, 'HYPERDRIVE'>): WorkerDb {
+  return getWorkerDb(env.HYPERDRIVE.connectionString);
+}
diff --git a/services/cloud-agent-next/src/execution/orchestrator.ts b/services/cloud-agent-next/src/execution/orchestrator.ts
index d49b28b37f..7a0676df6a 100644
--- a/services/cloud-agent-next/src/execution/orchestrator.ts
+++ b/services/cloud-agent-next/src/execution/orchestrator.ts
@@ -17,6 +17,7 @@ import type { CloudAgentSession } from '../persistence/CloudAgentSession.js';
 import type { ExecutionPlan, ExecutionResult } from './types.js';
 import { ExecutionError } from './errors.js';
 import { SessionService, type PreparedSession } from '../session-service.js';
+import type { SessionProfileBundle } from '../session-profile.js';
 import { logger } from '../logger.js';
 import { logSandboxOperationTimeout } from '../sandbox-timeout-logging.js';
 import { updateGitRemoteToken } from '../workspace.js';
@@ -43,6 +44,29 @@ function withWorkspacePreparationTimeout<T>(operation: Promise<T>, step: string)
   );
 }
 
+/**
+ * Build the profile bundle for the fast path: prefer `initContext.profile`,
+ * but fall back to `existingMetadata.profile` for `mcpServers`, `runtimeSkills`,
+ * and `runtimeAgents` — fields that were "previously dropped on the fast
+ * path" and must flow back in when we recreate the sandbox session.
+ *
+ * `envVars`, `encryptedSecrets`, and `setupCommands` come from `initContext`
+ * only (no existing-metadata fallback) to match the prior behaviour.
+ */
+function mergeFastPathProfile(
+  initProfile: SessionProfileBundle | undefined,
+  existingProfile: SessionProfileBundle | undefined
+): SessionProfileBundle {
+  return {
+    envVars: initProfile?.envVars,
+    encryptedSecrets: initProfile?.encryptedSecrets,
+    setupCommands: initProfile?.setupCommands,
+    mcpServers: initProfile?.mcpServers ?? existingProfile?.mcpServers,
+    runtimeSkills: initProfile?.runtimeSkills ?? existingProfile?.runtimeSkills,
+    runtimeAgents: initProfile?.runtimeAgents ?? existingProfile?.runtimeAgents,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -290,21 +314,21 @@ export class ExecutionOrchestrator {
           gitUrl: initContext.gitUrl,
           gitToken: initContext.gitToken,
           platform: initContext.platform,
-          envVars: initContext.envVars,
+          envVars: initContext.profile?.envVars,
         };
 
         const session = await withWorkspacePreparationTimeout(
-          this.sessionService.getOrCreateSession(
+          this.sessionService.getOrCreateSession({
             sandbox,
             context,
-            this.deps.env,
-            initContext.kilocodeToken,
-            initContext.kilocodeModel ?? 'default',
-            orgId,
-            initContext.encryptedSecrets,
-            initContext.createdOnPlatform,
-            existingMetadata.appendSystemPrompt
-          ),
+            env: this.deps.env,
+            originalToken: initContext.kilocodeToken,
+            kilocodeModel: initContext.kilocodeModel ?? 'default',
+            originalOrgId: orgId,
+            createdOnPlatform: initContext.createdOnPlatform,
+            appendSystemPrompt: existingMetadata.appendSystemPrompt,
+            profile: mergeFastPathProfile(initContext.profile, existingMetadata.profile),
+          }),
           'prepared session creation'
         );
 
@@ -343,10 +367,7 @@ export class ExecutionOrchestrator {
             kilocodeModel: initContext.kilocodeModel ?? 'default',
             kiloSessionId: initContext.kiloSessionId,
             env: this.deps.env,
-            envVars: initContext.envVars,
-            encryptedSecrets: initContext.encryptedSecrets,
-            setupCommands: initContext.setupCommands,
-            mcpServers: initContext.mcpServers,
+            profile: initContext.profile,
             botId: initContext.botId,
             githubAppType: initContext.githubAppType,
             createdOnPlatform: initContext.createdOnPlatform,
@@ -373,10 +394,7 @@ export class ExecutionOrchestrator {
           gitUrl: initContext.gitUrl,
           gitToken: initContext.gitToken,
           env: this.deps.env,
-          envVars: initContext.envVars,
-          encryptedSecrets: initContext.encryptedSecrets,
-          setupCommands: initContext.setupCommands,
-          mcpServers: initContext.mcpServers,
+          profile: initContext.profile,
           upstreamBranch: initContext.upstreamBranch,
           botId: initContext.botId,
           githubAppType: initContext.githubAppType,
diff --git a/services/cloud-agent-next/src/execution/types.ts b/services/cloud-agent-next/src/execution/types.ts
index 3e0784dea4..07057a7216 100644
--- a/services/cloud-agent-next/src/execution/types.ts
+++ b/services/cloud-agent-next/src/execution/types.ts
@@ -10,8 +10,8 @@
 import type { ExecutionId, SessionId, UserId } from '../types/ids.js';
 import type { AgentMode } from '../schema.js';
 import type { Images, EncryptedSecrets as SchemaEncryptedSecrets } from '../router/schemas.js';
-import type { EncryptedSecrets } from '../utils/encryption.js';
-import type { MCPServerConfig } from '../persistence/types.js';
+import type { MCPServerConfig, RuntimeSkill, RuntimeAgent } from '../persistence/types.js';
+import type { SessionProfileBundle } from '../session-profile.js';
 
 // ---------------------------------------------------------------------------
 // Execution Modes
@@ -60,17 +60,12 @@ export type InitializeContext = {
   gitUrl?: string;
   /** Git token for authentication */
   gitToken?: string;
-  /** Environment variables to set in the session (plaintext) */
-  envVars?: Record<string, string>;
   /**
-   * Encrypted secret env vars from agent environment profiles.
-   * Stored encrypted, decrypted only at session execution time.
+   * Profile-derived configuration snapshot (envVars, encryptedSecrets,
+   * setupCommands, mcpServers, runtimeSkills, runtimeAgents). Adding a new
+   * profile field is a single-line change in {@link SessionProfileBundle}.
    */
-  encryptedSecrets?: SchemaEncryptedSecrets;
-  /** Setup commands to run after clone (e.g., npm install) */
-  setupCommands?: string[];
-  /** MCP server configurations */
-  mcpServers?: Record<string, MCPServerConfig>;
+  profile?: SessionProfileBundle;
   /** Branch to checkout (if not session-specific) */
   upstreamBranch?: string;
   /** Bot ID for sandbox isolation */
@@ -123,6 +118,8 @@ type InitiateExecutionRequest = BaseExecutionRequest & {
   encryptedSecrets?: SchemaEncryptedSecrets;
   setupCommands?: string[];
   mcpServers?: Record<string, MCPServerConfig>;
+  runtimeSkills?: readonly RuntimeSkill[];
+  runtimeAgents?: readonly RuntimeAgent[];
   autoCommit?: boolean;
   condenseOnComplete?: boolean;
   upstreamBranch?: string;
@@ -236,8 +233,6 @@ export type InitContext = {
   gitUrl?: string;
   githubToken?: string;
   gitToken?: string;
-  envVars?: Record<string, string>;
-  setupCommands?: string[];
   upstreamBranch?: string;
   kiloSessionId?: string;
   isPreparedSession?: boolean;
@@ -245,10 +240,11 @@ export type InitContext = {
   kilocodeToken: string;
   /** Kilocode model to use */
   kilocodeModel?: string;
-  /** Encrypted secrets for agent environment profiles */
-  encryptedSecrets?: EncryptedSecrets;
-  /** MCP server configurations */
-  mcpServers?: Record<string, MCPServerConfig>;
+  /**
+   * Profile-derived configuration snapshot (envVars, encryptedSecrets,
+   * setupCommands, mcpServers, runtimeSkills, runtimeAgents).
+   */
+  profile?: SessionProfileBundle;
   /** Bot ID for bot-specific sessions */
   botId?: string;
   /** GitHub app type for determining which app to use */
@@ -269,6 +265,12 @@ export type ExistingSessionMetadata = {
   sessionHome?: string;
   upstreamBranch?: string;
   appendSystemPrompt?: string;
+  /**
+   * Profile snapshot stored on the session at prepare time. Used by the
+   * fast path to re-inject MCP servers, runtime skills, and runtime modes
+   * when recreating the sandbox session.
+   */
+  profile?: SessionProfileBundle;
   /** GitHub repo (for token updates) */
   githubRepo?: string;
   /** Git URL (for token updates) */
diff --git a/services/cloud-agent-next/src/logger.ts b/services/cloud-agent-next/src/logger.ts
index 721952fd31..8dd69fadef 100644
--- a/services/cloud-agent-next/src/logger.ts
+++ b/services/cloud-agent-next/src/logger.ts
@@ -13,8 +13,8 @@ export type CloudAgentTags = {
   botId?: string;
   inflightId?: string;
 
-  // Execution context
-  mode?: 'plan' | 'code' | 'debug' | 'build' | 'orchestrator' | 'architect' | 'ask' | 'custom';
+  // Execution context — built-in slug or a profile-defined custom slug
+  mode?: string;
   model?: string;
   isResume?: boolean;
 
diff --git a/services/cloud-agent-next/src/persistence/CloudAgentSession.ts b/services/cloud-agent-next/src/persistence/CloudAgentSession.ts
index 0db98ec77e..170339ba27 100644
--- a/services/cloud-agent-next/src/persistence/CloudAgentSession.ts
+++ b/services/cloud-agent-next/src/persistence/CloudAgentSession.ts
@@ -6,18 +6,26 @@
 
 import { DurableObject } from 'cloudflare:workers';
 import { TRPCError } from '@trpc/server';
-import type { CloudAgentSessionState, OperationResult, MCPServerConfig } from './types.js';
+import type {
+  CloudAgentSessionState,
+  OperationResult,
+  MCPServerConfig,
+  RuntimeSkill,
+  RuntimeAgent,
+} from './types.js';
 import {
   MetadataSchema,
   PreparationInputSchema,
   type Images,
   type PreparationInput,
+  type SessionProfileBundle,
 } from './schemas.js';
+import { readProfileBundle } from '../session-profile.js';
 import type { EncryptedSecrets } from '../router/schemas.js';
 import type { CallbackJob, CallbackTarget } from '../callbacks/index.js';
 import { drizzle } from 'drizzle-orm/durable-sqlite';
 import { logger } from '../logger.js';
-import { Limits } from '../schema.js';
+import { Limits, BUILTIN_AGENT_MODES } from '../schema.js';
 import { migrate } from 'drizzle-orm/durable-sqlite/migrator';
 import migrations from '../../drizzle/migrations';
 import { normalizeKilocodeModel } from './model-utils.js';
@@ -125,6 +133,16 @@ type DisconnectGraceState = {
   wsCloseReason: string;
 };
 
+function validateModeAgainstRuntimeAgents(metadata: CloudAgentSessionState): string | null {
+  const mode = metadata.mode;
+  if (!mode || BUILTIN_AGENT_MODES.has(mode)) return null;
+
+  const knownSlugs = new Set((readProfileBundle(metadata).runtimeAgents ?? []).map(m => m.slug));
+  if (knownSlugs.has(mode)) return null;
+
+  return `Mode "${mode}" is not a built-in and does not match any runtimeAgents on this session`;
+}
+
 /**
  * Concatenate text content from assistant message parts.
  * Parts have a loose `Record<string, unknown>` type; only include those with
@@ -870,6 +888,8 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
     encryptedSecrets?: EncryptedSecrets;
     setupCommands?: string[];
     mcpServers?: Record<string, MCPServerConfig>;
+    runtimeSkills?: readonly RuntimeSkill[];
+    runtimeAgents?: readonly RuntimeAgent[];
     autoCommit?: boolean;
     condenseOnComplete?: boolean;
     appendSystemPrompt?: string;
@@ -893,8 +913,26 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
 
     const now = Date.now();
 
+    const {
+      envVars,
+      encryptedSecrets,
+      setupCommands,
+      mcpServers,
+      runtimeSkills,
+      runtimeAgents,
+      ...rest
+    } = input;
+
     const metadata: CloudAgentSessionState = {
-      ...input,
+      ...rest,
+      profile: {
+        envVars,
+        encryptedSecrets,
+        setupCommands,
+        mcpServers,
+        runtimeSkills: runtimeSkills ? [...runtimeSkills] : undefined,
+        runtimeAgents: runtimeAgents ? [...runtimeAgents] : undefined,
+      },
       version: now,
       timestamp: now,
       preparedAt: now,
@@ -923,6 +961,12 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
    * Stores minimal metadata WITHOUT setting preparedAt.
    * Makes getMetadata() return non-null so the chat page can distinguish
    * "async prep in progress" from "no DO at all".
+   *
+   * Accepts an optional `profile` bundle so that profile-derived fields the
+   * chat UI needs immediately after navigation (notably `runtimeAgents` for
+   * the custom-mode picker) are readable before the async `prepare()` alarm
+   * fires. Fields like encryptedSecrets/envVars/mcpServers that are only
+   * consumed by workspace setup are intentionally re-written by `prepare()`.
    */
   async registerSession(input: {
     sessionId: string;
@@ -938,6 +982,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
     gitUrl?: string;
     platform?: 'github' | 'gitlab';
     initialMessageId?: string;
+    profile?: SessionProfileBundle;
   }): Promise<OperationResult> {
     await this.requireSessionId(input.sessionId as SessionId);
     const existing = await this.ctx.storage.get<CloudAgentSessionState>('metadata');
@@ -960,6 +1005,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
       gitUrl: input.gitUrl,
       platform: input.platform,
       initialMessageId: input.initialMessageId,
+      profile: input.profile,
       version: now,
       timestamp: now,
       // NOTE: preparedAt is NOT set — this is the key difference from prepare()
@@ -1068,6 +1114,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
       createdKiloSessionId = result.kiloSessionId;
 
       // 10. Store full metadata via prepare() — sets preparedAt
+      const inputProfile = readProfileBundle(input);
       const prepareResult = await this.prepare({
         sessionId: input.sessionId,
         userId: input.userId,
@@ -1087,10 +1134,12 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
         gitToken: result.resolvedGitToken,
         platform: input.platform,
         gitlabTokenManaged: result.gitlabTokenManaged,
-        envVars: input.envVars,
-        encryptedSecrets: input.encryptedSecrets,
-        setupCommands: input.setupCommands,
-        mcpServers: input.mcpServers,
+        envVars: inputProfile.envVars,
+        encryptedSecrets: inputProfile.encryptedSecrets,
+        setupCommands: inputProfile.setupCommands,
+        mcpServers: inputProfile.mcpServers,
+        runtimeSkills: inputProfile.runtimeSkills,
+        runtimeAgents: inputProfile.runtimeAgents,
         upstreamBranch: input.upstreamBranch,
         autoCommit: input.autoCommit,
         condenseOnComplete: input.condenseOnComplete,
@@ -1182,6 +1231,8 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
     encryptedSecrets?: EncryptedSecrets;
     setupCommands?: string[];
     mcpServers?: Record<string, MCPServerConfig>;
+    runtimeSkills?: readonly RuntimeSkill[];
+    runtimeAgents?: readonly RuntimeAgent[];
     callbackTarget?: CallbackTarget | null;
     upstreamBranch?: string | null;
   }): Promise<OperationResult> {
@@ -1202,10 +1253,43 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
       return { success: false, error: 'Session has already been initiated' };
     }
 
-    // Apply updates (handle null for clearing)
+    // Profile-derived fields are merged into `metadata.profile` (nested).
+    // Everything else (mode, model, tokens, …) lives flat on metadata.
+    // Legacy flat profile fields on the existing record are ignored on
+    // read (via `readProfileBundle`) so we don't bother stripping them —
+    // they go away when the `profile` field and fallback branch are
+    // eventually removed.
+    const PROFILE_UPDATE_KEYS = new Set([
+      'envVars',
+      'encryptedSecrets',
+      'setupCommands',
+      'mcpServers',
+      'runtimeSkills',
+      'runtimeAgents',
+    ]);
+
     const updated = { ...metadata };
+
+    // Seed `updated.profile` from whatever profile the existing record
+    // currently carries (nested or flat); subsequent per-key updates then
+    // apply on top.
+    const baseProfile = readProfileBundle(metadata);
+    const hasBaseProfile = Object.values(baseProfile).some(v => v !== undefined);
+    updated.profile = hasBaseProfile ? { ...baseProfile } : metadata.profile;
+
     for (const [key, value] of Object.entries(updates)) {
-      if (value === null) {
+      if (PROFILE_UPDATE_KEYS.has(key)) {
+        // Lazily materialize updated.profile so we don't emit an empty object
+        // when the caller only clears fields.
+        const nextProfile = { ...(updated.profile ?? {}) } as Record<string, unknown>;
+        if (value === null) {
+          delete nextProfile[key];
+        } else if (value !== undefined) {
+          nextProfile[key] = value;
+        }
+        updated.profile =
+          Object.keys(nextProfile).length > 0 ? (nextProfile as SessionProfileBundle) : undefined;
+      } else if (value === null) {
         delete (updated as Record<string, unknown>)[key];
       } else if (value !== undefined) {
         (updated as Record<string, unknown>)[key] = value;
@@ -1224,6 +1308,11 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
       };
     }
 
+    const modeError = validateModeAgainstRuntimeAgents(parseResult.data);
+    if (modeError) {
+      return { success: false, error: modeError };
+    }
+
     await this.ctx.storage.put('metadata', parseResult.data);
 
     // Track activity for session TTL
@@ -2151,25 +2240,31 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
     existingMetadata?: CloudAgentSessionState;
     kiloSessionId?: string;
   }): ExecutionPlan {
+    const existingMetadataProfile = params.existingMetadata
+      ? readProfileBundle(params.existingMetadata)
+      : undefined;
+    const existingMetadataView = params.existingMetadata
+      ? {
+          workspacePath: params.existingMetadata.workspacePath ?? '',
+          kiloSessionId: params.existingMetadata.kiloSessionId ?? '',
+          branchName: params.existingMetadata.branchName ?? '',
+          sandboxId: params.existingMetadata.sandboxId,
+          sessionHome: params.existingMetadata.sessionHome,
+          upstreamBranch: params.existingMetadata.upstreamBranch,
+          appendSystemPrompt: params.existingMetadata.appendSystemPrompt,
+          profile: existingMetadataProfile,
+          githubRepo: params.existingMetadata.githubRepo,
+          gitUrl: params.existingMetadata.gitUrl,
+          createdOnPlatform: params.existingMetadata.createdOnPlatform,
+        }
+      : undefined;
+
     const workspace = params.initContext
       ? {
           shouldPrepare: true as const,
           sandboxId: params.sandboxId,
           initContext: params.initContext,
-          existingMetadata: params.existingMetadata
-            ? {
-                workspacePath: params.existingMetadata.workspacePath ?? '',
-                kiloSessionId: params.existingMetadata.kiloSessionId ?? '',
-                branchName: params.existingMetadata.branchName ?? '',
-                sandboxId: params.existingMetadata.sandboxId,
-                sessionHome: params.existingMetadata.sessionHome,
-                upstreamBranch: params.existingMetadata.upstreamBranch,
-                appendSystemPrompt: params.existingMetadata.appendSystemPrompt,
-                githubRepo: params.existingMetadata.githubRepo,
-                gitUrl: params.existingMetadata.gitUrl,
-                createdOnPlatform: params.existingMetadata.createdOnPlatform,
-              }
-            : undefined,
+          existingMetadata: existingMetadataView,
         }
       : {
           shouldPrepare: false as const,
@@ -2184,20 +2279,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
             gitToken: params.resumeContext?.gitToken,
             createdOnPlatform: params.existingMetadata?.createdOnPlatform,
           },
-          existingMetadata: params.existingMetadata
-            ? {
-                workspacePath: params.existingMetadata.workspacePath ?? '',
-                kiloSessionId: params.existingMetadata.kiloSessionId ?? '',
-                branchName: params.existingMetadata.branchName ?? '',
-                sandboxId: params.existingMetadata.sandboxId,
-                sessionHome: params.existingMetadata.sessionHome,
-                upstreamBranch: params.existingMetadata.upstreamBranch,
-                appendSystemPrompt: params.existingMetadata.appendSystemPrompt,
-                githubRepo: params.existingMetadata.githubRepo,
-                gitUrl: params.existingMetadata.gitUrl,
-                createdOnPlatform: params.existingMetadata.createdOnPlatform,
-              }
-            : undefined,
+          existingMetadata: existingMetadataView,
         };
 
     return {
@@ -2422,10 +2504,14 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
           githubToken: request.githubToken,
           gitUrl: request.gitUrl,
           gitToken: request.gitToken,
-          envVars: request.envVars,
-          encryptedSecrets: request.encryptedSecrets,
-          setupCommands: request.setupCommands,
-          mcpServers: request.mcpServers,
+          profile: {
+            envVars: request.envVars,
+            encryptedSecrets: request.encryptedSecrets,
+            setupCommands: request.setupCommands,
+            mcpServers: request.mcpServers,
+            runtimeSkills: request.runtimeSkills ? [...request.runtimeSkills] : undefined,
+            runtimeAgents: request.runtimeAgents ? [...request.runtimeAgents] : undefined,
+          },
           upstreamBranch: request.upstreamBranch,
           botId: request.botId,
           platform: request.platform,
@@ -2469,6 +2555,11 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
           );
         }
 
+        const modeError = validateModeAgainstRuntimeAgents(metadata);
+        if (modeError) {
+          return this.buildStartError('BAD_REQUEST', modeError);
+        }
+
         // Transition to initiated state
         const initiateResult = await this.tryInitiate();
         if (
@@ -2515,10 +2606,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
           githubToken,
           gitUrl: metadata.gitUrl,
           gitToken,
-          envVars: metadata.envVars,
-          encryptedSecrets: metadata.encryptedSecrets,
-          setupCommands: metadata.setupCommands,
-          mcpServers: metadata.mcpServers,
+          profile: readProfileBundle(metadata),
           upstreamBranch: metadata.upstreamBranch,
           botId: request.botId,
           kiloSessionId: metadata.kiloSessionId,
@@ -2534,7 +2622,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
           sessionId,
           userId: metadata.userId as UserId,
           orgId: metadata.orgId,
-          mode: metadata.mode as ExecutionMode,
+          mode: metadata.mode,
           prompt: metadata.prompt,
           model: metadata.model,
           variant: metadata.variant,
@@ -2567,7 +2655,7 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
         await this.updateGitToken(request.tokenOverrides.gitToken);
         metadata.gitToken = request.tokenOverrides.gitToken;
       }
-      const mode = (request.mode ?? metadata.mode ?? 'code') as ExecutionMode;
+      const mode = request.mode ?? metadata.mode ?? 'code';
       const model = normalizeKilocodeModel(request.model ?? metadata.model);
       const variant = request.variant ?? metadata.variant;
       if (!model) {
@@ -2576,6 +2664,20 @@ export class CloudAgentSession extends DurableObject<WorkerEnv> {
           'No model specified and session has no default model'
         );
       }
+      // Reject custom slugs that aren't in the session's stored runtimeAgents.
+      // Built-in slugs and `custom` (which sendMessageV2 schema already rejects
+      // at the API boundary) pass through unchanged.
+      if (!BUILTIN_AGENT_MODES.has(mode)) {
+        const knownSlugs = new Set(
+          (readProfileBundle(metadata).runtimeAgents ?? []).map(m => m.slug)
+        );
+        if (!knownSlugs.has(mode)) {
+          return this.buildStartError(
+            'BAD_REQUEST',
+            `Mode "${mode}" is not a built-in and does not match any runtimeAgents on this session`
+          );
+        }
+      }
 
       // Token overrides win: only generate from installation ID if no override provided
       let githubToken = request.tokenOverrides?.githubToken ?? metadata.githubToken;
diff --git a/services/cloud-agent-next/src/persistence/async-preparation.test.ts b/services/cloud-agent-next/src/persistence/async-preparation.test.ts
index 42f3787c23..a13a3daf49 100644
--- a/services/cloud-agent-next/src/persistence/async-preparation.test.ts
+++ b/services/cloud-agent-next/src/persistence/async-preparation.test.ts
@@ -31,6 +31,8 @@ vi.mock('../session-service.js', () => ({
   ),
   runSetupCommands: vi.fn().mockResolvedValue(undefined),
   writeAuthFile: vi.fn().mockResolvedValue(undefined),
+  writeGlobalRules: vi.fn().mockResolvedValue(undefined),
+  writeRuntimeSkills: vi.fn().mockResolvedValue(undefined),
   SessionService: class SessionService {
     buildContext = vi.fn((options: Record<string, unknown>) => ({
       ...options,
diff --git a/services/cloud-agent-next/src/persistence/async-preparation.ts b/services/cloud-agent-next/src/persistence/async-preparation.ts
index 6ce5400489..5847b03255 100644
--- a/services/cloud-agent-next/src/persistence/async-preparation.ts
+++ b/services/cloud-agent-next/src/persistence/async-preparation.ts
@@ -19,10 +19,12 @@ import {
   determineBranchName,
   runSetupCommands,
   writeAuthFile,
+  writeGlobalRules,
 } from '../session-service.js';
 import { WrapperClient } from '../kilo/wrapper-client.js';
 import type { PreparingStep } from '../shared/protocol.js';
 import type { PreparationInput } from './schemas.js';
+import { readProfileBundle } from '../session-profile.js';
 import type { Env as WorkerEnv, SandboxId, SessionId as AgentSessionId } from '../types.js';
 
 type EmitProgress = (step: PreparingStep, message: string) => void;
@@ -147,18 +149,17 @@ export async function executePreparationSteps(
     botId: input.botId,
   });
 
-  const session = await sessionService.getOrCreateSession(
+  const session = await sessionService.getOrCreateSession({
     sandbox,
     context,
     env,
-    input.authToken,
-    input.model,
-    input.orgId,
-    input.encryptedSecrets,
-    input.createdOnPlatform,
-    input.appendSystemPrompt,
-    input.mcpServers
-  );
+    originalToken: input.authToken,
+    kilocodeModel: input.model,
+    originalOrgId: input.orgId,
+    createdOnPlatform: input.createdOnPlatform,
+    appendSystemPrompt: input.appendSystemPrompt,
+    profile: readProfileBundle(input),
+  });
 
   const cloneOptions = input.shallow ? { shallow: true } : undefined;
   if (input.gitUrl) {
@@ -189,13 +190,15 @@ export async function executePreparationSteps(
   await manageBranch(session, workspacePath, branchName, !!input.upstreamBranch);
 
   // 6. Setup commands
-  if (input.setupCommands && input.setupCommands.length > 0) {
+  const inputSetupCommands = readProfileBundle(input).setupCommands;
+  if (inputSetupCommands && inputSetupCommands.length > 0) {
     emitProgress('setup_commands', 'Running setup commands…');
-    await runSetupCommands(session, context, input.setupCommands, true);
+    await runSetupCommands(session, context, inputSetupCommands, true);
   }
 
-  // 7. Write auth file
+  // 7. Write auth file and global rules (runtime skills are written by getOrCreateSession above)
   await writeAuthFile(sandbox, sessionHome, input.authToken);
+  await writeGlobalRules(sandbox, sessionHome, input.sessionId);
 
   // 8. Import pre-generated session into CLI's SQLite so the wrapper picks it up
   if (input.kiloSessionId) {
diff --git a/services/cloud-agent-next/src/persistence/schemas.test.ts b/services/cloud-agent-next/src/persistence/schemas.test.ts
index 1be3a0cdfe..acd7cefcff 100644
--- a/services/cloud-agent-next/src/persistence/schemas.test.ts
+++ b/services/cloud-agent-next/src/persistence/schemas.test.ts
@@ -1,5 +1,12 @@
 import { describe, it, expect } from 'vitest';
-import { ImagesSchema, MCPServerConfigSchema, MetadataSchema } from './schemas.js';
+import {
+  ImagesSchema,
+  MCPServerConfigSchema,
+  MetadataSchema,
+  RuntimeAgentSchema,
+  RuntimeSkillSchema,
+  RuntimeSkillsSchema,
+} from './schemas.js';
 import type { MCPServerConfig } from './types.js';
 
 describe('ImagesSchema', () => {
@@ -76,10 +83,16 @@ describe('MCPServerConfigSchema', () => {
     });
 
     it('should accept local config with all optional fields', () => {
+      const envelope = {
+        encryptedData: 'ciphertext',
+        encryptedDEK: 'dek',
+        algorithm: 'rsa-aes-256-gcm' as const,
+        version: 1 as const,
+      };
       const config = {
         type: 'local' as const,
         command: ['node', 'server.js'],
-        environment: { NODE_ENV: 'production' },
+        environment: { NODE_ENV: envelope },
         enabled: true,
         timeout: 30000,
       };
@@ -88,7 +101,7 @@ describe('MCPServerConfigSchema', () => {
       expect(result).toEqual({
         type: 'local',
         command: ['node', 'server.js'],
-        environment: { NODE_ENV: 'production' },
+        environment: { NODE_ENV: envelope },
         enabled: true,
         timeout: 30000,
       });
@@ -121,12 +134,18 @@ describe('MCPServerConfigSchema', () => {
     });
 
     it('should accept remote config with headers', () => {
+      const envelope = {
+        encryptedData: 'ciphertext',
+        encryptedDEK: 'dek',
+        algorithm: 'rsa-aes-256-gcm' as const,
+        version: 1 as const,
+      };
       const config = {
         type: 'remote' as const,
         url: 'https://example.com/mcp',
         headers: {
-          Authorization: 'Bearer token123',
-          'X-Custom-Header': 'value',
+          Authorization: envelope,
+          'X-Custom-Header': envelope,
         },
       };
 
@@ -135,17 +154,23 @@ describe('MCPServerConfigSchema', () => {
         type: 'remote',
         url: 'https://example.com/mcp',
         headers: {
-          Authorization: 'Bearer token123',
-          'X-Custom-Header': 'value',
+          Authorization: envelope,
+          'X-Custom-Header': envelope,
         },
       });
     });
 
     it('should accept remote config with all optional fields', () => {
+      const envelope = {
+        encryptedData: 'ciphertext',
+        encryptedDEK: 'dek',
+        algorithm: 'rsa-aes-256-gcm' as const,
+        version: 1 as const,
+      };
       const config = {
         type: 'remote' as const,
         url: 'https://example.com/mcp',
-        headers: { 'X-API-Key': 'key456' },
+        headers: { 'X-API-Key': envelope },
         enabled: false,
         timeout: 60000,
       };
@@ -154,7 +179,7 @@ describe('MCPServerConfigSchema', () => {
       expect(result).toEqual({
         type: 'remote',
         url: 'https://example.com/mcp',
-        headers: { 'X-API-Key': 'key456' },
+        headers: { 'X-API-Key': envelope },
         enabled: false,
         timeout: 60000,
       });
@@ -244,7 +269,14 @@ describe('MCPServerConfigSchema', () => {
       const config = {
         type: 'remote' as const,
         url: 'https://example.com',
-        environment: { NODE_ENV: 'production' },
+        environment: {
+          NODE_ENV: {
+            encryptedData: 'c',
+            encryptedDEK: 'k',
+            algorithm: 'rsa-aes-256-gcm',
+            version: 1,
+          },
+        },
       };
       expect(() => MCPServerConfigSchema.parse(config)).toThrow();
     });
@@ -719,3 +751,181 @@ describe('MetadataSchema', () => {
     });
   });
 });
+
+describe('MCPServerConfigSchema with mixed plain-string and envelope values', () => {
+  const envelope = {
+    encryptedData: 'ciphertext',
+    encryptedDEK: 'dek',
+    algorithm: 'rsa-aes-256-gcm' as const,
+    version: 1 as const,
+  };
+
+  it('accepts local config with envelope-valued environment record', () => {
+    const config = {
+      type: 'local' as const,
+      command: ['node', 'server.js'],
+      environment: { API_KEY: envelope, OTHER: envelope },
+    };
+
+    const result = MCPServerConfigSchema.parse(config);
+    expect(result.type).toBe('local');
+    if (result.type === 'local') {
+      const v = result.environment?.API_KEY;
+      expect(typeof v).toBe('object');
+      if (v && typeof v !== 'string') expect(v.algorithm).toBe('rsa-aes-256-gcm');
+    }
+  });
+
+  it('accepts remote config with envelope-valued headers record', () => {
+    const config = {
+      type: 'remote' as const,
+      url: 'https://example.com/mcp',
+      headers: { Authorization: envelope },
+    };
+
+    const result = MCPServerConfigSchema.parse(config);
+    expect(result.type).toBe('remote');
+    if (result.type === 'remote') {
+      const v = result.headers?.Authorization;
+      expect(typeof v).toBe('object');
+      if (v && typeof v !== 'string') expect(v.algorithm).toBe('rsa-aes-256-gcm');
+    }
+  });
+
+  it('accepts plain-string environment values', () => {
+    const config = {
+      type: 'local' as const,
+      command: ['node'],
+      environment: { LOCALE: 'en-US', PORT: '4000' },
+    };
+    const result = MCPServerConfigSchema.parse(config);
+    expect(result.type).toBe('local');
+    if (result.type === 'local') {
+      expect(result.environment?.LOCALE).toBe('en-US');
+      expect(result.environment?.PORT).toBe('4000');
+    }
+  });
+
+  it('accepts plain-string header values', () => {
+    const config = {
+      type: 'remote' as const,
+      url: 'https://example.com/mcp',
+      headers: { 'X-Region': 'eu-west-1' },
+    };
+    const result = MCPServerConfigSchema.parse(config);
+    expect(result.type).toBe('remote');
+    if (result.type === 'remote') {
+      expect(result.headers?.['X-Region']).toBe('eu-west-1');
+    }
+  });
+
+  it('accepts mixed plain-string and envelope environment values per key', () => {
+    const config = {
+      type: 'local' as const,
+      command: ['node'],
+      environment: { LOCALE: 'en-US', API_KEY: envelope },
+    };
+    const result = MCPServerConfigSchema.parse(config);
+    if (result.type === 'local') {
+      expect(result.environment?.LOCALE).toBe('en-US');
+      const apiKey = result.environment?.API_KEY;
+      expect(typeof apiKey).toBe('object');
+    }
+  });
+
+  it('rejects environment values that are neither strings nor envelopes', () => {
+    const bad = {
+      type: 'local' as const,
+      command: ['node'],
+      environment: { API_KEY: { not: 'an envelope' } },
+    };
+    const result = MCPServerConfigSchema.safeParse(bad);
+    expect(result.success).toBe(false);
+  });
+
+  it('rejects header values that are neither strings nor envelopes', () => {
+    const bad = {
+      type: 'remote' as const,
+      url: 'https://example.com/mcp',
+      headers: { Authorization: 12345 },
+    };
+    const result = MCPServerConfigSchema.safeParse(bad);
+    expect(result.success).toBe(false);
+  });
+});
+
+describe('RuntimeSkillSchema', () => {
+  it('accepts a well-formed runtime skill', () => {
+    const skill = {
+      name: 'my-skill',
+      rawMarkdown: '---\nname: my-skill\n---\nBody',
+    };
+    expect(RuntimeSkillSchema.parse(skill)).toEqual(skill);
+  });
+
+  it('rejects uppercase or symbols in skill names', () => {
+    const badCases = ['My-Skill', 'my skill', 'my.skill', '-leading-dash'];
+    for (const name of badCases) {
+      expect(RuntimeSkillSchema.safeParse({ name, rawMarkdown: 'body' }).success).toBe(false);
+    }
+  });
+
+  it('rejects markdown exceeding the size limit', () => {
+    const huge = 'x'.repeat(100_001);
+    expect(RuntimeSkillSchema.safeParse({ name: 'big', rawMarkdown: huge }).success).toBe(false);
+  });
+
+  it('caps the runtime skills array at 50 entries', () => {
+    const many = Array.from({ length: 51 }, (_, i) => ({
+      name: `skill-${i}`,
+      rawMarkdown: 'body',
+    }));
+    expect(RuntimeSkillsSchema.safeParse(many).success).toBe(false);
+  });
+});
+
+describe('MetadataSchema with runtimeSkills', () => {
+  it('accepts runtimeSkills on persisted metadata', () => {
+    const metadata = {
+      version: 1,
+      sessionId: 'session123',
+      userId: 'user789',
+      timestamp: Date.now(),
+      runtimeSkills: [{ name: 'demo', rawMarkdown: 'body' }],
+    };
+    const result = MetadataSchema.parse(metadata);
+    expect(result.runtimeSkills).toEqual([{ name: 'demo', rawMarkdown: 'body' }]);
+  });
+});
+
+describe('RuntimeAgentSchema', () => {
+  it('accepts a well-formed custom slug', () => {
+    const agent = { slug: 'reviewer', name: 'Reviewer', config: {} };
+    expect(RuntimeAgentSchema.parse(agent)).toEqual(agent);
+  });
+
+  it('rejects built-in slugs so they cannot override the bundled agents', () => {
+    for (const slug of ['code', 'plan', 'architect', 'custom', 'orchestrator', 'ask']) {
+      const result = RuntimeAgentSchema.safeParse({ slug, name: slug, config: {} });
+      expect(result.success).toBe(false);
+    }
+  });
+
+  it('rejects a variant without a model — variants are model-specific', () => {
+    const result = RuntimeAgentSchema.safeParse({
+      slug: 'reviewer',
+      name: 'Reviewer',
+      config: { variant: 'high' },
+    });
+    expect(result.success).toBe(false);
+  });
+
+  it('accepts a variant when paired with a model', () => {
+    const agent = {
+      slug: 'reviewer',
+      name: 'Reviewer',
+      config: { model: 'anthropic/claude-opus', variant: 'high' },
+    };
+    expect(RuntimeAgentSchema.parse(agent)).toEqual(agent);
+  });
+});
diff --git a/services/cloud-agent-next/src/persistence/schemas.ts b/services/cloud-agent-next/src/persistence/schemas.ts
index 6862dc56a6..86c33cd395 100644
--- a/services/cloud-agent-next/src/persistence/schemas.ts
+++ b/services/cloud-agent-next/src/persistence/schemas.ts
@@ -1,5 +1,5 @@
 import * as z from 'zod';
-import { AgentModeSchema, Limits } from '../schema.js';
+import { BUILTIN_AGENT_MODES, Limits } from '../schema.js';
 import type { SandboxId } from '../types.js';
 
 /**
@@ -54,6 +54,20 @@ export const EncryptedSecretEnvelopeSchema = z.object({
 
 export type EncryptedSecretEnvelope = z.infer<typeof EncryptedSecretEnvelopeSchema>;
 
+/**
+ * A single MCP env value or remote header value. Plain strings are passed
+ * through verbatim; encrypted envelopes are decrypted by the worker just
+ * before materializing `KILO_CONFIG_CONTENT.mcp`. Callers mix the two per
+ * key: secrets travel as envelopes, non-sensitive config (locale, paths,
+ * public IDs, …) travels as plain strings.
+ */
+export const MCPSecretValueSchema = z.union([
+  z.string().max(Limits.MAX_ENV_VAR_VALUE_LENGTH),
+  EncryptedSecretEnvelopeSchema,
+]);
+
+export type MCPSecretValue = z.infer<typeof MCPSecretValueSchema>;
+
 /**
  * Schema for encrypted secrets - a record of key names to encrypted envelopes.
  * Used to pass profile secrets securely from backend to cloud-agent worker.
@@ -86,12 +100,15 @@ export const modelIdSchema = z
 
 /**
  * Local MCP server configuration schema (runs a command).
+ * Each env value is either a plain string or an encrypted envelope; the
+ * worker decrypts envelope-shaped values per key when materializing the
+ * `KILO_CONFIG_CONTENT.mcp` block for the sandbox session.
  */
 const MCPLocalServerConfigSchema = z
   .object({
     type: z.literal('local'),
     command: z.string().array().min(1, 'Command array must have at least one element'),
-    environment: z.record(z.string(), z.string()).optional(),
+    environment: z.record(z.string(), MCPSecretValueSchema).optional(),
     enabled: z.boolean().optional(),
     timeout: z.number().min(1).max(3_600_000).optional(),
   })
@@ -99,12 +116,15 @@ const MCPLocalServerConfigSchema = z
 
 /**
  * Remote MCP server configuration schema (connects to a URL).
+ * Each header value is either a plain string or an encrypted envelope; the
+ * worker decrypts envelope-shaped values per key when materializing the
+ * `KILO_CONFIG_CONTENT.mcp` block for the sandbox session.
  */
 const MCPRemoteServerConfigSchema = z
   .object({
     type: z.literal('remote'),
     url: z.string().url('URL must be a valid URL format'),
-    headers: z.record(z.string(), z.string()).optional(),
+    headers: z.record(z.string(), MCPSecretValueSchema).optional(),
     enabled: z.boolean().optional(),
     timeout: z.number().min(1).max(3_600_000).optional(),
   })
@@ -118,6 +138,161 @@ export const MCPServerConfigSchema = z.discriminatedUnion('type', [
   MCPRemoteServerConfigSchema,
 ]);
 
+const SKILL_FILE_PATH_PATTERN = /^[a-zA-Z0-9._\-/]+$/;
+
+/** Validate a map of companion files bundled with a skill. */
+const RuntimeSkillFilesSchema = z
+  .record(
+    z.string().min(1).max(Limits.MAX_RUNTIME_SKILL_COMPANION_PATH_LENGTH),
+    z.string().max(Limits.MAX_RUNTIME_SKILL_COMPANION_FILE_SIZE)
+  )
+  .refine(
+    files => Object.keys(files).length <= Limits.MAX_RUNTIME_SKILL_COMPANION_FILES,
+    `A skill may have at most ${Limits.MAX_RUNTIME_SKILL_COMPANION_FILES} companion files`
+  )
+  .superRefine((files, ctx) => {
+    let total = 0;
+    for (const [path, content] of Object.entries(files)) {
+      if (!SKILL_FILE_PATH_PATTERN.test(path)) {
+        ctx.addIssue({ code: 'custom', message: `Skill file path rejected: ${path}` });
+        return;
+      }
+      if (path.startsWith('/') || path.includes('..') || path.includes('//')) {
+        ctx.addIssue({ code: 'custom', message: `Skill file path rejected: ${path}` });
+        return;
+      }
+      if (path === 'SKILL.md' || path.toLowerCase() === 'skill.md') {
+        ctx.addIssue({
+          code: 'custom',
+          message: 'SKILL.md must be passed as rawMarkdown, not inside files',
+        });
+        return;
+      }
+      total += content.length;
+    }
+    if (total > Limits.MAX_RUNTIME_SKILL_COMPANION_FILES_TOTAL) {
+      ctx.addIssue({
+        code: 'custom',
+        message: `Skill companion files total ${total} bytes, exceeds ${Limits.MAX_RUNTIME_SKILL_COMPANION_FILES_TOTAL}`,
+      });
+    }
+  });
+
+/**
+ * Runtime skill schema. Each entry is materialized to
+ * `${SESSION_HOME}/.kilocode/skills/<name>/` at preparation time — `rawMarkdown`
+ * is written to `SKILL.md`, and each `files[path]` is written under the same
+ * directory.
+ */
+export const RuntimeSkillSchema = z.object({
+  name: z
+    .string()
+    .min(1)
+    .max(Limits.MAX_RUNTIME_SKILL_NAME_LENGTH)
+    .regex(/^[a-z0-9][a-z0-9-]*$/, 'Skill name must be a slug'),
+  rawMarkdown: z.string().min(1).max(Limits.MAX_RUNTIME_SKILL_MARKDOWN),
+  files: RuntimeSkillFilesSchema.optional(),
+});
+
+export const RuntimeSkillsSchema = z
+  .array(RuntimeSkillSchema)
+  .max(Limits.MAX_RUNTIME_SKILLS, `Maximum ${Limits.MAX_RUNTIME_SKILLS} runtime skills allowed`);
+
+export type RuntimeSkillInput = z.infer<typeof RuntimeSkillSchema>;
+
+// --- Runtime agents ---
+
+const PermissionActionSchema = z.enum(['allow', 'ask', 'deny']);
+// Flat permissive shape — the runtime tolerates any shape the CLI accepts
+// (bare action string, per-tool map with per-pattern maps, null sentinels).
+// Schema-level typing kept loose so the zod inference used by MetadataSchema
+// stays tractable; tighter validation lives at the web-app boundary.
+const PermissionConfigSchema = z.union([PermissionActionSchema, z.record(z.string(), z.unknown())]);
+
+/**
+ * Runtime agent schema. Each entry is materialized into
+ * `KILO_CONFIG_CONTENT.agent.<slug>` at session preparation time. Mirrors the
+ * CLI's AgentConfig shape so we pass through verbatim.
+ *
+ * Reserved built-in slugs (`code`, `plan`, `architect`, `custom`, …) are
+ * rejected here so an inline or persisted runtime agent cannot override a
+ * built-in agent's prompt or permissions inside the sandbox. The web-side
+ * profile service applies the same rule when persisting agents.
+ */
+export const RuntimeAgentSchema = z.object({
+  slug: z
+    .string()
+    .min(1)
+    .max(Limits.MAX_RUNTIME_AGENT_SLUG_LENGTH)
+    .regex(/^[a-z][a-z0-9-]*$/, 'Agent slug must start with a letter')
+    .refine(slug => !BUILTIN_AGENT_MODES.has(slug), {
+      message: 'Slug conflicts with a built-in agent; choose a different slug',
+    }),
+  name: z.string().min(1).max(Limits.MAX_RUNTIME_AGENT_NAME_LENGTH),
+  config: z
+    .object({
+      prompt: z.string().max(Limits.MAX_RUNTIME_AGENT_PROMPT).optional(),
+      description: z.string().max(Limits.MAX_RUNTIME_AGENT_DESCRIPTION).optional(),
+      mode: z.enum(['subagent', 'primary', 'all']).optional(),
+      model: z.string().max(Limits.MAX_RUNTIME_AGENT_MODEL_LENGTH).nullable().optional(),
+      variant: z.string().max(50).optional(),
+      temperature: z.number().optional(),
+      top_p: z.number().optional(),
+      steps: z.number().int().positive().optional(),
+      hidden: z.boolean().optional(),
+      disable: z.boolean().optional(),
+      color: z.string().max(50).optional(),
+      permission: PermissionConfigSchema.optional(),
+      options: z.record(z.string(), z.unknown()).optional(),
+    })
+    // Variant keys are model-specific, so a `variant` without a `model`
+    // has no anchor — mirror the web-side AgentConfigSchema invariant.
+    .refine(c => !c.variant || (typeof c.model === 'string' && c.model.length > 0), {
+      message: 'variant requires a model — variants are model-specific',
+      path: ['variant'],
+    }),
+});
+
+export const RuntimeAgentsSchema = z
+  .array(RuntimeAgentSchema)
+  .max(Limits.MAX_RUNTIME_AGENTS, `Maximum ${Limits.MAX_RUNTIME_AGENTS} runtime agents allowed`);
+
+export type RuntimeAgentInput = z.infer<typeof RuntimeAgentSchema>;
+
+// --- Profile bundle ---
+
+/**
+ * Schema for the profile-derived configuration bundle persisted with a
+ * session. Writers always emit this nested shape; readers prefer it but
+ * fall back to the legacy flat fields (`envVars`, `encryptedSecrets`, …)
+ * co-located on the same record for backwards compatibility with sessions
+ * stored before the nesting landed.
+ *
+ * The flat read-fallback can be deleted once all live sessions have been
+ * rewritten with the nested `profile` key (typically a few weeks of
+ * session TTL after deploy).
+ */
+export const SessionProfileBundleSchema = z.object({
+  envVars: z
+    .record(z.string().max(256), z.string().max(256))
+    .refine(obj => Object.keys(obj).length <= 50, {
+      message: 'Maximum 50 environment variables allowed',
+    })
+    .optional(),
+  encryptedSecrets: EncryptedSecretsSchema.optional(),
+  setupCommands: z.array(z.string().max(500)).max(Limits.MAX_SETUP_COMMANDS).optional(),
+  mcpServers: z
+    .record(z.string().max(100), MCPServerConfigSchema)
+    .refine(obj => Object.keys(obj).length <= Limits.MAX_MCP_SERVERS, {
+      message: `Maximum ${Limits.MAX_MCP_SERVERS} MCP servers allowed`,
+    })
+    .optional(),
+  runtimeSkills: RuntimeSkillsSchema.optional(),
+  runtimeAgents: RuntimeAgentsSchema.optional(),
+});
+
+export type SessionProfileBundle = z.infer<typeof SessionProfileBundleSchema>;
+
 /**
  * Zod schema for CloudAgentSession metadata validation.
  * Used for both DO storage and restoration validation.
@@ -138,15 +313,21 @@ export const MetadataSchema = z.object({
   gitToken: z.string().optional(),
   platform: z.enum(['github', 'gitlab']).optional(),
   gitlabTokenManaged: z.boolean().optional(),
+  /**
+   * Profile-derived configuration (envVars, encryptedSecrets, MCP servers,
+   * setup commands, runtime skills/agents). This nested form is what
+   * writers emit; the flat fields below are kept optional so that records
+   * written before this key existed still parse. Readers must go through
+   * `readProfileBundle` so the fallback stays in one place.
+   */
+  profile: SessionProfileBundleSchema.optional(),
+  // --- Legacy flat profile fields (read-only fallback, no longer written) ---
   envVars: z
     .record(z.string().max(256), z.string().max(256))
     .refine(obj => Object.keys(obj).length <= 50, {
       message: 'Maximum 50 environment variables allowed',
     })
     .optional(),
-  // Encrypted secrets from agent environment profiles.
-  // Keys are env var names, values are encrypted envelopes.
-  // Stored encrypted, decrypted only at execution time.
   encryptedSecrets: EncryptedSecretsSchema.optional(),
   setupCommands: z.array(z.string().max(500)).max(Limits.MAX_SETUP_COMMANDS).optional(),
   mcpServers: z
@@ -155,13 +336,16 @@ export const MetadataSchema = z.object({
       message: `Maximum ${Limits.MAX_MCP_SERVERS} MCP servers allowed`,
     })
     .optional(),
+  runtimeSkills: RuntimeSkillsSchema.optional(),
+  runtimeAgents: RuntimeAgentsSchema.optional(),
   upstreamBranch: branchNameSchema.optional(),
   kiloSessionId: z.string().optional(),
   createdOnPlatform: z.string().max(100).optional(),
 
   // Execution params
   prompt: z.string().max(Limits.MAX_PROMPT_LENGTH).optional(),
-  mode: AgentModeSchema.optional(),
+  // Mode accepts built-in slugs plus any custom slug from runtimeAgents.
+  mode: z.string().max(Limits.MAX_RUNTIME_AGENT_SLUG_LENGTH).optional(),
   model: z.string().optional(),
   variant: z
     .string()
@@ -233,11 +417,15 @@ export const PreparationInputSchema = z.object({
   mode: z.string(),
   model: z.string(),
   variant: z.string().optional(),
-  // Configuration
+  // Profile-derived configuration (nested form — what writers emit).
+  profile: SessionProfileBundleSchema.optional(),
+  // Legacy flat profile fields (read-only fallback, no longer written).
   envVars: z.record(z.string(), z.string()).optional(),
   encryptedSecrets: EncryptedSecretsSchema.optional(),
   setupCommands: z.array(z.string()).optional(),
   mcpServers: z.record(z.string(), MCPServerConfigSchema).optional(),
+  runtimeSkills: RuntimeSkillsSchema.optional(),
+  runtimeAgents: RuntimeAgentsSchema.optional(),
   upstreamBranch: z.string().optional(),
   autoCommit: z.boolean().optional(),
   condenseOnComplete: z.boolean().optional(),
diff --git a/services/cloud-agent-next/src/persistence/types.ts b/services/cloud-agent-next/src/persistence/types.ts
index 550c867148..05a84b5e52 100644
--- a/services/cloud-agent-next/src/persistence/types.ts
+++ b/services/cloud-agent-next/src/persistence/types.ts
@@ -1,20 +1,23 @@
 import type { SandboxId, SessionId, SessionContext, ExecutionSession } from '../types.js';
 import type { Sandbox } from '@cloudflare/sandbox';
 import type { CloudAgentSession } from './CloudAgentSession.js';
-import type { EncryptedSecrets } from '../router/schemas.js';
+import type { EncryptedSecrets, MCPSecretValue } from '../router/schemas.js';
 import type { CallbackTarget } from '../callbacks/index.js';
-import type { Images } from './schemas.js';
+import type { Images, SessionProfileBundle } from './schemas.js';
 import type { SessionIngestBinding } from '../session-ingest-binding.js';
 
 /**
- * Local MCP server configuration (runs a command)
+ * Local MCP server configuration (runs a command).
+ * Each env value is a plain string or an encrypted envelope; the worker
+ * decrypts envelope-shaped values per key when materializing
+ * `KILO_CONFIG_CONTENT.mcp` for the sandbox session.
  */
 export type MCPLocalServerConfig = {
   type: 'local';
   /** Command to execute — first element is the binary, rest are args */
   command: string[];
-  /** Environment variables for the command */
-  environment?: Record<string, string>;
+  /** Env values: plain strings pass through, envelopes are decrypted per key. */
+  environment?: Record<string, MCPSecretValue>;
   /** Whether this server is enabled (default true) */
   enabled?: boolean;
   /** Timeout in milliseconds */
@@ -22,14 +25,17 @@ export type MCPLocalServerConfig = {
 };
 
 /**
- * Remote MCP server configuration (connects to a URL)
+ * Remote MCP server configuration (connects to a URL).
+ * Each header value is a plain string or an encrypted envelope; the worker
+ * decrypts envelope-shaped values per key when materializing
+ * `KILO_CONFIG_CONTENT.mcp` for the sandbox session.
  */
 export type MCPRemoteServerConfig = {
   type: 'remote';
   /** Server URL */
   url: string;
-  /** HTTP headers */
-  headers?: Record<string, string>;
+  /** Header values: plain strings pass through, envelopes are decrypted per key. */
+  headers?: Record<string, MCPSecretValue>;
   /** Whether this server is enabled (default true) */
   enabled?: boolean;
   /** Timeout in milliseconds */
@@ -41,6 +47,48 @@ export type MCPRemoteServerConfig = {
  */
 export type MCPServerConfig = MCPLocalServerConfig | MCPRemoteServerConfig;
 
+/**
+ * Runtime skill injected from the web app's merged profile stack. `rawMarkdown`
+ * is materialized to `${SESSION_HOME}/.kilocode/skills/<name>/SKILL.md`; each
+ * entry in `files` is written under the same directory.
+ */
+export type RuntimeSkill = {
+  name: string;
+  rawMarkdown: string;
+  files?: Record<string, string>;
+};
+
+/**
+ * Runtime agent injected from the web app's merged profile stack. Stored in
+ * the CLI's AgentConfig shape and passed through to
+ * `KILO_CONFIG_CONTENT.agent.<slug>` at session preparation time.
+ *
+ * Permission is typed loosely here to match the zod schema — the web-app
+ * service layer does the tight validation before values land in the DO.
+ */
+export type PermissionAction = 'allow' | 'ask' | 'deny';
+export type PermissionConfig = PermissionAction | Record<string, unknown>;
+
+export type RuntimeAgent = {
+  slug: string;
+  name: string;
+  config: {
+    prompt?: string;
+    description?: string;
+    mode?: 'subagent' | 'primary' | 'all';
+    model?: string | null;
+    variant?: string;
+    temperature?: number;
+    top_p?: number;
+    steps?: number;
+    hidden?: boolean;
+    disable?: boolean;
+    color?: string;
+    permission?: PermissionConfig;
+    options?: Record<string, unknown>;
+  };
+};
+
 export type CloudAgentSessionState = {
   /** Current version timestamp (for cache invalidation) */
   version: number;
@@ -74,18 +122,26 @@ export type CloudAgentSessionState = {
   platform?: 'github' | 'gitlab';
   /** Whether the GitLab token was auto-looked up via git-token-service (enables refresh on resume) */
   gitlabTokenManaged?: boolean;
-  /** Environment variables to inject into sandbox execution sessions (plaintext) */
-  envVars?: Record<string, string>;
   /**
-   * Encrypted secret env vars from agent environment profiles.
-   * Stored encrypted in DO, decrypted only at execution time when injected into CLI.
-   * Keys are env var names, values are encrypted envelopes.
+   * Profile-derived configuration (envVars, encryptedSecrets, setupCommands,
+   * mcpServers, runtimeSkills, runtimeAgents). Always written in this nested
+   * form; the legacy flat fields below are a read-only compatibility surface
+   * for sessions stored before nesting landed. Never access these fields
+   * directly — go through `readProfileBundle` to get a normalized bundle.
    */
+  profile?: SessionProfileBundle;
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).envVars`. */
+  envVars?: Record<string, string>;
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).encryptedSecrets`. */
   encryptedSecrets?: EncryptedSecrets;
-  /** Installation commands to run on init/resume */
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).setupCommands`. */
   setupCommands?: string[];
-  /** MCP server configurations injected via KILO_CONFIG_CONTENT env var */
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).mcpServers`. */
   mcpServers?: Record<string, MCPServerConfig>;
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).runtimeSkills`. */
+  runtimeSkills?: readonly RuntimeSkill[];
+  /** @deprecated Legacy flat read-fallback. Use `readProfileBundle(state).runtimeAgents`. */
+  runtimeAgents?: readonly RuntimeAgent[];
   /** Upstream branch to checkout when cloning the repo */
   upstreamBranch?: string;
   /** Kilo CLI session ID for continuation (from session_created event) */
diff --git a/services/cloud-agent-next/src/router.test.ts b/services/cloud-agent-next/src/router.test.ts
index 1f61519712..386d9603e1 100644
--- a/services/cloud-agent-next/src/router.test.ts
+++ b/services/cloud-agent-next/src/router.test.ts
@@ -311,6 +311,9 @@ describe('router sessionId validation', () => {
               INTERNAL_API_SECRET_PROD: {
                 get: vi.fn().mockResolvedValue('test-secret'),
               } as unknown as TRPCContext['env']['INTERNAL_API_SECRET_PROD'],
+              HYPERDRIVE: {
+                connectionString: 'postgresql://test',
+              } as unknown as TRPCContext['env']['HYPERDRIVE'],
             },
           };
           cloudAgentSession = mockContext.env.CLOUD_AGENT_SESSION as unknown as MockCAS;
@@ -682,6 +685,9 @@ describe('router sessionId validation', () => {
             INTERNAL_API_SECRET_PROD: {
               get: vi.fn().mockResolvedValue('test-secret'),
             } as unknown as TRPCContext['env']['INTERNAL_API_SECRET_PROD'],
+            HYPERDRIVE: {
+              connectionString: 'postgresql://test',
+            } as unknown as TRPCContext['env']['HYPERDRIVE'],
           },
         };
         cloudAgentSession = mockContext.env.CLOUD_AGENT_SESSION as unknown as MockCAS;
@@ -738,11 +744,6 @@ describe('router sessionId validation', () => {
           expect(result.timestamp).toBe(123456789);
           expect(result.version).toBe(123456789);
 
-          // Verify counts are returned, not actual values
-          expect(result.envVarCount).toBe(2);
-          expect(result.setupCommandCount).toBe(2);
-          expect(result.mcpServerCount).toBe(1);
-
           // Verify secrets are NOT returned
           expect(result).not.toHaveProperty('githubToken');
           expect(result).not.toHaveProperty('gitToken');
@@ -799,9 +800,6 @@ describe('router sessionId validation', () => {
           expect(result.autoCommit).toBeUndefined();
           expect(result.preparedAt).toBeUndefined();
           expect(result.initiatedAt).toBeUndefined();
-          expect(result.envVarCount).toBeUndefined();
-          expect(result.setupCommandCount).toBeUndefined();
-          expect(result.mcpServerCount).toBeUndefined();
         });
       });
 
@@ -936,6 +934,9 @@ describe('router sessionId validation', () => {
             INTERNAL_API_SECRET_PROD: {
               get: vi.fn().mockResolvedValue('test-secret'),
             } as unknown as TRPCContext['env']['INTERNAL_API_SECRET_PROD'],
+            HYPERDRIVE: {
+              connectionString: 'postgresql://test',
+            } as unknown as TRPCContext['env']['HYPERDRIVE'],
           },
         };
         cloudAgentSession = mockContext.env.CLOUD_AGENT_SESSION as unknown as MockCAS;
diff --git a/services/cloud-agent-next/src/router/handlers/session-management.ts b/services/cloud-agent-next/src/router/handlers/session-management.ts
index ddfbab0456..ea5677cffd 100644
--- a/services/cloud-agent-next/src/router/handlers/session-management.ts
+++ b/services/cloud-agent-next/src/router/handlers/session-management.ts
@@ -5,7 +5,8 @@ import { logger, withLogTags } from '../../logger.js';
 import { generateSandboxId, getSandboxNamespace } from '../../sandbox-id.js';
 import type { SessionId, InterruptResult } from '../../types.js';
 import type { SandboxId } from '../../types.js';
-import type { AgentMode } from '../../schema.js';
+import type { CloudAgentSessionState } from '../../persistence/types.js';
+import { readProfileBundle } from '../../session-profile.js';
 import {
   InvalidSessionMetadataError,
   SessionService,
@@ -239,13 +240,13 @@ export function createSessionManagementHandlers() {
             );
 
             // Get or create the session to use for killing processes
-            const session = await sessionService.getOrCreateSession(
+            const session = await sessionService.getOrCreateSession({
               sandbox,
               context,
               env,
-              ctx.authToken,
-              metadata.orgId
-            );
+              originalToken: ctx.authToken,
+              originalOrgId: metadata.orgId,
+            });
 
             // Kill all kilocode processes in this session
             // Use pkill method as a temporary workaround for sandbox API reliability issues
@@ -320,8 +321,14 @@ export function createSessionManagementHandlers() {
           const getStub = () =>
             env.CLOUD_AGENT_SESSION.get(env.CLOUD_AGENT_SESSION.idFromName(doKey));
 
-          // Fetch metadata with retry
-          const metadata = await withDORetry(getStub, s => s.getMetadata(), 'getMetadata');
+          // Fetch metadata with retry. Explicit generic annotation works around
+          // a tsgo inference hiccup — without it `metadata` collapses to
+          // `null` alone, which makes the downstream narrowing collapse
+          // to `never` after the `if (!metadata)` check.
+          const metadata = await withDORetry<
+            ReturnType<typeof getStub>,
+            CloudAgentSessionState | null
+          >(getStub, s => s.getMetadata(), 'getMetadata');
 
           // Handle not found
           if (!metadata) {
@@ -385,6 +392,8 @@ export function createSessionManagementHandlers() {
           logger.setTags({ sandboxId, orgId: metadata.orgId ?? '(personal)' });
           logger.info('Session metadata retrieved successfully');
 
+          const metadataProfile = readProfileBundle(metadata);
+
           // Compute execution health if there's an active execution
           const executionHealth =
             execution && activeExecutionStatus
@@ -411,20 +420,26 @@ export function createSessionManagementHandlers() {
 
             prompt: metadata.prompt,
             // mode is validated by zod (AgentModeSchema) at storage time
-            mode: metadata.mode as AgentMode | undefined,
+            mode: metadata.mode,
             model: metadata.model,
             variant: metadata.variant,
             autoCommit: metadata.autoCommit,
             upstreamBranch: metadata.upstreamBranch,
 
-            // Counts only, no actual values
-            envVarCount:
-              metadata.envVars === undefined ? undefined : Object.keys(metadata.envVars).length,
-            setupCommandCount: metadata.setupCommands?.length,
-            mcpServerCount:
-              metadata.mcpServers === undefined
-                ? undefined
-                : Object.keys(metadata.mcpServers).length,
+            // Only surface agents that would appear in the chat picker: not
+            // subagent-only, not hidden, not disabled. Matches the extension's
+            // `available = agents.filter(a => a.mode !== 'subagent' && !a.hidden)`.
+            runtimeAgents: metadataProfile.runtimeAgents
+              ?.filter(a => a.config.mode !== 'subagent' && !a.config.hidden && !a.config.disable)
+              .map(a => ({
+                slug: a.slug,
+                name: a.name,
+                // Surface model + variant overrides so the chat UI can lock
+                // its model and thinking-effort pickers when this agent is
+                // selected. Other config fields stay server-side.
+                model: typeof a.config.model === 'string' ? a.config.model : undefined,
+                variant: a.config.variant,
+              })),
 
             // Execution status (grouped for cleaner API)
             execution:
@@ -547,13 +562,13 @@ export function createSessionManagementHandlers() {
             botId: sessionService.metadata?.botId,
           });
 
-          const session = await sessionService.getOrCreateSession(
+          const session = await sessionService.getOrCreateSession({
             sandbox,
             context,
             env,
-            ctx.authToken,
-            sessionService.metadata?.orgId
-          );
+            originalToken: ctx.authToken,
+            originalOrgId: sessionService.metadata?.orgId,
+          });
 
           // Discover all log files from the sandbox
           const logPaths: string[] = [];
diff --git a/services/cloud-agent-next/src/router/handlers/session-prepare.ts b/services/cloud-agent-next/src/router/handlers/session-prepare.ts
index 1a8223a491..e1fb3c0b06 100644
--- a/services/cloud-agent-next/src/router/handlers/session-prepare.ts
+++ b/services/cloud-agent-next/src/router/handlers/session-prepare.ts
@@ -1,5 +1,15 @@
 import { TRPCError } from '@trpc/server';
+import type * as z from 'zod';
 import { getSandbox } from '@cloudflare/sandbox';
+import {
+  mergeProfileConfiguration,
+  profileMcpServersToClientRecord,
+  ProfileNotFoundError,
+  type ClientMcpServerValue,
+  type InlineAgentInput,
+  type MergeProfileConfigurationResult,
+  type ProfileOwner,
+} from '@kilocode/cloud-agent-profile';
 import { logger, withLogTags } from '../../logger.js';
 import {
   generateSessionId,
@@ -7,7 +17,9 @@ import {
   determineBranchName,
   runSetupCommands,
   writeAuthFile,
+  writeGlobalRules,
 } from '../../session-service.js';
+import type { SessionProfileBundle } from '../../session-profile.js';
 
 import { internalApiProtectedProcedure } from '../auth.js';
 import {
@@ -15,6 +27,7 @@ import {
   PrepareSessionOutput,
   UpdateSessionInput,
   UpdateSessionOutput,
+  isBuiltinMode,
 } from '../schemas.js';
 import { generateSandboxId, getSandboxNamespace } from '../../sandbox-id.js';
 import {
@@ -32,12 +45,124 @@ import {
   resolveGitHubTokenForRepo,
   resolveManagedGitLabToken,
 } from '../../services/git-token-service-client.js';
+import { getPgDb } from '../../db/pg.js';
+import { repoFullNameFromGitUrl } from '@kilocode/worker-utils/git-url';
 
 type SessionPrepareHandlers = {
   prepareSession: typeof prepareSessionHandler;
   updateSession: typeof updateSessionHandler;
 };
 
+/**
+ * Platform that always gets full profile resolution applied — the main
+ * user-facing cloud-agent chat UI. Other callers must opt in via `profileId`.
+ */
+const CLOUD_AGENT_WEB_PLATFORM = 'cloud-agent-web';
+
+type PrepareInput = z.infer<typeof PrepareSessionInput>;
+
+/** Pick a stable `repoFullName` for repo-binding lookup across platforms. */
+function repoFullNameForBindingLookup(input: PrepareInput): string | undefined {
+  if (input.githubRepo) return input.githubRepo;
+  if (input.platform === 'gitlab' && input.gitUrl) {
+    return repoFullNameFromGitUrl(input.gitUrl);
+  }
+  return undefined;
+}
+
+/**
+ * Resolve the caller's profile stack in Postgres when we should — see the
+ * "When cloud agent resolves a profile" section of the refactor plan for the rule.
+ *
+ * Returns `null` when no resolution runs so that the handler can keep passing
+ * inline fields through verbatim.
+ */
+async function resolveProfileForInput(
+  ctx: { env: Pick<Env, 'HYPERDRIVE'>; userId: string },
+  input: PrepareInput
+): Promise<MergeProfileConfigurationResult | null> {
+  const shouldResolve = !!input.profileId || input.createdOnPlatform === CLOUD_AGENT_WEB_PLATFORM;
+  if (!shouldResolve) return null;
+
+  const owner: ProfileOwner = input.kilocodeOrganizationId
+    ? { type: 'organization', id: input.kilocodeOrganizationId }
+    : { type: 'user', id: ctx.userId };
+  // In org context we also allow the user's personal profile to apply.
+  const userId = input.kilocodeOrganizationId ? ctx.userId : undefined;
+
+  const db = getPgDb(ctx.env);
+
+  try {
+    return await mergeProfileConfiguration(db, {
+      profileId: input.profileId,
+      owner,
+      userId,
+      repoFullName: repoFullNameForBindingLookup(input),
+      platform: input.platform,
+      envVars: input.envVars,
+      setupCommands: input.setupCommands,
+      encryptedSecrets: input.encryptedSecrets,
+      mcpServers: input.mcpServers as Record<string, ClientMcpServerValue> | undefined,
+      runtimeSkills: input.runtimeSkills,
+      // Cast: the runtime-agent schema permits looser color/permission shapes
+      // than db's AgentConfig, but configs are forwarded opaquely to the CLI.
+      runtimeAgents: input.runtimeAgents as InlineAgentInput[] | undefined,
+    });
+  } catch (err) {
+    if (err instanceof ProfileNotFoundError) {
+      throw new TRPCError({ code: 'NOT_FOUND', message: err.message });
+    }
+    throw err;
+  }
+}
+
+/**
+ * Project the resolved bundle (or the unresolved inline pass-through) into
+ * the canonical `SessionProfileBundle` shape consumed by the session
+ * service. When resolution ran, `mergeProfileConfiguration` has already
+ * stacked the inline layer on top of the profile layers — this function
+ * just reshapes mcpServers from the profile's array form to the worker's
+ * record form.
+ *
+ * `ClientMcpServerValue` is structurally identical to the worker's
+ * `MCPServerConfig`, so the record passes through without coercion.
+ */
+function applyProfileResolution(
+  input: PrepareInput,
+  resolved: MergeProfileConfigurationResult | null
+): SessionProfileBundle {
+  if (!resolved) {
+    return {
+      envVars: input.envVars,
+      encryptedSecrets: input.encryptedSecrets,
+      setupCommands: input.setupCommands,
+      mcpServers: input.mcpServers,
+      runtimeSkills: input.runtimeSkills,
+      runtimeAgents: input.runtimeAgents,
+    };
+  }
+
+  return {
+    envVars: resolved.envVars,
+    setupCommands: resolved.setupCommands,
+    encryptedSecrets: resolved.encryptedSecrets,
+    mcpServers: profileMcpServersToClientRecord(resolved.mcpServers),
+    runtimeSkills: resolved.skills,
+    runtimeAgents: resolved.agents,
+  };
+}
+
+function assertModeAvailableForProfile(mode: string, profile: SessionProfileBundle): void {
+  if (isBuiltinMode(mode)) return;
+  const slugs = new Set((profile.runtimeAgents ?? []).map(a => a.slug));
+  if (slugs.has(mode)) return;
+
+  throw new TRPCError({
+    code: 'BAD_REQUEST',
+    message: `Mode "${mode}" is not a built-in slug and does not match any runtimeAgents on this session`,
+  });
+}
+
 function setUpdateValue(updates: Record<string, unknown>, key: string, value: unknown): void {
   if (value !== undefined) {
     updates[key] = value;
@@ -119,6 +244,15 @@ const prepareSessionHandler = internalApiProtectedProcedure
       });
       logger.info('Preparing new session with workspace setup');
 
+      // Resolve profile (repo binding + default + explicit override) server-side.
+      // Runs only when the caller either set an explicit profileId, or this
+      // session comes from the main user-facing chat UI ('cloud-agent-web').
+      // Other callers (app-builder, security-agent, webhooks without profileId,
+      // etc.) keep getting their inline fields verbatim — same as before.
+      const resolved = await resolveProfileForInput(ctx, input);
+      const effective = applyProfileResolution(input, resolved);
+      assertModeAvailableForProfile(input.mode, effective);
+
       // 2. Lookup GitHub installation + generate token via git-token-service RPC
       let resolvedGithubToken = input.githubToken;
       let resolvedInstallationId: string | undefined;
@@ -219,6 +353,10 @@ const prepareSessionHandler = internalApiProtectedProcedure
           gitUrl: input.gitUrl,
           platform: input.platform,
           initialMessageId: input.initialMessageId,
+          // Carry the resolved profile into the DO up-front so the chat page
+          // can render custom-mode options (runtimeAgents) immediately after
+          // navigation, before the async prepare() alarm fires.
+          profile: effective,
         });
 
         if (!registerResult.success) {
@@ -254,10 +392,7 @@ const prepareSessionHandler = internalApiProtectedProcedure
             mode: input.mode,
             model: input.model,
             variant: input.variant,
-            envVars: input.envVars,
-            encryptedSecrets: input.encryptedSecrets,
-            setupCommands: input.setupCommands,
-            mcpServers: input.mcpServers,
+            profile: effective,
             upstreamBranch: input.upstreamBranch,
             autoCommit: input.autoCommit,
             condenseOnComplete: input.condenseOnComplete,
@@ -322,18 +457,17 @@ const prepareSessionHandler = internalApiProtectedProcedure
       });
 
       logger.info('Creating execution session');
-      const session = await sessionService.getOrCreateSession(
+      const session = await sessionService.getOrCreateSession({
         sandbox,
         context,
-        ctx.env,
-        ctx.authToken,
-        input.model,
-        input.kilocodeOrganizationId,
-        input.encryptedSecrets,
-        input.createdOnPlatform,
-        input.appendSystemPrompt,
-        input.mcpServers
-      );
+        env: ctx.env,
+        originalToken: ctx.authToken,
+        kilocodeModel: input.model,
+        originalOrgId: input.kilocodeOrganizationId,
+        createdOnPlatform: input.createdOnPlatform,
+        appendSystemPrompt: input.appendSystemPrompt,
+        profile: effective,
+      });
 
       // 7. Clone repository
       const cloneOptions = input.shallow ? { shallow: true } : undefined;
@@ -385,13 +519,15 @@ const prepareSessionHandler = internalApiProtectedProcedure
       }
 
       // 9. Run setup commands
-      if (input.setupCommands && input.setupCommands.length > 0) {
-        logger.withFields({ count: input.setupCommands.length }).info('Running setup commands');
-        await runSetupCommands(session, context, input.setupCommands, true); // fail-fast
+      if (effective.setupCommands && effective.setupCommands.length > 0) {
+        logger.withFields({ count: effective.setupCommands.length }).info('Running setup commands');
+        await runSetupCommands(session, context, effective.setupCommands, true); // fail-fast
       }
 
-      // 10. Write auth file for session ingest
+      // 10. Write auth file for session ingest, plus global rules.
+      // (runtime skills were written by getOrCreateSession above)
       await writeAuthFile(sandbox, sessionHome, ctx.authToken);
+      await writeGlobalRules(sandbox, sessionHome, cloudAgentSessionId);
 
       // 11. Start wrapper (which starts kilo server in-process and creates session)
       logger.info('Starting wrapper');
@@ -466,10 +602,12 @@ const prepareSessionHandler = internalApiProtectedProcedure
           gitToken: resolvedGitToken,
           platform: input.platform,
           gitlabTokenManaged,
-          envVars: input.envVars,
-          encryptedSecrets: input.encryptedSecrets,
-          setupCommands: input.setupCommands,
-          mcpServers: input.mcpServers,
+          envVars: effective.envVars,
+          encryptedSecrets: effective.encryptedSecrets,
+          setupCommands: effective.setupCommands,
+          mcpServers: effective.mcpServers,
+          runtimeSkills: effective.runtimeSkills,
+          runtimeAgents: effective.runtimeAgents,
           upstreamBranch: input.upstreamBranch,
           autoCommit: input.autoCommit,
           condenseOnComplete: input.condenseOnComplete,
@@ -579,6 +717,12 @@ const updateSessionHandler = internalApiProtectedProcedure
       setCollectionUpdate(updates, 'mcpServers', input.mcpServers, value => {
         return Object.keys(value).length === 0;
       });
+      setCollectionUpdate(updates, 'runtimeSkills', input.runtimeSkills, value => {
+        return value.length === 0;
+      });
+      setCollectionUpdate(updates, 'runtimeAgents', input.runtimeAgents, value => {
+        return value.length === 0;
+      });
 
       // 3. Call tryUpdate() on DO
       const result = await stub.tryUpdate(updates);
diff --git a/services/cloud-agent-next/src/router/handlers/session-questions.ts b/services/cloud-agent-next/src/router/handlers/session-questions.ts
index 2d78a3fb18..82b9045965 100644
--- a/services/cloud-agent-next/src/router/handlers/session-questions.ts
+++ b/services/cloud-agent-next/src/router/handlers/session-questions.ts
@@ -49,13 +49,13 @@ async function resolveWrapperClient(opts: {
     botId: metadata.botId,
   });
 
-  const session = await sessionService.getOrCreateSession(
+  const session = await sessionService.getOrCreateSession({
     sandbox,
     context,
     env,
-    authToken,
-    metadata.orgId
-  );
+    originalToken: authToken,
+    originalOrgId: metadata.orgId,
+  });
 
   return new WrapperClient({ session, port: wrapperInfo.port });
 }
diff --git a/services/cloud-agent-next/src/router/schemas.ts b/services/cloud-agent-next/src/router/schemas.ts
index 9bdb23f8c7..c8a4ad6dff 100644
--- a/services/cloud-agent-next/src/router/schemas.ts
+++ b/services/cloud-agent-next/src/router/schemas.ts
@@ -2,28 +2,58 @@ import * as z from 'zod';
 import { sessionIdSchema, githubRepoSchema, gitUrlSchema, envVarsSchema } from '../types.js';
 import {
   MCPServerConfigSchema,
+  MCPSecretValueSchema,
   branchNameSchema,
   modelIdSchema,
   EncryptedSecretEnvelopeSchema,
   EncryptedSecretsSchema,
   CallbackTargetSchema,
   ImagesSchema,
+  RuntimeSkillSchema,
+  RuntimeSkillsSchema,
+  RuntimeAgentSchema,
+  RuntimeAgentsSchema,
 } from '../persistence/schemas.js';
-import { AgentModeSchema, Limits } from '../schema.js';
+import { AgentModeSchema, BUILTIN_AGENT_MODES, Limits } from '../schema.js';
 
 // Re-export schemas from types.ts and persistence/schemas.ts for convenience
 export { sessionIdSchema, githubRepoSchema, gitUrlSchema, envVarsSchema };
-export { MCPServerConfigSchema, branchNameSchema, modelIdSchema };
+export { MCPServerConfigSchema, MCPSecretValueSchema, branchNameSchema, modelIdSchema };
 export { AgentModeSchema, Limits };
 export {
   EncryptedSecretEnvelopeSchema,
   EncryptedSecretsSchema,
   CallbackTargetSchema,
   ImagesSchema,
+  RuntimeSkillSchema,
+  RuntimeSkillsSchema,
+  RuntimeAgentSchema,
+  RuntimeAgentsSchema,
 };
 
 // Re-export types
-export type { EncryptedSecretEnvelope, EncryptedSecrets } from '../persistence/schemas.js';
+export type {
+  EncryptedSecretEnvelope,
+  EncryptedSecrets,
+  MCPSecretValue,
+} from '../persistence/schemas.js';
+export type { RuntimeSkillInput, RuntimeAgentInput } from '../persistence/schemas.js';
+
+/**
+ * Flexible mode slug — built-in agent enum value, `custom`, or any slug
+ * referenced by the session's `runtimeAgents`. Cross-validation against the
+ * runtime modes happens in each handler against the DO state.
+ */
+export const ModeSlugSchema = z
+  .string()
+  .min(1)
+  .max(Limits.MAX_RUNTIME_AGENT_SLUG_LENGTH)
+  .regex(/^[a-z][a-z0-9-]*$/, 'Mode slug must start with a letter');
+
+/** True when the slug is a built-in agent mode (including `custom`). */
+export function isBuiltinMode(slug: string): boolean {
+  return BUILTIN_AGENT_MODES.has(slug);
+}
 
 export type Images = z.infer<typeof ImagesSchema>;
 
@@ -33,7 +63,9 @@ export type Images = z.infer<typeof ImagesSchema>;
  */
 export const PromptPayload = z.object({
   prompt: z.string().min(1, 'Prompt is required').describe('The task prompt for Kilo Code'),
-  mode: AgentModeSchema.describe('Kilo Code execution mode (required)'),
+  mode: ModeSlugSchema.describe(
+    'Kilo Code execution mode (built-in slug or a custom slug from runtimeAgents)'
+  ),
   model: modelIdSchema.describe('AI model to use (required)'),
   variant: z
     .string()
@@ -126,7 +158,9 @@ export const PrepareSessionInput = z
       .min(1)
       .max(Limits.MAX_PROMPT_LENGTH)
       .describe('The task prompt for Kilo Code'),
-    mode: AgentModeSchema.describe('Kilo Code execution mode'),
+    mode: ModeSlugSchema.describe(
+      'Kilo Code execution mode (built-in or custom slug from runtimeAgents)'
+    ),
     model: modelIdSchema.describe('AI model to use'),
     variant: z
       .string()
@@ -168,6 +202,12 @@ export const PrepareSessionInput = z
       })
       .optional()
       .describe('MCP server configurations'),
+    runtimeSkills: RuntimeSkillsSchema.optional().describe(
+      'Runtime skills to materialize as SKILL.md files inside the sandbox'
+    ),
+    runtimeAgents: RuntimeAgentsSchema.optional().describe(
+      'Custom kilo agents materialized into KILO_CONFIG_CONTENT.agent.<slug>'
+    ),
     upstreamBranch: branchNameSchema
       .optional()
       .describe('Optional upstream branch to checkout during session initialization'),
@@ -197,6 +237,18 @@ export const PrepareSessionInput = z
       .optional()
       .describe('Organization ID (UUID, optional)'),
 
+    // Profile resolution — cloud-agent-next resolves the profile stack
+    // (repo binding + default + explicit override) server-side and stacks
+    // the inline fields above as one more layer on top. All six collections
+    // (envVars / setupCommands / encryptedSecrets / mcpServers /
+    // runtimeSkills / runtimeAgents) follow the same precedence: inline
+    // wins on collision with the profile-derived value.
+    profileId: z
+      .string()
+      .uuid()
+      .optional()
+      .describe('Profile ID to resolve (repo binding + default still apply on top)'),
+
     // Image attachments
     images: ImagesSchema.optional().describe(
       'Optional image attachments to download from R2 to the sandbox'
@@ -261,7 +313,7 @@ export const UpdateSessionInput = z
     cloudAgentSessionId: sessionIdSchema.describe('Cloud-agent session ID to update'),
 
     // Scalar fields - null to clear, value to set, undefined to skip
-    mode: AgentModeSchema.nullable().optional().describe('Mode to set (null to clear)'),
+    mode: ModeSlugSchema.nullable().optional().describe('Mode to set (null to clear)'),
     model: modelIdSchema.nullable().optional().describe('Model to set (null to clear)'),
     variant: z
       .string()
@@ -305,6 +357,10 @@ export const UpdateSessionInput = z
       })
       .optional()
       .describe('MCP servers (empty object to clear)'),
+    runtimeSkills: RuntimeSkillsSchema.optional().describe('Runtime skills (empty array to clear)'),
+    runtimeAgents: RuntimeAgentsSchema.optional().describe(
+      'Custom kilo agents (empty array to clear)'
+    ),
     callbackTarget: CallbackTargetSchema.nullable()
       .optional()
       .describe('Callback target (null to clear, value to set, undefined to skip)'),
@@ -312,6 +368,24 @@ export const UpdateSessionInput = z
   .refine(requiresAppendSystemPrompt, {
     message: 'appendSystemPrompt is required when mode is custom',
     path: ['appendSystemPrompt'],
+  })
+  .superRefine((data, ctx) => {
+    // If the caller sets `mode`, it must resolve against the incoming runtimeAgents
+    // (or the existing session's runtimeAgents — checked at handler level). At schema
+    // time we only cross-check within this payload to catch obvious mistakes.
+    if (data.mode === null || data.mode === undefined) return;
+    if (isBuiltinMode(data.mode)) return;
+    if (data.runtimeAgents !== undefined) {
+      const slugs = new Set(data.runtimeAgents.map(a => a.slug));
+      if (!slugs.has(data.mode)) {
+        ctx.addIssue({
+          code: 'custom',
+          path: ['mode'],
+          message: `Mode "${data.mode}" is not a built-in slug and does not match any runtimeAgents[].slug in this update payload`,
+        });
+      }
+    }
+    // If runtimeAgents not provided, handler validates against session state.
   });
 
 /** Output schema for updateSession endpoint */
@@ -374,16 +448,27 @@ export const GetSessionOutput = z.object({
 
   // Execution params
   prompt: z.string().optional().describe('Task prompt'),
-  mode: AgentModeSchema.optional().describe('Execution mode'),
+  mode: z.string().optional().describe('Execution mode (built-in or custom slug)'),
   model: z.string().optional().describe('AI model'),
   variant: z.string().optional().describe('Thinking effort variant'),
   autoCommit: z.boolean().optional().describe('Auto-commit setting'),
   upstreamBranch: z.string().optional().describe('Upstream branch name'),
 
-  // Configuration metadata (counts only, no values)
-  envVarCount: z.number().optional().describe('Number of environment variables configured'),
-  setupCommandCount: z.number().optional().describe('Number of setup commands configured'),
-  mcpServerCount: z.number().optional().describe('Number of MCP servers configured'),
+  runtimeAgents: z
+    .array(
+      z.object({
+        slug: z.string(),
+        name: z.string(),
+        /** Optional model override so the chat UI can lock its model picker. */
+        model: z.string().optional(),
+        /** Optional thinking-effort variant override so the chat UI can lock its variant picker. */
+        variant: z.string().optional(),
+      })
+    )
+    .optional()
+    .describe(
+      'Custom agents available on this session (slug + name, plus optional model and thinking-effort overrides)'
+    ),
 
   // Execution status (grouped for cleaner API)
   execution: ExecutionStatusSchema,
diff --git a/services/cloud-agent-next/src/schema.ts b/services/cloud-agent-next/src/schema.ts
index 24ef9256ea..11155ec865 100644
--- a/services/cloud-agent-next/src/schema.ts
+++ b/services/cloud-agent-next/src/schema.ts
@@ -33,24 +33,27 @@ export const AgentModes = [
   'architect',
   'custom',
 ] as const;
-export type AgentMode = (typeof AgentModes)[number];
+/**
+ * AgentMode accepts any string — built-in slugs from `AgentModes` or any
+ * custom slug from a session's `runtimeAgents`. Use `AgentModeSchema` to
+ * validate that a value is one of the built-ins specifically.
+ */
+export type AgentMode = string;
+export type BuiltinAgentMode = (typeof AgentModes)[number];
 export const AgentModeSchema = z.enum(AgentModes);
 
 /**
- * Maps input agent modes to internal modes used by kilo CLI.
+ * Maps input agent modes to internal modes used by kilo CLI. Built-ins are
+ * aliased (build → code, architect → plan); any non-built-in slug (from a
+ * runtimeMode) is passed through unchanged.
  */
-export function normalizeAgentMode(mode: AgentMode): InternalAgentMode {
+export function normalizeAgentMode(mode: string): string {
   switch (mode) {
     case 'build':
       return 'code';
     case 'architect':
       return 'plan';
-    case 'code':
-    case 'plan':
-    case 'debug':
-    case 'orchestrator':
-    case 'ask':
-    case 'custom':
+    default:
       return mode;
   }
 }
@@ -64,10 +67,26 @@ export const Limits = {
   MAX_SETUP_COMMANDS: 20,
   MAX_SETUP_COMMAND_LENGTH: 500,
   MAX_MCP_SERVERS: 20,
+  MAX_RUNTIME_SKILLS: 50,
+  MAX_RUNTIME_SKILL_MARKDOWN: 100_000, // ~100KB
+  MAX_RUNTIME_SKILL_NAME_LENGTH: 100,
+  MAX_RUNTIME_SKILL_COMPANION_FILES: 20,
+  MAX_RUNTIME_SKILL_COMPANION_FILE_SIZE: 100_000,
+  MAX_RUNTIME_SKILL_COMPANION_FILES_TOTAL: 500_000,
+  MAX_RUNTIME_SKILL_COMPANION_PATH_LENGTH: 200,
+  MAX_RUNTIME_AGENTS: 20,
+  MAX_RUNTIME_AGENT_SLUG_LENGTH: 50,
+  MAX_RUNTIME_AGENT_NAME_LENGTH: 100,
+  MAX_RUNTIME_AGENT_PROMPT: 50_000,
+  MAX_RUNTIME_AGENT_DESCRIPTION: 2000,
+  MAX_RUNTIME_AGENT_MODEL_LENGTH: 200,
   SESSION_TTL_DAYS: 90,
   SESSION_TTL_MS: 90 * 24 * 60 * 60 * 1000, // 90 days in milliseconds
 } as const;
 
+/** Built-in mode slugs recognized by the CLI. */
+export const BUILTIN_AGENT_MODES = new Set<string>(AgentModes);
+
 // === ExecutionParams (for session-service) ===
 export type ExecutionParams = {
   sessionId: string; // cloudAgentSessionId
diff --git a/services/cloud-agent-next/src/session-prepare.test.ts b/services/cloud-agent-next/src/session-prepare.test.ts
index b06af672e3..ea5346bd34 100644
--- a/services/cloud-agent-next/src/session-prepare.test.ts
+++ b/services/cloud-agent-next/src/session-prepare.test.ts
@@ -77,6 +77,8 @@ vi.mock('./session-service.js', () => ({
   ),
   runSetupCommands: vi.fn().mockResolvedValue(undefined),
   writeAuthFile: vi.fn().mockResolvedValue(undefined),
+  writeGlobalRules: vi.fn().mockResolvedValue(undefined),
+  writeRuntimeSkills: vi.fn().mockResolvedValue(undefined),
   InvalidSessionMetadataError: class InvalidSessionMetadataError extends Error {
     constructor(
       public readonly userId: string,
@@ -977,11 +979,36 @@ describe('UpdateSessionInput schema validation', () => {
       expect(result.success).toBe(true);
     }
 
-    const result = schemas.UpdateSessionInput.safeParse({
+    // Non-built-in slugs pass schema validation as long as they look like a
+    // slug — the handler cross-checks them against the session's
+    // stored runtimeAgents. Reject only malformed slugs at the schema layer.
+    const badSlug = schemas.UpdateSessionInput.safeParse({
       cloudAgentSessionId: 'agent_12345678-1234-1234-1234-123456789abc',
-      mode: 'invalid-mode',
+      mode: 'Invalid Mode!',
     });
-    expect(result.success).toBe(false);
+    expect(badSlug.success).toBe(false);
+
+    // A well-formed custom slug is allowed, but when runtimeAgents is provided
+    // in the same payload the slug must match one of them.
+    const unknownWithRuntimeAgents = schemas.UpdateSessionInput.safeParse({
+      cloudAgentSessionId: 'agent_12345678-1234-1234-1234-123456789abc',
+      mode: 'my-custom',
+      runtimeAgents: [],
+    });
+    expect(unknownWithRuntimeAgents.success).toBe(false);
+
+    const knownWithRuntimeAgents = schemas.UpdateSessionInput.safeParse({
+      cloudAgentSessionId: 'agent_12345678-1234-1234-1234-123456789abc',
+      mode: 'my-custom',
+      runtimeAgents: [
+        {
+          slug: 'my-custom',
+          name: 'My Custom',
+          config: { prompt: 'Do things' },
+        },
+      ],
+    });
+    expect(knownWithRuntimeAgents.success).toBe(true);
   });
 
   it('requires appendSystemPrompt for custom mode updates', () => {
diff --git a/services/cloud-agent-next/src/session-profile.ts b/services/cloud-agent-next/src/session-profile.ts
new file mode 100644
index 0000000000..73e5acdbb4
--- /dev/null
+++ b/services/cloud-agent-next/src/session-profile.ts
@@ -0,0 +1,64 @@
+import type { SessionProfileBundle } from './persistence/schemas.js';
+import type {
+  CloudAgentSessionState,
+  MCPServerConfig,
+  RuntimeAgent,
+  RuntimeSkill,
+} from './persistence/types.js';
+
+export type { SessionProfileBundle } from './persistence/schemas.js';
+
+/**
+ * Shape of persisted records that may carry profile-derived configuration in
+ * either the nested `profile` form (current writers) or the legacy flat form
+ * (records written before nesting landed). Both `CloudAgentSessionState` and
+ * `PreparationInput` structurally match this — arrays are typed `readonly`
+ * so stored metadata's `readonly` arrays assign through.
+ */
+type ProfileCarrier = {
+  profile?: SessionProfileBundle;
+  envVars?: Record<string, string>;
+  encryptedSecrets?: SessionProfileBundle['encryptedSecrets'];
+  setupCommands?: readonly string[];
+  mcpServers?: Record<string, MCPServerConfig>;
+  runtimeSkills?: readonly RuntimeSkill[];
+  runtimeAgents?: readonly RuntimeAgent[];
+};
+
+/**
+ * Extract the profile-derived subset from a persisted record, preferring the
+ * nested `profile` key and falling back to the legacy flat fields on records
+ * that pre-date the nesting. When the nested form is present the flat
+ * fallback is ignored entirely (nested wins, even when the flat slots also
+ * hold values — which should not happen since writers no longer emit them).
+ *
+ * Arrays are copied because zod infers mutable element types while the
+ * hand-written `CloudAgentSessionState` types them `readonly`.
+ */
+export function readProfileBundle(record: ProfileCarrier): SessionProfileBundle {
+  if (record.profile) {
+    const { runtimeSkills, runtimeAgents, ...rest } = record.profile;
+    return {
+      ...rest,
+      runtimeSkills: runtimeSkills ? [...runtimeSkills] : undefined,
+      runtimeAgents: runtimeAgents ? [...runtimeAgents] : undefined,
+    };
+  }
+  return {
+    envVars: record.envVars,
+    encryptedSecrets: record.encryptedSecrets,
+    setupCommands: record.setupCommands ? [...record.setupCommands] : undefined,
+    mcpServers: record.mcpServers,
+    runtimeSkills: record.runtimeSkills ? [...record.runtimeSkills] : undefined,
+    runtimeAgents: record.runtimeAgents ? [...record.runtimeAgents] : undefined,
+  };
+}
+
+/**
+ * Legacy alias. Prefer `readProfileBundle` for new call sites — it accepts
+ * any `ProfileCarrier` (metadata or preparation input), not just stored
+ * metadata.
+ */
+export function profileFromMetadata(metadata: CloudAgentSessionState): SessionProfileBundle {
+  return readProfileBundle(metadata);
+}
diff --git a/services/cloud-agent-next/src/session-service.test.ts b/services/cloud-agent-next/src/session-service.test.ts
index 3cabd8c754..900bcbcf20 100644
--- a/services/cloud-agent-next/src/session-service.test.ts
+++ b/services/cloud-agent-next/src/session-service.test.ts
@@ -184,8 +184,8 @@ describe('SessionService', () => {
           KILO_PLATFORM: 'cloud-agent',
           KILO_DISABLE_AUTOUPDATE: 'true',
           KILOCODE_FEATURE: 'cloud-agent',
-          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
-          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
         },
         cwd: `/workspace/org/user/sessions/${sessionId}`,
       });
@@ -341,8 +341,8 @@ describe('SessionService', () => {
           KILO_PLATFORM: 'cloud-agent',
           KILO_DISABLE_AUTOUPDATE: 'true',
           KILOCODE_FEATURE: 'cloud-agent',
-          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
-          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
         },
         cwd: `/workspace/org/user/sessions/${sessionId}`,
       });
@@ -1325,7 +1325,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        envVars,
+        profile: { envVars },
       });
 
       expect(sandboxCreateSession).toHaveBeenCalledWith({
@@ -1339,8 +1339,8 @@ describe('SessionService', () => {
           KILO_PLATFORM: 'cloud-agent',
           KILO_DISABLE_AUTOUPDATE: 'true',
           KILOCODE_FEATURE: 'cloud-agent',
-          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
-          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
           API_KEY: 'test-key-123',
           DATABASE_URL: 'postgres://localhost:5432/test',
           NODE_ENV: 'development',
@@ -1386,7 +1386,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        envVars,
+        profile: { envVars },
       });
 
       expect(sandboxCreateSession).toHaveBeenCalledWith({
@@ -1445,8 +1445,8 @@ describe('SessionService', () => {
           KILO_PLATFORM: 'cloud-agent',
           KILO_DISABLE_AUTOUPDATE: 'true',
           KILOCODE_FEATURE: 'cloud-agent',
-          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
-          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          OPENCODE_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
+          KILO_CONFIG_CONTENT: `{"permission":{"external_directory":{"*":"deny","/tmp/${sessionId}/**":"allow","/workspace/org/user/sessions/${sessionId}/**":"allow","/home/${sessionId}/.kilocode/skills/**":"allow"},"question":"deny","read":"allow","edit":"allow","glob":"allow","grep":"allow","list":"allow","bash":"allow","task":"allow","webfetch":"allow","websearch":"allow","codesearch":"allow","lsp":"allow","skill":"allow","todowrite":"allow","todoread":"allow"},"provider":{"kilo":{"options":{"apiKey":"token","kilocodeToken":"token","kilocodeOrganizationId":"org"}}},"autoupdate":false,"model":"kilo/test-model"}`,
         },
         cwd: `/workspace/org/user/sessions/${sessionId}`,
       });
@@ -1661,8 +1661,10 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         githubToken,
-        envVars: {
-          GH_TOKEN: userProvidedToken,
+        profile: {
+          envVars: {
+            GH_TOKEN: userProvidedToken,
+          },
         },
         env: mockEnv,
       });
@@ -1861,7 +1863,7 @@ describe('SessionService', () => {
         gitUrl: 'https://gitlab.com/acme/repo.git',
         gitToken: 'access-token',
         platform: 'gitlab',
-        envVars: { GLAB_IS_OAUTH2: 'false' },
+        profile: { envVars: { GLAB_IS_OAUTH2: 'false' } },
         env: mockEnv,
       });
 
@@ -2030,7 +2032,7 @@ describe('SessionService', () => {
           kilocodeModel: 'test-model',
           githubRepo: 'acme/repo',
           env: mockEnv,
-          setupCommands,
+          profile: { setupCommands },
         })
       ).rejects.toMatchObject({
         name: 'SetupCommandFailedError',
@@ -2076,7 +2078,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        setupCommands: ['pwd', 'ls -la'],
+        profile: { setupCommands: ['pwd', 'ls -la'] },
       });
 
       expect(fakeSession.exec).toHaveBeenCalledWith(
@@ -2120,7 +2122,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        setupCommands: [], // Empty array
+        profile: { setupCommands: [] }, // Empty array
       });
 
       // exec should only be called once for git checkout -b, not for setup commands
@@ -2171,7 +2173,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        mcpServers,
+        profile: { mcpServers },
       });
 
       const callArgs = sandboxCreateSession.mock.calls[0][0] as { env: Record<string, string> };
@@ -2216,7 +2218,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        mcpServers: {}, // Empty object
+        profile: { mcpServers: {} }, // Empty object
       });
 
       const callArgs = sandboxCreateSession.mock.calls[0][0] as { env: Record<string, string> };
@@ -2251,12 +2253,10 @@ describe('SessionService', () => {
         'server-1': {
           type: 'local' as const,
           command: ['node', 'server.js'],
-          environment: { FOO: 'bar' },
         },
         'server-2': {
           type: 'remote' as const,
           url: 'https://example.com/mcp',
-          headers: { Authorization: 'Bearer tok' },
         },
       };
 
@@ -2270,23 +2270,20 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        mcpServers,
+        profile: { mcpServers },
       });
 
       const callArgs = sandboxCreateSession.mock.calls[0][0] as { env: Record<string, string> };
       const configContent = JSON.parse(callArgs.env.KILO_CONFIG_CONTENT) as {
         mcp: Record<string, unknown>;
       };
-      // MCP configs are passed through directly — no conversion
       expect(configContent.mcp['server-1']).toEqual({
         type: 'local',
         command: ['node', 'server.js'],
-        environment: { FOO: 'bar' },
       });
       expect(configContent.mcp['server-2']).toEqual({
         type: 'remote',
         url: 'https://example.com/mcp',
-        headers: { Authorization: 'Bearer tok' },
       });
     });
 
@@ -2330,7 +2327,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: mockEnv,
-        mcpServers,
+        profile: { mcpServers },
       });
 
       const callArgs = sandboxCreateSession.mock.calls[0][0] as { env: Record<string, string> };
@@ -2344,6 +2341,70 @@ describe('SessionService', () => {
         timeout: 30000,
       });
     });
+
+    it('passes plain-string MCP env values straight through without requiring a private key', async () => {
+      const fakeSession = {
+        exec: vi.fn().mockResolvedValue({ success: true, exitCode: 0 }),
+        gitCheckout: vi.fn().mockResolvedValue({ success: true, exitCode: 0 }),
+        writeFile: vi.fn().mockResolvedValue(undefined),
+        deleteFile: vi.fn().mockResolvedValue(undefined),
+      };
+      const sandboxCreateSession = vi.fn().mockResolvedValue(fakeSession);
+      const sandbox = {
+        createSession: sandboxCreateSession,
+        mkdir: vi.fn().mockResolvedValue(undefined),
+        exec: vi.fn().mockResolvedValue({ exitCode: 0 }),
+        writeFile: vi.fn().mockResolvedValue(undefined),
+      } as unknown as SandboxInstance;
+      const sessionId: SessionId = 'agent_mcp_plain_env';
+      mockedSetupWorkspace.mockResolvedValue({
+        workspacePath: `/workspace/org/user/sessions/${sessionId}`,
+        sessionHome: `/home/${sessionId}`,
+      });
+
+      const service = new SessionService();
+      const mcpServers = {
+        config: {
+          type: 'local' as const,
+          command: ['node', 'server.js'],
+          environment: { LOCALE: 'en-US', PORT: '4000' },
+        },
+        publicRemote: {
+          type: 'remote' as const,
+          url: 'https://example.com/mcp',
+          headers: { 'X-Region': 'eu-west-1' },
+        },
+      };
+
+      // No AGENT_ENV_VARS_PRIVATE_KEY in env — must still succeed because no envelopes are present.
+      await service.initiate({
+        sandbox,
+        sandboxId: 'org__user',
+        orgId: 'org',
+        userId: 'user',
+        sessionId,
+        kilocodeToken: 'token',
+        kilocodeModel: 'test-model',
+        githubRepo: 'acme/repo',
+        env: mockEnv,
+        profile: { mcpServers },
+      });
+
+      const callArgs = sandboxCreateSession.mock.calls[0][0] as { env: Record<string, string> };
+      const configContent = JSON.parse(callArgs.env.KILO_CONFIG_CONTENT) as {
+        mcp: Record<string, unknown>;
+      };
+      expect(configContent.mcp.config).toEqual({
+        type: 'local',
+        command: ['node', 'server.js'],
+        environment: { LOCALE: 'en-US', PORT: '4000' },
+      });
+      expect(configContent.mcp.publicRemote).toEqual({
+        type: 'remote',
+        url: 'https://example.com/mcp',
+        headers: { 'X-Region': 'eu-west-1' },
+      });
+    });
   });
 
   describe('Metadata Persistence', () => {
@@ -2388,23 +2449,24 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: testEnv,
-        envVars,
-        setupCommands,
-        mcpServers,
+        profile: { envVars, setupCommands, mcpServers },
       });
 
-      // Verify metadata was saved
+      // Verify metadata was saved with profile-derived fields nested
+      // under `profile` (the flat form is no longer written).
       expect(updateMetadata).toHaveBeenCalledWith(
         expect.objectContaining({
           sessionId,
           orgId: 'org',
           userId: 'user',
           githubRepo: 'acme/repo',
-          envVars: { API_KEY: 'test-123' },
-          setupCommands: ['npm install', 'npm build'],
-          mcpServers: {
-            test: { type: 'local', command: ['test-server'] },
-          },
+          profile: expect.objectContaining({
+            envVars: { API_KEY: 'test-123' },
+            setupCommands: ['npm install', 'npm build'],
+            mcpServers: {
+              test: { type: 'local', command: ['test-server'] },
+            },
+          }) as unknown,
         })
       );
     });
@@ -2505,7 +2567,7 @@ describe('SessionService', () => {
         kilocodeModel: 'test-model',
         githubRepo: 'acme/repo',
         env: testEnv,
-        ...originalData,
+        profile: originalData,
       });
 
       // Load
@@ -2520,11 +2582,14 @@ describe('SessionService', () => {
         env: testEnv,
       });
 
-      // Verify round-trip
+      // Verify round-trip — writers now emit the nested profile form
       expect(result.context.envVars).toEqual(originalData.envVars);
       expect(savedMetadata).toBeDefined();
-      expect(savedMetadata?.setupCommands).toEqual(originalData.setupCommands);
-      expect(savedMetadata?.mcpServers?.server1).toEqual({ type: 'local', command: ['test'] });
+      expect(savedMetadata?.profile?.setupCommands).toEqual(originalData.setupCommands);
+      expect(savedMetadata?.profile?.mcpServers?.server1).toEqual({
+        type: 'local',
+        command: ['test'],
+      });
     });
   });
 
@@ -3326,7 +3391,7 @@ describe('SessionService', () => {
         kiloSessionId,
         githubRepo: 'acme/repo',
         env: testEnv,
-        setupCommands: ['npm install', 'npm run build'],
+        profile: { setupCommands: ['npm install', 'npm run build'] },
       });
 
       // Verify setup commands were run
diff --git a/services/cloud-agent-next/src/session-service.ts b/services/cloud-agent-next/src/session-service.ts
index 2b63ace763..a90b03fcae 100644
--- a/services/cloud-agent-next/src/session-service.ts
+++ b/services/cloud-agent-next/src/session-service.ts
@@ -27,11 +27,15 @@ import type {
   PersistenceEnv,
   CloudAgentSessionState,
   MCPServerConfig,
+  RuntimeSkill,
+  RuntimeAgent,
 } from './persistence/types.js';
 import { MetadataSchema } from './persistence/schemas.js';
 import { withDORetry } from './utils/do-retry.js';
-import { mergeEnvVarsWithSecrets } from './utils/encryption.js';
-import type { EncryptedSecrets } from './router/schemas.js';
+import { decryptWithPrivateKey, mergeEnvVarsWithSecrets } from './utils/encryption.js';
+import type { MCPSecretValue } from './router/schemas.js';
+import type { SessionProfileBundle } from './session-profile.js';
+import { readProfileBundle } from './session-profile.js';
 
 const SETUP_COMMAND_TIMEOUT_SECONDS = 300; // 5 minutes
 const SANDBOX_RETRY_DEFAULTS = {
@@ -358,6 +362,92 @@ export async function writeAuthFile(
   logger.info('Wrote kilo auth file for session ingest');
 }
 
+/**
+ * CLI-native MCP config shape (env/header values as plain strings), ready to
+ * JSON-encode into KILO_CONFIG_CONTENT.mcp.
+ */
+type CliMcpServer =
+  | {
+      type: 'local';
+      command: string[];
+      environment?: Record<string, string>;
+      enabled?: boolean;
+      timeout?: number;
+    }
+  | {
+      type: 'remote';
+      url: string;
+      headers?: Record<string, string>;
+      enabled?: boolean;
+      timeout?: number;
+    };
+
+/**
+ * Materialize each MCP env/header value into its plaintext form for the CLI.
+ * Plain strings pass through verbatim; encrypted envelopes are decrypted
+ * per key. Throws only if at least one envelope is present and
+ * AGENT_ENV_VARS_PRIVATE_KEY is missing — records of pure plain strings
+ * never require the key.
+ */
+function materializeMcpServers(
+  mcpServers: Record<string, MCPServerConfig>,
+  privateKey: string | undefined
+): Record<string, CliMcpServer> {
+  const out: Record<string, CliMcpServer> = {};
+  for (const [name, server] of Object.entries(mcpServers)) {
+    if (server.type === 'local') {
+      const environment = materializeSecretValueRecord(
+        server.environment,
+        privateKey,
+        `MCP server "${name}" environment`
+      );
+      out[name] = {
+        type: 'local',
+        command: server.command,
+        ...(environment !== undefined && { environment }),
+        ...(server.enabled !== undefined && { enabled: server.enabled }),
+        ...(server.timeout !== undefined && { timeout: server.timeout }),
+      };
+    } else {
+      const headers = materializeSecretValueRecord(
+        server.headers,
+        privateKey,
+        `MCP server "${name}" headers`
+      );
+      out[name] = {
+        type: 'remote',
+        url: server.url,
+        ...(headers !== undefined && { headers }),
+        ...(server.enabled !== undefined && { enabled: server.enabled }),
+        ...(server.timeout !== undefined && { timeout: server.timeout }),
+      };
+    }
+  }
+  return out;
+}
+
+function materializeSecretValueRecord(
+  values: Record<string, MCPSecretValue> | undefined,
+  privateKey: string | undefined,
+  label: string
+): Record<string, string> | undefined {
+  if (!values || Object.keys(values).length === 0) return undefined;
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(values)) {
+    if (typeof value === 'string') {
+      out[key] = value;
+      continue;
+    }
+    if (!privateKey) {
+      throw new Error(
+        `${label} contains encrypted values but AGENT_ENV_VARS_PRIVATE_KEY is not configured on the worker`
+      );
+    }
+    out[key] = decryptWithPrivateKey(value, privateKey);
+  }
+  return out;
+}
+
 // Write global rules file so the CLI injects cloud-agent-specific instructions.
 // The CLI's RulesMigrator discovers ~/.kilocode/rules/*.md and appends them
 // to the system prompt automatically.
@@ -388,6 +478,115 @@ export async function writeGlobalRules(
   await sandbox.writeFile(rulesPath, content);
 }
 
+/**
+ * Simple djb2 hash for logging a short, non-reversible fingerprint of skill
+ * content without exposing the content itself.
+ */
+function shortHash(input: string): string {
+  let hash = 5381;
+  for (let i = 0; i < input.length; i++) {
+    hash = ((hash << 5) + hash + input.charCodeAt(i)) | 0;
+  }
+  return (hash >>> 0).toString(16);
+}
+
+/**
+ * Write each runtime skill to `${sessionHome}/.kilocode/skills/<name>/SKILL.md`.
+ * The CLI auto-discovers skills under `~/.kilocode/skills/<name>/SKILL.md`; `HOME`
+ * is set to `sessionHome` when the execution session is created so the default
+ * discovery path resolves here.
+ *
+ * Logs name, size, and a short content hash — never the raw content.
+ */
+/**
+ * Build the `KILO_CONFIG_CONTENT.agent.<slug>` entry for a profile agent.
+ * The stored `config` already matches the CLI's AgentConfig shape, so this
+ * is essentially a pass-through with a default `mode: 'primary'` when the
+ * user didn't specify one.
+ */
+export function buildAgentEntryFromRuntimeAgent(agent: RuntimeAgent): Record<string, unknown> {
+  const { config } = agent;
+  const entry: Record<string, unknown> = {
+    mode: config.mode ?? 'primary',
+  };
+  if (config.prompt !== undefined) entry.prompt = config.prompt;
+  if (config.description !== undefined) entry.description = config.description;
+  if (config.model !== undefined) entry.model = config.model;
+  if (config.variant !== undefined) entry.variant = config.variant;
+  if (config.temperature !== undefined) entry.temperature = config.temperature;
+  if (config.top_p !== undefined) entry.top_p = config.top_p;
+  if (config.steps !== undefined) entry.steps = config.steps;
+  if (config.hidden !== undefined) entry.hidden = config.hidden;
+  if (config.disable !== undefined) entry.disable = config.disable;
+  if (config.color !== undefined) entry.color = config.color;
+  if (config.permission !== undefined) entry.permission = config.permission;
+  if (config.options !== undefined) entry.options = config.options;
+  return entry;
+}
+
+/**
+ * Defensive check on a companion file path before we exec `mkdir -p`/`writeFile`.
+ * Schema-level validation already enforces these rules, but re-check at the
+ * sandbox boundary to prevent any stray input from escaping the skill dir.
+ */
+function isSafeSkillFilePath(relativePath: string): boolean {
+  if (relativePath.length === 0 || relativePath.length > 200) return false;
+  if (relativePath.startsWith('/')) return false;
+  if (relativePath.includes('..')) return false;
+  if (relativePath.includes('\\') || relativePath.includes('\0')) return false;
+  if (relativePath.toLowerCase() === 'skill.md') return false;
+  return /^[a-zA-Z0-9._\-/]+$/.test(relativePath);
+}
+
+export async function writeRuntimeSkills(
+  sandbox: SandboxInstance,
+  sessionHome: string,
+  skills: readonly RuntimeSkill[] | undefined
+): Promise<void> {
+  if (!skills || skills.length === 0) return;
+
+  const baseDir = `${sessionHome}/.kilocode/skills`;
+  await timedExec(sandbox, `mkdir -p ${baseDir}`, 'session.writeRuntimeSkills.mkdir');
+
+  const summaries: { name: string; bytes: number; hash: string; fileCount: number }[] = [];
+  for (const skill of skills) {
+    const skillDir = `${baseDir}/${skill.name}`;
+    const skillPath = `${skillDir}/SKILL.md`;
+    await timedExec(sandbox, `mkdir -p ${skillDir}`, 'session.writeRuntimeSkills.mkdir');
+    await sandbox.writeFile(skillPath, skill.rawMarkdown);
+
+    let fileCount = 0;
+    if (skill.files) {
+      for (const [relativePath, content] of Object.entries(skill.files)) {
+        if (!isSafeSkillFilePath(relativePath)) {
+          logger
+            .withFields({ skill: skill.name, relativePath })
+            .warn('Rejected unsafe skill companion file path');
+          continue;
+        }
+        const filePath = `${skillDir}/${relativePath}`;
+        const parent = filePath.substring(0, filePath.lastIndexOf('/'));
+        if (parent && parent !== skillDir) {
+          await timedExec(sandbox, `mkdir -p ${parent}`, 'session.writeRuntimeSkills.mkdir');
+        }
+        await sandbox.writeFile(filePath, content);
+        fileCount += 1;
+      }
+    }
+
+    summaries.push({
+      name: skill.name,
+      bytes: skill.rawMarkdown.length,
+      hash: shortHash(skill.rawMarkdown),
+      fileCount,
+    });
+  }
+
+  logger
+    .withFields({ skillCount: summaries.length, skills: summaries })
+    .info('Wrote runtime skills');
+}
+
 /**
  * Fetch session metadata from Durable Object using RPC with retry logic.
  * Creates a fresh stub for each retry attempt as recommended by Cloudflare.
@@ -529,25 +728,29 @@ export class SessionService {
     };
   }
 
-  private getSaferEnvVars(
-    userEnvVars: Record<string, string> | undefined,
-    sessionHome: string,
-    sessionId: string,
-    workspacePath: string,
-    env: PersistenceEnv,
-    originalToken: string,
-    kilocodeModel: string | undefined,
-    originalOrgId?: string,
-    githubToken?: string,
-    githubRepo?: string,
-    encryptedSecrets?: EncryptedSecrets,
-    createdOnPlatform?: string,
-    appendSystemPrompt?: string,
-    gitUrl?: string,
-    gitToken?: string,
-    platform?: 'github' | 'gitlab',
-    mcpServers?: Record<string, MCPServerConfig>
-  ): Record<string, string> {
+  private getSaferEnvVars(opts: GetSaferEnvVarsOptions): Record<string, string> {
+    const {
+      sessionHome,
+      sessionId,
+      workspacePath,
+      env,
+      originalToken,
+      kilocodeModel,
+      originalOrgId,
+      githubToken,
+      githubRepo,
+      createdOnPlatform,
+      appendSystemPrompt,
+      gitUrl,
+      gitToken,
+      platform,
+      profile,
+    } = opts;
+    const userEnvVars = profile?.envVars;
+    const encryptedSecrets = profile?.encryptedSecrets;
+    const mcpServers = profile?.mcpServers;
+    const runtimeAgents = profile?.runtimeAgents;
+
     // Use override if available, otherwise use original values from API
     const kilocodeToken = env.KILOCODE_TOKEN_OVERRIDE ?? originalToken;
     const kilocodeOrganizationId = env.KILOCODE_ORG_ID_OVERRIDE ?? originalOrgId;
@@ -603,6 +806,7 @@ export class SessionService {
         '*': 'deny',
         [`/tmp/${sessionId}/**`]: 'allow',
         [`${workspacePath}/**`]: 'allow',
+        [`${sessionHome}/.kilocode/skills/**`]: 'allow',
       },
       ...(!isInteractive && { question: 'deny' }),
       read: 'allow',
@@ -669,12 +873,14 @@ export class SessionService {
       },
       autoupdate: false,
     };
-    // MCP configs are already in CLI-native format — pass through directly
+    // Decrypt each env/header envelope into its plaintext value and emit the
+    // CLI-native shape the runtime consumes under `KILO_CONFIG_CONTENT.mcp`.
     if (mcpServers && Object.keys(mcpServers).length > 0) {
-      configContent.mcp = mcpServers;
+      const materialized = materializeMcpServers(mcpServers, env.AGENT_ENV_VARS_PRIVATE_KEY);
+      configContent.mcp = materialized;
       logger.info('MCP config merged into KILO_CONFIG_CONTENT', {
-        mcpServerNames: Object.keys(mcpServers),
-        mcpServerCount: Object.keys(mcpServers).length,
+        mcpServerNames: Object.keys(materialized),
+        mcpServerCount: Object.keys(materialized).length,
       });
     }
     if (kilocodeModel && kilocodeModel.trim()) {
@@ -683,13 +889,24 @@ export class SessionService {
         : `kilo/${kilocodeModel}`;
       configContent.model = normalizedModel;
     }
-    // Add custom agent config if appendSystemPrompt is provided (from prepareSession)
+    // Merge custom-prompt (appendSystemPrompt) and profile-provided runtimeAgents
+    // under a single `agent` map keyed by slug. The CLI looks up the mode by
+    // slug and applies its prompt + per-tool permission map.
+    const agentConfig: Record<string, unknown> = {};
     if (appendSystemPrompt && appendSystemPrompt.trim()) {
-      configContent.agent = {
-        custom: {
-          prompt: appendSystemPrompt,
-        },
-      };
+      agentConfig.custom = { prompt: appendSystemPrompt };
+    }
+    if (runtimeAgents && runtimeAgents.length > 0) {
+      for (const agent of runtimeAgents) {
+        agentConfig[agent.slug] = buildAgentEntryFromRuntimeAgent(agent);
+      }
+      logger.info('Runtime agents merged into KILO_CONFIG_CONTENT', {
+        agentSlugs: runtimeAgents.map(a => a.slug),
+        agentCount: runtimeAgents.length,
+      });
+    }
+    if (Object.keys(agentConfig).length > 0) {
+      configContent.agent = agentConfig;
     }
     const configJson = JSON.stringify(configContent);
     envVars.OPENCODE_CONFIG_CONTENT = configJson;
@@ -761,24 +978,37 @@ export class SessionService {
    *
    * Sessions within a sandbox maintain isolated shell state (environment variables,
    * working directory) but share the filesystem.
+   *
+   * Profile-derived configuration (envVars, encryptedSecrets, MCP servers,
+   * runtime skills/agents) comes through as a single `profile` bundle so
+   * adding a new profile field is one-line change here instead of threading
+   * yet another positional argument through every caller.
    */
-  async getOrCreateSession(
-    sandbox: SandboxInstance,
-    context: SessionContext,
-    env: PersistenceEnv,
-    originalToken: string,
-    kilocodeModel: string | undefined,
-    originalOrgId?: string,
-    encryptedSecrets?: EncryptedSecrets,
-    createdOnPlatform?: string,
-    appendSystemPrompt?: string,
-    mcpServers?: Record<string, MCPServerConfig>
-  ) {
-    const { sessionId, sessionHome, workspacePath, envVars } = context;
+  async getOrCreateSession(opts: GetOrCreateSessionOptions) {
+    const {
+      sandbox,
+      context,
+      env,
+      originalToken,
+      kilocodeModel,
+      originalOrgId,
+      createdOnPlatform,
+      appendSystemPrompt,
+      profile,
+    } = opts;
+    const { sessionId, sessionHome, workspacePath, envVars: contextEnvVars } = context;
+
+    // The pre-refactor code threaded `context.envVars` into `getSaferEnvVars`
+    // (set by callers from metadata on resume, profile on prepare). Merge
+    // with the profile bundle's envVars — profile wins when both are set
+    // since the bundle is the authoritative snapshot during prepare/initiate.
+    const effectiveProfile: SessionProfileBundle | undefined =
+      profile === undefined && contextEnvVars === undefined
+        ? undefined
+        : { ...profile, envVars: profile?.envVars ?? contextEnvVars };
 
     // Decrypt secrets and merge with env vars (just-in-time decryption)
-    const saferEnvVars = this.getSaferEnvVars(
-      envVars,
+    const saferEnvVars = this.getSaferEnvVars({
       sessionHome,
       sessionId,
       workspacePath,
@@ -786,22 +1016,30 @@ export class SessionService {
       originalToken,
       kilocodeModel,
       originalOrgId,
-      context.githubToken,
-      context.githubRepo,
-      encryptedSecrets,
+      githubToken: context.githubToken,
+      githubRepo: context.githubRepo,
       createdOnPlatform,
       appendSystemPrompt,
-      context.gitUrl,
-      context.gitToken,
-      context.platform,
-      mcpServers
-    );
+      gitUrl: context.gitUrl,
+      gitToken: context.gitToken,
+      platform: context.platform,
+      profile: effectiveProfile,
+    });
 
     const session = await sandbox.createSession({
       name: sessionId,
       env: saferEnvVars,
       cwd: workspacePath,
     });
+
+    // Materialize runtime skills on disk so the CLI picks them up from its
+    // default discovery path under HOME/.kilocode/skills. Done once per
+    // session creation — for idempotent re-runs we overwrite files in place.
+    const runtimeSkills = profile?.runtimeSkills;
+    if (runtimeSkills && runtimeSkills.length > 0) {
+      await writeRuntimeSkills(sandbox, sessionHome, runtimeSkills);
+    }
+
     return session;
   }
 
@@ -840,16 +1078,14 @@ export class SessionService {
       gitUrl,
       gitToken,
       env,
-      envVars,
-      encryptedSecrets,
-      setupCommands,
-      mcpServers,
+      profile,
       upstreamBranch,
       botId,
       githubAppType,
       createdOnPlatform,
       shallow,
     } = options;
+    const setupCommands = profile?.setupCommands;
 
     logger.setTags({
       sessionId,
@@ -884,23 +1120,23 @@ export class SessionService {
       platform: options.platform,
     });
 
-    // Inject env vars into context for session creation
-    if (envVars) {
-      context.envVars = envVars;
+    // Inject env vars into context for session creation (profile snapshot
+    // is the source of truth on initiate). Consumers also read this off the
+    // returned `context`, so keep it populated — the tests rely on it.
+    if (profile?.envVars) {
+      context.envVars = profile.envVars;
     }
 
-    const session = await this.getOrCreateSession(
+    const session = await this.getOrCreateSession({
       sandbox,
       context,
       env,
-      kilocodeToken,
+      originalToken: kilocodeToken,
       kilocodeModel,
-      orgId,
-      encryptedSecrets,
+      originalOrgId: orgId,
       createdOnPlatform,
-      undefined, // appendSystemPrompt
-      mcpServers
-    );
+      profile,
+    });
 
     // Clone repository using appropriate method
     // Shallow clone (depth: 1) can be enabled for faster checkout and reduced disk usage
@@ -960,9 +1196,7 @@ export class SessionService {
         githubToken,
         gitUrl,
         gitToken,
-        envVars,
-        setupCommands,
-        mcpServers,
+        profile,
         upstreamBranch,
       },
       existingMetadata ?? undefined
@@ -1007,14 +1241,12 @@ export class SessionService {
       gitUrl,
       gitToken,
       env,
-      envVars,
-      encryptedSecrets,
-      setupCommands,
-      mcpServers,
+      profile,
       botId,
       githubAppType,
       existingMetadata,
     } = options;
+    const setupCommands = profile?.setupCommands;
 
     logger.setTags({
       sessionId,
@@ -1057,22 +1289,35 @@ export class SessionService {
       platform: existingMetadata?.platform,
     });
 
-    if (envVars) {
-      context.envVars = envVars;
+    if (profile?.envVars) {
+      context.envVars = profile.envVars;
     }
 
-    const session = await this.getOrCreateSession(
+    // Merge caller-provided bundle with fallbacks from existingMetadata: for
+    // fields the caller didn't resupply (skills/agents on a resume), reuse
+    // the snapshot captured at prepare time. `readProfileBundle` handles the
+    // nested-vs-legacy-flat lookup and copies arrays into mutable form.
+    const existingProfile = existingMetadata ? readProfileBundle(existingMetadata) : undefined;
+    const mergedProfile: SessionProfileBundle = {
+      envVars: profile?.envVars,
+      encryptedSecrets: profile?.encryptedSecrets,
+      setupCommands,
+      mcpServers: profile?.mcpServers,
+      runtimeSkills: profile?.runtimeSkills ?? existingProfile?.runtimeSkills,
+      runtimeAgents: profile?.runtimeAgents ?? existingProfile?.runtimeAgents,
+    };
+
+    const session = await this.getOrCreateSession({
       sandbox,
       context,
       env,
-      kilocodeToken,
+      originalToken: kilocodeToken,
       kilocodeModel,
-      orgId,
-      encryptedSecrets,
-      options.createdOnPlatform ?? existingMetadata?.createdOnPlatform,
-      existingMetadata?.appendSystemPrompt,
-      mcpServers
-    );
+      originalOrgId: orgId,
+      createdOnPlatform: options.createdOnPlatform ?? existingMetadata?.createdOnPlatform,
+      appendSystemPrompt: existingMetadata?.appendSystemPrompt,
+      profile: mergedProfile,
+    });
 
     // Clone repository using appropriate method
     if (gitUrl) {
@@ -1142,9 +1387,7 @@ export class SessionService {
         githubToken,
         gitUrl,
         gitToken,
-        envVars,
-        setupCommands,
-        mcpServers,
+        profile: mergedProfile,
         kiloSessionId,
       },
       metadataToPreserve
@@ -1238,25 +1481,26 @@ export class SessionService {
       platform: metadata?.platform,
     });
 
+    const resumeProfile = metadata ? readProfileBundle(metadata) : undefined;
+
     // Inject env vars from metadata into context (before creating session)
-    if (metadata?.envVars) {
-      context.envVars = metadata.envVars;
+    if (resumeProfile?.envVars) {
+      context.envVars = resumeProfile.envVars;
     }
 
     // Create session first so we can use it for all operations
     // Note: encryptedSecrets come from metadata for resume - they were stored during prepare/initiate
-    const session = await this.getOrCreateSession(
+    const session = await this.getOrCreateSession({
       sandbox,
       context,
       env,
-      kilocodeToken,
+      originalToken: kilocodeToken,
       kilocodeModel,
-      orgId,
-      metadata?.encryptedSecrets,
-      metadata?.createdOnPlatform,
-      metadata?.appendSystemPrompt,
-      metadata?.mcpServers
-    );
+      originalOrgId: orgId,
+      createdOnPlatform: metadata?.createdOnPlatform,
+      appendSystemPrompt: metadata?.appendSystemPrompt,
+      profile: resumeProfile,
+    });
 
     // Check if workspace repo exists - if not, we may need to reclone
     const repoCheck = await timedExec(
@@ -1425,10 +1669,11 @@ export class SessionService {
       }
 
       // Re-run setup commands (fresh clone, need to reinstall)
-      if (metadata.setupCommands && metadata.setupCommands.length > 0) {
+      const coldStartSetupCommands = readProfileBundle(metadata).setupCommands;
+      if (coldStartSetupCommands && coldStartSetupCommands.length > 0) {
         onProgress?.('setup_commands', 'Running setup commands…');
         logger.info('Re-running setup commands after fresh clone');
-        await runSetupCommands(session, context, metadata.setupCommands, false); // lenient
+        await runSetupCommands(session, context, coldStartSetupCommands, false); // lenient
       }
 
       // Wrapper will be (re)started by the orchestrator after we return
@@ -1678,9 +1923,7 @@ export class SessionService {
       githubToken?: string;
       gitUrl?: string;
       gitToken?: string;
-      envVars?: Record<string, string>;
-      setupCommands?: string[];
-      mcpServers?: Record<string, MCPServerConfig>;
+      profile?: SessionProfileBundle;
       upstreamBranch?: string;
       kiloSessionId?: string;
     },
@@ -1689,11 +1932,13 @@ export class SessionService {
     const { orgId, userId, sessionId, botId, platform, sandboxId } = context;
     const doKey = `${userId}:${sessionId}`;
 
-    // Build metadata, preserving prepared session fields from existing if provided
+    // Legacy flat profile fields on `existing` are harmless leftovers —
+    // `readProfileBundle` always prefers `profile` so they are never read.
+    // They are left in place and will be dropped naturally when `profile`
+    // is removed alongside the fallback branch.
     const metadata: CloudAgentSessionState = {
-      // Start with existing metadata if provided (preserves preparedAt, initiatedAt, prompt, mode, model, autoCommit)
+      // Preserves preparedAt, initiatedAt, prompt, mode, model, autoCommit, etc.
       ...(existing ?? {}),
-      // Always update these core fields
       version: Date.now(),
       sessionId,
       orgId,
@@ -1702,14 +1947,11 @@ export class SessionService {
       platform,
       sandboxId,
       timestamp: Date.now(),
-      // Apply the new data (may override some existing fields, which is intentional)
       githubRepo: data.githubRepo,
       githubToken: data.githubToken,
       gitUrl: data.gitUrl,
       gitToken: data.gitToken,
-      envVars: data.envVars,
-      setupCommands: data.setupCommands,
-      mcpServers: data.mcpServers,
+      profile: data.profile,
       upstreamBranch: data.upstreamBranch,
       kiloSessionId: data.kiloSessionId,
     };
@@ -1877,6 +2119,48 @@ export interface PreparedSession {
   session: Awaited<ReturnType<SessionService['getOrCreateSession']>>;
 }
 
+/**
+ * Options for `SessionService.getOrCreateSession`.
+ *
+ * Profile-derived fields live inside `profile` so adding a new field is a
+ * single-line change here plus the corresponding entry in `SessionProfileBundle`.
+ */
+export type GetOrCreateSessionOptions = {
+  sandbox: SandboxInstance;
+  context: SessionContext;
+  env: PersistenceEnv;
+  /** Kilocode token used for API calls (overridden by KILOCODE_TOKEN_OVERRIDE). */
+  originalToken: string;
+  kilocodeModel?: string;
+  originalOrgId?: string;
+  createdOnPlatform?: string;
+  appendSystemPrompt?: string;
+  profile?: SessionProfileBundle;
+};
+
+/**
+ * Options for the private `getSaferEnvVars` helper. Kept as a named type so
+ * the grouping mirrors `GetOrCreateSessionOptions` and call-site params stay
+ * discoverable.
+ */
+type GetSaferEnvVarsOptions = {
+  sessionHome: string;
+  sessionId: string;
+  workspacePath: string;
+  env: PersistenceEnv;
+  originalToken: string;
+  kilocodeModel?: string;
+  originalOrgId?: string;
+  githubToken?: string;
+  githubRepo?: string;
+  createdOnPlatform?: string;
+  appendSystemPrompt?: string;
+  gitUrl?: string;
+  gitToken?: string;
+  platform?: 'github' | 'gitlab';
+  profile?: SessionProfileBundle;
+};
+
 export interface InitiateOptions {
   sandbox: SandboxInstance;
   sandboxId: SessionContext['sandboxId'];
@@ -1890,10 +2174,12 @@ export interface InitiateOptions {
   gitUrl?: string;
   gitToken?: string;
   env: PersistenceEnv;
-  envVars?: Record<string, string>;
-  encryptedSecrets?: EncryptedSecrets;
-  setupCommands?: string[];
-  mcpServers?: Record<string, MCPServerConfig>;
+  /**
+   * Profile-derived configuration snapshot. Contains envVars, encryptedSecrets,
+   * setupCommands, mcpServers, runtimeSkills, runtimeAgents. Adding a new
+   * profile field means extending `SessionProfileBundle`, not this interface.
+   */
+  profile?: SessionProfileBundle;
   upstreamBranch?: string;
   botId?: string;
   /** GitHub App type for selecting correct slug/bot identity */
@@ -1940,10 +2226,8 @@ type InitiateFromKiloSessionBaseOptions = {
   kilocodeModel: string;
   kiloSessionId: string;
   env: PersistenceEnv;
-  envVars?: Record<string, string>;
-  encryptedSecrets?: EncryptedSecrets;
-  setupCommands?: string[];
-  mcpServers?: Record<string, MCPServerConfig>;
+  /** Profile-derived configuration snapshot — see {@link SessionProfileBundle}. */
+  profile?: SessionProfileBundle;
   botId?: string;
   /** GitHub App type for selecting correct slug/bot identity */
   githubAppType?: 'standard' | 'lite';
diff --git a/services/cloud-agent-next/src/types.ts b/services/cloud-agent-next/src/types.ts
index a17fa35b5d..0f72205d0c 100644
--- a/services/cloud-agent-next/src/types.ts
+++ b/services/cloud-agent-next/src/types.ts
@@ -185,6 +185,12 @@ export type Env = {
   R2_ATTACHMENTS_READONLY_SECRET_ACCESS_KEY?: string;
   /** R2 bucket name for image attachments */
   R2_ATTACHMENTS_BUCKET?: string;
+  /**
+   * Hyperdrive binding for reading Postgres (agent environment profiles).
+   * The `connectionString` is proxied through Hyperdrive so the worker
+   * authenticates against Hyperdrive, not directly against Postgres.
+   */
+  HYPERDRIVE: Hyperdrive;
 };
 
 /** tRPC context passed to all procedures */
diff --git a/services/cloud-agent-next/test/unit/execution/orchestrator.test.ts b/services/cloud-agent-next/test/unit/execution/orchestrator.test.ts
index fa929bd07c..0f49c775e5 100644
--- a/services/cloud-agent-next/test/unit/execution/orchestrator.test.ts
+++ b/services/cloud-agent-next/test/unit/execution/orchestrator.test.ts
@@ -325,8 +325,10 @@ describe('WorkspacePlan types', () => {
       gitUrl: 'https://git.example.com/repo.git',
       githubToken: 'gh_token',
       gitToken: 'git_token',
-      envVars: { NODE_ENV: 'production' },
-      setupCommands: ['npm install'],
+      profile: {
+        envVars: { NODE_ENV: 'production' },
+        setupCommands: ['npm install'],
+      },
       upstreamBranch: 'main',
       kiloSessionId: 'kilo_sess',
       isPreparedSession: true,
diff --git a/services/gastown/src/util/platform-pr.util.ts b/services/gastown/src/util/platform-pr.util.ts
index c05bff3431..f0310321c4 100644
--- a/services/gastown/src/util/platform-pr.util.ts
+++ b/services/gastown/src/util/platform-pr.util.ts
@@ -6,14 +6,13 @@
  */
 
 import { z } from 'zod';
+import { parseGitUrl } from '@kilocode/worker-utils/git-url';
 
-// -- Git URL parsing --
-
-export type RepoCoordinates = {
-  platform: 'github' | 'gitlab';
-  owner: string;
-  repo: string;
-};
+// Re-export the shared git URL helpers so existing imports
+// (`import { parseGitUrl } from '../../util/platform-pr.util'`) continue to
+// resolve. New call sites should import directly from `@kilocode/worker-utils/git-url`.
+export { parseGitUrl };
+export type { RepoCoordinates } from '@kilocode/worker-utils/git-url';
 
 /**
  * Parse the hostname from a URL string, returning null on failure.
@@ -26,92 +25,6 @@ function hostnameOf(urlStr: string): string | null {
   }
 }
 
-/**
- * Check whether a host is a known GitLab host (gitlab.com or matches
- * the configured instance URL by exact hostname comparison).
- */
-function isGitLabHost(host: string, gitlabInstanceUrl?: string): boolean {
-  if (host === 'gitlab.com') return true;
-  if (gitlabInstanceUrl && hostnameOf(gitlabInstanceUrl) === host) return true;
-  return false;
-}
-
-/**
- * Extract owner/repo from a git URL.
- * Supports https and git@ formats:
- *   https://github.com/org/repo.git
- *   git@github.com:org/repo.git
- *   https://gitlab.example.com/org/repo.git
- *   https://gitlab.com/group/subgroup/project.git  (GitLab subgroups)
- */
-export function parseGitUrl(gitUrl: string, gitlabInstanceUrl?: string): RepoCoordinates | null {
-  // Normalize: strip trailing .git and embedded credentials (e.g. https://token@github.com/...)
-  const url = gitUrl.replace(/\.git$/, '').replace(/\/\/[^@]+@/, '//');
-
-  // HTTPS format: https://host/path...
-  const httpsMatch = url.match(/^https?:\/\/([^/]+)\/(.+)/);
-  if (httpsMatch) {
-    const host = httpsMatch[1];
-    const fullPath = httpsMatch[2];
-
-    if (host === 'github.com') {
-      // GitHub: always owner/repo (two segments)
-      const parts = fullPath.split('/');
-      if (parts.length >= 2) {
-        return { platform: 'github', owner: parts[0], repo: parts[1] };
-      }
-      return null;
-    }
-
-    if (isGitLabHost(host, gitlabInstanceUrl)) {
-      // GitLab: supports subgroups — owner is everything except the last
-      // segment, repo is the last segment.
-      const lastSlash = fullPath.lastIndexOf('/');
-      if (lastSlash > 0) {
-        return {
-          platform: 'gitlab',
-          owner: fullPath.slice(0, lastSlash),
-          repo: fullPath.slice(lastSlash + 1),
-        };
-      }
-      return null;
-    }
-
-    return null;
-  }
-
-  // SSH format: git@host:path
-  const sshMatch = url.match(/^git@([^:]+):(.+)/);
-  if (sshMatch) {
-    const host = sshMatch[1];
-    const fullPath = sshMatch[2];
-
-    if (host === 'github.com') {
-      const parts = fullPath.split('/');
-      if (parts.length >= 2) {
-        return { platform: 'github', owner: parts[0], repo: parts[1] };
-      }
-      return null;
-    }
-
-    if (isGitLabHost(host, gitlabInstanceUrl)) {
-      const lastSlash = fullPath.lastIndexOf('/');
-      if (lastSlash > 0) {
-        return {
-          platform: 'gitlab',
-          owner: fullPath.slice(0, lastSlash),
-          repo: fullPath.slice(lastSlash + 1),
-        };
-      }
-      return null;
-    }
-
-    return null;
-  }
-
-  return null;
-}
-
 // -- PR body template --
 
 export type QualityGateResult = {
diff --git a/services/session-ingest/src/dos/session-ingest-extractors.ts b/services/session-ingest/src/dos/session-ingest-extractors.ts
index 8ddeb47d5d..cf82a40034 100644
--- a/services/session-ingest/src/dos/session-ingest-extractors.ts
+++ b/services/session-ingest/src/dos/session-ingest-extractors.ts
@@ -1,3 +1,4 @@
+import { isValidGitUrl, sanitizeGitUrl } from '@kilocode/worker-utils/git-url';
 import type { IngestBatch } from '../types/session-sync';
 
 function normalizeOptionalString(value: unknown): string | null | undefined {
@@ -41,28 +42,6 @@ export function extractNormalizedOrgIdFromItem(
   return normalizeOptionalString((item.data as { orgId?: unknown } | null | undefined)?.orgId);
 }
 
-// Validate git URL and strip credentials, query params, and hash.
-// Matches the sanitization in cli-sessions-router.ts (V1 sessions).
-function normalizeGitUrl(url: string): string | null {
-  const sshMatch = url.match(/^git@([^:]+):(.+)$/);
-  if (sshMatch) {
-    const host = sshMatch[1];
-    const path = sshMatch[2].split('?')[0];
-    return `git@${host}:${path}`;
-  }
-  try {
-    const parsed = new URL(url);
-    if (!['http:', 'https:'].includes(parsed.protocol)) return null;
-    parsed.username = '';
-    parsed.password = '';
-    parsed.search = '';
-    parsed.hash = '';
-    return parsed.toString();
-  } catch {
-    return null;
-  }
-}
-
 export function extractNormalizedGitUrlFromItem(
   item: IngestBatch[number]
 ): string | null | undefined {
@@ -72,7 +51,7 @@ export function extractNormalizedGitUrlFromItem(
   );
   if (raw === undefined) return undefined;
   if (raw === null) return null;
-  return normalizeGitUrl(raw);
+  return isValidGitUrl(raw) ? sanitizeGitUrl(raw) : null;
 }
 
 export function extractNormalizedGitBranchFromItem(
diff --git a/services/webhook-agent-ingest/src/db/queries.ts b/services/webhook-agent-ingest/src/db/queries.ts
index da867c968b..5dc4b47bde 100644
--- a/services/webhook-agent-ingest/src/db/queries.ts
+++ b/services/webhook-agent-ingest/src/db/queries.ts
@@ -1,15 +1,6 @@
 import { getWorkerDb, type WorkerDb } from '@kilocode/db/client';
-import {
-  kilocode_users,
-  organizations,
-  organization_memberships,
-  agent_environment_profiles,
-  agent_environment_profile_vars,
-  agent_environment_profile_commands,
-} from '@kilocode/db/schema';
-import { eq, and, isNull, asc } from 'drizzle-orm';
-import * as z from 'zod';
-import { logger } from '../util/logger.js';
+import { kilocode_users, organizations, organization_memberships } from '@kilocode/db/schema';
+import { eq, and, isNull } from 'drizzle-orm';
 
 export { getWorkerDb, type WorkerDb };
 
@@ -23,19 +14,6 @@ export type BotUserForToken = {
   api_token_pepper: string;
 };
 
-const encryptedSecretSchema = z.object({
-  encryptedData: z.string(),
-  encryptedDEK: z.string(),
-  algorithm: z.literal('rsa-aes-256-gcm'),
-  version: z.literal(1),
-});
-
-export type ResolvedProfileConfig = {
-  envVars: Record<string, string>;
-  encryptedSecrets: Record<string, z.infer<typeof encryptedSecretSchema>>;
-  setupCommands: string[];
-};
-
 // Bot user constants — must match kilocode-backend's src/lib/bot-users/types.ts
 const WEBHOOK_BOT_ID_PREFIX = 'bot-webhook';
 const WEBHOOK_BOT_EMAIL_SUFFIX = 'webhook-bot';
@@ -164,74 +142,3 @@ async function ensureBotIsOrgMember(db: WorkerDb, botUserId: string, orgId: stri
     role: 'member',
   });
 }
-
-export async function resolveProfile(
-  db: WorkerDb,
-  profileId: string,
-  ownerUserId?: string | null,
-  ownerOrgId?: string | null
-): Promise<ResolvedProfileConfig | null> {
-  const profiles = await db
-    .select({
-      id: agent_environment_profiles.id,
-      owned_by_organization_id: agent_environment_profiles.owned_by_organization_id,
-      owned_by_user_id: agent_environment_profiles.owned_by_user_id,
-    })
-    .from(agent_environment_profiles)
-    .where(eq(agent_environment_profiles.id, profileId))
-    .limit(1);
-
-  const profile = profiles[0];
-  if (!profile) return null;
-
-  // Validate ownership
-  if (ownerOrgId) {
-    if (profile.owned_by_organization_id !== ownerOrgId) return null;
-  } else if (ownerUserId) {
-    if (profile.owned_by_user_id !== ownerUserId) return null;
-  }
-
-  const [vars, commands] = await Promise.all([
-    db
-      .select({
-        key: agent_environment_profile_vars.key,
-        value: agent_environment_profile_vars.value,
-        is_secret: agent_environment_profile_vars.is_secret,
-      })
-      .from(agent_environment_profile_vars)
-      .where(eq(agent_environment_profile_vars.profile_id, profileId)),
-
-    db
-      .select({
-        command: agent_environment_profile_commands.command,
-      })
-      .from(agent_environment_profile_commands)
-      .where(eq(agent_environment_profile_commands.profile_id, profileId))
-      .orderBy(asc(agent_environment_profile_commands.sequence)),
-  ]);
-
-  const envVars: Record<string, string> = {};
-  const encryptedSecrets: ResolvedProfileConfig['encryptedSecrets'] = {};
-
-  for (const variable of vars) {
-    if (variable.is_secret) {
-      try {
-        encryptedSecrets[variable.key] = encryptedSecretSchema.parse(JSON.parse(variable.value));
-      } catch {
-        // Skip malformed secrets
-        logger.error('Failed to parse encrypted secret', {
-          profileId,
-          key: variable.key,
-        });
-      }
-    } else {
-      envVars[variable.key] = variable.value;
-    }
-  }
-
-  return {
-    envVars,
-    encryptedSecrets,
-    setupCommands: commands.map(c => c.command),
-  };
-}
diff --git a/services/webhook-agent-ingest/src/queue-consumer.ts b/services/webhook-agent-ingest/src/queue-consumer.ts
index 421e64350d..e03678f93a 100644
--- a/services/webhook-agent-ingest/src/queue-consumer.ts
+++ b/services/webhook-agent-ingest/src/queue-consumer.ts
@@ -4,7 +4,6 @@ import { renderPromptTemplate } from './util/prompt-template';
 import { logger } from './util/logger';
 import { withDORetry } from './util/do-retry';
 import { getTokenMintingService } from './services/token-minting-service.js';
-import { getProfileResolutionService } from './services/profile-resolution-service.js';
 import { classifyInitiateResponse } from './initiate-response';
 import { z } from 'zod';
 
@@ -355,7 +354,10 @@ async function processWebhookMessage(
         },
       };
 
-      // Resolve profile at runtime via Hyperdrive if profileId is set
+      // Profile resolution (repo binding + default + explicit override) happens
+      // inside cloud-agent-next. A trigger must still have a profile assigned;
+      // cloud-agent-next returns 404 if the id is stale/revoked and we let that
+      // flow through the existing non-5xx failure path below.
       if (!triggerProfileId) {
         logger.error('No Agent Env Profile found.', {
           triggerId: triggerConfig.triggerId,
@@ -366,30 +368,6 @@ async function processWebhookMessage(
         return;
       }
 
-      logger.debug('Resolving profile for trigger', {
-        triggerId: triggerConfig.triggerId,
-        profileId: triggerProfileId,
-      });
-
-      const profileService = getProfileResolutionService(env);
-      const resolvedProfile = await profileService.resolveProfileConfig({
-        profileId: triggerProfileId,
-        userId: triggerConfig.userId,
-        orgId: triggerConfig.orgId,
-      });
-
-      if (!resolvedProfile) {
-        logger.error('No Agent Env Profile found.', {
-          triggerId: triggerConfig.triggerId,
-          profileId: triggerProfileId,
-          requestId: webhook.requestId,
-        });
-        await failRequest(stub, webhook.requestId, 'No Agent Env Profile found.');
-        message.ack();
-        return;
-      }
-
-      // Build prepareSession body with resolved profile values
       const prepareSessionBody: {
         prompt: string;
         mode: string;
@@ -397,12 +375,7 @@ async function processWebhookMessage(
         githubRepo: string;
         kilocodeOrganizationId?: string;
         callbackTarget: { url: string; headers: Record<string, string> };
-        envVars?: Record<string, string>;
-        encryptedSecrets?: Record<
-          string,
-          { encryptedData: string; encryptedDEK: string; algorithm: string; version: number }
-        >;
-        setupCommands?: string[];
+        profileId: string;
         autoCommit?: boolean;
         condenseOnComplete?: boolean;
         createdOnPlatform: string;
@@ -412,6 +385,7 @@ async function processWebhookMessage(
         model: triggerModel,
         githubRepo: triggerGithubRepo,
         callbackTarget,
+        profileId: triggerProfileId,
         createdOnPlatform: request.method === 'SCHEDULED' ? 'scheduled' : 'webhook',
       };
 
@@ -419,17 +393,6 @@ async function processWebhookMessage(
         prepareSessionBody.kilocodeOrganizationId = triggerConfig.orgId;
       }
 
-      // Pass resolved profile values to cloud-agent
-      if (Object.keys(resolvedProfile.envVars).length > 0) {
-        prepareSessionBody.envVars = resolvedProfile.envVars;
-      }
-      if (Object.keys(resolvedProfile.encryptedSecrets).length > 0) {
-        prepareSessionBody.encryptedSecrets = resolvedProfile.encryptedSecrets;
-      }
-      if (resolvedProfile.setupCommands.length > 0) {
-        prepareSessionBody.setupCommands = resolvedProfile.setupCommands;
-      }
-
       // Behavior flags from trigger config (not profile-related)
       if (triggerConfig.autoCommit !== undefined) {
         prepareSessionBody.autoCommit = triggerConfig.autoCommit;
diff --git a/services/webhook-agent-ingest/src/services/profile-resolution-service.ts b/services/webhook-agent-ingest/src/services/profile-resolution-service.ts
deleted file mode 100644
index 5de76cdae7..0000000000
--- a/services/webhook-agent-ingest/src/services/profile-resolution-service.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import {
-  getWorkerDb,
-  resolveProfile,
-  type WorkerDb,
-  type ResolvedProfileConfig,
-} from '../db/queries.js';
-import { logger } from '../util/logger.js';
-
-/**
- * Environment bindings required for profile resolution.
- */
-export type ProfileResolutionEnv = {
-  HYPERDRIVE: { connectionString: string };
-};
-
-type ResolveProfileParams = {
-  profileId: string;
-  userId?: string | null;
-  orgId?: string | null;
-};
-
-export function getProfileResolutionService(env: ProfileResolutionEnv): ProfileResolutionService {
-  return new ProfileResolutionService(env);
-}
-
-/**
- * Service for resolving agent environment profiles via Hyperdrive.
- *
- * Uses Hyperdrive to access the database directly for profile resolution
- * at webhook processing time.
- */
-export class ProfileResolutionService {
-  private db: WorkerDb | null = null;
-
-  constructor(private env: ProfileResolutionEnv) {}
-
-  private getDb(): WorkerDb {
-    if (!this.db) {
-      this.db = getWorkerDb(this.env.HYPERDRIVE.connectionString);
-    }
-    return this.db;
-  }
-
-  /**
-   * Resolve a profile by ID and return the full configuration.
-   *
-   * @param params.profileId - The profile UUID to resolve
-   * @param params.userId - For user triggers, validates profile ownership
-   * @param params.orgId - For org triggers, validates profile ownership
-   * @returns Resolved profile config or null if not found/not authorized
-   */
-  async resolveProfileConfig(params: ResolveProfileParams): Promise<ResolvedProfileConfig | null> {
-    const db = this.getDb();
-
-    logger.debug('Resolving profile via Hyperdrive', {
-      profileId: params.profileId,
-      userId: params.userId,
-      orgId: params.orgId,
-    });
-
-    const config = await resolveProfile(db, params.profileId, params.userId, params.orgId);
-
-    if (!config) {
-      logger.warn('Profile not found or not authorized', {
-        profileId: params.profileId,
-        userId: params.userId,
-        orgId: params.orgId,
-      });
-      return null;
-    }
-
-    logger.debug('Profile resolved successfully', {
-      profileId: params.profileId,
-      envVarCount: Object.keys(config.envVars).length,
-      secretCount: Object.keys(config.encryptedSecrets).length,
-      commandCount: config.setupCommands.length,
-    });
-
-    return config;
-  }
-}