@open-mercato/ai-assistant 0.4.11-develop.1917.b6098e78cb → 0.4.11-develop.1922.46b23ba3b5

package/src/frontend/hooks/useCommandPalette.ts

@@ -19,6 +19,8 @@ import type {
   DebugEventType,
   OpenCodeQuestion,
 } from '../types'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiFetch } from '@open-mercato/ui/backend/utils/api'
 import { COMMAND_PALETTE_SHORTCUT, AI_CHAT_SHORTCUT } from '../constants'
 import { filterTools } from '../utils/toolMatcher'
 import { useMcpTools } from './useMcpTools'
@@ -497,7 +499,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
   // Route query using fast model
   const routeQuery = useCallback(
     async (query: string): Promise<RouteResult> => {
-      const response = await fetch('/api/ai_assistant/route', {
+      const { ok, result, status } = await apiCall<RouteResult>('/api/ai_assistant/route', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
@@ -509,11 +511,15 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
         }),
       })
 
-      if (!response.ok) {
-        throw new Error(`Routing failed: ${response.status}`)
+      if (!ok) {
+        throw new Error(`Routing failed: ${status}`)
       }
 
-      return response.json()
+      if (!result) {
+        throw new Error('Routing returned empty response')
+      }
+
+      return result
     },
     [tools]
   )
@@ -547,7 +553,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
         const controller = new AbortController()
         currentStreamController.current = controller
 
