specrails-desktop 2.30.2 → 2.31.0

package/server/dist/profiles-router.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.providerSupportsAgentStudioAutomation = providerSupportsAgentStudioAutomation;
 exports.createProfilesRouter = createProfilesRouter;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -11,27 +12,85 @@ const agent_generator_1 = require("./agent-generator");
 const agent_refine_db_1 = require("./agent-refine-db");
 const agent_refine_manager_1 = require("./agent-refine-manager");
 const providers_1 = require("./providers");
+const kimi_skill_prompt_1 = require("./providers/kimi-skill-prompt");
 const profile_manager_1 = require("./profile-manager");
 const workspace_resolution_1 = require("./workspace-resolution");
+const project_router_helpers_1 = require("./project-router-helpers");
 /**
  * Relocate-artifacts gate: the dir whose `.specrails/{profiles,specrails-version}`
- * AND whose `.claude/agents/**` catalog the profiles surface reads/writes.
- * Relocated ⇒ the workspace dir (where core assembled the agents catalog +
+ * and provider-native roles catalog the profiles surface reads/writes.
+ * Relocated ⇒ the workspace dir (where Core assembled the roles catalog +
  * `.specrails/profiles`); legacy ⇒ project.path (byte-identical to today).
  *
- * The `.claude/agents/**` catalog MUST follow this same root: when relocated,
- * core materializes the agents into `<workspace>/.claude/agents`, so a profiles
- * catalog read/write rooted at `project.path` would (a) read a stale/absent repo
- * copy and (b) write custom-* agents into the repo — violating repo-immutability
- * and never reaching the workspace the rails actually load from.
+ * The roles catalog MUST follow this same root. Depending on the selected
+ * adapter, Core materializes file-based roles such as
+ * `<workspace>/.claude/agents/<id>.md`, or skill-based roles such as
+ * `<workspace>/.kimi-code/skills/<id>/SKILL.md`. Reading/writing beneath
+ * `project.path` would miss the execution catalog and violate repo immutability.
  */
 function specRoot(project) {
     const exec = (0, workspace_resolution_1.resolveProjectExecution)({ slug: project.slug, path: project.path });
     return exec.relocated && exec.workspaceDir ? exec.workspaceDir : project.path;
 }
