wolfpack-mcp 1.0.51 → 1.0.53

package/dist/agentBuilderTools.js

@@ -3,12 +3,25 @@
  * Registered only when the API key has the `agent_builder` capability.
  */
 import { z } from 'zod';
+import { config } from './config.js';
+const ORG_SLUG_PROP = {
+    org_slug: {
+        type: 'string',
+        description: 'Organisation slug. Required when you belong to multiple organisations. Use list_organisations to find slugs.',
+    },
+};
 export const AGENT_BUILDER_TOOLS = [
+    // ─── Group 0: Organisations ─────────────────────────────────────────────
+    {
+        name: 'list_organisations',
+        description: 'List organisations you belong to. Use org_slug parameter in other agent builder tools when you belong to multiple organisations.',
+        inputSchema: { type: 'object', properties: {} },
+    },
     // ─── Group 1: Agent CRUD ─────────────────────────────────────────────────
     {
         name: 'list_agents',
         description: 'List all agents in the organisation. Returns name, status, template, and assigned projects.',
-        inputSchema: { type: 'object', properties: {} },
+        inputSchema: { type: 'object', properties: { ...ORG_SLUG_PROP } },
     },
     {
         name: 'get_agent',
@@ -17,6 +30,7 @@ export const AGENT_BUILDER_TOOLS = [
             type: 'object',
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -30,6 +44,7 @@ export const AGENT_BUILDER_TOOLS = [
                 template_id: { type: 'string', description: 'Template ID to create the agent from' },
                 name: { type: 'string', description: 'Display name for the agent' },
                 config: { type: 'object', description: 'Optional agent-specific configuration' },
+                ...ORG_SLUG_PROP,
             },
             required: ['template_id', 'name'],
         },
@@ -42,6 +57,10 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 name: { type: 'string', description: 'Updated display name' },
+                username: {
+                    type: 'string',
+                    description: 'Username for the agent (e.g. "k9"). Set to null to clear.',
+                },
                 instructions: {
                     type: 'string',
                     description: 'Agent-specific instructions (supplements template instructions). Set to null to clear.',
@@ -59,6 +78,7 @@ export const AGENT_BUILDER_TOOLS = [
                     description: 'LLM model family (e.g. "sonnet"). Agent auto-upgrades to latest in family.',
                 },
                 scheduling_enabled: { type: 'boolean', description: 'Whether scheduled tasks are enabled' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -71,6 +91,7 @@ export const AGENT_BUILDER_TOOLS = [
             type: 'object',
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -83,6 +104,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 project_slug: { type: 'string', description: 'Project slug to assign the agent to' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'project_slug'],
         },
@@ -95,6 +117,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 project_slug: { type: 'string', description: 'Project slug to remove the agent from' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'project_slug'],
         },
@@ -114,6 +137,7 @@ export const AGENT_BUILDER_TOOLS = [
                 },
                 limit: { type: 'number', description: 'Maximum sessions to return' },
                 offset: { type: 'number', description: 'Sessions to skip for pagination' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -126,6 +150,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 session_id: { type: 'string', description: 'Session ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'session_id'],
         },
@@ -140,6 +165,7 @@ export const AGENT_BUILDER_TOOLS = [
                 session_id: { type: 'string', description: 'Session ID' },
                 limit: { type: 'number', description: 'Turns to return' },
                 offset: { type: 'number', description: 'Turns to skip' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'session_id'],
         },
@@ -154,6 +180,7 @@ export const AGENT_BUILDER_TOOLS = [
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 prompt: { type: 'string', description: 'What the agent should do' },
                 project_slug: { type: 'string', description: 'Project to scope the session to (optional)' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'prompt'],
         },
@@ -166,6 +193,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 session_id: { type: 'string', description: 'Session ID to stop' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'session_id'],
         },
@@ -179,6 +207,7 @@ export const AGENT_BUILDER_TOOLS = [
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 session_id: { type: 'string', description: 'Completed session ID to resume' },
                 prompt: { type: 'string', description: 'Follow-up prompt for the agent' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'session_id', 'prompt'],
         },
@@ -191,6 +220,7 @@ export const AGENT_BUILDER_TOOLS = [
             type: 'object',
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -203,6 +233,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 task_id: { type: 'string', description: 'Task ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'task_id'],
         },
@@ -224,6 +255,7 @@ export const AGENT_BUILDER_TOOLS = [
                     type: 'number',
                     description: 'Order within scheduled batch (lower = first)',
                 },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'name', 'prompt'],
         },
@@ -241,6 +273,7 @@ export const AGENT_BUILDER_TOOLS = [
                 scheduled_enabled: { type: 'boolean', description: 'Include in scheduled runs' },
                 sort_order: { type: 'number', description: 'Order within scheduled batch' },
                 is_active: { type: 'boolean', description: 'Whether this task is active' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'task_id'],
         },
@@ -255,6 +288,7 @@ export const AGENT_BUILDER_TOOLS = [
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 task_id: { type: 'string', description: 'Task ID to run' },
                 project_slug: { type: 'string', description: 'Project to scope the session to (optional)' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'task_id'],
         },
@@ -271,6 +305,7 @@ export const AGENT_BUILDER_TOOLS = [
                     enum: ['queued', 'running', 'completed', 'failed', 'cancelled'],
                     description: 'Filter by queue entry status',
                 },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -283,6 +318,7 @@ export const AGENT_BUILDER_TOOLS = [
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 entry_id: { type: 'string', description: 'Queue entry ID to cancel' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'entry_id'],
         },
@@ -290,7 +326,8 @@ export const AGENT_BUILDER_TOOLS = [
     // ─── Group 5: Skills (authoring) ─────────────────────────────────────────
     {
         name: 'create_skill',
-        description: 'Create a new org-level skill. Skills are reusable capability packs agents can load on demand.',
+        description: 'Create a skill. By default creates an org-level skill. ' +
+            'Pass agent_id to create an agent-private skill scoped to that agent only.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -306,6 +343,11 @@ export const AGENT_BUILDER_TOOLS = [
                     type: 'string',
                     description: 'Instruction body in markdown',
                 },
+                agent_id: {
+                    type: 'string',
+                    description: 'Agent profile ID. When provided, creates an agent-private skill instead of org-level.',
+                },
+                ...ORG_SLUG_PROP,
             },
             required: ['name', 'description', 'content'],
         },
@@ -320,6 +362,7 @@ export const AGENT_BUILDER_TOOLS = [
                 name: { type: 'string', description: 'Updated skill name' },
                 description: { type: 'string', description: 'Updated description' },
                 content: { type: 'string', description: 'Updated instruction body' },
+                ...ORG_SLUG_PROP,
             },
             required: ['skill_id'],
         },