-        const response = await fetch('/api/ai_assistant/chat', {
+        const response = await apiFetch('/api/ai_assistant/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({
@@ -765,7 +771,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
         }
         setMessages([userMessage])
 
-        const response = await fetch('/api/ai_assistant/chat', {
+        const response = await apiFetch('/api/ai_assistant/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({
@@ -978,7 +984,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
         currentStreamController.current = controller
 
         // Send to chat API with OpenCode session for context persistence
-        const response = await fetch('/api/ai_assistant/chat', {
+        const response = await apiFetch('/api/ai_assistant/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({
@@ -1271,7 +1277,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
       try {
         // Send answer as simple POST - the original SSE stream will receive the follow-up
         const sessionId = pendingQuestion.sessionID
-        const response = await fetch('/api/ai_assistant/chat', {
+        const { ok, result, status } = await apiCall<{ error?: string }>('/api/ai_assistant/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({
@@ -1283,9 +1289,8 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
           }),
         })
 
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({}))
-          throw new Error(errorData.error || `Answer request failed: ${response.status}`)
+        if (!ok) {
+          throw new Error(result?.error || `Answer request failed: ${status}`)
         }
 
         // Answer sent successfully - the original stream will handle the response
@@ -1325,7 +1330,7 @@ export function useCommandPalette(options: UseCommandPaletteOptions) {
 
       try {
         // Send to chat API
-        const response = await fetch('/api/ai_assistant/chat', {
+        const response = await apiFetch('/api/ai_assistant/chat', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({

package/src/frontend/hooks/useMcpTools.ts

@@ -1,6 +1,7 @@
 'use client'
 
 import { useState, useCallback, useEffect } from 'react'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import type { ToolInfo, ToolExecutionResult } from '../types'
 
 export function useMcpTools() {
@@ -12,16 +13,14 @@ export function useMcpTools() {
     setIsLoading(true)
     setError(null)
     try {
-      const response = await fetch('/api/ai_assistant/tools', {
-        headers: {
-          'x-om-forbidden-redirect': '0',
-        },
-      })
-      if (!response.ok) {
-        throw new Error(`Failed to fetch tools: ${response.status}`)
+      const { ok, result, status } = await apiCall<{ tools: ToolInfo[] }>(
+        '/api/ai_assistant/tools',
+        { headers: { 'x-om-forbidden-redirect': '0' } }
+      )
+      if (!ok) {
+        throw new Error(`Failed to fetch tools: ${status}`)
       }
-      const data = await response.json()
-      setTools(data.tools || [])
+      setTools(result?.tools || [])
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to load tools')
       setTools([])
@@ -33,27 +32,28 @@ export function useMcpTools() {
   const executeTool = useCallback(
     async (toolName: string, args: Record<string, unknown> = {}): Promise<ToolExecutionResult> => {
       try {
-        const response = await fetch('/api/ai_assistant/tools/execute', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'x-om-forbidden-redirect': '0',
-          },
-          body: JSON.stringify({ toolName, args }),
-        })
-
-        const data = await response.json()
+        const { ok, result, status } = await apiCall<{ result: unknown; error?: string }>(
+          '/api/ai_assistant/tools/execute',
+          {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              'x-om-forbidden-redirect': '0',
+            },
+            body: JSON.stringify({ toolName, args }),
+          }
+        )
 
-        if (!response.ok) {
+        if (!ok) {
           return {
             success: false,
-            error: data.error || `Tool execution failed: ${response.status}`,
+            error: result?.error || `Tool execution failed: ${status}`,
           }
         }
 
         return {
           success: true,
-          result: data.result,
+          result: result?.result,
         }
       } catch (err) {
         return {

package/src/modules/ai_assistant/api/chat/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import {
   handleOpenCodeMessageStreaming,
@@ -119,6 +120,14 @@ RESPONSE RULES:
 - Only ask for confirmation before create/update/delete operations.
 `.trim()
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'AI chat',
+  methods: {
+    POST: { summary: 'Send message to AI agent via SSE stream' },
+  },
+}
+
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/api/health/route.ts

@@ -1,7 +1,16 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { handleOpenCodeHealth } from '../../lib/opencode-handlers'
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'AI assistant health check',
+  methods: {
+    GET: { summary: 'Check OpenCode and MCP connection status' },
+  },
+}
+
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/api/route/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { generateObject } from '../../lib/ai-sdk'
 import {
   createOpenAI,
@@ -19,6 +20,14 @@ import {
   type ChatProviderId,
 } from '../../lib/chat-config'
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'AI query routing',
+  methods: {
+    POST: { summary: 'Route user query to appropriate AI handler' },
+  },
+}
+
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/api/settings/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import {
   OPEN_CODE_PROVIDER_IDS,
@@ -9,6 +10,14 @@ import {
   resolveOpenCodeProviderId,
 } from '@open-mercato/shared/lib/ai/opencode-provider'
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'AI assistant settings',
+  methods: {
+    GET: { summary: 'Get AI provider configuration' },
+  },
+}
+
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/api/tools/execute/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { executeTool } from '../../../lib/tool-executor'
@@ -6,6 +7,14 @@ import { loadAllModuleTools } from '../../../lib/tool-loader'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import type { McpToolContext } from '../../../lib/types'
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'Execute AI tool',
+  methods: {
+    POST: { summary: 'Execute a specific MCP tool by name' },
+  },
+}
+
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/api/tools/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { zodToJsonSchema } from 'zod-to-json-schema'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
@@ -7,6 +8,14 @@ import { loadAllModuleTools } from '../../lib/tool-loader'
 import { hasRequiredFeatures } from '../../lib/auth'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 
+export const openApi: OpenApiRouteDoc = {
+  tag: 'AI Assistant',
+  summary: 'List AI tools',
+  methods: {
+    GET: { summary: 'List available MCP tools filtered by user permissions' },
+  },
+}
+
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['ai_assistant.view'] },
 }

package/src/modules/ai_assistant/lib/opencode-client.ts

@@ -4,6 +4,7 @@
  * Client for communicating with OpenCode server running in headless mode.
  * OpenCode is used as an AI agent that can execute MCP tools.
  */
+import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 
 export type OpenCodeClientConfig = {
   baseUrl: string
@@ -195,7 +196,9 @@ export class OpenCodeClient {
       throw new Error(`Health check failed: ${res.status}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeHealth>(res, null)
+    if (!data) throw new Error('Health check returned invalid JSON response')
+    return data
   }
 
   /**
@@ -210,7 +213,9 @@ export class OpenCodeClient {
       throw new Error(`MCP status check failed: ${res.status}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeMcpStatus>(res, null)
+    if (!data) throw new Error('MCP status check returned invalid JSON response')
+    return data
   }
 
   /**
@@ -228,7 +233,9 @@ export class OpenCodeClient {
       throw new Error(`Failed to create session: ${error}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeSession>(res, null)
+    if (!data) throw new Error('Create session returned invalid JSON response')
+    return data
   }
 
   /**
@@ -243,7 +250,9 @@ export class OpenCodeClient {
       throw new Error(`Failed to get session: ${res.status}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeSession>(res, null)
+    if (!data) throw new Error('Get session returned invalid JSON response')
+    return data
   }
 
   /**
@@ -275,7 +284,9 @@ export class OpenCodeClient {
       throw new Error(`Failed to send message: ${error}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeMessage>(res, null)
+    if (!data) throw new Error('Send message returned invalid JSON response')
+    return data
   }
 
   /**
@@ -305,7 +316,9 @@ export class OpenCodeClient {
       throw new Error(`Failed to get config: ${res.status}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<Record<string, unknown>>(res, null)
+    if (!data) throw new Error('Get config returned invalid JSON response')
+    return data
   }
 
   /**
@@ -320,7 +333,9 @@ export class OpenCodeClient {
       throw new Error(`Failed to get questions: ${res.status}`)
     }
 
-    return res.json()
+    const data = await readJsonSafe<OpenCodeQuestion[]>(res, null)
+    if (!data) throw new Error('Get questions returned invalid JSON response')
+    return data
   }
 
   /**
@@ -395,7 +410,8 @@ export class OpenCodeClient {
       if (res.ok) {
         const contentType = res.headers.get('content-type')
         if (contentType && contentType.includes('application/json')) {
-          return res.json()
+          const data = await readJsonSafe<{ status: string; questionId?: string }>(res, null)
+          if (data) return data
         }
       }
     } catch {