wolfpack-mcp 1.0.52 → 1.0.53

package/dist/agentSelfTools.js

@@ -0,0 +1,124 @@
+import { z } from 'zod';
+function text(data) {
+    return JSON.stringify(data, null, 2);
+}
+// ─── Tool definitions ──────────────────────────────────────────────────────────
+export const AGENT_SELF_TOOLS = [
+    {
+        name: 'get_self',
+        description: 'Get your own agent profile with full composed context: template system prompt, agent instructions, skills, LLM model, and assigned projects. ' +
+            'Use this to understand how you are configured and what capabilities you have. ' +
+            'Essential for self-reflection and improvement proposals.',
+        inputSchema: { type: 'object', properties: {} },
+    },
+    {
+        name: 'get_own_sessions',
+        description: 'List your own recent sessions. Returns session metadata including status, trigger type, and timestamps. ' +
+            'Use this to review your recent activity for retrospective analysis.',
+        inputSchema: {
+            type: 'object',
+            properties: {
+                limit: { type: 'number', description: 'Max sessions to return (default 10)' },
+                offset: { type: 'number', description: 'Skip first N sessions (default 0)' },
+            },
+        },
+    },
+    {
+        name: 'list_memories',
+        description: 'List all your persistent memory entries. Memory persists across sessions and is scoped to you. ' +
+            'Use this to recall observations, patterns, and notes from previous work.',
+        inputSchema: { type: 'object', properties: {} },
+    },
+    {
+        name: 'get_memory',
+        description: 'Get a specific memory entry by key. Returns the content and metadata for a single memory entry.',
+        inputSchema: {
+            type: 'object',
+            properties: {
+                key: { type: 'string', description: 'The memory key to retrieve' },
+            },
+            required: ['key'],
+        },
+    },
+    {
+        name: 'save_memory',
+        description: 'Save a persistent memory entry by key. Creates the entry if it does not exist, or updates it if it does. ' +
+            'Use this to persist observations, learnings, and notes across sessions. ' +
+            'To clear a memory entry, save it with empty content.',
+        inputSchema: {
+            type: 'object',
+            properties: {
+                key: {
+                    type: 'string',
+                    description: 'A unique key for this memory entry (e.g. "retrospective-notes", "recurring-issues", "session-learnings")',
+                },
+                content: {
+                    type: 'string',
+                    description: 'The content to persist. Use markdown for structured notes.',
+                },
+            },
+            required: ['key', 'content'],
+        },
+    },
+];
+// ─── Zod schemas ───────────────────────────────────────────────────────────────
+const GetOwnSessionsSchema = z.object({
+    limit: z.number().optional(),
+    offset: z.number().optional(),
+});
+const GetMemorySchema = z.object({
+    key: z.string(),
+});
+const SaveMemorySchema = z.object({
+    key: z.string(),
+    content: z.string(),
+});
+// ─── Handler ───────────────────────────────────────────────────────────────────
+export async function handleAgentSelfTool(name, args, client) {
+    switch (name) {
+        case 'get_self': {
+            const self = await client.getSelf();
+            return { content: [{ type: 'text', text: text(self) }] };
+        }
+        case 'get_own_sessions': {
+            const parsed = GetOwnSessionsSchema.parse(args || {});
+            const sessions = await client.getOwnSessions(parsed);
+            return { content: [{ type: 'text', text: text(sessions) }] };
+        }
+        case 'list_memories': {
+            const memories = await client.listMemories();
+            if (memories.length === 0) {
+                return {
+                    content: [
+                        { type: 'text', text: 'No memory entries found. Use save_memory to create one.' },
+                    ],
+                };
+            }
+            return { content: [{ type: 'text', text: text(memories) }] };
+        }
+        case 'get_memory': {
+            const parsed = GetMemorySchema.parse(args);
+            const memory = await client.getMemory(parsed.key);
+            if (!memory) {
+                return {
+                    content: [{ type: 'text', text: `Memory entry "${parsed.key}" not found.` }],
+                };
+            }
+            return { content: [{ type: 'text', text: text(memory) }] };
+        }
+        case 'save_memory': {
+            const parsed = SaveMemorySchema.parse(args);
+            const memory = await client.saveMemory(parsed.key, parsed.content);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: `Saved memory "${parsed.key}" (updated: ${memory.dateUpdated})`,
+                    },
+                ],
+            };
+        }
+        default:
+            throw new Error(`Unknown agent self tool: ${name}`);
+    }
+}

