argustack 0.1.34 → 0.3.1

package/dist/mcp/tools/issue.js

@@ -1,49 +1,51 @@
 import { z } from 'zod/v4';
-import { loadWorkspace, createAdapters, textResponse, errorResponse, getErrorMessage, str, } from '../helpers.js';
+import { loadWorkspace, createAdapters, textResponse, errorResponse, workspaceNotFoundResponse, getErrorMessage, str, strOr, hasText, ANNOTATIONS, } from '../helpers.js';
 import { groupReviewsByPr, groupFilesByCommit } from './formatters.js';
+const workspaceIdParam = z.string().optional().describe('Workspace id or name (defaults to active workspace)');
 export function registerIssueTools(server) {
     server.registerTool('get_issue', {
-        description: 'Get full details of a specific issue by key — description, comments, changelogs, worklogs, links, all custom fields. Use for deep-dive into a single issue. For cross-source timeline use issue_timeline instead.',
+        title: 'Get issue details',
+        description: 'Get full details of an issue by key — fields, comments, changelog. For full cross-source timeline use issue_timeline.',
         inputSchema: {
+            workspace_id: workspaceIdParam,
             issue_key: z.string().describe('Issue key (e.g. "PROJ-123")'),
         },
-    }, async ({ issue_key: issueKey }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, issue_key: issueKey }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         const key = issueKey.toUpperCase();
         try {
-            const issueResult = await storage.query(`SELECT * FROM issues WHERE issue_key = $1`, [key]);
+            const issueResult = await storage.queryForWorkspace(workspaceId, `SELECT * FROM issues WHERE workspace_id = $1 AND issue_key = $2`, [key]);
             if (issueResult.rows.length === 0) {
-                await storage.close();
-                return errorResponse(`Issue ${issueKey} not found in local database.`);
+                return errorResponse(`Issue ${issueKey} not found in workspace ${workspaceId}.`);
             }
             const issue = issueResult.rows[0];
-            const commentsResult = await storage.query(`SELECT author, body, created FROM issue_comments WHERE issue_key = $1 ORDER BY created`, [key]);
-            const changelogsResult = await storage.query(`SELECT author, field, from_value, to_value, changed_at
-           FROM issue_changelogs WHERE issue_key = $1 ORDER BY changed_at DESC LIMIT 20`, [key]);
-            await storage.close();
+            const commentsResult = await storage.queryForWorkspace(workspaceId, `SELECT author, body, created FROM issue_comments WHERE workspace_id = $1 AND issue_key = $2 ORDER BY created`, [key]);
+            const changelogsResult = await storage.queryForWorkspace(workspaceId, `SELECT author, field, from_value, to_value, changed_at
+           FROM issue_changelogs WHERE workspace_id = $1 AND issue_key = $2 ORDER BY changed_at DESC LIMIT 20`, [key]);
             const sections = [];
             sections.push(`# ${str(issue.issue_key)}: ${str(issue.summary)}`);
             sections.push('');
-            sections.push(`Type: ${str(issue.issue_type) || 'N/A'} | Status: ${str(issue.status) || 'N/A'} | Priority: ${str(issue.priority) || 'N/A'}`);
-            sections.push(`Assignee: ${str(issue.assignee) || 'Unassigned'} | Reporter: ${str(issue.reporter) || 'N/A'}`);
-            sections.push(`Created: ${str(issue.created) || 'N/A'} | Updated: ${str(issue.updated) || 'N/A'}`);
+            sections.push(`Type: ${strOr(issue.issue_type, 'N/A')} | Status: ${strOr(issue.status, 'N/A')} | Priority: ${strOr(issue.priority, 'N/A')}`);
+            sections.push(`Assignee: ${strOr(issue.assignee, 'Unassigned')} | Reporter: ${strOr(issue.reporter, 'N/A')}`);
+            sections.push(`Created: ${strOr(issue.created, 'N/A')} | Updated: ${strOr(issue.updated, 'N/A')}`);
             if (Array.isArray(issue.labels) && issue.labels.length > 0) {
                 sections.push(`Labels: ${issue.labels.join(', ')}`);
             }
             if (Array.isArray(issue.components) && issue.components.length > 0) {
                 sections.push(`Components: ${issue.components.join(', ')}`);
             }
-            if (issue.parent_key) {
+            if (hasText(issue.parent_key)) {
                 sections.push(`Parent: ${issue.parent_key}`);
             }
             sections.push('');
             sections.push('## Description');
-            sections.push(str(issue.description) || '(no description)');
-            if (issue.custom_fields && Object.keys(issue.custom_fields).length > 0) {
+            sections.push(strOr(issue.description, '(no description)'));
+            if (issue.custom_fields !== undefined && Object.keys(issue.custom_fields).length > 0) {
                 sections.push('');
                 sections.push('## Custom Fields');
                 for (const [field, value] of Object.entries(issue.custom_fields)) {
@@ -55,18 +57,18 @@ export function registerIssueTools(server) {
             if (commentsResult.rows.length > 0) {
                 sections.push('');
                 sections.push(`## Comments (${String(commentsResult.rows.length)})`);
-                for (const rawComment of commentsResult.rows) {
-                    const c = rawComment;
+                for (const raw of commentsResult.rows) {
+                    const c = raw;
                     sections.push(`--- ${str(c.author)} (${str(c.created)}) ---`);
-                    sections.push(str(c.body) || '(empty)');
+                    sections.push(strOr(c.body, '(empty)'));
                     sections.push('');
                 }
             }
             if (changelogsResult.rows.length > 0) {
                 sections.push('');
                 sections.push(`## Recent Changes (${String(changelogsResult.rows.length)})`);
-                for (const rawChangelog of changelogsResult.rows) {
-                    const ch = rawChangelog;
+                for (const raw of changelogsResult.rows) {
+                    const ch = raw;
                     sections.push(`  ${str(ch.changed_at)}: ${str(ch.author)} changed ${str(ch.field)}: "${str(ch.from_value)}" → "${str(ch.to_value)}"`);
                 }
             }
@@ -77,56 +79,54 @@ export function registerIssueTools(server) {
         }
     });
     server.registerTool('issue_stats', {
-        description: 'Get aggregate statistics about issues — counts by status, type, project, assignee. Use for project health overview, sprint planning, or answering "how many bugs do we have?" Returns grouped counts, not individual issues.',
+        title: 'Issue statistics',
+        description: 'Aggregate issue statistics for the active workspace — counts by status, type, project, assignee.',
         inputSchema: {
-            project: z.string().optional().describe('Filter stats by project key'),
+            workspace_id: workspaceIdParam,
+            project: z.string().optional().describe('Filter by project key'),
         },
-    }, async ({ project }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, project }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         try {
-            const filterClause = project ? `WHERE project_key = $1` : '';
-            const filterParams = project ? [project.toUpperCase()] : [];
+            const projectClause = hasText(project) ? `AND project_key = $2` : '';
+            const params = hasText(project) ? [project.toUpperCase()] : [];
             const [total, byStatus, byType, byProject, byAssignee] = await Promise.all([
-                storage.query(`SELECT COUNT(*) as count FROM issues ${filterClause}`, filterParams),
-                storage.query(`SELECT status, COUNT(*) as count FROM issues ${filterClause} GROUP BY status ORDER BY count DESC`, filterParams),
-                storage.query(`SELECT issue_type, COUNT(*) as count FROM issues ${filterClause} GROUP BY issue_type ORDER BY count DESC`, filterParams),
-                storage.query(`SELECT project_key, COUNT(*) as count FROM issues ${filterClause} GROUP BY project_key ORDER BY count DESC`, filterParams),
-                storage.query(`SELECT assignee, COUNT(*) as count FROM issues ${filterClause} GROUP BY assignee ORDER BY count DESC LIMIT 15`, filterParams),
+                storage.queryForWorkspace(workspaceId, `SELECT COUNT(*) as count FROM issues WHERE workspace_id = $1 ${projectClause}`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT status, COUNT(*) as count FROM issues WHERE workspace_id = $1 ${projectClause} GROUP BY status ORDER BY count DESC`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT issue_type, COUNT(*) as count FROM issues WHERE workspace_id = $1 ${projectClause} GROUP BY issue_type ORDER BY count DESC`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT project_key, COUNT(*) as count FROM issues WHERE workspace_id = $1 ${projectClause} GROUP BY project_key ORDER BY count DESC`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT assignee, COUNT(*) as count FROM issues WHERE workspace_id = $1 ${projectClause} GROUP BY assignee ORDER BY count DESC LIMIT 15`, params),
             ]);
-            await storage.close();
             const sections = [];
             const totalRow = total.rows[0];
-            sections.push(`# Issue Statistics${project ? ` (${project})` : ''}`);
+            sections.push(`# Issue Statistics${hasText(project) ? ` (${project})` : ''} — workspace ${workspaceId}`);
             sections.push(`Total issues: ${str(totalRow?.count)}`);
-            sections.push('');
-            sections.push('## By Status');
-            for (const rawRow of byStatus.rows) {
-                const r = rawRow;
-                sections.push(`  ${str(r.status) || 'null'}: ${str(r.count)}`);
+            sections.push('\n## By Status');
+            for (const raw of byStatus.rows) {
+                const r = raw;
+                sections.push(`  ${strOr(r.status, 'null')}: ${str(r.count)}`);
             }
-            sections.push('');
-            sections.push('## By Type');
-            for (const rawRow of byType.rows) {
-                const r = rawRow;
-                sections.push(`  ${str(r.issue_type) || 'null'}: ${str(r.count)}`);
+            sections.push('\n## By Type');
+            for (const raw of byType.rows) {
+                const r = raw;
+                sections.push(`  ${strOr(r.issue_type, 'null')}: ${str(r.count)}`);
             }
-            if (!project) {
-                sections.push('');
-                sections.push('## By Project');
-                for (const rawRow of byProject.rows) {
-                    const r = rawRow;
+            if (!hasText(project)) {
+                sections.push('\n## By Project');
+                for (const raw of byProject.rows) {
+                    const r = raw;
                     sections.push(`  ${str(r.project_key)}: ${str(r.count)}`);
                 }
             }
-            sections.push('');
-            sections.push('## Top Assignees');
-            for (const rawRow of byAssignee.rows) {
-                const r = rawRow;
-                sections.push(`  ${str(r.assignee) || 'Unassigned'}: ${str(r.count)}`);
+            sections.push('\n## Top Assignees');
+            for (const raw of byAssignee.rows) {
+                const r = raw;
+                sections.push(`  ${strOr(r.assignee, 'Unassigned')}: ${str(r.count)}`);
             }
             return textResponse(sections.join('\n'));
         }
@@ -135,44 +135,42 @@ export function registerIssueTools(server) {
         }
     });
     server.registerTool('issue_commits', {
-        description: 'Cross-reference: find all Git commits that mention a Jira issue key in commit message. Shows what code was actually changed. Requires Git sync. For full timeline with PRs use issue_timeline.',
+        title: 'Commits for an issue',
+        description: 'Git commits mentioning the issue key. Requires Git sync.',
         inputSchema: {
+            workspace_id: workspaceIdParam,
             issue_key: z.string().describe('Issue key (e.g. "PROJ-123")'),
-            repo_path: z.string().optional().describe('Filter by repository path (substring match)'),
+            repo_path: z.string().optional().describe('Filter by repo path substring'),
         },
-    }, async ({ issue_key: issueKey, repo_path: repoPath }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, issue_key: issueKey, repo_path: repoPath }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         const key = issueKey.toUpperCase();
         try {
-            const repoFilter = repoPath ? `AND c.repo_path ILIKE $2` : '';
-            const commitsParams = [key];
-            if (repoPath) {
-                commitsParams.push(`%${repoPath}%`);
-            }
-            const commitsResult = await storage.query(`SELECT c.hash, c.message, c.author, c.committed_at, c.repo_path
+            const repoFilter = hasText(repoPath) ? `AND c.repo_path ILIKE $3` : '';
+            const params = hasText(repoPath) ? [key, `%${repoPath}%`] : [key];
+            const commitsResult = await storage.queryForWorkspace(workspaceId, `SELECT c.hash, c.message, c.author, c.committed_at, c.repo_path
            FROM commits c
-           JOIN commit_issue_refs r ON c.hash = r.commit_hash
-           WHERE r.issue_key = $1 ${repoFilter}
-           ORDER BY c.committed_at DESC`, commitsParams);
+           JOIN commit_issue_refs r ON r.workspace_id = c.workspace_id AND r.commit_hash = c.hash
+           WHERE c.workspace_id = $1 AND r.issue_key = $2 ${repoFilter}
+           ORDER BY c.committed_at DESC`, params);
             if (commitsResult.rows.length === 0) {
-                await storage.close();
-                return textResponse(`No commits found mentioning ${issueKey}. Make sure you've run "argustack sync git".`);
+                return textResponse(`No commits mentioning ${issueKey}. Run "argustack sync git" with this workspace.`);
             }
             const hashes = commitsResult.rows.map((r) => r.hash).filter(Boolean);
-            const hashPlaceholders = hashes.map((_, i) => `$${String(i + 1)}`).join(',');
-            const filesResult = await storage.query(`SELECT commit_hash, file_path, status, additions, deletions
-           FROM commit_files WHERE commit_hash IN (${hashPlaceholders})`, hashes);
-            await storage.close();
+            const hashPlaceholders = hashes.map((_, i) => `$${String(i + 2)}`).join(',');
+            const filesResult = await storage.queryForWorkspace(workspaceId, `SELECT commit_hash, file_path, status, additions, deletions
+           FROM commit_files WHERE workspace_id = $1 AND commit_hash IN (${hashPlaceholders})`, hashes);
             const filesByCommit = groupFilesByCommit(filesResult.rows);
             const sections = [];
             sections.push(`# Commits for ${issueKey} (${String(commitsResult.rows.length)})`);
             sections.push('');
-            for (const rawRow of commitsResult.rows) {
-                const row = rawRow;
+            for (const raw of commitsResult.rows) {
+                const row = raw;
                 const shortHash = (row.hash ?? '').substring(0, 7);
                 sections.push(`## ${shortHash} — ${str(row.author)} (${str(row.committed_at).substring(0, 10)})`);
                 sections.push(str(row.message));
@@ -192,44 +190,47 @@ export function registerIssueTools(server) {
         }
     });
     server.registerTool('issue_prs', {
-        description: 'Cross-reference: find all GitHub PRs that mention a Jira issue key. Shows which PRs implemented a ticket, with review status and merge info. Requires GitHub sync.',
+        title: 'PRs for an issue',
+        description: 'GitHub PRs mentioning the issue key. Requires GitHub sync.',
         inputSchema: {
+            workspace_id: workspaceIdParam,
             issue_key: z.string().describe('Issue key (e.g. "PROJ-123")'),
         },
-    }, async ({ issue_key: issueKey }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, issue_key: issueKey }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         const key = issueKey.toUpperCase();
         try {
-            const prsResult = await storage.query(`SELECT p.number, p.title, p.state, p.author, p.created_at, p.merged_at,
+            const prsResult = await storage.queryForWorkspace(workspaceId, `SELECT p.number, p.title, p.state, p.author, p.created_at, p.merged_at,
                   p.additions, p.deletions, p.base_ref, p.head_ref, p.repo_full_name
            FROM pull_requests p
-           JOIN pr_issue_refs r ON p.repo_full_name = r.repo_full_name AND p.number = r.pr_number
-           WHERE r.issue_key = $1
+           JOIN pr_issue_refs r ON r.workspace_id = p.workspace_id
+             AND r.repo_full_name = p.repo_full_name AND r.pr_number = p.number
+           WHERE p.workspace_id = $1 AND r.issue_key = $2
            ORDER BY p.created_at DESC`, [key]);
             if (prsResult.rows.length === 0) {
-                await storage.close();
-                return textResponse(`No PRs found mentioning ${issueKey}. Make sure GitHub sync is configured.`);
+                return textResponse(`No PRs mentioning ${issueKey}.\n` +
+                    'If you expected results, run `argustack sync github` to refresh GitHub sync data.');
             }
             const prNumbers = prsResult.rows.map((r) => r.number);
-            const repoFullName = prsResult.rows[0].repo_full_name;
-            const reviewPlaceholders = prNumbers.map((_, i) => `$${String(i + 2)}`).join(',');
-            const reviewsResult = await storage.query(`SELECT pr_number, reviewer, state, submitted_at FROM pr_reviews
-           WHERE repo_full_name = $1 AND pr_number IN (${reviewPlaceholders})
+            const repoFullName = prsResult.rows[0].repo_full_name ?? '';
+            const reviewPlaceholders = prNumbers.map((_, i) => `$${String(i + 3)}`).join(',');
+            const reviewsResult = await storage.queryForWorkspace(workspaceId, `SELECT pr_number, reviewer, state, submitted_at FROM pr_reviews
+           WHERE workspace_id = $1 AND repo_full_name = $2 AND pr_number IN (${reviewPlaceholders})
            ORDER BY submitted_at`, [repoFullName, ...prNumbers]);
-            await storage.close();
             const reviewsByPr = groupReviewsByPr(reviewsResult.rows);
             const sections = [];
             sections.push(`# Pull Requests for ${issueKey} (${String(prsResult.rows.length)})`);
             sections.push('');
-            for (const rawRow of prsResult.rows) {
-                const pr = rawRow;
+            for (const raw of prsResult.rows) {
+                const pr = raw;
                 sections.push(`## #${str(pr.number)} — ${str(pr.title)}`);
                 sections.push(`State: ${str(pr.state)} | Author: ${str(pr.author)} | ${str(pr.base_ref)} ← ${str(pr.head_ref)}`);
-                sections.push(`+${str(pr.additions)} -${str(pr.deletions)} | Created: ${str(pr.created_at ?? '').substring(0, 10)}${pr.merged_at ? ` | Merged: ${str(pr.merged_at).substring(0, 10)}` : ''}`);
+                sections.push(`+${str(pr.additions)} -${str(pr.deletions)} | Created: ${str(pr.created_at ?? '').substring(0, 10)}${hasText(pr.merged_at) ? ` | Merged: ${str(pr.merged_at).substring(0, 10)}` : ''}`);
                 const reviews = reviewsByPr.get(pr.number ?? 0) ?? [];
                 if (reviews.length > 0) {
                     sections.push('Reviews:');
@@ -246,34 +247,40 @@ export function registerIssueTools(server) {
         }
     });
     server.registerTool('issue_timeline', {
-        description: 'Full cross-source timeline for a Jira issue: changelog events, Git commits, GitHub PRs with reviews — all in chronological order. Best tool for understanding the complete history of a ticket. Combines data from Jira + Git + GitHub in one call.',
+        title: 'Cross-source issue timeline',
+        description: 'Cross-source timeline for an issue: changelog + commits + PRs in chronological order.',
         inputSchema: {
+            workspace_id: workspaceIdParam,
             issue_key: z.string().describe('Issue key (e.g. "PROJ-123")'),
         },
-    }, async ({ issue_key: issueKey }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, issue_key: issueKey }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         const key = issueKey.toUpperCase();
         try {
             const [issueResult, changelogsResult, commitsResult, prsResult, commitFilesResult] = await Promise.all([
-                storage.query(`SELECT issue_key, summary, status, issue_type, assignee, reporter, created, updated, resolved FROM issues WHERE issue_key = $1`, [key]),
-                storage.query(`SELECT author, field, from_value, to_value, changed_at FROM issue_changelogs WHERE issue_key = $1 ORDER BY changed_at`, [key]),
-                storage.query(`SELECT c.hash, c.message, c.author, c.email, c.committed_at
-             FROM commits c JOIN commit_issue_refs r ON c.hash = r.commit_hash
-             WHERE r.issue_key = $1 ORDER BY c.committed_at`, [key]),
-                storage.query(`SELECT p.number, p.title, p.state, p.author, p.created_at, p.merged_at, p.base_ref,
+                storage.queryForWorkspace(workspaceId, `SELECT issue_key, summary, status, issue_type, assignee, reporter, created, updated, resolved
+             FROM issues WHERE workspace_id = $1 AND issue_key = $2`, [key]),
+                storage.queryForWorkspace(workspaceId, `SELECT author, field, from_value, to_value, changed_at FROM issue_changelogs
+             WHERE workspace_id = $1 AND issue_key = $2 ORDER BY changed_at`, [key]),
+                storage.queryForWorkspace(workspaceId, `SELECT c.hash, c.message, c.author, c.email, c.committed_at
+             FROM commits c JOIN commit_issue_refs r ON r.workspace_id = c.workspace_id AND r.commit_hash = c.hash
+             WHERE c.workspace_id = $1 AND r.issue_key = $2 ORDER BY c.committed_at`, [key]),
+                storage.queryForWorkspace(workspaceId, `SELECT p.number, p.title, p.state, p.author, p.created_at, p.merged_at, p.base_ref,
                     p.additions, p.deletions, p.repo_full_name
-             FROM pull_requests p JOIN pr_issue_refs r ON p.repo_full_name = r.repo_full_name AND p.number = r.pr_number
-             WHERE r.issue_key = $1 ORDER BY p.created_at`, [key]),
-                storage.query(`SELECT cf.commit_hash, cf.file_path, cf.status, cf.additions, cf.deletions
-             FROM commit_files cf JOIN commit_issue_refs r ON cf.commit_hash = r.commit_hash
-             WHERE r.issue_key = $1`, [key]),
+             FROM pull_requests p JOIN pr_issue_refs r ON r.workspace_id = p.workspace_id
+               AND r.repo_full_name = p.repo_full_name AND r.pr_number = p.number
+             WHERE p.workspace_id = $1 AND r.issue_key = $2 ORDER BY p.created_at`, [key]),
+                storage.queryForWorkspace(workspaceId, `SELECT cf.commit_hash, cf.file_path, cf.status, cf.additions, cf.deletions
+             FROM commit_files cf
+             JOIN commit_issue_refs r ON r.workspace_id = cf.workspace_id AND r.commit_hash = cf.commit_hash
+             WHERE cf.workspace_id = $1 AND r.issue_key = $2`, [key]),
             ]);
             if (issueResult.rows.length === 0) {
-                await storage.close();
                 return textResponse(`Issue ${key} not found.`);
             }
             const issue = issueResult.rows[0];
@@ -281,62 +288,56 @@ export function registerIssueTools(server) {
             let reviewsByPr = new Map();
             if (prRows.length > 0) {
                 const prNumbers = prRows.map((pr) => pr.number);
-                const repoFullName = prRows[0]?.repo_full_name;
-                const reviewPlaceholders = prNumbers.map((_, i) => `$${String(i + 2)}`).join(',');
-                const reviewsResult = await storage.query(`SELECT pr_number, reviewer, state, submitted_at FROM pr_reviews
-             WHERE repo_full_name = $1 AND pr_number IN (${reviewPlaceholders})
+                const repoFullName = prRows[0]?.repo_full_name ?? '';
+                const reviewPlaceholders = prNumbers.map((_, i) => `$${String(i + 3)}`).join(',');
+                const reviewsResult = await storage.queryForWorkspace(workspaceId, `SELECT pr_number, reviewer, state, submitted_at FROM pr_reviews
+             WHERE workspace_id = $1 AND repo_full_name = $2 AND pr_number IN (${reviewPlaceholders})
              ORDER BY submitted_at`, [repoFullName, ...prNumbers]);
                 reviewsByPr = groupReviewsByPr(reviewsResult.rows);
             }
-            await storage.close();
             const filesByCommit = groupFilesByCommit(commitFilesResult.rows);
             const events = [];
-            if (issue.created) {
+            if (hasText(issue.created)) {
                 events.push({ date: str(issue.created), type: 'created', text: 'Issue created' });
             }
             for (const raw of changelogsResult.rows) {
                 const ch = raw;
-                if (ch.changed_at) {
+                if (hasText(ch.changed_at)) {
                     events.push({
-                        date: str(ch.changed_at),
-                        type: 'changelog',
+                        date: str(ch.changed_at), type: 'changelog',
                         text: `${str(ch.author)} changed ${str(ch.field)}: "${str(ch.from_value)}" → "${str(ch.to_value)}"`,
                     });
                 }
             }
             for (const raw of commitsResult.rows) {
                 const c = raw;
-                if (c.committed_at) {
+                if (hasText(c.committed_at)) {
                     const firstLine = (c.message ?? '').split('\n')[0];
                     events.push({
-                        date: str(c.committed_at),
-                        type: 'commit',
+                        date: str(c.committed_at), type: 'commit',
                         text: `Commit ${c.hash.substring(0, 7)} — "${firstLine}" (${str(c.author)})`,
                     });
                 }
             }
             for (const pr of prRows) {
-                if (pr.created_at) {
+                if (hasText(pr.created_at)) {
                     events.push({
-                        date: str(pr.created_at),
-                        type: 'pr_opened',
+                        date: str(pr.created_at), type: 'pr_opened',
                         text: `PR #${String(pr.number)} opened — "${str(pr.title)}" (${str(pr.author)})`,
                     });
                 }
                 const reviews = reviewsByPr.get(pr.number) ?? [];
                 for (const r of reviews) {
-                    if (r.submitted_at) {
+                    if (hasText(r.submitted_at)) {
                         events.push({
-                            date: str(r.submitted_at),
-                            type: 'pr_reviewed',
+                            date: str(r.submitted_at), type: 'pr_reviewed',
                             text: `PR #${String(pr.number)} reviewed — ${str(r.state)} (${str(r.reviewer)})`,
                         });
                     }
                 }
-                if (pr.merged_at) {
+                if (hasText(pr.merged_at)) {
                     events.push({
-                        date: str(pr.merged_at),
-                        type: 'pr_merged',
+                        date: str(pr.merged_at), type: 'pr_merged',
                         text: `PR #${String(pr.number)} merged into ${str(pr.base_ref)}`,
                     });
                 }
@@ -346,7 +347,7 @@ export function registerIssueTools(server) {
             sections.push(`=== ISSUE: ${key} ===`);
             sections.push(`Summary: ${str(issue.summary)}`);
             sections.push(`Status: ${str(issue.status)} | Type: ${str(issue.issue_type)} | Assignee: ${str(issue.assignee)}`);
-            sections.push(`Created: ${str(issue.created ?? '').substring(0, 10)} | Resolved: ${str(issue.resolved ?? '').substring(0, 10) || 'n/a'}`);
+            sections.push(`Created: ${str(issue.created ?? '').substring(0, 10)} | Resolved: ${strOr(str(issue.resolved ?? '').substring(0, 10), 'n/a')}`);
             sections.push('');
             sections.push(`--- TIMELINE (${String(events.length)} events) ---`);
             for (const ev of events) {
@@ -382,70 +383,69 @@ export function registerIssueTools(server) {
         }
     });
     server.registerTool('commit_stats', {
-        description: 'Aggregate statistics about Git commits — total count, top authors, most changed files, commits per day/week. Use for "who is most active?" or "what files change most?" questions. Requires Git sync.',
+        title: 'Git commit statistics',
+        description: 'Aggregate Git commit statistics for the active workspace.',
         inputSchema: {
-            since: z.string().optional().describe('Stats from this date (YYYY-MM-DD)'),
-            author: z.string().optional().describe('Filter stats by author name'),
-            repo_path: z.string().optional().describe('Filter by repository path (substring match)'),
+            workspace_id: workspaceIdParam,
+            since: z.string().optional(),
+            author: z.string().optional(),
+            repo_path: z.string().optional(),
         },
-    }, async ({ since, author, repo_path: repoPath }) => {
-        const ws = loadWorkspace();
+        annotations: ANNOTATIONS.READ_ONLY,
+    }, async ({ workspace_id: workspaceIdInput, since, author, repo_path: repoPath }) => {
+        const ws = await loadWorkspace(workspaceIdInput);
         if (!ws.ok) {
-            return errorResponse(`Workspace not found: ${ws.reason}`);
+            return workspaceNotFoundResponse(ws.reason);
         }
-        const { storage } = await createAdapters(ws.root);
+        const { storage, workspaceId } = await createAdapters(ws.workspaceId);
         try {
-            const conditions = [];
-            const joinConditions = [];
+            const conditions = ['workspace_id = $1'];
+            const joinConditions = ['c.workspace_id = $1'];
             const params = [];
-            let paramIdx = 1;
-            if (since) {
+            let paramIdx = 2;
+            if (hasText(since)) {
                 conditions.push(`committed_at >= $${String(paramIdx)}`);
                 joinConditions.push(`c.committed_at >= $${String(paramIdx)}`);
                 params.push(since);
                 paramIdx++;
             }
-            if (author) {
+            if (hasText(author)) {
                 conditions.push(`author ILIKE $${String(paramIdx)}`);
                 joinConditions.push(`c.author ILIKE $${String(paramIdx)}`);
                 params.push(`%${author}%`);
                 paramIdx++;
             }
-            if (repoPath) {
+            if (hasText(repoPath)) {
                 conditions.push(`repo_path ILIKE $${String(paramIdx)}`);
                 joinConditions.push(`c.repo_path ILIKE $${String(paramIdx)}`);
                 params.push(`%${repoPath}%`);
                 paramIdx++;
             }
-            const where = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
-            const joinWhere = joinConditions.length > 0 ? `WHERE ${joinConditions.join(' AND ')}` : '';
+            const where = `WHERE ${conditions.join(' AND ')}`;
+            const joinWhere = `WHERE ${joinConditions.join(' AND ')}`;
             const [total, byAuthor, hotFiles, issueRefCount] = await Promise.all([
-                storage.query(`SELECT COUNT(*) as count FROM commits ${where}`, params),
-                storage.query(`SELECT author, COUNT(*) as count FROM commits ${where} GROUP BY author ORDER BY count DESC LIMIT 15`, params),
-                storage.query(`SELECT cf.file_path, COUNT(*) as changes
-             FROM commit_files cf
-             JOIN commits c ON cf.commit_hash = c.hash
+                storage.queryForWorkspace(workspaceId, `SELECT COUNT(*) as count FROM commits ${where}`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT author, COUNT(*) as count FROM commits ${where} GROUP BY author ORDER BY count DESC LIMIT 15`, params),
+                storage.queryForWorkspace(workspaceId, `SELECT cf.file_path, COUNT(*) as changes
+             FROM commit_files cf JOIN commits c ON c.workspace_id = cf.workspace_id AND c.hash = cf.commit_hash
              ${joinWhere}
              GROUP BY cf.file_path ORDER BY changes DESC LIMIT 15`, params),
-                storage.query(`SELECT COUNT(DISTINCT issue_key) as count FROM commit_issue_refs`, []),
+                storage.queryForWorkspace(workspaceId, `SELECT COUNT(DISTINCT issue_key) as count FROM commit_issue_refs WHERE workspace_id = $1`, []),
             ]);
-            await storage.close();
             const sections = [];
             const totalRow = total.rows[0];
             const refsRow = issueRefCount.rows[0];
-            sections.push(`# Git Statistics${since ? ` (since ${since})` : ''}${author ? ` (author: ${author})` : ''}`);
+            sections.push(`# Git Statistics${hasText(since) ? ` (since ${since})` : ''}${hasText(author) ? ` (author: ${author})` : ''} — workspace ${workspaceId}`);
             sections.push(`Total commits: ${str(totalRow?.count)}`);
             sections.push(`Linked issue keys: ${str(refsRow?.count)}`);
-            sections.push('');
-            sections.push('## Top Authors');
-            for (const rawRow of byAuthor.rows) {
-                const r = rawRow;
-                sections.push(`  ${str(r.author) || 'unknown'}: ${str(r.count)}`);
+            sections.push('\n## Top Authors');
+            for (const raw of byAuthor.rows) {
+                const r = raw;
+                sections.push(`  ${strOr(r.author, 'unknown')}: ${str(r.count)}`);
             }
-            sections.push('');
-            sections.push('## Most Changed Files');
-            for (const rawRow of hotFiles.rows) {
-                const r = rawRow;
+            sections.push('\n## Most Changed Files');
+            for (const raw of hotFiles.rows) {
+                const r = raw;
                 sections.push(`  ${str(r.file_path)}: ${str(r.changes)} changes`);
             }
             return textResponse(sections.join('\n'));