-/** The agents-catalog directory for the relocate-aware root (`<root>/.claude/agents`). */
-function agentsCatalogDir(project) {
-    return path_1.default.join(specRoot(project), '.claude', 'agents');
+function installedProviders(project) {
+    const primary = project.provider ?? 'claude';
+    const configured = project.providers?.filter((provider) => typeof provider === 'string');
+    return configured?.length ? [...new Set([primary, ...configured])] : [primary];
+}
+function requestedProvider(req, project, bodyProvider) {
+    const queryProvider = typeof req.query.provider === 'string' ? req.query.provider : undefined;
+    const explicitBodyProvider = typeof bodyProvider === 'string' && bodyProvider.length > 0
+        ? bodyProvider
+        : undefined;
+    if (queryProvider && explicitBodyProvider && queryProvider !== explicitBodyProvider) {
+        throw new profile_manager_1.ProfileValidationError([
+            `body provider '${explicitBodyProvider}' does not match requested provider '${queryProvider}'`,
+        ]);
+    }
+    const provider = queryProvider ?? explicitBodyProvider ?? project.provider ?? 'claude';
+    if (!(0, providers_1.hasAdapter)(provider) || !installedProviders(project).includes(provider)) {
+        throw new profile_manager_1.ProfileValidationError([
+            `provider '${provider}' is not installed for this project`,
+        ]);
+    }
+    return provider;
+}
+function projectAdapter(project, provider) {
+    return (0, providers_1.getAdapter)(provider ?? project.provider ?? 'claude');
+}
+function agentFile(project, agentId, provider) {
+    const root = specRoot(project);
+    const adapter = projectAdapter(project, provider);
+    return adapter.customRolePath?.(root, agentId)
+        ?? path_1.default.join(root, adapter.projectDirName, 'agents', `${agentId}.md`);
+}
+/** The provider-native roles catalog directory. */
+function agentsCatalogDir(project, provider) {
+    const probe = agentFile(project, '__catalog_probe__', provider);
+    // File-based roles use `<catalog>/<id>.md`; skill-based roles (Kimi) use
+    // `<catalog>/<id>/SKILL.md`.
+    return path_1.default.basename(probe) === 'SKILL.md'
+        ? path_1.default.dirname(path_1.default.dirname(probe))
+        : path_1.default.dirname(probe);
+}
+function listAgentFiles(project, provider) {
+    const dir = agentsCatalogDir(project, provider);
+    if (!fs_1.default.existsSync(dir))
+        return [];
+    const out = [];
+    for (const entry of fs_1.default.readdirSync(dir, { withFileTypes: true })) {
+        const id = entry.isDirectory()
+            ? entry.name
+            : entry.isFile() && entry.name.endsWith('.md')
+                ? entry.name.slice(0, -3)
+                : null;
+        if (!id)
+            continue;
+        const file = agentFile(project, id, provider);
+        if (fs_1.default.existsSync(file))
+            out.push({ id, file });
+    }
+    return out;
 }
 const AGENTS_SECTION_ENABLED = process.env.SPECRAILS_AGENTS_SECTION !== 'false';
 function handleError(res, err) {
@@ -50,6 +109,35 @@ function handleError(res, err) {
     const message = err instanceof Error ? err.message : 'unknown error';
     res.status(500).json({ error: message });
 }
+/** Studio automation is safe when the CLI can enforce either a no-tools or a
+ * read-only boundary. Codex/Gemini use their verified native read-only modes;
+ * Kimi prompt mode exposes neither and therefore fails closed. */
+function providerSupportsAgentStudioAutomation(provider) {
+    const adapter = (0, providers_1.getAdapter)(provider);
+    const policies = adapter.capabilities.toolPolicies ?? [];
+    return policies.includes('none') || policies.includes('read-only');
+}
+function requireSafeStudioPolicy(res, provider) {
+    if (providerSupportsAgentStudioAutomation(provider))
+        return true;
+    res.status(409).json({
+        error: 'provider_tool_policy_unsupported',
+        provider,
+        requiredPolicies: ['none', 'read-only'],
+    });
+    return false;
+}
+/** Kimi custom roles are provider-native Skills, so a non-empty markdown file
+ * is not enough: discovery requires valid identifying frontmatter. Reuse the
+ * execution parser directly so Profiles can never persist regex-accepted YAML
+ * that the Kimi headless path rejects later. The parser module is dependency
+ * leaf (fs/path/js-yaml only), so this direct import does not create a router /
+ * adapter cycle. */
+function validateCustomRoleBody(provider, agentId, body) {
+    if (provider !== 'kimi')
+        return [];
+    return (0, kimi_skill_prompt_1.validateKimiRoleDocument)(body, agentId, `${agentId}/SKILL.md`);
+}
 function createProfilesRouter() {
     const router = (0, express_1.Router)({ mergeParams: true });
     function ctx(req) {
@@ -63,41 +151,75 @@ function createProfilesRouter() {
         }
         next();
     });
+    // GET /api/projects/:projectId/profiles/context
+    // Provider-aware catalogs drive both Profiles and Agent Studio without
+    // hard-coding a Claude fallback into either client.
+    router.get('/context', (req, res) => {
+        try {
+            const { project } = ctx(req);
+            const providers = installedProviders(project);
+            const catalogs = Object.fromEntries(providers.map((provider) => {
+                const adapter = (0, providers_1.getAdapter)(provider);
+                return [provider, {
+                        models: adapter.modelCatalog().map(({ value, label }) => ({ value, label })),
+                        defaultModel: adapter.defaultModel(),
+                        baselineAgents: [...adapter.baselineAgents()],
+                        customModelAliases: adapter.capabilities.customModelAliases === true,
+                    }];
+            }));
+            res.json({
+                primaryProvider: project.provider ?? providers[0] ?? 'claude',
+                providers,
+                catalogs,
+            });
+        }
+        catch (err) {
+            handleError(res, err);
+        }
+    });
     // POST /api/projects/:projectId/profiles/migrate-from-settings
     // Seed a `default` profile from the agent frontmatter + legacy routing.
     // Intended for first-time onboarding of existing projects.
     router.post('/migrate-from-settings', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
-            const agentsDir = agentsCatalogDir(project);
+            const provider = requestedProvider(req, project);
+            const adapter = projectAdapter(project, provider);
+            const configuredKimiModels = provider === 'kimi'
+                ? (0, project_router_helpers_1.readAgentModelSelection)({ ...project, provider })
+                : null;
+            const projectedKimiModels = configuredKimiModels
+                ? new Map((0, project_router_helpers_1.readAgentModels)({ ...project, provider })
+                    .map((entry) => [entry.name, entry.model]))
+                : null;
+            const agentsDir = agentsCatalogDir(project, provider);
             if (!fs_1.default.existsSync(agentsDir)) {
-                res.status(400).json({ error: 'no .claude/agents/ directory found' });
+                res.status(400).json({ error: `no ${adapter.projectDirName} roles catalog found` });
                 return;
             }
-            // Gather installed sr-*.md with their declared models.
             const agents = [];
-            for (const entry of fs_1.default.readdirSync(agentsDir)) {
-                if (!entry.endsWith('.md'))
+            for (const entry of listAgentFiles(project, provider)) {
+                if (!entry.id.startsWith('sr-'))
                     continue;
-                if (!entry.startsWith('sr-'))
-                    continue;
-                const id = entry.slice(0, -'.md'.length);
-                let model = 'sonnet';
-                try {
-                    const content = fs_1.default.readFileSync(path_1.default.join(agentsDir, entry), 'utf8');
-                    const fm = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-                    if (fm) {
-                        const m = fm[1].match(/^model:\s*(sonnet|opus|haiku)/m);
-                        if (m)
-                            model = m[1];
+                const id = entry.id;
+                let model = projectedKimiModels?.get(id) ?? adapter.defaultModel();
+                if (!projectedKimiModels) {
+                    try {
+                        const content = fs_1.default.readFileSync(entry.file, 'utf8');
+                        const fm = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+                        if (fm) {
+                            const m = fm[1].match(/^model:\s*(\S+)/m);
+                            if (m && (0, providers_1.isModelAvailableForAdapter)(adapter, m[1]))
+                                model = m[1];
+                        }
+                    }
+                    catch {
+                        // skip unreadable files
                     }
-                }
-                catch {
-                    // skip unreadable files
                 }
                 agents.push({ id, model });
             }
-            const baseline = ['sr-architect', 'sr-developer', 'sr-reviewer'];
+            const baseline = [...adapter.baselineAgents()];
             const missing = baseline.filter((id) => !agents.some((a) => a.id === id));
             if (missing.length > 0) {
                 res.status(400).json({
@@ -120,23 +242,23 @@ function createProfilesRouter() {
                     .sort((a, b) => a.id.localeCompare(b.id)),
                 ...agents.filter((a) => pinnedLast.has(a.id)),
             ];
-            // Build the default profile mirroring legacy routing. The frontmatter
-            // model aliases parsed above are claude-specific; for any other provider
-            // they are not in the adapter's catalog, so fall back to that provider's
-            // default model and stamp the provider so the persisted profile validates
-            // against the right catalog on every future read.
-            const provider = project.provider ?? 'claude';
+            // Build the default profile mirroring legacy routing. Claude keeps its
+            // role-frontmatter projection. Kimi has no compatible `model:` field in
+            // SKILL.md, so its exact validated default/overrides come from the
+            // provider install config projected above.
             const isClaude = provider === 'claude';
-            const fallbackModel = isClaude ? 'sonnet' : (0, providers_1.getAdapter)(provider).defaultModel();
+            const fallbackModel = adapter.defaultModel();
             const profile = {
                 schemaVersion: 1,
                 name: 'default',
                 description: 'Baseline profile migrated from your current agent frontmatters.',
-                ...(isClaude ? {} : { provider }),
-                orchestrator: { model: isClaude ? 'sonnet' : fallbackModel },
+                ...(!isClaude || installedProviders(project).length > 1 ? { provider } : {}),
+                orchestrator: {
+                    model: configuredKimiModels?.defaultModel ?? fallbackModel,
+                },
                 agents: orderedAgents.map((a) => ({
                     id: a.id,
-                    model: isClaude ? a.model : fallbackModel,
+                    model: a.model,
                     required: baseline.includes(a.id),
                 })),
                 routing: [
@@ -170,7 +292,8 @@ function createProfilesRouter() {
     // Per-profile aggregated metrics over the requested time window.
     router.get('/analytics', (req, res) => {
         try {
-            const { db } = ctx(req);
+            const { db, project } = ctx(req);
+            const provider = requestedProvider(req, project);
             const windowDays = Math.max(1, Math.min(365, parseInt((req.query.windowDays ?? '30'), 10) || 30));
             const since = Date.now() - windowDays * 24 * 60 * 60 * 1000;
             const rows = db
@@ -179,16 +302,30 @@ function createProfilesRouter() {
              COUNT(*) AS jobs,
              SUM(CASE WHEN j.status = 'completed' THEN 1 ELSE 0 END) AS succeeded,
              AVG(j.duration_ms) AS avgDurationMs,
-             AVG(COALESCE(j.tokens_in, 0) + COALESCE(j.tokens_out, 0)
-                 + COALESCE(j.tokens_cache_read, 0) + COALESCE(j.tokens_cache_create, 0)) AS avgTokens,
-             AVG(j.total_cost_usd) AS avgCostUsd
+             AVG(CASE
+                   WHEN j.tokens_in IS NOT NULL OR j.tokens_out IS NOT NULL
+                     OR j.tokens_cache_read IS NOT NULL OR j.tokens_cache_create IS NOT NULL
+                   THEN COALESCE(j.tokens_in, 0) + COALESCE(j.tokens_out, 0)
+                     + COALESCE(j.tokens_cache_read, 0) + COALESCE(j.tokens_cache_create, 0)
+                 END) AS avgTokens,
+             AVG(j.total_cost_usd) AS avgCostUsd,
+             SUM(CASE WHEN j.tokens_in IS NOT NULL OR j.tokens_out IS NOT NULL
+                           OR j.tokens_cache_read IS NOT NULL OR j.tokens_cache_create IS NOT NULL
+                      THEN 1 ELSE 0 END) AS usageReportedJobs,
+             SUM(CASE WHEN j.tokens_in IS NULL AND j.tokens_out IS NULL
+                           AND j.tokens_cache_read IS NULL AND j.tokens_cache_create IS NULL
+                      THEN 1 ELSE 0 END) AS usageUnavailableJobs,
+             COUNT(j.total_cost_usd) AS pricedJobs,
+             SUM(CASE WHEN j.total_cost_usd IS NULL THEN 1 ELSE 0 END) AS unpricedJobs
            FROM job_profiles jp
            JOIN jobs j ON j.id = jp.job_id
            WHERE jp.created_at >= ?
+             AND COALESCE(j.provider, 'claude') = ?
            GROUP BY jp.profile_name
            ORDER BY jobs DESC`)
-                .all(since);
+                .all(since, provider);
             res.json({
+                provider,
                 windowDays,
                 rows: rows.map((r) => ({
                     profileName: r.profileName,
@@ -198,6 +335,10 @@ function createProfilesRouter() {
                     avgDurationMs: r.avgDurationMs,
                     avgTokens: r.avgTokens,
                     avgCostUsd: r.avgCostUsd,
+                    usageReportedJobs: r.usageReportedJobs,
+                    usageUnavailableJobs: r.usageUnavailableJobs,
+                    pricedJobs: r.pricedJobs,
+                    unpricedJobs: r.unpricedJobs,
                 })),
             });
         }
@@ -248,20 +389,19 @@ function createProfilesRouter() {
         }
     });
     // GET /api/projects/:projectId/profiles/catalog
-    // List all agents available in .claude/agents/ (upstream sr-* and custom custom-*)
+    // List all roles in the selected provider-native catalog (sr-* + custom-*).
     router.get('/catalog', (req, res) => {
         try {
             const { project } = ctx(req);
-            const dir = agentsCatalogDir(project);
-            if (!fs_1.default.existsSync(dir)) {
+            const provider = requestedProvider(req, project);
+            const files = listAgentFiles(project, provider);
+            if (files.length === 0) {
                 res.json({ agents: [] });
                 return;
             }
             const agents = [];
-            for (const file of fs_1.default.readdirSync(dir)) {
-                if (!file.endsWith('.md'))
-                    continue;
-                const id = file.slice(0, -'.md'.length);
+            for (const entry of files) {
+                const id = entry.id;
                 const kind = id.startsWith('sr-')
                     ? 'upstream'
                     : id.startsWith('custom-')
@@ -272,9 +412,16 @@ function createProfilesRouter() {
                 let description;
                 let model;
                 try {
-                    const body = fs_1.default.readFileSync(path_1.default.join(dir, file), 'utf8');
-                    const fm = body.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-                    if (fm) {
+                    const body = fs_1.default.readFileSync(entry.file, 'utf8');
+                    if (provider === 'kimi') {
+                        // Use the same js-yaml metadata parser as validation/execution so
+                        // folded/literal descriptions and quoted scalars render correctly.
+                        description = (0, kimi_skill_prompt_1.parseKimiSkillDocument)(body, entry.file).description;
+                    }
+                    else {
+                        const fm = body.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+                        if (!fm)
+                            throw new Error(`Missing frontmatter in ${entry.file}`);
                         // description can be a long JSON-escaped string spanning multiple lines.
                         // Match from `description:` up to the next top-level YAML key or the end
                         // of the frontmatter block. Then unescape \n, \t, \" and strip surrounding
@@ -304,6 +451,9 @@ function createProfilesRouter() {
                         if (modelMatch)
                             model = modelMatch[1];
                     }
+                    if (description && description.length > 280) {
+                        description = description.slice(0, 277) + '…';
+                    }
                 }
                 catch {
                     // ignore unreadable files
@@ -322,12 +472,13 @@ function createProfilesRouter() {
     router.get('/catalog/:agentId', (req, res) => {
         try {
             const { project } = ctx(req);
+            const provider = requestedProvider(req, project);
             const agentId = req.params.agentId;
             if (!/^(sr|custom)-[a-z0-9][a-z0-9-]*$/.test(agentId)) {
                 res.status(400).json({ error: 'invalid agent id' });
                 return;
             }
-            const file = path_1.default.join(agentsCatalogDir(project), `${agentId}.md`);
+            const file = agentFile(project, agentId, provider);
             if (!fs_1.default.existsSync(file)) {
                 res.status(404).json({ error: 'agent not found' });
                 return;
@@ -345,6 +496,7 @@ function createProfilesRouter() {
     router.post('/catalog', (req, res) => {
         try {
             const { project, db, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
             const id = (req.body?.id ?? '').toString().trim();
             const body = (req.body?.body ?? '').toString();
             if (!/^custom-[a-z0-9][a-z0-9-]*$/.test(id)) {
@@ -355,9 +507,13 @@ function createProfilesRouter() {
                 res.status(400).json({ error: 'body is required' });
                 return;
             }
-            const agentsDir = agentsCatalogDir(project);
-            fs_1.default.mkdirSync(agentsDir, { recursive: true });
-            const file = path_1.default.join(agentsDir, `${id}.md`);
+            const roleErrors = validateCustomRoleBody(provider, id, body);
+            if (roleErrors.length > 0) {
+                res.status(400).json({ error: 'invalid_kimi_skill', details: roleErrors });
+                return;
+            }
+            const file = agentFile(project, id, provider);
+            fs_1.default.mkdirSync(path_1.default.dirname(file), { recursive: true });
             if (fs_1.default.existsSync(file)) {
                 res.status(409).json({ error: `agent '${id}' already exists` });
                 return;
@@ -365,7 +521,8 @@ function createProfilesRouter() {
             fs_1.default.writeFileSync(file, body, 'utf8');
             // Record initial version
             const nextVersion = 1;
-            db.prepare(`INSERT INTO agent_versions (agent_name, version, body, created_at) VALUES (?, ?, ?, ?)`).run(id, nextVersion, body, Date.now());
+            db.prepare(`INSERT INTO agent_versions (provider, agent_name, version, body, created_at)
+         VALUES (?, ?, ?, ?, ?)`).run(provider, id, nextVersion, body, Date.now());
             broadcast({ type: 'agent.changed', projectId: project.id, id });
             res.status(201).json({ id, body, version: nextVersion });
         }
@@ -378,6 +535,7 @@ function createProfilesRouter() {
     router.patch('/catalog/:agentId', (req, res) => {
         try {
             const { project, db, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
             const agentId = req.params.agentId;
             if (!/^custom-[a-z0-9][a-z0-9-]*$/.test(agentId)) {
                 res.status(403).json({ error: 'only custom-* agents can be edited from the app' });
@@ -388,17 +546,24 @@ function createProfilesRouter() {
                 res.status(400).json({ error: 'body is required' });
                 return;
             }
-            const file = path_1.default.join(agentsCatalogDir(project), `${agentId}.md`);
+            const roleErrors = validateCustomRoleBody(provider, agentId, body);
+            if (roleErrors.length > 0) {
+                res.status(400).json({ error: 'invalid_kimi_skill', details: roleErrors });
+                return;
+            }
+            const file = agentFile(project, agentId, provider);
             if (!fs_1.default.existsSync(file)) {
                 res.status(404).json({ error: 'agent not found' });
                 return;
             }
             fs_1.default.writeFileSync(file, body, 'utf8');
             const maxVersion = db
-                .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions WHERE agent_name = ?`)
-                .get(agentId).v;
+                .prepare(`SELECT COALESCE(MAX(version), 0) AS v FROM agent_versions
+           WHERE provider = ? AND agent_name = ?`)
+                .get(provider, agentId).v;
             const nextVersion = maxVersion + 1;
-            db.prepare(`INSERT INTO agent_versions (agent_name, version, body, created_at) VALUES (?, ?, ?, ?)`).run(agentId, nextVersion, body, Date.now());
+            db.prepare(`INSERT INTO agent_versions (provider, agent_name, version, body, created_at)
+         VALUES (?, ?, ?, ?, ?)`).run(provider, agentId, nextVersion, body, Date.now());
             broadcast({ type: 'agent.changed', projectId: project.id, id: agentId });
             res.json({ id: agentId, body, version: nextVersion });
         }
@@ -411,17 +576,24 @@ function createProfilesRouter() {
     router.delete('/catalog/:agentId', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project);
             const agentId = req.params.agentId;
             if (!/^custom-[a-z0-9][a-z0-9-]*$/.test(agentId)) {
                 res.status(403).json({ error: 'only custom-* agents can be deleted' });
                 return;
             }
-            const file = path_1.default.join(agentsCatalogDir(project), `${agentId}.md`);
+            const file = agentFile(project, agentId, provider);
             if (!fs_1.default.existsSync(file)) {
                 res.status(404).json({ error: 'agent not found' });
                 return;
             }
             fs_1.default.unlinkSync(file);
+            try {
+                const parent = path_1.default.dirname(file);
+                if (parent !== agentsCatalogDir(project, provider) && fs_1.default.readdirSync(parent).length === 0)
+                    fs_1.default.rmdirSync(parent);
+            }
+            catch { /* best-effort */ }
             broadcast({ type: 'agent.changed', projectId: project.id, id: agentId, deleted: true });
             res.json({ ok: true });
         }
@@ -436,6 +608,9 @@ function createProfilesRouter() {
     router.post('/catalog/test', async (req, res) => {
         try {
             const { project, db, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
+            if (!requireSafeStudioPolicy(res, provider))
+                return;
             const agentId = (req.body?.agentId ?? '').toString().trim() || 'draft';
             const draftBody = (req.body?.draftBody ?? '').toString();
             const sampleTask = (req.body?.sampleTask ?? '').toString().trim();
@@ -450,10 +625,12 @@ function createProfilesRouter() {
             const result = await (0, agent_generator_1.testCustomAgent)(project.path, {
                 draftBody,
                 sampleTask,
+                providerId: provider,
                 record: { db, projectId: project.id, surfaceRefId: agentId, broadcast },
             });
-            db.prepare(`INSERT INTO agent_tests (agent_name, draft_hash, sample_task_id, tokens, duration_ms, output, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`).run(agentId, result.draftHash, null, result.tokens, result.durationMs, result.output, Date.now());
+            db.prepare(`INSERT INTO agent_tests
+           (provider, agent_name, draft_hash, sample_task_id, tokens, duration_ms, output, created_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(provider, agentId, result.draftHash, null, result.tokens, result.durationMs, result.output, Date.now());
             res.json(result);
         }
         catch (err) {
@@ -467,6 +644,9 @@ function createProfilesRouter() {
     router.post('/catalog/generate', async (req, res) => {
         try {
             const { project, db, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
+            if (!requireSafeStudioPolicy(res, provider))
+                return;
             const name = (req.body?.name ?? '').toString().trim();
             const description = (req.body?.description ?? '').toString().trim();
             if (!/^custom-[a-z0-9][a-z0-9-]*$/.test(name)) {
@@ -480,6 +660,7 @@ function createProfilesRouter() {
             const draft = await (0, agent_generator_1.generateCustomAgent)(project.path, {
                 name,
                 description,
+                providerId: provider,
                 record: { db, projectId: project.id, surfaceRefId: name, broadcast },
             });
             res.json({ draft });
@@ -493,7 +674,20 @@ function createProfilesRouter() {
     router.post('/catalog/:agentId/refine', async (req, res) => {
         try {
             const ctxObj = ctx(req);
-            const { agentRefineManager } = ctxObj;
+            const { agentRefineManager, project } = ctxObj;
+            const provider = requestedProvider(req, project, req.body?.provider);
+            if (!requireSafeStudioPolicy(res, provider))
+                return;
+            // AgentRefineManager owns the primary provider's native session store.
+            // Cross-provider sessions need a provider column/migration before they
+            // can be resumed safely; reject instead of silently using the primary.
+            if (provider !== (project.provider ?? 'claude')) {
+                res.status(409).json({
+                    error: 'provider_refine_manager_unavailable',
+                    provider,
+                });
+                return;
+            }
             const agentId = req.params.agentId;
             if (!/^custom-[a-z0-9][a-z0-9-]*$/.test(agentId)) {
                 res.status(400).json({ error: 'not_a_custom_agent' });
@@ -528,7 +722,17 @@ function createProfilesRouter() {
     });
     router.post('/catalog/:agentId/refine/:refineId/turn', async (req, res) => {
         try {
-            const { agentRefineManager, db } = ctx(req);
+            const { agentRefineManager, db, project } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
+            if (!requireSafeStudioPolicy(res, provider))
+                return;
+            if (provider !== (project.provider ?? 'claude')) {
+                res.status(409).json({
+                    error: 'provider_refine_manager_unavailable',
+                    provider,
+                });
+                return;
+            }
             const refineId = req.params.refineId;
             const instruction = (req.body?.instruction ?? '').toString().trim();
             if (!instruction) {
@@ -661,12 +865,13 @@ function createProfilesRouter() {
     // GET /api/projects/:projectId/profiles/catalog/:agentId/versions
     router.get('/catalog/:agentId/versions', (req, res) => {
         try {
-            const { db } = ctx(req);
+            const { db, project } = ctx(req);
+            const provider = requestedProvider(req, project);
             const agentId = req.params.agentId;
             const rows = db
                 .prepare(`SELECT version, body, created_at AS createdAt FROM agent_versions
-           WHERE agent_name = ? ORDER BY version DESC`)
-                .all(agentId);
+           WHERE provider = ? AND agent_name = ? ORDER BY version DESC`)
+                .all(provider, agentId);
             res.json({ versions: rows });
         }
         catch (err) {
@@ -677,7 +882,12 @@ function createProfilesRouter() {
     router.get('/', (req, res) => {
         try {
             const { project } = ctx(req);
-            res.json({ profiles: (0, profile_manager_1.listProfiles)(specRoot(project)) });
+            const provider = requestedProvider(req, project);
+            const primary = project.provider ?? 'claude';
+            res.json({
+                profiles: (0, profile_manager_1.listProfiles)(specRoot(project), primary)
+                    .filter((profile) => profile.provider === provider),
+            });
         }
         catch (err) {
             handleError(res, err);
@@ -687,8 +897,9 @@ function createProfilesRouter() {
     router.get('/resolve', (req, res) => {
         try {
             const { project } = ctx(req);
+            const provider = requestedProvider(req, project);
             const explicit = typeof req.query.profile === 'string' ? req.query.profile : undefined;
-            const resolved = (0, profile_manager_1.resolveProfile)(specRoot(project), explicit, project.provider ?? 'claude');
+            const resolved = (0, profile_manager_1.resolveProfile)(specRoot(project), explicit, provider);
             if (!resolved) {
                 res.json({ resolved: null });
                 return;
@@ -703,8 +914,15 @@ function createProfilesRouter() {
     router.post('/', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
-            const body = req.body;
-            (0, profile_manager_1.createProfile)(specRoot(project), body, project.provider ?? 'claude');
+            const input = req.body;
+            const provider = requestedProvider(req, project, input?.provider);
+            const body = {
+                ...input,
+                ...(input?.provider || provider !== 'claude' || installedProviders(project).length > 1
+                    ? { provider }
+                    : {}),
+            };
+            (0, profile_manager_1.createProfile)(specRoot(project), body, provider);
             broadcast({ type: 'profile.changed', projectId: project.id, name: body.name });
             res.status(201).json({ profile: body });
         }
@@ -716,12 +934,13 @@ function createProfilesRouter() {
     router.post('/:name/duplicate', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
             const newName = (req.body?.name ?? '').toString();
             if (!newName) {
                 res.status(400).json({ error: "body field 'name' is required" });
                 return;
             }
-            const copy = (0, profile_manager_1.duplicateProfile)(specRoot(project), req.params.name, newName, project.provider ?? 'claude');
+            const copy = (0, profile_manager_1.duplicateProfile)(specRoot(project), req.params.name, newName, provider);
             broadcast({ type: 'profile.changed', projectId: project.id, name: newName });
             res.status(201).json({ profile: copy });
         }
@@ -733,12 +952,13 @@ function createProfilesRouter() {
     router.post('/:name/rename', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
+            const provider = requestedProvider(req, project, req.body?.provider);
             const newName = (req.body?.name ?? '').toString();
             if (!newName) {
                 res.status(400).json({ error: "body field 'name' is required" });
                 return;
             }
-            const renamed = (0, profile_manager_1.renameProfile)(specRoot(project), req.params.name, newName, project.provider ?? 'claude');
+            const renamed = (0, profile_manager_1.renameProfile)(specRoot(project), req.params.name, newName, provider);
             broadcast({ type: 'profile.changed', projectId: project.id, name: newName });
             res.json({ profile: renamed });
         }
@@ -750,10 +970,11 @@ function createProfilesRouter() {
     router.get('/:name', (req, res) => {
         try {
             const { project } = ctx(req);
+            const provider = requestedProvider(req, project);
             // Non-validating read so a profile that drifted invalid against the current
             // catalog can still be opened + repaired in the editor (getProfile threw and
             // locked it out). The body + validation errors are both returned.
-            const { profile, valid, errors } = (0, profile_manager_1.getProfileRaw)(specRoot(project), req.params.name, project.provider ?? 'claude');
+            const { profile, valid, errors } = (0, profile_manager_1.getProfileRaw)(specRoot(project), req.params.name, provider);
             res.json({ profile, valid, validationErrors: errors });
         }
         catch (err) {
@@ -764,12 +985,19 @@ function createProfilesRouter() {
     router.patch('/:name', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
-            const body = req.body;
+            const input = req.body;
+            const provider = requestedProvider(req, project, input?.provider);
+            const body = {
+                ...input,
+                ...(input?.provider || provider !== 'claude' || installedProviders(project).length > 1
+                    ? { provider }
+                    : {}),
+            };
             if (body.name !== req.params.name) {
                 res.status(400).json({ error: "body.name must match path parameter (use /rename to change name)" });
                 return;
             }
-            (0, profile_manager_1.updateProfile)(specRoot(project), body, project.provider ?? 'claude');
+            (0, profile_manager_1.updateProfile)(specRoot(project), body, provider);
             broadcast({ type: 'profile.changed', projectId: project.id, name: body.name });
             res.json({ profile: body });
         }
@@ -781,7 +1009,8 @@ function createProfilesRouter() {
     router.delete('/:name', (req, res) => {
         try {
             const { project, broadcast } = ctx(req);
-            (0, profile_manager_1.deleteProfile)(specRoot(project), req.params.name);
+            const provider = requestedProvider(req, project);
+            (0, profile_manager_1.deleteProfile)(specRoot(project), req.params.name, provider);
             broadcast({ type: 'profile.changed', projectId: project.id, name: req.params.name, deleted: true });
             res.json({ ok: true });
         }