package/dist/client.js

@@ -17,6 +17,13 @@ export class WolfpackClient {
         const sep = path.includes('?') ? '&' : '?';
         return `${path}${sep}teamSlug=${encodeURIComponent(slug)}`;
     }
+    /** Build a URL path with optional org_slug query parameter. */
+    withOrgSlug(path, orgSlug) {
+        if (!orgSlug)
+            return path;
+        const sep = path.includes('?') ? '&' : '?';
+        return `${path}${sep}org_slug=${encodeURIComponent(orgSlug)}`;
+    }
     /**
      * Fetch and cache the project slug by verifying it exists.
      * Uses the MCP team endpoint to validate the slug.
@@ -572,13 +579,18 @@ export class WolfpackClient {
     async getCapabilities() {
         return this.api.get('/capabilities');
     }
+    // ─── Organisations ──────────────────────────────────────────────────────────
+    async listOrganisations() {
+        const response = await this.api.get('/organisations');
+        return response.organisations;
+    }
     // ─── Agent Builder: Agent CRUD ─────────────────────────────────────────────
-    async listAgents() {
-        return this.api.get('/agents');
+    async listAgents(orgSlug) {
+        return this.api.get(this.withOrgSlug('/agents', orgSlug));
     }
-    async getAgent(agentId) {
+    async getAgent(agentId, orgSlug) {
         try {
-            return await this.api.get(`/agents/${agentId}`);
+            return await this.api.get(this.withOrgSlug(`/agents/${agentId}`, orgSlug));
         }
         catch (error) {
             if (error && typeof error === 'object' && 'status' in error && error.status === 404)
@@ -586,26 +598,26 @@ export class WolfpackClient {
             throw error;
         }
     }
-    async createAgent(body) {
-        return this.api.post('/agents', body);
+    async createAgent(body, orgSlug) {
+        return this.api.post(this.withOrgSlug('/agents', orgSlug), body);
     }
-    async updateAgent(agentId, body) {
-        return this.api.patch(`/agents/${agentId}`, body);
+    async updateAgent(agentId, body, orgSlug) {
+        return this.api.patch(this.withOrgSlug(`/agents/${agentId}`, orgSlug), body);
     }
     // ─── Agent Builder: Project Assignment ────────────────────────────────────
-    async listAgentProjects(agentId) {
-        return this.api.get(`/agents/${agentId}/projects`);
+    async listAgentProjects(agentId, orgSlug) {
+        return this.api.get(this.withOrgSlug(`/agents/${agentId}/projects`, orgSlug));
     }
-    async assignAgentToProject(agentId, teamSlug) {
-        return this.api.post(`/agents/${agentId}/projects/${encodeURIComponent(teamSlug)}`, {});
+    async assignAgentToProject(agentId, teamSlug, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/projects/${encodeURIComponent(teamSlug)}`, orgSlug), {});
     }
-    async removeAgentFromProject(agentId, teamSlug) {
+    async removeAgentFromProject(agentId, teamSlug, orgSlug) {
         return this.api
-            .delete(`/agents/${agentId}/projects/${encodeURIComponent(teamSlug)}`)
+            .delete(this.withOrgSlug(`/agents/${agentId}/projects/${encodeURIComponent(teamSlug)}`, orgSlug))
             .then(() => ({ success: true }));
     }
     // ─── Agent Builder: Sessions ───────────────────────────────────────────────
-    async listAgentSessions(agentId, options) {
+    async listAgentSessions(agentId, options, orgSlug) {
         const params = new URLSearchParams();
         if (options?.status)
             params.append('status', options.status);
@@ -613,12 +625,14 @@ export class WolfpackClient {
             params.append('limit', options.limit.toString());
         if (options?.offset !== undefined)
             params.append('offset', options.offset.toString());
+        if (orgSlug)
+            params.append('org_slug', orgSlug);
         const q = params.toString();
         return this.api.get(`/agents/${agentId}/sessions${q ? `?${q}` : ''}`);
     }
-    async getAgentSession(agentId, sessionId) {
+    async getAgentSession(agentId, sessionId, orgSlug) {
         try {
-            return await this.api.get(`/agents/${agentId}/sessions/${sessionId}`);
+            return await this.api.get(this.withOrgSlug(`/agents/${agentId}/sessions/${sessionId}`, orgSlug));
         }
         catch (error) {
             if (error && typeof error === 'object' && 'status' in error && error.status === 404)
@@ -626,33 +640,36 @@ export class WolfpackClient {
             throw error;
         }
     }
-    async getAgentSessionConversation(agentId, sessionId, options) {
+    async getAgentSessionConversation(agentId, sessionId, options, orgSlug) {
         const params = new URLSearchParams();
         if (options?.limit !== undefined)
             params.append('limit', options.limit.toString());
         if (options?.offset !== undefined)
             params.append('offset', options.offset.toString());
+        if (orgSlug)
+            params.append('org_slug', orgSlug);
         const q = params.toString();
         return this.api.get(`/agents/${agentId}/sessions/${sessionId}/conversation${q ? `?${q}` : ''}`);
     }
-    async runAgent(agentId, prompt, teamSlug) {
-        return this.api.post(`/agents/${agentId}/run`, { prompt, teamSlug });
-    }
-    async stopAgentSession(agentId, sessionId) {
-        return this.api.post(`/agents/${agentId}/sessions/${sessionId}/stop`, {});
-    }
-    async resumeAgentSession(agentId, sessionId, prompt) {
-        return this.api.post(`/agents/${agentId}/sessions/${sessionId}/resume`, {
+    async runAgent(agentId, prompt, teamSlug, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/run`, orgSlug), {
             prompt,
+            teamSlug,
         });
     }
+    async stopAgentSession(agentId, sessionId, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/sessions/${sessionId}/stop`, orgSlug), {});
+    }
+    async resumeAgentSession(agentId, sessionId, prompt, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/sessions/${sessionId}/resume`, orgSlug), { prompt });
+    }
     // ─── Agent Builder: Tasks ──────────────────────────────────────────────────
-    async listAgentTasks(agentId) {
-        return this.api.get(`/agents/${agentId}/tasks`);
+    async listAgentTasks(agentId, orgSlug) {
+        return this.api.get(this.withOrgSlug(`/agents/${agentId}/tasks`, orgSlug));
     }
-    async getAgentTask(agentId, taskId) {
+    async getAgentTask(agentId, taskId, orgSlug) {
         try {
-            return await this.api.get(`/agents/${agentId}/tasks/${taskId}`);
+            return await this.api.get(this.withOrgSlug(`/agents/${agentId}/tasks/${taskId}`, orgSlug));
         }
         catch (error) {
             if (error && typeof error === 'object' && 'status' in error && error.status === 404)
@@ -660,59 +677,69 @@ export class WolfpackClient {
             throw error;
         }
     }
-    async createAgentTask(agentId, body) {
-        return this.api.post(`/agents/${agentId}/tasks`, body);
+    async createAgentTask(agentId, body, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/tasks`, orgSlug), body);
     }
-    async updateAgentTask(agentId, taskId, body) {
-        return this.api.patch(`/agents/${agentId}/tasks/${taskId}`, body);
+    async updateAgentTask(agentId, taskId, body, orgSlug) {
+        return this.api.patch(this.withOrgSlug(`/agents/${agentId}/tasks/${taskId}`, orgSlug), body);
     }
-    async runAgentTask(agentId, taskId, teamSlug) {
-        return this.api.post(`/agents/${agentId}/tasks/${taskId}/run`, { teamSlug });
+    async runAgentTask(agentId, taskId, teamSlug, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/tasks/${taskId}/run`, orgSlug), { teamSlug });
     }
     // ─── Agent Builder: Queue ──────────────────────────────────────────────────
-    async listAgentQueue(agentId, status) {
-        const q = status ? `?status=${encodeURIComponent(status)}` : '';
-        return this.api.get(`/agents/${agentId}/queue${q}`);
+    async listAgentQueue(agentId, status, orgSlug) {
+        const params = new URLSearchParams();
+        if (status)
+            params.append('status', status);
+        if (orgSlug)
+            params.append('org_slug', orgSlug);
+        const q = params.toString();
+        return this.api.get(`/agents/${agentId}/queue${q ? `?${q}` : ''}`);
     }
-    async cancelQueueEntry(agentId, entryId) {
-        return this.api.delete(`/agents/${agentId}/queue/${entryId}`).then(() => ({ success: true }));
+    async cancelQueueEntry(agentId, entryId, orgSlug) {
+        return this.api
+            .delete(this.withOrgSlug(`/agents/${agentId}/queue/${entryId}`, orgSlug))
+            .then(() => ({ success: true }));
     }
     // ─── Agent Builder: Secrets ────────────────────────────────────────────────
-    async listAgentSecrets(agentId) {
-        return this.api.get(`/agents/${agentId}/secrets`);
+    async listAgentSecrets(agentId, orgSlug) {
+        return this.api.get(this.withOrgSlug(`/agents/${agentId}/secrets`, orgSlug));
     }
-    async setAgentSecret(agentId, name, value) {
-        return this.api.post(`/agents/${agentId}/secrets`, { name, value });
+    async setAgentSecret(agentId, name, value, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/agents/${agentId}/secrets`, orgSlug), { name, value });
     }
     // ─── Agent Builder: Skills (write) ────────────────────────────────────────
-    async createSkill(body) {
-        return this.api.post('/skills', body);
+    async createSkill(body, orgSlug) {
+        return this.api.post(this.withOrgSlug('/skills', orgSlug), body);
     }
-    async updateSkill(skillId, body) {
-        return this.api.patch(`/skills/${skillId}`, body);
+    async updateSkill(skillId, body, orgSlug) {
+        return this.api.patch(this.withOrgSlug(`/skills/${skillId}`, orgSlug), body);
     }
-    async createSkillResource(skillId, body) {
-        return this.api.post(`/skills/${skillId}/resources`, body);
+    async createSkillResource(skillId, body, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/skills/${skillId}/resources`, orgSlug), body);
     }
-    async updateSkillResource(skillId, resourceId, body) {
-        return this.api.patch(`/skills/${skillId}/resources/${resourceId}`, body);
+    async updateSkillResource(skillId, resourceId, body, orgSlug) {
+        return this.api.patch(this.withOrgSlug(`/skills/${skillId}/resources/${resourceId}`, orgSlug), body);
     }
-    async setAgentSkills(agentId, skillIds) {
-        return this.api.post(`/skills/agent-assignments/${agentId}`, {
-            skillIds,
-        });
+    async setAgentSkills(agentId, skillIds, orgSlug) {
+        return this.api.post(this.withOrgSlug(`/skills/agent-assignments/${agentId}`, orgSlug), { skillIds });
     }
     // ─── Agent Builder: Skills (read) ──────────────────────────────────────────
     async listAgentSkills(agentId) {
         return this.api.get(`/skills/agent-profiles/${agentId}`);
     }
-    async listOrgSkills() {
-        return this.api.get('/agents/org-skills');
+    async listOrgSkills(orgSlug) {
+        return this.api.get(this.withOrgSlug('/agents/org-skills', orgSlug));
     }
-    async getSkillDetail(name, agentId) {
+    async getSkillDetail(name, agentId, orgSlug) {
         try {
-            const query = agentId ? `?agentProfileId=${agentId}` : '';
-            return await this.api.get(`/agents/org-skills/${encodeURIComponent(name)}${query}`);
+            const params = new URLSearchParams();
+            if (agentId)
+                params.append('agentProfileId', agentId);
+            if (orgSlug)
+                params.append('org_slug', orgSlug);
+            const q = params.toString();
+            return await this.api.get(`/agents/org-skills/${encodeURIComponent(name)}${q ? `?${q}` : ''}`);
         }
         catch (error) {
             if (error && typeof error === 'object' && 'status' in error && error.status === 404)
@@ -721,11 +748,93 @@ export class WolfpackClient {
         }
     }
     // ─── Agent Builder: Discovery ──────────────────────────────────────────────
-    async listAgentTemplates() {
-        return this.api.get('/agent-builder/templates');
+    async listAgentTemplates(orgSlug) {
+        return this.api.get(this.withOrgSlug('/agent-builder/templates', orgSlug));
+    }
+    async listLlmModels(orgSlug) {
+        return this.api.get(this.withOrgSlug('/agent-builder/llm-models', orgSlug));
+    }
+    // ─── Procedures ──────────────────────────────────────────────────────────
+    async listProcedures(options) {
+        const params = new URLSearchParams();
+        if (options?.teamSlug)
+            params.append('teamSlug', options.teamSlug);
+        if (options?.search)
+            params.append('search', options.search);
+        if (options?.activeOnly)
+            params.append('activeOnly', 'true');
+        if (options?.limit !== undefined || options?.offset !== undefined) {
+            if (options?.limit)
+                params.append('limit', options.limit.toString());
+            if (options?.offset)
+                params.append('offset', options.offset.toString());
+            const query = params.toString();
+            const response = await this.api.get(`/procedures${query ? `?${query}` : ''}`);
+            if (!response || !Array.isArray(response.items)) {
+                throw new Error(`Invalid API response from /procedures: expected { items: [], total: number } but got ${JSON.stringify(response)}`);
+            }
+            return {
+                items: response.items,
+                total: response.total,
+                truncated: response.total > response.items.length,
+            };
+        }
+        return this.fetchAllPages('/procedures', params);
+    }
+    async getProcedure(procedureId, teamSlug) {
+        try {
+            const params = new URLSearchParams();
+            if (teamSlug)
+                params.append('teamSlug', teamSlug);
+            const query = params.toString();
+            return await this.api.get(`/procedures/${procedureId}${query ? `?${query}` : ''}`);
+        }
+        catch (error) {
+            if (error && typeof error === 'object' && 'status' in error && error.status === 404) {
+                return null;
+            }
+            throw error;
+        }
+    }
+    async createProcedure(data) {
+        const { teamSlug, ...rest } = data;
+        return this.api.post('/procedures', { ...rest, teamSlug });
+    }
+    async updateProcedure(procedureId, data, teamSlug) {
+        return this.api.patch(this.withTeamSlug(`/procedures/${procedureId}`, teamSlug), data);
+    }
+    async deleteProcedure(procedureId, teamSlug) {
+        await this.api.delete(this.withTeamSlug(`/procedures/${procedureId}`, teamSlug));
+        return { success: true };
+    }
+    // ─── Agent Self-Introspection ──────────────────────────────────────────────
+    async getSelf() {
+        return this.api.get('/self');
+    }
+    async getOwnSessions(options) {
+        const params = new URLSearchParams();
+        if (options?.limit !== undefined)
+            params.append('limit', options.limit.toString());
+        if (options?.offset !== undefined)
+            params.append('offset', options.offset.toString());
+        const q = params.toString();
+        return this.api.get(`/self/sessions${q ? `?${q}` : ''}`);
+    }
+    async listMemories() {
+        return this.api.get('/self/memories');
+    }
+    async getMemory(key) {
+        try {
+            return await this.api.get(`/self/memories/${encodeURIComponent(key)}`);
+        }
+        catch (error) {
+            if (error && typeof error === 'object' && 'status' in error && error.status === 404)
+                return null;
+            throw error;
+        }
     }
-    async listLlmModels() {
-        return this.api.get('/agent-builder/llm-models');
+    async saveMemory(key, content) {
+        return this.api.put(`/self/memories/${encodeURIComponent(key)}`, { content });
     }
     close() {
         // No cleanup needed for API client

package/dist/config.js

@@ -2,6 +2,7 @@ export const config = {
     apiUrl: process.env.WOLFPACK_API_URL || 'https://wolfpacks.work/api/mcp',
     apiKey: process.env.WOLFPACK_API_KEY,
     projectSlug: process.env.WOLFPACK_PROJECT_SLUG || process.env.WOLFPACK_TEAM_SLUG,
+    orgSlug: process.env.WOLFPACK_ORG_SLUG,
 };
 // Validate configuration on startup
 export function validateConfig() {
@@ -17,6 +18,9 @@ export function validateConfig() {
         process.exit(1);
     }
     console.error(`MCP Server connecting to: ${config.apiUrl}`);
+    if (config.orgSlug) {
+        console.error(`Organisation configured: ${config.orgSlug}`);
+    }
     if (config.projectSlug) {
         console.error(`Project configured: ${config.projectSlug}`);
     }

package/dist/index.js

@@ -9,6 +9,8 @@ import { basename, extname, resolve } from 'path';
 import { WolfpackClient } from './client.js';
 import { validateConfig, config } from './config.js';
 import { AGENT_BUILDER_TOOLS, handleAgentBuilderTool } from './agentBuilderTools.js';
+import { PROCEDURE_TOOLS, handleProcedureTool } from './procedureTools.js';
+import { AGENT_SELF_TOOLS, handleAgentSelfTool } from './agentSelfTools.js';
 // Get current package version
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
@@ -46,8 +48,9 @@ async function checkForUpdates() {
 }
 // Cross-reference syntax for linking between content items in markdown fields
 const CONTENT_LINKING_HELP = 'CROSS-REFERENCES: In any markdown content, you can link to other items using these patterns: ' +
-    '#123 or #w123 for work items, #i123 for issues, #r123 for initiatives/roadmap, ' +
-    '#j123 for journal entries, #c123 for cases, #p123 for procedures. ' +
+    '#123, #w123, or #work-123 for work items (DEFAULT — bare #N always means a work item), ' +
+    '#i123 or #issue-123 for issues, #r123 or #roadmap-123 for initiatives/roadmap, ' +
+    '#j123 or #journal-123 for journal entries, #c123 or #case-123 for cases, #p123 or #proc-123 for procedures. ' +
     'Use @username to mention team members (triggers notifications). ' +
     'Standard markdown links also work: [link text](/project/{slug}/work-items/123).';
 // Work Item schemas
@@ -643,7 +646,12 @@ class WolfpackMCPServer {
                         '3) NEVER perform bulk actions across multiple projects - always work in one project at a time. ' +
                         '4) If the user mentions a specific project, use that for all subsequent operations. ' +
                         '5) If unclear which project to use, ASK the user before proceeding. ' +
-                        'Returns project slugs, names, and types. Single-project users have their project auto-selected; multi-project users must specify project_slug in other tool calls.',
+                        'Returns project slugs, names, and types. Single-project users have their project auto-selected; multi-project users must specify project_slug in other tool calls. ' +
+                        'ID CONVENTION: A bare number like #1 or #42 ALWAYS refers to a WORK ITEM refId — use get_work_item. ' +
+                        'Other document types REQUIRE a prefix and are never bare numbers: ' +
+                        '#i1 or #issue-1 for issues, #r1 or #roadmap-1 for roadmap/radar, ' +
+                        '#j1 or #journal-1 for journal, #c1 or #case-1 for cases, #p1 or #proc-1 for procedures. ' +
+                        'Wiki pages are referenced by path (e.g. /docs/setup). There is no ambiguity: bare #N = work item.',
                     inputSchema: {
                         type: 'object',
                         properties: {},
@@ -652,7 +660,8 @@ class WolfpackMCPServer {
                 // Work Item tools
                 {
                     name: 'list_work_items',
-                    description: 'List work items (tasks/tickets) on the Kanban board or backlog. By default lists ALL items in the team, sorted by most recently updated. ' +
+                    description: 'List work items (tasks/tickets) on the Kanban board or backlog. Work items are the PRIMARY entity — bare #N references (e.g. "work on #1") always mean work items. ' +
+                        'By default lists ALL items in the team, sorted by most recently updated. ' +
                         'Use assigned_to_id="me" to filter to only your assigned items. ' +
                         'TERMINOLOGY: "board" and "kanban" are synonymous - both refer to the Kanban board of work items. ' +
                         'The board has columns: "new" (to do), "doing" (in progress), "review" (pending review), "ready" (code done, awaiting deployment), "blocked", "completed" (deployed). ' +
@@ -717,7 +726,8 @@ class WolfpackMCPServer {
                 },
                 {
                     name: 'get_work_item',
-                    description: 'Get a specific work item/task by reference number. Returns full details including description (markdown notes). ' +
+                    description: 'Get a specific work item/task by reference number. This is the DEFAULT lookup when a user says "#1" or "work on #42" — bare #N always means a work item. ' +
+                        'Returns full details including description (markdown notes). ' +
                         'Call this before updating to see current content. ' +
                         'WORKFLOW: When asked to work on an item, check its status and follow the required state transitions ' +
                         '(pending→pull first, new→doing, blocked/ready/completed/closed→new→doing, then review when done). ' +
@@ -1001,8 +1011,9 @@ class WolfpackMCPServer {
                     name: 'list_issues',
                     description: 'List issues from the Issue Tracker. Issues are a SEPARATE system from work items on the Kanban board. ' +
                         'Issues track bugs, feature requests, and other reports that may or may not have associated work items. ' +
+                        'Issues are referenced with the #i prefix (e.g. #i5). A bare #N (without prefix) is ALWAYS a work item, NOT an issue. ' +
                         'IMPORTANT: If the user asks about "bugs" or "tasks" in the context of the "board", "kanban", or "backlog", use list_work_items instead - those are work items, not issues. ' +
-                        'Only use this tool when the user specifically asks about "issues", the "issue tracker", or is clearly referring to the issue tracking system. ' +
+                        'Only use this tool when the user specifically asks about "issues", the "issue tracker", uses the #i prefix, or is clearly referring to the issue tracking system. ' +
                         'Can filter by status, severity, and type.',
                     inputSchema: {
                         type: 'object',
@@ -1057,7 +1068,9 @@ class WolfpackMCPServer {
                 },
                 {
                     name: 'get_issue',
-                    description: 'Get a specific issue by reference number, including comment and attachment counts. ' +
+                    description: 'Get a specific issue by its PREFIXED reference #iN (e.g. #i5). ' +
+                        'IMPORTANT: A bare #N (without prefix) is ALWAYS a work item, NOT an issue. Only use this tool when the user explicitly says "issue" or uses the #i prefix. ' +
+                        'Returns full details including comment and attachment counts. ' +
                         'IMAGES: Image references in the description (e.g. `![alt](/api/files/images/...)`) can be viewed using the download_image tool.',
                     inputSchema: {
                         type: 'object',
@@ -1863,6 +1876,8 @@ class WolfpackMCPServer {
                         required: ['discussion_id', 'content'],
                     },
                 },
+                ...(this.capabilities.includes('procedures') ? PROCEDURE_TOOLS : []),
+                ...(this.capabilities.includes('agent_self') ? AGENT_SELF_TOOLS : []),
                 ...(this.capabilities.includes('agent_builder') ? AGENT_BUILDER_TOOLS : []),
             ],
         }));
@@ -2702,6 +2717,21 @@ class WolfpackMCPServer {
                         };
                     }
                     default: {
+                        // Check procedure tools
+                        if (this.capabilities.includes('procedures')) {
+                            const procedureToolNames = PROCEDURE_TOOLS.map((t) => t.name);
+                            if (procedureToolNames.includes(name)) {
+                                return handleProcedureTool(name, args, this.client);
+                            }
+                        }
+                        // Check agent self tools
+                        if (this.capabilities.includes('agent_self')) {
+                            const selfToolNames = AGENT_SELF_TOOLS.map((t) => t.name);
+                            if (selfToolNames.includes(name)) {
+                                return handleAgentSelfTool(name, args, this.client);
+                            }
+                        }
+                        // Check agent builder tools
                         if (this.capabilities.includes('agent_builder')) {
                             return handleAgentBuilderTool(name, args, this.client);
                         }