@@ -339,6 +382,7 @@ export const AGENT_BUILDER_TOOLS = [
                 name: { type: 'string', description: 'Resource filename' },
                 content: { type: 'string', description: 'Resource text content' },
                 mime_type: { type: 'string', description: 'MIME type (optional)' },
+                ...ORG_SLUG_PROP,
             },
             required: ['skill_id', 'type', 'name', 'content'],
         },
@@ -354,6 +398,7 @@ export const AGENT_BUILDER_TOOLS = [
                 name: { type: 'string', description: 'Updated filename' },
                 content: { type: 'string', description: 'Updated text content' },
                 mime_type: { type: 'string', description: 'Updated MIME type' },
+                ...ORG_SLUG_PROP,
             },
             required: ['skill_id', 'resource_id'],
         },
@@ -371,22 +416,31 @@ export const AGENT_BUILDER_TOOLS = [
                     items: { type: 'string' },
                     description: 'Array of skill IDs to assign (replaces all current assignments)',
                 },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'skill_ids'],
         },
     },
-    // ─── Group 5b: Skills (reading org library) ──────────────────────────────
+    // ─── Group 5b: Skills (reading) ─────────────────────────────────────────
     {
-        name: 'list_org_skills',
-        description: 'List all skills in the org skill library (org-level + system-level). ' +
-            'Returns ID, name, description, and whether the skill is built-in. ' +
-            'Use skill IDs with set_agent_skills to assign skills to an agent.',
-        inputSchema: { type: 'object', properties: {} },
+        name: 'list_agent_skills',
+        description: 'List all skills for a specific agent: agent-private skills + linked org skills + built-in skills. ' +
+            'Returns full skill objects with IDs. Agent-scoped skills have agentProfileId set. ' +
+            'Use this to see what skills an agent has and get IDs for update_skill.',
+        inputSchema: {
+            type: 'object',
+            properties: {
+                agent_id: { type: 'string', description: 'Agent profile ID' },
+            },
+            required: ['agent_id'],
+        },
     },
     {
-        name: 'get_org_skill',
-        description: 'Get the full content of an org-level skill by name. ' +
-            'Returns instructions, metadata, and a list of attached resources.',
+        name: 'get_skill_detail',
+        description: 'Get the full content of a skill by name. ' +
+            'Returns instructions, metadata, and a list of attached resources. ' +
+            'With agent_id: resolves agent-private → org → system (use after list_agent_skills). ' +
+            'Without agent_id: resolves org → system (use after list_org_skills).',
         inputSchema: {
             type: 'object',
             properties: {
@@ -394,10 +448,22 @@ export const AGENT_BUILDER_TOOLS = [
                     type: 'string',
                     description: 'The name of the skill to load (e.g. "deploy-app")',
                 },
+                agent_id: {
+                    type: 'string',
+                    description: 'Agent profile ID. When provided, resolves with agent-scoped precedence (agent → org → system).',
+                },
+                ...ORG_SLUG_PROP,
             },
             required: ['skill_name'],
         },
     },
