@skopon-cool/form-sdk 0.2.1 → 0.2.3

package/src/client/formClient.ts

@@ -1,5 +1,10 @@
 import type { FormDetailResult, FormSchema } from '../types/index'
 import { mapFormDefinitionFromDto, resolveSurfaceFromFormDefinition } from '../adapter/resolveSurface'
+import { parseEnvelope } from './apiEnvelope'
+import {
+  type ClientHeadersOptions,
+  resolveClientHeaders,
+} from './authStorage'
 
 export interface FormDetailDto {
   form_id: number
@@ -9,39 +14,16 @@ export interface FormDetailDto {
   form_definition: Record<string, unknown>
 }
 
-export interface FormClientOptions {
+export interface FormClientOptions extends ClientHeadersOptions {
   baseUrl?: string
   detailPath?: string
   fetch?: typeof fetch
-  getHeaders?: () => Record<string, string> | Promise<Record<string, string>>
 }
 
 export interface FormClient {
   fetchDetail: (ref: { formUniqueId?: string; formId?: number }) => Promise<FormDetailResult>
 }
 
-interface ApiEnvelope<T> {
-  success?: boolean
-  data?: T
-  message?: string
-}
-
-async function parseEnvelope<T>(response: Response): Promise<T> {
-  let json: ApiEnvelope<T>
-  try {
-    json = (await response.json()) as ApiEnvelope<T>
-  } catch {
-    throw new Error(`响应非 JSON (${response.status})`)
-  }
-  if (!response.ok || json.success === false) {
-    throw new Error(json.message || `请求失败 (${response.status})`)
-  }
-  if (json.data === undefined || json.data === null) {
-    throw new Error(json.message || `响应缺少 data (${response.status})`)
-  }
-  return json.data
-}
-
 export function createFormClient(options: FormClientOptions = {}): FormClient {
   const baseUrl = (options.baseUrl ?? '/api/v1').replace(/\/$/, '')
   const detailPath = options.detailPath ?? '/dev/form/detail'
@@ -60,7 +42,7 @@ export function createFormClient(options: FormClientOptions = {}): FormClient {
       throw new Error('form_id 或 form_unique_id 至少传一个')
     }
 
-    const headers = (await options.getHeaders?.()) ?? {}
+    const headers = await resolveClientHeaders(options)
     const response = await fetchFn(`${baseUrl}${detailPath}?${params.toString()}`, {
       method: 'GET',
       headers,

package/src/client/resumeSearchClient.test.ts

@@ -0,0 +1,87 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it, vi } from 'vitest'
+import { createResumeSearchClient } from './resumeSearchClient'
+
+function mockResponse(
+  init: Partial<Response> & { json?: () => Promise<unknown> },
+): Response {
+  return {
+    ok: init.ok ?? true,
+    status: init.status ?? 200,
+    headers: { get: () => 'application/json' },
+    json: init.json ?? (async () => ({})),
+    text: async () => '',
+  } as Response
+}
+
+describe('createResumeSearchClient', () => {
+  it('maps filter to query and response to ResumeSearchItem', async () => {
+    const fetchMock = vi.fn(async () =>
+      mockResponse({
+        json: async () => ({
+          success: true,
+          data: {
+            list: [
+              {
+                resume_id: 1,
+                agent_id: 2,
+                name: '导演 A',
+                avatar_url: 'https://cdn/a.png',
+                satisfaction: 90,
+                personality_json: ['外向'],
+                specialties_json: ['剪辑'],
+                traits_json: ['短视频'],
+                works_json: [{ title: '作品1', cover_url: 'https://cdn/c.png', link: 'https://x' }],
+                published: 1,
+                works_count: 3,
+                resume_unique_id: 'resume-abc',
+              },
+            ],
+            total: 1,
+            page: 1,
+            page_size: 20,
+          },
+        }),
+      }),
+    ) as unknown as typeof fetch
+
+    const resumeSearch = createResumeSearchClient({
+      fetch: fetchMock,
+      baseUrl: '/api/v1',
+      getHeaders: async () => ({ Authorization: 'Bearer test' }),
+    })
+
+    const result = await resumeSearch({
+      filter: {
+        names: ['导演'],
+        agentUniqueIds: ['agent-1'],
+        resumeUniqueIds: ['resume-abc'],
+        pageSize: 20,
+      },
+      page: 1,
+    })
+
+    expect(fetchMock).toHaveBeenCalledOnce()
+    const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]
+    expect(url).toContain('/api/v1/univ/resume/search?')
+    expect(url).toContain('name=%E5%AF%BC%E6%BC%94')
+    expect(url).toContain('agent_unique_id=agent-1')
+    expect(url).toContain('resume_unique_id=resume-abc')
+    expect(init.headers).toEqual({ Authorization: 'Bearer test' })
+
+    expect(result.list).toHaveLength(1)
+    expect(result.list[0]).toMatchObject({
+      resumeUniqueId: 'resume-abc',
+      name: '导演 A',
+      satisfaction: 90,
+      worksCount: 3,
+    })
+    expect(result.list[0].works?.[0]).toMatchObject({
+      title: '作品1',
+      coverUrl: 'https://cdn/c.png',
+    })
+    expect(result.total).toBe(1)
+  })
+})

package/src/client/resumeSearchClient.ts

@@ -0,0 +1,108 @@
+import type { FormResumeFilter } from '../types/index'
+import type { ResumeSearchFn, ResumeSearchItem } from '../catalog/resumeSearchContext'
+import { parseEnvelope } from './apiEnvelope'
+import {
+  type ClientHeadersOptions,
+  resolveClientHeaders,
+} from './authStorage'
+
+export interface ResumeSearchClientOptions extends ClientHeadersOptions {
+  baseUrl?: string
+  searchPath?: string
+  fetch?: typeof fetch
+}
+
+interface ResumeWorkDto {
+  id?: string
+  title?: string
+  link?: string
+  cover_url?: string | null
+}
+
+interface ResumeListItemDto {
+  resume_id: number
+  agent_id: number
+  name: string
+  avatar_url?: string | null
+  description?: string | null
+  satisfaction: number
+  personality_json?: string[]
+  specialties_json?: string[]
+  traits_json?: string[]
+  works_json?: ResumeWorkDto[]
+  published: number
+  works_count: number
+  resume_unique_id: string
+}
+
+interface PagedListDto<T> {
+  list: T[]
+  total: number
+  page: number
+  page_size: number
+}
+
+function mapResumeListItem(dto: ResumeListItemDto): ResumeSearchItem {
+  return {
+    resumeUniqueId: dto.resume_unique_id,
+    resumeId: dto.resume_id,
+    agentId: dto.agent_id,
+    name: dto.name,
+    avatarUrl: dto.avatar_url ?? null,
+    description: dto.description ?? undefined,
+    satisfaction: dto.satisfaction,
+    published: dto.published,
+    worksCount: dto.works_count,
+    personality: dto.personality_json ?? [],
+    specialties: dto.specialties_json ?? [],
+    traits: dto.traits_json ?? [],
+    works: (dto.works_json ?? []).map((work) => ({
+      title: work.title ?? '',
+      coverUrl: work.cover_url ?? null,
+      link: work.link,
+    })),
+  }
+}
+
+function buildResumeSearchQuery(
+  filter: FormResumeFilter,
+  page: number,
+): URLSearchParams {
+  const params = new URLSearchParams()
+  params.set('page', String(page))
+  params.set('page_size', String(filter.pageSize ?? 20))
+  for (const name of filter.names ?? []) {
+    if (name) params.append('name', name)
+  }
+  for (const id of filter.agentUniqueIds ?? []) {
+    if (id) params.append('agent_unique_id', id)
+  }
+  for (const id of filter.resumeUniqueIds ?? []) {
+    if (id) params.append('resume_unique_id', id)
+  }
+  return params
+}
+
+export function createResumeSearchClient(
+  options: ResumeSearchClientOptions = {},
+): ResumeSearchFn {
+  const baseUrl = (options.baseUrl ?? '/api/v1').replace(/\/$/, '')
+  const searchPath = options.searchPath ?? '/univ/resume/search'
+  const fetchFn = options.fetch ?? fetch
+
+  return async ({ filter, page }) => {
+    const headers = await resolveClientHeaders(options)
+    const params = buildResumeSearchQuery(filter, page)
+    const response = await fetchFn(`${baseUrl}${searchPath}?${params.toString()}`, {
+      method: 'GET',
+      headers,
+    })
+    const data = await parseEnvelope<PagedListDto<ResumeListItemDto>>(response)
+    return {
+      list: (data.list ?? []).map(mapResumeListItem),
+      total: data.total ?? 0,
+      page: data.page ?? page,
+      pageSize: data.page_size ?? filter.pageSize ?? 20,
+    }
+  }
+}

package/src/client/skoponSdkClients.ts

@@ -0,0 +1,51 @@
+import { createCaseSearchClient, type CaseSearchClientOptions } from './caseSearchClient'
+import { createFormClient, type FormClient, type FormClientOptions } from './formClient'
+import { createResumeSearchClient, type ResumeSearchClientOptions } from './resumeSearchClient'
+import type { CaseSearchFn } from '../catalog/caseSearchContext'
+import type { ResumeSearchFn } from '../catalog/resumeSearchContext'
+import type { SkoponAuthStorageOptions } from './authStorage'
+
+export interface SkoponSdkClientsOptions {
+  baseUrl?: string
+  fetch?: typeof fetch
+  getHeaders?: () => Record<string, string> | Promise<Record<string, string>>
+  authStorage?: SkoponAuthStorageOptions
+  form?: Pick<FormClientOptions, 'detailPath'>
+  resume?: Pick<ResumeSearchClientOptions, 'searchPath'>
+  case?: Pick<CaseSearchClientOptions, 'listPath' | 'published'>
+}
+
+export interface SkoponSdkClients {
+  fetchDetail: FormClient['fetchDetail']
+  resumeSearch: ResumeSearchFn
+  caseSearch: CaseSearchFn
+}
+
+export function createSkoponSdkClients(
+  options: SkoponSdkClientsOptions = {},
+): SkoponSdkClients {
+  const shared = {
+    baseUrl: options.baseUrl,
+    fetch: options.fetch,
+    getHeaders: options.getHeaders,
+    authStorage: options.authStorage,
+  }
+
+  const formClient = createFormClient({
+    ...shared,
+    detailPath: options.form?.detailPath,
+  })
+
+  return {
+    fetchDetail: formClient.fetchDetail,
+    resumeSearch: createResumeSearchClient({
+      ...shared,
+      searchPath: options.resume?.searchPath,
+    }),
+    caseSearch: createCaseSearchClient({
+      ...shared,
+      listPath: options.case?.listPath,
+      published: options.case?.published,
+    }),
+  }
+}

package/src/components/AskUserFormCard.tsx

@@ -2,7 +2,10 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { Button, Spin, Tag, Tooltip } from 'antd'
 import type { FormDetailResult, FormSchema, SubmitMode } from '../types/index'
 import { buildAskUserSurface } from '../adapter/resolveSurface'
-import { buildAskUserCurlStatement } from '../submit/buildCurlStatement'
+import {
+  buildAnswerAgentBody,
+  type AskUserAnswerAgentContext,
+} from '../submit/buildAnswerAgentBody'
 import {
   extractExtraBlockValues,
   getPayloadInputFieldNames,
@@ -11,7 +14,9 @@ import {
   parsePayloadBlocksJson,
   payloadHasInputBlocks,
 } from '../submit/intersectPayloadBlocksWithForm'
-import { copyTextToClipboard, submitFormJson } from '../submit/submitFormJson'
+import { submitFormJson } from '../submit/submitFormJson'
+import { submitAnswerAgent } from '../submit/submitAnswerAgent'
+import { validateFormSubmitValues } from '../submit/validateFormSubmit'
 import type { CaseSearchFn } from '../catalog/caseSearchContext'
 import type { ResumeSearchFn } from '../catalog/resumeSearchContext'
 import SkoponFormRenderer, { type SkoponFormRendererRef } from './SkoponFormRenderer'
@@ -37,6 +42,7 @@ export interface AskUserFormCardProps {
   formUniqueId?: string | null
   callbackUrl?: string | null
   submitMode?: SubmitMode
+  answerAgentContext?: AskUserAnswerAgentContext
   /** 需 useCallback 稳定引用，避免重复拉取 */
   fetchFormDetail: (ref: { formUniqueId: string }) => Promise<FormDetailResult>
   onNotify?: (type: 'success' | 'error', message: string) => void
@@ -51,6 +57,7 @@ export default function AskUserFormCard({
   formUniqueId,
   callbackUrl,
   submitMode = 'curl',
+  answerAgentContext,
   fetchFormDetail,
   onNotify,
   resumeSearch = null,
@@ -67,6 +74,14 @@ export default function AskUserFormCard({
 
   const resolvedFormUniqueId = formUniqueId?.trim() ?? ''
 
+  const resolvedAnswerAgentContext = useMemo(
+    (): AskUserAnswerAgentContext => ({
+      ...answerAgentContext,
+      callbackUrl: answerAgentContext?.callbackUrl ?? callbackUrl ?? null,
+    }),
+    [answerAgentContext, callbackUrl],
+  )
+
   useEffect(() => {
     mountedRef.current = true
     return () => {
@@ -169,7 +184,7 @@ export default function AskUserFormCard({
         <CurlSubmitBlock
           payload={payload}
           callbackUrl={callbackUrl}
-          copyMode="submitFields"
+          answerAgentContext={resolvedAnswerAgentContext}
           unpublishedFormId={formDisabled && resolvedFormUniqueId ? resolvedFormUniqueId : undefined}
           onNotify={onNotify}
         />
@@ -182,7 +197,12 @@ export default function AskUserFormCard({
     setSubmitting(true)
     try {
       const cardValues = rendererRef.current?.getValues(fieldNames) ?? {}
-      const submitBody = { ...cardValues, ...extraValues }
+      const validationError = validateFormSubmitValues(renderBlocks, cardValues)
+      if (validationError) {
+        onNotifyRef.current?.('error', validationError.message)
+        return
+      }
+      const answer = { ...cardValues, ...extraValues }
 
       if (submitMode === 'post') {
         const url = (callbackUrl ?? '').trim()
@@ -190,7 +210,7 @@ export default function AskUserFormCard({
           onNotifyRef.current?.('error', 'callback_url 为空，无法提交')
           return
         }
-        const result = await submitFormJson(url, submitBody)
+        const result = await submitFormJson(url, answer)
         if (!mountedRef.current) return
         if (result.ok) {
           onNotifyRef.current?.('success', '提交成功')
@@ -200,14 +220,22 @@ export default function AskUserFormCard({
         return
       }
 
-      await copyTextToClipboard(
-        buildAskUserCurlStatement({ cardValues, extraValues, callbackUrl }),
-      )
+      const body = buildAnswerAgentBody({
+        context: resolvedAnswerAgentContext,
+        payload,
+        form: formDef ?? payloadDef,
+        answer,
+      })
+      const result = await submitAnswerAgent(body)
       if (!mountedRef.current) return
-      onNotifyRef.current?.('success', '已复制 curl 到剪贴板')
+      if (result.ok) {
+        onNotifyRef.current?.('success', '提交成功')
+      } else {
+        onNotifyRef.current?.('error', formatSubmitErrorMessage(result.status, result.body))
+      }
     } catch (error) {
       if (!mountedRef.current) return
-      const detail = error instanceof Error ? error.message : '复制失败'
+      const detail = error instanceof Error ? error.message : '提交失败'
       onNotifyRef.current?.('error', detail)
     } finally {
       if (mountedRef.current) setSubmitting(false)
@@ -236,7 +264,13 @@ export default function AskUserFormCard({
       />
 
       <div className="ask-user-form-actions">
-        <Tooltip title={submitMode === 'curl' ? '点击复制 curl' : '提交 JSON 到 callback_url'}>
+        <Tooltip
+          title={
+            submitMode === 'post'
+              ? '提交 JSON 到 callback_url'
+              : '提交到 answer_agent_callback_url'
+          }
+        >
           <Button
             type="primary"
             size="small"

package/src/components/CurlSubmitBlock.tsx

@@ -1,10 +1,15 @@
-import { useMemo } from 'react'
+import { useMemo, useState } from 'react'
 import { Button, Tag, Tooltip, Typography } from 'antd'
+import { buildCurlStatement } from '../submit/buildCurlStatement'
 import {
-  buildAskUserSubmitCurlFromPayload,
-  buildCurlStatement,
-} from '../submit/buildCurlStatement'
-import { copyTextToClipboard } from '../submit/submitFormJson'
+  buildAnswerAgentBody,
+  type AskUserAnswerAgentContext,
+} from '../submit/buildAnswerAgentBody'
+import {
+  extractExtraBlockValues,
+  parsePayloadBlocksJson,
+} from '../submit/intersectPayloadBlocksWithForm'
+import { submitAnswerAgent } from '../submit/submitAnswerAgent'
 
 export type CurlSubmitBlockCopyMode = 'display' | 'submitFields'
 
@@ -16,43 +21,80 @@ export interface CurlSubmitBlockProps {
   incompleteFormId?: string | null
   /** display：复制与显示一致；submitFields：复制向 callback 提交返回字段的 curl */
   copyMode?: CurlSubmitBlockCopyMode
+  answerAgentContext?: AskUserAnswerAgentContext
   onNotify?: (type: 'success' | 'error', message: string) => void
 }
 
+function formatSubmitErrorMessage(status: number, body: unknown): string {
+  if (body && typeof body === 'object' && body !== null && 'message' in body) {
+    const msg = (body as { message: unknown }).message
+    if (typeof msg === 'string' && msg.trim()) {
+      return `提交失败 (${status}): ${msg.trim()}`
+    }
+  }
+  if (typeof body === 'string' && body.trim()) {
+    return `提交失败 (${status}): ${body.trim()}`
+  }
+  return `提交失败 (${status})`
+}
+
+function resolveAnswerFromPayload(payload: unknown): Record<string, unknown> {
+  const def = parsePayloadBlocksJson(payload)
+  if (def) return extractExtraBlockValues(def.blocks)
+  if (payload && typeof payload === 'object' && !Array.isArray(payload)) {
+    return payload as Record<string, unknown>
+  }
+  return {}
+}
+
 export default function CurlSubmitBlock({
   payload,
   callbackUrl,
   title,
   unpublishedFormId,
   incompleteFormId,
-  copyMode = 'display',
+  answerAgentContext,
   onNotify,
 }: CurlSubmitBlockProps) {
+  const [submitting, setSubmitting] = useState(false)
+
   const displayCurl = useMemo(
     () => buildCurlStatement(payload, callbackUrl),
     [payload, callbackUrl],
   )
-  const copyCurl = useMemo(() => {
-    if (copyMode === 'submitFields') {
-      return buildAskUserSubmitCurlFromPayload(payload, callbackUrl)
-    }
-    return displayCurl
-  }, [copyMode, payload, callbackUrl, displayCurl])
 
-  async function handleCopy() {
+  const resolvedContext = useMemo(
+    (): AskUserAnswerAgentContext => ({
+      ...answerAgentContext,
+      callbackUrl: answerAgentContext?.callbackUrl ?? callbackUrl ?? null,
+    }),
+    [answerAgentContext, callbackUrl],
+  )
+
+  async function handleSubmit() {
+    if (submitting) return
+    setSubmitting(true)
     try {
-      await copyTextToClipboard(copyCurl)
-      onNotify?.('success', '已复制到剪贴板')
-    } catch {
-      onNotify?.('error', '复制失败')
+      const answer = resolveAnswerFromPayload(payload)
+      const body = buildAnswerAgentBody({
+        context: resolvedContext,
+        payload,
+        answer,
+      })
+      const result = await submitAnswerAgent(body)
+      if (result.ok) {
+        onNotify?.('success', '提交成功')
+      } else {
+        onNotify?.('error', formatSubmitErrorMessage(result.status, result.body))
+      }
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : '提交失败'
+      onNotify?.('error', detail)
+    } finally {
+      setSubmitting(false)
     }
   }
 
-  const copyTooltip =
-    copyMode === 'submitFields'
-      ? '复制提交字段 curl（向 callback 回传）'
-      : '复制 curl'
-
   return (
     <div className="ask-user-curl-card">
       <div className="ask-user-curl-card-header">
@@ -69,9 +111,15 @@ export default function CurlSubmitBlock({
             </Tooltip>
           ) : null}
         </div>
-        <Tooltip title={copyTooltip}>
-          <Button size="small" type="text" onClick={() => void handleCopy()}>
-            复制
+        <Tooltip title="提交到 answer_agent_callback_url">
+          <Button
+            size="small"
+            type="text"
+            loading={submitting}
+            disabled={submitting}
+            onClick={() => void handleSubmit()}
+          >
+            提交
           </Button>
         </Tooltip>
       </div>

package/src/index.ts

@@ -65,6 +65,38 @@ export {
 } from './submit/submitFormJson'
 
 export { createFormClient, type FormClient, type FormClientOptions } from './client/formClient'
+export {
+  buildAnswerAgentBody,
+  type AskUserAnswerAgentContext,
+  type BuildAnswerAgentBodyOptions,
+} from './submit/buildAnswerAgentBody'
+export {
+  submitAnswerAgent,
+  type SubmitAnswerAgentOptions,
+} from './submit/submitAnswerAgent'
+export {
+  resolveAnswerAgentCallbackUrl,
+  resolveSkoponAuthHeaders,
+  resolveClientHeaders,
+  DEFAULT_AUTH_STORAGE_KEY,
+  DEFAULT_AUTH_TOKEN_FIELD,
+  DEFAULT_AUTH_ANSWER_AGENT_CALLBACK_URL_FIELD,
+  type SkoponAuthStorageOptions,
+  type ClientHeadersOptions,
+} from './client/authStorage'
+export {
+  createResumeSearchClient,
+  type ResumeSearchClientOptions,
+} from './client/resumeSearchClient'
+export {
+  createCaseSearchClient,
+  type CaseSearchClientOptions,
+} from './client/caseSearchClient'
+export {
+  createSkoponSdkClients,
+  type SkoponSdkClients,
+  type SkoponSdkClientsOptions,
+} from './client/skoponSdkClients'
 
 export { default as SkoponFormRenderer } from './components/SkoponFormRenderer'
 export type { SkoponFormRendererProps, SkoponFormRendererRef } from './components/SkoponFormRenderer'

package/src/submit/buildAnswerAgentBody.ts

@@ -0,0 +1,61 @@
+import type { FormSchema } from '../types/index'
+import {
+  parsePayloadBlocksJson,
+  type PayloadBlocksDefinition,
+} from './intersectPayloadBlocksWithForm'
+
+export interface AskUserAnswerAgentContext {
+  missionId?: number | string | null
+  tenantId?: number | null
+  tenantUserId?: string | null
+  requestId?: string | null
+  askUserQueryDescription?: string | null
+  callbackUrl?: string | null
+}
+
+function toBlocksJsonShape(
+  source: PayloadBlocksDefinition | FormSchema | unknown,
+): unknown {
+  if (!source || typeof source !== 'object' || Array.isArray(source)) {
+    return source ?? null
+  }
+  const obj = source as Record<string, unknown>
+  if (!Array.isArray(obj.blocks)) {
+    return source
+  }
+  return {
+    title: typeof obj.title === 'string' ? obj.title : '',
+    description: typeof obj.description === 'string' ? obj.description : '',
+    blocks: obj.blocks,
+  }
+}
+
+export interface BuildAnswerAgentBodyOptions {
+  context: AskUserAnswerAgentContext
+  payload: unknown
+  form?: PayloadBlocksDefinition | FormSchema | null
+  answer: Record<string, unknown>
+}
+
+/** 组装 answer-agent 外包消息体（与 mock AskUserAnswerMockVo 对齐）。 */
+export function buildAnswerAgentBody({
+  context,
+  payload,
+  form,
+  answer,
+}: BuildAnswerAgentBodyOptions): Record<string, unknown> {
+  const question = parsePayloadBlocksJson(payload) ?? payload
+  const formBody = form ? toBlocksJsonShape(form) : question
+
+  return {
+    mission_id: context.missionId ?? null,
+    tenant_id: context.tenantId ?? null,
+    tenant_user_id: context.tenantUserId ?? null,
+    request_id: context.requestId ?? null,
+    ask_user_query_description: context.askUserQueryDescription ?? null,
+    callback_url: (context.callbackUrl ?? '').trim() || null,
+    form: formBody,
+    question,
+    answer,
+  }
+}