feat(mcp): Atlassian MCP integration foundation (PR-A: 純 MCP 統合)

packages/ai-engine/src/agent-runner.test.ts

@@ -228,6 +228,7 @@ describe('runAgent', () => {
         id: 'proj-test',
         name: 'FRC integration',
         codebases: [{ id: 'main', label: 'Main', path: codebaseDir }],
+        mcpServers: [],
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
       });
@@ -288,6 +289,7 @@ describe('runAgent', () => {
       id: 'proj-test',
       name: 'P',
       codebases: [{ id: 'main', label: 'Main', path: codebaseDir }],
+      mcpServers: [],
       createdAt: '2026-04-18T00:00:00Z',
       updatedAt: '2026-04-18T00:00:00Z',
     });
@@ -436,7 +438,9 @@ describe('runAgent', () => {
   it('ingest-document: anchor 無しで起動し、tool_use を素通しする', async () => {
     const store = {
       getNode: vi.fn(),
-      getProjectMeta: vi.fn(),
+      // Task 15: agent-runner は mcpServers[] を取得するため毎ターン getProjectMeta を呼ぶ。
+      // 空 (mcpServers なし) を返して既存挙動と同等にする。
+      getProjectMeta: vi.fn().mockResolvedValue(null),
       addNode: vi.fn(),
       listNodes: vi.fn().mockResolvedValue([]),
       findRelatedNodes: vi.fn().mockResolvedValue([]),
@@ -489,8 +493,150 @@ describe('runAgent', () => {
     expect(events.some((e) => e.type === 'error')).toBe(false);
     const toolUseEvents = events.filter((e) => e.type === 'tool_use');
     expect(toolUseEvents.length).toBeGreaterThan(0);
-    // anchor 無しなので store.getNode / getProjectMeta は呼ばれない
+    // anchor 無しなので store.getNode は呼ばれない
     expect(store.getNode).not.toHaveBeenCalled();
-    expect(store.getProjectMeta).not.toHaveBeenCalled();
+    // Task 15: getProjectMeta は mcpServers[] を取るため必ず呼ばれる
+    expect(store.getProjectMeta).toHaveBeenCalled();
+  });
+
+  describe('Task 15: agent-runner で buildMcpServers を共有', () => {
+    const ORIGINAL_ENV = { ...process.env };
+    afterEach(() => {
+      process.env = { ...ORIGINAL_ENV };
+    });
+
+    it('プロジェクト mcpServers[] を sdk.query に動的に渡す (chat-runner と同じ utility 共有)', async () => {
+      process.env.TEST_PAT = 'secret';
+      const store = {
+        getNode: vi.fn().mockResolvedValue({
+          id: 'uc-1',
+          type: 'usecase',
+          x: 0,
+          y: 0,
+          title: 'UC',
+          body: '',
+        }),
+        getProjectMeta: vi.fn().mockResolvedValue({
+          id: 'p',
+          name: 'P',
+          codebases: [],
+          mcpServers: [
+            {
+              id: 'atlassian',
+              name: 'A',
+              kind: 'atlassian',
+              url: 'https://t.test/mcp',
+              auth: { type: 'pat', scheme: 'bearer', tokenEnvVar: 'TEST_PAT' },
+              options: { maxChildIssues: 30, maxCommentsPerIssue: 5 },
+            },
+          ],
+          createdAt: '2026-04-24T00:00:00Z',
+          updatedAt: '2026-04-24T00:00:00Z',
+        }),
+        addNode: vi.fn(),
+        listNodes: vi.fn().mockResolvedValue([]),
+        findRelatedNodes: vi.fn().mockResolvedValue([]),
+        addEdge: vi.fn(),
+      } as unknown as ProjectStore;
+
+      const querySpy = vi.fn(() =>
+        (async function* () {
+          yield {
+            type: 'result',
+            subtype: 'success',
+            result: 'ok',
+          } as unknown as SdkMessageLike;
+        })(),
+      );
+      const sdk: SdkLike = { query: querySpy };
+
+      for await (const _ of runAgent({
+        sdk,
+        store,
+        projectDir: '/ws',
+        req: {
+          type: 'start',
+          agent: 'extract-questions',
+          projectId: 'p',
+          input: { nodeId: 'uc-1' },
+        },
+      })) {
+        /* drain */
+      }
+
+      const callArg = (querySpy.mock.calls as unknown[][])[0]?.[0] as unknown as {
+        options?: {
+          mcpServers?: Record<string, { headers?: Record<string, string> }>;
+          allowedTools?: string[];
+        };
+      };
+      expect(Object.keys(callArg.options?.mcpServers ?? {})).toEqual(
+        expect.arrayContaining(['tally', 'atlassian']),
+      );
+      const atlassian = callArg.options?.mcpServers?.atlassian;
+      expect(atlassian?.headers?.Authorization).toBe('Bearer secret');
+      // agent 固有の allowedTools (mcp__tally__find_related 等) + 外部 MCP wildcard
+      expect(callArg.options?.allowedTools).toContain('mcp__atlassian__*');
+    });
+
+    it('env 未設定なら error event を emit、sdk.query は呼ばない', async () => {
+      delete process.env.MISSING_PAT;
+      const store = {
+        getNode: vi.fn().mockResolvedValue({
+          id: 'uc-1',
+          type: 'usecase',
+          x: 0,
+          y: 0,
+          title: 'UC',
+          body: '',
+        }),
+        getProjectMeta: vi.fn().mockResolvedValue({
+          id: 'p',
+          name: 'P',
+          codebases: [],
+          mcpServers: [
+            {
+              id: 'a',
+              name: 'A',
+              kind: 'atlassian',
+              url: 'https://t.test/mcp',
+              auth: { type: 'pat', scheme: 'bearer', tokenEnvVar: 'MISSING_PAT' },
+              options: { maxChildIssues: 30, maxCommentsPerIssue: 5 },
+            },
+          ],
+          createdAt: '2026-04-24T00:00:00Z',
+          updatedAt: '2026-04-24T00:00:00Z',
+        }),
+        addNode: vi.fn(),
+        listNodes: vi.fn().mockResolvedValue([]),
+        findRelatedNodes: vi.fn().mockResolvedValue([]),
+        addEdge: vi.fn(),
+      } as unknown as ProjectStore;
+
+      const querySpy = vi.fn();
+      const sdk: SdkLike = { query: querySpy };
+      const events: AgentEvent[] = [];
+      for await (const e of runAgent({
+        sdk,
+        store,
+        projectDir: '/ws',
+        req: {
+          type: 'start',
+          agent: 'extract-questions',
+          projectId: 'p',
+          input: { nodeId: 'uc-1' },
+        },
+      })) {
+        events.push(e);
+      }
+
+      // buildMcpServers の throw が catch (err) で error event に流れる
+      expect(querySpy).not.toHaveBeenCalled();
+      const errorEvent = events.find((e) => e.type === 'error');
+      expect(errorEvent).toBeDefined();
+      if (errorEvent && errorEvent.type === 'error') {
+        expect(errorEvent.message).toMatch(/MISSING_PAT/);
+      }
+    });
   });
 });

packages/ai-engine/src/agent-runner.ts

@@ -2,6 +2,7 @@ import type { AgentName } from '@tally/core';
 import type { ProjectStore } from '@tally/storage';
 
 import { AGENT_REGISTRY } from './agents/registry';
+import { buildMcpServers } from './mcp/build-mcp-servers';
 import type { AgentEvent, SdkMessageLike } from './stream';
 import { sdkMessageToAgentEvent } from './stream';
 import { buildTallyMcpServer } from './tools';
@@ -104,19 +105,36 @@ export async function* runAgent(deps: RunAgentDeps): AsyncGenerator<AgentEvent>
     input: parsed.data,
   });
   try {
+    // Task 15: プロジェクト設定の mcpServers[] を毎ターン読み込み、buildMcpServers で
+    // Tally MCP と外部 MCP (Atlassian 等) を合成する。chat-runner と同じ utility を共有。
+    // env 未設定時は throw → catch で error event に流す。
+    const projectMeta = await store.getProjectMeta();
+    const externalConfigs = projectMeta?.mcpServers ?? [];
+    const { mcpServers, allowedTools: externalAllowed } = buildMcpServers({
+      tallyMcp: mcp,
+      configs: externalConfigs,
+    });
+
     // built-in ツールは mcp__ プレフィックスを持たないもの (Read / Glob / Grep など)。
     // options.tools = 実質的な built-in 使用可能リスト。[] を渡せば Bash/Edit/Write 等すべてオフ。
     const builtInTools = def.allowedTools.filter((t) => !t.startsWith('mcp__'));
+    // agent 固有の allowedTools (Tally MCP の具体 tool 名 + built-in) に、外部 MCP の wildcard
+    // (mcp__<id>__*) を合流。tally の wildcard は agent 側に既に具体名で並んでいるので除外して dedup。
+    const finalAllowedTools = [
+      ...def.allowedTools,
+      ...externalAllowed.filter((t) => t !== 'mcp__tally__*'),
+    ];
+
     const iter = sdk.query({
       prompt: prompt.userPrompt,
       options: {
         systemPrompt: prompt.systemPrompt,
-        mcpServers: { tally: mcp as unknown as Record<string, unknown> },
+        mcpServers,
         // built-in ツールは registry で宣言した範囲のみ許可。
         // これで find-related-code に Bash / Edit / Write 等が使われなくなる。
         tools: builtInTools,
-        // MCP ツール (mcp__tally__*) も含めて自動承認する。
-        allowedTools: def.allowedTools,
+        // MCP ツール (mcp__tally__* + 外部 MCP wildcard) を自動承認する。
+        allowedTools: finalAllowedTools,
         // 承認リスト外は拒否。built-in 側は tools で絞っているので二重ガード。
         permissionMode: 'dontAsk',
         // cwd は find-related-code のコード探索スコープ。未指定エージェントは SDK デフォルト。

packages/ai-engine/src/agents/find-related-code.test.ts

@@ -52,6 +52,7 @@ describe('findRelatedCodeAgent.validateInput', () => {
       id: 'proj-frc',
       name: 'FRC',
       codebases: [{ id: 'main', label: 'Main', path: codebaseDir }],
+      mcpServers: [],
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     });
@@ -106,6 +107,7 @@ describe('findRelatedCodeAgent.validateInput', () => {
       id: 'proj-frc',
       name: 'FRC',
       codebases: [],
+      mcpServers: [],
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     });
@@ -122,6 +124,7 @@ describe('findRelatedCodeAgent.validateInput', () => {
       id: 'proj-frc',
       name: 'FRC',
       codebases: [{ id: 'main', label: 'Main', path: filePath }],
+      mcpServers: [],
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     });
@@ -136,6 +139,7 @@ describe('findRelatedCodeAgent.validateInput', () => {
       id: 'proj-frc',
       name: 'FRC',
       codebases: [{ id: 'main', label: 'Main', path: '../nonexistent-xyz' }],
+      mcpServers: [],
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     });