@vibe-forge/mcp 0.9.1-alpha.2 → 0.9.2-alpha.0

package/__tests__/tools.spec.ts

@@ -1,11 +1,22 @@
-import { describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import wait from '#~/tools/general/wait.js'
 import { createMcpTools } from '#~/tools/index.js'
+import askUser from '#~/tools/interaction/ask-user.js'
 
 import { createToolTester } from './mcp-test-utils.js'
 
 describe('mcp tools integration', () => {
+  beforeEach(() => {
+    process.env.__VF_PROJECT_AI_SESSION_ID__ = 'sess-1'
+    vi.stubGlobal('fetch', vi.fn())
+  })
+
+  afterEach(() => {
+    delete process.env.__VF_PROJECT_AI_SESSION_ID__
+    vi.unstubAllGlobals()
+  })
+
   it('registers task tools by default', () => {
     expect(createMcpTools()).toHaveProperty('task')
   })
@@ -46,4 +57,39 @@ describe('mcp tools integration', () => {
         .rejects.toThrow()
     })
   })
+
+  describe('askUserQuestion tool', () => {
+    it('returns scalar answers as plain text content', async () => {
+      const tester = createToolTester()
+      askUser(tester.mockRegister)
+      vi.mocked(fetch).mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: true, data: { result: '米饭' } })
+      } as Response)
+
+      const result = await tester.callTool('AskUserQuestion', {
+        question: '今晚吃了什么？',
+        options: [{ label: '米饭' }]
+      }) as any
+
+      expect(result.content).toEqual([{ type: 'text', text: '米饭' }])
+    })
+
+    it('returns multiselect answers as newline-separated text', async () => {
+      const tester = createToolTester()
+      askUser(tester.mockRegister)
+      vi.mocked(fetch).mockResolvedValue({
+        ok: true,
+        json: async () => ({ success: true, data: { result: ['米饭', '面条'] } })
+      } as Response)
+
+      const result = await tester.callTool('AskUserQuestion', {
+        question: '今晚吃了什么？',
+        options: [{ label: '米饭' }, { label: '面条' }],
+        multiselect: true
+      }) as any
+
+      expect(result.content).toEqual([{ type: 'text', text: '米饭\n面条' }])
+    })
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/mcp",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.0",
   "description": "Vibe Forge MCP server",
   "imports": {
     "#~/*.js": {
@@ -33,13 +33,13 @@
     "@modelcontextprotocol/sdk": "^1.25.3",
     "commander": "^12.1.0",
     "zod": "^3.24.1",
-    "@vibe-forge/config": "^0.8.3",
-    "@vibe-forge/register": "^0.8.0",
-    "@vibe-forge/types": "^0.8.3",
-    "@vibe-forge/utils": "^0.8.3",
-    "@vibe-forge/task": "^0.8.3",
-    "@vibe-forge/cli-helper": "^0.8.0",
-    "@vibe-forge/hooks": "^0.8.0"
+    "@vibe-forge/hooks": "^0.9.1",
+    "@vibe-forge/config": "^0.9.1-alpha.0",
+    "@vibe-forge/cli-helper": "^0.9.0",
+    "@vibe-forge/task": "^0.9.0",
+    "@vibe-forge/types": "^0.9.0",
+    "@vibe-forge/utils": "^0.9.0",
+    "@vibe-forge/register": "^0.9.0"
   },
   "scripts": {
     "test": "pnpm -C ../.. exec vitest run --workspace vitest.workspace.ts --project bundler packages/mcp/__tests__"

package/src/command.ts

@@ -59,5 +59,5 @@ export const configureMcpCommand = (command: Command, version: string) => (
 )
 
 export function registerMcpCommand(program: Command, version: string) {
-  return configureMcpCommand(program.command('mcp'), version)
+  return configureMcpCommand(program, version)
 }

package/src/tools/interaction/ask-user.ts

@@ -6,9 +6,22 @@ const Schema = z.object({
   question: z.string().describe('The question to ask the user'),
   options: z.array(z.object({
     label: z.string().describe('The label of the option'),
+    value: z.string().optional().describe('Stable value returned when the option is chosen'),
     description: z.string().optional().describe('The description of the option')
   })).optional().describe('The options for the user to select from'),
-  multiselect: z.boolean().optional().describe('Whether the user can select multiple options')
+  multiselect: z.boolean().optional().describe('Whether the user can select multiple options'),
+  kind: z.enum(['question', 'permission']).optional().describe('UI hint for how to present the interaction'),
+  permissionContext: z.object({
+    adapter: z.string().optional(),
+    currentMode: z.enum(['default', 'acceptEdits', 'plan', 'dontAsk', 'bypassPermissions']).optional(),
+    suggestedMode: z.enum(['default', 'acceptEdits', 'plan', 'dontAsk', 'bypassPermissions']).optional(),
+    deniedTools: z.array(z.string()).optional(),
+    reasons: z.array(z.string()).optional(),
+    subjectKey: z.string().optional(),
+    subjectLabel: z.string().optional(),
+    scope: z.enum(['tool']).optional(),
+    projectConfigPath: z.string().optional()
+  }).optional().describe('Extra context for permission escalation prompts')
 })
 
 export default defineRegister(({ registerTool }) => {
@@ -20,7 +33,7 @@ export default defineRegister(({ registerTool }) => {
       inputSchema: Schema
     },
     async (args) => {
-      const { question, options, multiselect } = args
+      const { question, options, multiselect, kind, permissionContext } = args
       const sessionId = process.env.__VF_PROJECT_AI_SESSION_ID__
 
       if (!sessionId) {
@@ -40,7 +53,9 @@ export default defineRegister(({ registerTool }) => {
           sessionId,
           question,
           options,
-          multiselect
+          multiselect,
+          kind,
+          permissionContext
         })
       })
 
@@ -49,12 +64,31 @@ export default defineRegister(({ registerTool }) => {
         throw new Error(`Failed to ask user question: ${response.statusText} - ${errorText}`)
       }
 
-      const result = await response.json()
+      const result = await response.json() as { data?: unknown; result?: unknown } | unknown
+      const body = result != null &&
+          typeof result === 'object' &&
+          'data' in result
+        ? (result as { data?: unknown }).data
+        : result
+      const answer = body != null &&
+          typeof body === 'object' &&
+          'result' in body
+        ? (body as { result?: unknown }).result
+        : body
+
+      if (answer == null) {
+        throw new Error('AskUserQuestion returned an empty result')
+      }
+
+      const text = Array.isArray(answer)
+        ? answer.map(item => String(item)).join('\n')
+        : String(answer)
+
       return {
         content: [
           {
             type: 'text',
-            text: JSON.stringify(result.result)
+            text
           }
         ]
       }

package/src/tools/task/index.ts

@@ -65,7 +65,7 @@ export const createTaskRegister = () => {
         await callHook('StartTasks', {
           cwd: process.cwd(),
           sessionId: process.env.__VF_PROJECT_AI_SESSION_ID__!,
-          tasks: resolvedTasks
+          tasks
         })
         const syncResults = parentSessionId
           ? await Promise.allSettled(resolvedTasks.map(task =>

package/src/tools/task/manager.ts

@@ -3,7 +3,7 @@ import process from 'node:process'
 import { loadInjectDefaultSystemPromptValue, mergeSystemPrompts } from '@vibe-forge/config'
 import { callHook } from '@vibe-forge/hooks'
 import { generateAdapterQueryOptions, run } from '@vibe-forge/task'
-import type { ChatMessage, McpTaskOutputEvent, McpTaskSession, SessionPermissionMode } from '@vibe-forge/types'
+import type { AdapterOutputEvent, ChatMessage, McpTaskSession, SessionPermissionMode } from '@vibe-forge/types'
 import { extractTextFromMessage } from '@vibe-forge/utils/chat-message'
 
 import { fetchSessionMessages, postSessionEvent } from '#~/sync.js'
@@ -117,7 +117,8 @@ export class TaskManager {
         skills: resolvedConfig.skills,
         mcpServers: resolvedConfig.mcpServers,
         promptAssetIds: resolvedConfig.promptAssetIds,
-        onEvent: (event: McpTaskOutputEvent) => {
+        assetBundle: resolvedConfig.assetBundle,
+        onEvent: (event: AdapterOutputEvent) => {
           this.handleEvent(taskId, event)
         }
       })
@@ -164,7 +165,7 @@ export class TaskManager {
     return { taskId }
   }
 
-  private handleEvent(taskId: string, event: McpTaskOutputEvent) {
+  private handleEvent(taskId: string, event: AdapterOutputEvent) {
     const task = this.tasks.get(taskId)
     if (!task) return
 
@@ -220,6 +221,8 @@ export class TaskManager {
         this.stopServerPolling(taskId)
         task.onStop?.()
         break
+      default:
+        break
     }
   }
 
@@ -271,7 +274,7 @@ export class TaskManager {
     }
   }
 
-  private async syncEvent(task: TaskInfo, event: McpTaskOutputEvent) {
+  private async syncEvent(task: TaskInfo, event: AdapterOutputEvent) {
     if (!task.serverSync) return
     try {
       await postSessionEvent(task.serverSync.sessionId, event as unknown as Record<string, unknown>)

package/__tests__/start-tasks.spec.ts

@@ -1,94 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  callHook: vi.fn(),
-  uuid: vi.fn(),
-  createChildSession: vi.fn(),
-  getParentSessionId: vi.fn(),
-  startTask: vi.fn(),
-  getTask: vi.fn()
-}))
-
-vi.mock('@vibe-forge/hooks', () => ({
-  callHook: mocks.callHook
-}))
-
-vi.mock('@vibe-forge/utils/uuid', () => ({
-  uuid: mocks.uuid
-}))
-
-vi.mock('#~/sync.js', () => ({
-  createChildSession: mocks.createChildSession,
-  getParentSessionId: mocks.getParentSessionId
-}))
-
-vi.mock('#~/tools/task/manager.js', () => ({
-  TaskManager: class {
-    startTask = mocks.startTask
-    getTask = mocks.getTask
-  }
-}))
-
-import { createTaskRegister } from '#~/tools/task/index.js'
-
-import { createToolTester } from './mcp-test-utils.js'
-
-describe('StartTasks hook payload', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.callHook.mockResolvedValue({ continue: true })
-    mocks.getParentSessionId.mockReturnValue(undefined)
-    mocks.startTask.mockImplementation(async ({ taskId }: { taskId: string }) => ({ taskId }))
-    mocks.getTask.mockImplementation((taskId: string) => ({
-      taskId,
-      status: 'running',
-      logs: []
-    }))
-  })
-
-  it('passes resolved task ids to the StartTasks hook before launching child tasks', async () => {
-    mocks.uuid
-      .mockReturnValueOnce('task-1')
-      .mockReturnValueOnce('task-2')
-
-    const tester = createToolTester()
-    createTaskRegister()(tester.mockRegister)
-
-    await tester.callTool('StartTasks', {
-      tasks: [
-        { description: 'first task', type: 'entity', name: 'alpha' },
-        { description: 'second task', type: 'spec', name: 'beta', background: false }
-      ]
-    })
-
-    expect(mocks.callHook).toHaveBeenCalledWith(
-      'StartTasks',
-      expect.objectContaining({
-        tasks: [
-          {
-            taskId: 'task-1',
-            description: 'first task',
-            type: 'entity',
-            name: 'alpha'
-          },
-          {
-            taskId: 'task-2',
-            description: 'second task',
-            type: 'spec',
-            name: 'beta',
-            background: false
-          }
-        ]
-      })
-    )
-
-    expect(mocks.startTask).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ taskId: 'task-1' })
-    )
-    expect(mocks.startTask).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ taskId: 'task-2' })
-    )
-  })
-})