+    {
+        name: 'list_org_skills',
+        description: 'List all skills in the org skill library (org-level + system-level). ' +
+            'Returns ID, name, description, and whether the skill is built-in. ' +
+            'Use skill IDs with set_agent_skills to assign skills to an agent.',
+        inputSchema: { type: 'object', properties: { ...ORG_SLUG_PROP } },
+    },
     // ─── Group 6: Secrets ─────────────────────────────────────────────────────
     {
         name: 'list_agent_secrets',
@@ -406,6 +472,7 @@ export const AGENT_BUILDER_TOOLS = [
             type: 'object',
             properties: {
                 agent_id: { type: 'string', description: 'Agent profile ID' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id'],
         },
@@ -420,6 +487,7 @@ export const AGENT_BUILDER_TOOLS = [
                 agent_id: { type: 'string', description: 'Agent profile ID' },
                 name: { type: 'string', description: 'Secret name (e.g. MY_API_KEY)' },
                 value: { type: 'string', description: 'Secret value (encrypted at rest)' },
+                ...ORG_SLUG_PROP,
             },
             required: ['agent_id', 'name', 'value'],
         },
@@ -428,31 +496,50 @@ export const AGENT_BUILDER_TOOLS = [
     {
         name: 'list_agent_templates',
         description: 'List agent templates available to the organisation. Use template IDs when calling create_agent.',
-        inputSchema: { type: 'object', properties: {} },
+        inputSchema: { type: 'object', properties: { ...ORG_SLUG_PROP } },
     },
     {
         name: 'list_llm_models',
         description: 'List LLM providers and models available to the organisation. ' +
             'Use provider and model IDs when calling create_agent or update_agent.',
-        inputSchema: { type: 'object', properties: {} },
+        inputSchema: { type: 'object', properties: { ...ORG_SLUG_PROP } },
     },
 ];
+// Zod helper: org_slug with config fallback
+const orgSlugField = z.string().optional();
+function resolveOrg(parsed) {
+    return parsed.org_slug || config.orgSlug;
+}
 // Zod schemas for argument parsing
-const AgentIdSchema = z.object({ agent_id: z.string() });
-const AgentSessionSchema = z.object({ agent_id: z.string(), session_id: z.string() });
-const AgentTaskSchema = z.object({ agent_id: z.string(), task_id: z.string() });
-const SkillIdSchema = z.object({ skill_id: z.string() });
+const AgentIdSchema = z.object({ agent_id: z.string(), org_slug: orgSlugField });
+const AgentSessionSchema = z.object({
+    agent_id: z.string(),
+    session_id: z.string(),
+    org_slug: orgSlugField,
+});
+const AgentTaskSchema = z.object({
+    agent_id: z.string(),
+    task_id: z.string(),
+    org_slug: orgSlugField,
+});
+const SkillIdSchema = z.object({ skill_id: z.string(), org_slug: orgSlugField });
 export async function handleAgentBuilderTool(name, args, client) {
     const text = (t) => JSON.stringify(t, null, 2);
     switch (name) {
+        // ─── Organisations ─────────────────────────────────────────────────────
+        case 'list_organisations': {
+            const orgs = await client.listOrganisations();
+            return { content: [{ type: 'text', text: text(orgs) }] };
+        }
         // ─── Agent CRUD ────────────────────────────────────────────────────────
         case 'list_agents': {
-            const agents = await client.listAgents();
+            const parsed = z.object({ org_slug: orgSlugField }).parse(args);
+            const agents = await client.listAgents(resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(agents) }] };
         }
         case 'get_agent': {
-            const { agent_id } = AgentIdSchema.parse(args);
-            const agent = await client.getAgent(agent_id);
+            const parsed = AgentIdSchema.parse(args);
+            const agent = await client.getAgent(parsed.agent_id, resolveOrg(parsed));
             if (!agent)
                 return { content: [{ type: 'text', text: 'Agent not found' }] };
             return { content: [{ type: 'text', text: text(agent) }] };
@@ -463,13 +550,14 @@ export async function handleAgentBuilderTool(name, args, client) {
                 template_id: z.string(),
                 name: z.string(),
                 config: z.record(z.unknown()).optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
             const agent = await client.createAgent({
                 templateId: parsed.template_id,
                 name: parsed.name,
                 config: parsed.config,
-            });
+            }, resolveOrg(parsed));
             return {
                 content: [
                     {
@@ -484,17 +572,21 @@ export async function handleAgentBuilderTool(name, args, client) {
                 .object({
                 agent_id: z.string(),
                 name: z.string().optional(),
+                username: z.string().nullable().optional(),
                 instructions: z.string().nullable().optional(),
                 llm_provider: z.string().nullable().optional(),
                 llm_model: z.string().nullable().optional(),
                 llm_family: z.string().nullable().optional(),
                 scheduling_enabled: z.boolean().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
-            const { agent_id, ...rest } = parsed;
+            const { agent_id, org_slug, ...rest } = parsed;
             const fields = {};
             if (rest.name !== undefined)
                 fields.name = rest.name;
+            if (rest.username !== undefined)
+                fields.username = rest.username;
             if (rest.instructions !== undefined)
                 fields.instructions = rest.instructions;
             if (rest.llm_provider !== undefined)
@@ -505,25 +597,29 @@ export async function handleAgentBuilderTool(name, args, client) {
                 fields.llmFamily = rest.llm_family;
             if (rest.scheduling_enabled !== undefined)
                 fields.schedulingEnabled = rest.scheduling_enabled;
-            const agent = await client.updateAgent(agent_id, fields);
+            const agent = await client.updateAgent(agent_id, fields, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Updated agent\n\n${text(agent)}` }] };
         }
         // ─── Project Assignment ─────────────────────────────────────────────────
         case 'list_agent_projects': {
-            const { agent_id } = AgentIdSchema.parse(args);
-            const projects = await client.listAgentProjects(agent_id);
+            const parsed = AgentIdSchema.parse(args);
+            const projects = await client.listAgentProjects(parsed.agent_id, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(projects) }] };
         }
         case 'assign_agent_to_project': {
-            const parsed = z.object({ agent_id: z.string(), project_slug: z.string() }).parse(args);
-            await client.assignAgentToProject(parsed.agent_id, parsed.project_slug);
+            const parsed = z
+                .object({ agent_id: z.string(), project_slug: z.string(), org_slug: orgSlugField })
+                .parse(args);
+            await client.assignAgentToProject(parsed.agent_id, parsed.project_slug, resolveOrg(parsed));
             return {
                 content: [{ type: 'text', text: `Assigned agent to project "${parsed.project_slug}"` }],
             };
         }
         case 'remove_agent_from_project': {
-            const parsed = z.object({ agent_id: z.string(), project_slug: z.string() }).parse(args);
-            await client.removeAgentFromProject(parsed.agent_id, parsed.project_slug);
+            const parsed = z
+                .object({ agent_id: z.string(), project_slug: z.string(), org_slug: orgSlugField })
+                .parse(args);
+            await client.removeAgentFromProject(parsed.agent_id, parsed.project_slug, resolveOrg(parsed));
             return {
                 content: [{ type: 'text', text: `Removed agent from project "${parsed.project_slug}"` }],
             };
@@ -536,18 +632,19 @@ export async function handleAgentBuilderTool(name, args, client) {
                 status: z.string().optional(),
                 limit: z.number().optional(),
                 offset: z.number().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
             const sessions = await client.listAgentSessions(parsed.agent_id, {
                 status: parsed.status,
                 limit: parsed.limit,
                 offset: parsed.offset,
-            });
+            }, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(sessions) }] };
         }
         case 'get_agent_session': {
-            const { agent_id, session_id } = AgentSessionSchema.parse(args);
-            const session = await client.getAgentSession(agent_id, session_id);
+            const parsed = AgentSessionSchema.parse(args);
+            const session = await client.getAgentSession(parsed.agent_id, parsed.session_id, resolveOrg(parsed));
             if (!session)
                 return { content: [{ type: 'text', text: 'Session not found' }] };
             return { content: [{ type: 'text', text: text(session) }] };
@@ -559,19 +656,22 @@ export async function handleAgentBuilderTool(name, args, client) {
                 session_id: z.string(),
                 limit: z.number().optional(),
                 offset: z.number().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
-            const conv = await client.getAgentSessionConversation(parsed.agent_id, parsed.session_id, {
-                limit: parsed.limit,
-                offset: parsed.offset,
-            });
+            const conv = await client.getAgentSessionConversation(parsed.agent_id, parsed.session_id, { limit: parsed.limit, offset: parsed.offset }, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(conv) }] };
         }
         case 'run_agent': {
             const parsed = z
-                .object({ agent_id: z.string(), prompt: z.string(), project_slug: z.string().optional() })
+                .object({
+                agent_id: z.string(),
+                prompt: z.string(),
+                project_slug: z.string().optional(),
+                org_slug: orgSlugField,
+            })
                 .parse(args);
-            const result = await client.runAgent(parsed.agent_id, parsed.prompt, parsed.project_slug);
+            const result = await client.runAgent(parsed.agent_id, parsed.prompt, parsed.project_slug, resolveOrg(parsed));
             return {
                 content: [
                     {
@@ -582,8 +682,8 @@ export async function handleAgentBuilderTool(name, args, client) {
             };
         }
         case 'stop_agent_session': {
-            const { agent_id, session_id } = AgentSessionSchema.parse(args);
-            const session = await client.stopAgentSession(agent_id, session_id);
+            const parsed = AgentSessionSchema.parse(args);
+            const session = await client.stopAgentSession(parsed.agent_id, parsed.session_id, resolveOrg(parsed));
             return {
                 content: [
                     { type: 'text', text: `Stopped session (status: ${session.status})\n\n${text(session)}` },
@@ -592,20 +692,25 @@ export async function handleAgentBuilderTool(name, args, client) {
         }
         case 'resume_agent_session': {
             const parsed = z
-                .object({ agent_id: z.string(), session_id: z.string(), prompt: z.string() })
+                .object({
+                agent_id: z.string(),
+                session_id: z.string(),
+                prompt: z.string(),
+                org_slug: orgSlugField,
+            })
                 .parse(args);
-            const session = await client.resumeAgentSession(parsed.agent_id, parsed.session_id, parsed.prompt);
+            const session = await client.resumeAgentSession(parsed.agent_id, parsed.session_id, parsed.prompt, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Resumed session\n\n${text(session)}` }] };
         }
         // ─── Tasks ──────────────────────────────────────────────────────────────
         case 'list_agent_tasks': {
-            const { agent_id } = AgentIdSchema.parse(args);
-            const tasks = await client.listAgentTasks(agent_id);
+            const parsed = AgentIdSchema.parse(args);
+            const tasks = await client.listAgentTasks(parsed.agent_id, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(tasks) }] };
         }
         case 'get_agent_task': {
-            const { agent_id, task_id } = AgentTaskSchema.parse(args);
-            const task = await client.getAgentTask(agent_id, task_id);
+            const parsed = AgentTaskSchema.parse(args);
+            const task = await client.getAgentTask(parsed.agent_id, parsed.task_id, resolveOrg(parsed));
             if (!task)
                 return { content: [{ type: 'text', text: 'Task not found' }] };
             return { content: [{ type: 'text', text: text(task) }] };
@@ -618,6 +723,7 @@ export async function handleAgentBuilderTool(name, args, client) {
                 prompt: z.string(),
                 scheduled_enabled: z.boolean().optional(),
                 sort_order: z.number().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
             const task = await client.createAgentTask(parsed.agent_id, {
@@ -625,7 +731,7 @@ export async function handleAgentBuilderTool(name, args, client) {
                 prompt: parsed.prompt,
                 scheduledEnabled: parsed.scheduled_enabled,
                 sortOrder: parsed.sort_order,
-            });
+            }, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Created task "${task.name}"\n\n${text(task)}` }] };
         }
         case 'update_agent_task': {
@@ -638,6 +744,7 @@ export async function handleAgentBuilderTool(name, args, client) {
                 scheduled_enabled: z.boolean().optional(),
                 sort_order: z.number().optional(),
                 is_active: z.boolean().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
             const fields = {};
@@ -651,14 +758,19 @@ export async function handleAgentBuilderTool(name, args, client) {
                 fields.sortOrder = parsed.sort_order;
             if (parsed.is_active !== undefined)
                 fields.isActive = parsed.is_active;
-            const task = await client.updateAgentTask(parsed.agent_id, parsed.task_id, fields);
+            const task = await client.updateAgentTask(parsed.agent_id, parsed.task_id, fields, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Updated task\n\n${text(task)}` }] };
         }
         case 'run_agent_task': {
             const parsed = z
-                .object({ agent_id: z.string(), task_id: z.string(), project_slug: z.string().optional() })
+                .object({
+                agent_id: z.string(),
+                task_id: z.string(),
+                project_slug: z.string().optional(),
+                org_slug: orgSlugField,
+            })
                 .parse(args);
-            const result = await client.runAgentTask(parsed.agent_id, parsed.task_id, parsed.project_slug);
+            const result = await client.runAgentTask(parsed.agent_id, parsed.task_id, parsed.project_slug, resolveOrg(parsed));
             return {
                 content: [
                     {
@@ -669,23 +781,37 @@ export async function handleAgentBuilderTool(name, args, client) {
             };
         }
         case 'list_agent_queue': {
-            const parsed = z.object({ agent_id: z.string(), status: z.string().optional() }).parse(args);
-            const entries = await client.listAgentQueue(parsed.agent_id, parsed.status);
+            const parsed = z
+                .object({ agent_id: z.string(), status: z.string().optional(), org_slug: orgSlugField })
+                .parse(args);
+            const entries = await client.listAgentQueue(parsed.agent_id, parsed.status, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(entries) }] };
         }
         case 'cancel_queue_entry': {
-            const parsed = z.object({ agent_id: z.string(), entry_id: z.string() }).parse(args);
-            await client.cancelQueueEntry(parsed.agent_id, parsed.entry_id);
+            const parsed = z
+                .object({ agent_id: z.string(), entry_id: z.string(), org_slug: orgSlugField })
+                .parse(args);
+            await client.cancelQueueEntry(parsed.agent_id, parsed.entry_id, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Cancelled queue entry ${parsed.entry_id}` }] };
         }
         // ─── Skills ─────────────────────────────────────────────────────────────
         case 'create_skill': {
             const parsed = z
-                .object({ name: z.string(), description: z.string(), content: z.string() })
+                .object({
+                name: z.string(),
+                description: z.string(),
+                content: z.string(),
+                agent_id: z.string().optional(),
+                org_slug: orgSlugField,
+            })
                 .parse(args);
-            const skill = await client.createSkill(parsed);
+            const { agent_id, org_slug, ...fields } = parsed;
+            const skill = await client.createSkill({ ...fields, agentProfileId: agent_id }, resolveOrg(parsed));
+            const scope = agent_id ? 'agent-scoped' : 'org-level';
             return {
-                content: [{ type: 'text', text: `Created skill "${parsed.name}"\n\n${text(skill)}` }],
+                content: [
+                    { type: 'text', text: `Created ${scope} skill "${parsed.name}"\n\n${text(skill)}` },
+                ],
             };
         }
         case 'update_skill': {
@@ -695,10 +821,11 @@ export async function handleAgentBuilderTool(name, args, client) {
                 name: z.string().optional(),
                 description: z.string().optional(),
                 content: z.string().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
-            const { skill_id, ...fields } = parsed;
-            const skill = await client.updateSkill(skill_id, fields);
+            const { skill_id, org_slug, ...fields } = parsed;
+            const skill = await client.updateSkill(skill_id, fields, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Updated skill\n\n${text(skill)}` }] };
         }
         case 'create_skill_resource': {
@@ -709,10 +836,11 @@ export async function handleAgentBuilderTool(name, args, client) {
                 name: z.string(),
                 content: z.string(),
                 mime_type: z.string().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
-            const { skill_id, mime_type, ...rest } = parsed;
-            const resource = await client.createSkillResource(skill_id, { ...rest, mimeType: mime_type });
+            const { skill_id, mime_type, org_slug, ...rest } = parsed;
+            const resource = await client.createSkillResource(skill_id, { ...rest, mimeType: mime_type }, resolveOrg(parsed));
             return {
                 content: [{ type: 'text', text: `Created resource "${parsed.name}"\n\n${text(resource)}` }],
             };
@@ -725,18 +853,22 @@ export async function handleAgentBuilderTool(name, args, client) {
                 name: z.string().optional(),
                 content: z.string().optional(),
                 mime_type: z.string().optional(),
+                org_slug: orgSlugField,
             })
                 .parse(args);
-            const { skill_id, resource_id, mime_type, ...rest } = parsed;
-            const resource = await client.updateSkillResource(skill_id, resource_id, {
-                ...rest,
-                mimeType: mime_type,
-            });
+            const { skill_id, resource_id, mime_type, org_slug, ...rest } = parsed;
+            const resource = await client.updateSkillResource(skill_id, resource_id, { ...rest, mimeType: mime_type }, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Updated resource\n\n${text(resource)}` }] };
         }
         case 'set_agent_skills': {
-            const parsed = z.object({ agent_id: z.string(), skill_ids: z.array(z.string()) }).parse(args);
-            await client.setAgentSkills(parsed.agent_id, parsed.skill_ids);
+            const parsed = z
+                .object({
+                agent_id: z.string(),
+                skill_ids: z.array(z.string()),
+                org_slug: orgSlugField,
+            })
+                .parse(args);
+            await client.setAgentSkills(parsed.agent_id, parsed.skill_ids, resolveOrg(parsed));
             return {
                 content: [
                     {
@@ -746,46 +878,65 @@ export async function handleAgentBuilderTool(name, args, client) {
                 ],
             };
         }
-        // ─── Skills (reading org library) ────────────────────────────────────────
-        case 'list_org_skills': {
-            const skills = await client.listOrgSkills();
+        // ─── Skills (reading) ─────────────────────────────────────────────────────
+        case 'list_agent_skills': {
+            const parsed = z.object({ agent_id: z.string() }).parse(args);
+            const skills = await client.listAgentSkills(parsed.agent_id);
             return { content: [{ type: 'text', text: text(skills) }] };
         }
-        case 'get_org_skill': {
-            const parsed = z.object({ skill_name: z.string() }).parse(args);
-            const skill = await client.getOrgSkill(parsed.skill_name);
+        case 'get_skill_detail': {
+            const parsed = z
+                .object({
+                skill_name: z.string(),
+                agent_id: z.string().optional(),
+                org_slug: orgSlugField,
+            })
+                .parse(args);
+            const skill = await client.getSkillDetail(parsed.skill_name, parsed.agent_id, resolveOrg(parsed));
             if (!skill) {
                 return {
                     content: [
                         {
                             type: 'text',
-                            text: `Skill '${parsed.skill_name}' not found. Use list_org_skills to see available skills.`,
+                            text: `Skill '${parsed.skill_name}' not found. Use list_agent_skills or list_org_skills to see available skills.`,
                         },
                     ],
                 };
             }
             return { content: [{ type: 'text', text: text(skill) }] };
         }
+        case 'list_org_skills': {
+            const parsed = z.object({ org_slug: orgSlugField }).parse(args);
+            const skills = await client.listOrgSkills(resolveOrg(parsed));
+            return { content: [{ type: 'text', text: text(skills) }] };
+        }
         // ─── Secrets ─────────────────────────────────────────────────────────────
         case 'list_agent_secrets': {
-            const { agent_id } = AgentIdSchema.parse(args);
-            const secrets = await client.listAgentSecrets(agent_id);
+            const parsed = AgentIdSchema.parse(args);
+            const secrets = await client.listAgentSecrets(parsed.agent_id, resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(secrets) }] };
         }
         case 'set_agent_secret': {
             const parsed = z
-                .object({ agent_id: z.string(), name: z.string(), value: z.string() })
+                .object({
+                agent_id: z.string(),
+                name: z.string(),
+                value: z.string(),
+                org_slug: orgSlugField,
+            })
                 .parse(args);
-            const secret = await client.setAgentSecret(parsed.agent_id, parsed.name, parsed.value);
+            const secret = await client.setAgentSecret(parsed.agent_id, parsed.name, parsed.value, resolveOrg(parsed));
             return { content: [{ type: 'text', text: `Set secret "${secret.name}"` }] };
         }
         // ─── Discovery ────────────────────────────────────────────────────────────
         case 'list_agent_templates': {
-            const templates = await client.listAgentTemplates();
+            const parsed = z.object({ org_slug: orgSlugField }).parse(args);
+            const templates = await client.listAgentTemplates(resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(templates) }] };
         }
         case 'list_llm_models': {
-            const models = await client.listLlmModels();
+            const parsed = z.object({ org_slug: orgSlugField }).parse(args);
+            const models = await client.listLlmModels(resolveOrg(parsed));
             return { content: [{ type: 'text', text: text(models) }] };
         }
         default: