@skopon-cool/form-sdk 0.2.4 → 0.2.5

package/dist/submit/buildCurlStatement.d.ts

@@ -1,12 +1,13 @@
-export declare function buildCurlStatement(payload: unknown, callbackUrl?: string | null): string;
+export declare function buildCurlStatement(payload: unknown, callbackUrl?: string | null, headers?: Record<string, string>): string;
 /** 构建合法 JSON body（card + extra 合并，便于 curl 直接执行） */
 export declare function buildAskUserCurlBodyJson(cardValues: Record<string, unknown>, extraValues: Record<string, unknown>): string;
 export interface BuildAskUserCurlStatementOptions {
     cardValues: Record<string, unknown>;
     extraValues?: Record<string, unknown>;
     callbackUrl?: string | null;
+    headers?: Record<string, string>;
 }
-export declare function buildAskUserCurlStatement({ cardValues, extraValues, callbackUrl, }: BuildAskUserCurlStatementOptions): string;
+export declare function buildAskUserCurlStatement({ cardValues, extraValues, callbackUrl, headers, }: BuildAskUserCurlStatementOptions): string;
 /** 从 ask_user payload（blocksJson）生成向 callback 提交返回字段的 curl */
-export declare function buildAskUserSubmitCurlFromPayload(payload: unknown, callbackUrl?: string | null): string;
+export declare function buildAskUserSubmitCurlFromPayload(payload: unknown, callbackUrl?: string | null, headers?: Record<string, string>): string;
 //# sourceMappingURL=buildCurlStatement.d.ts.map

package/dist/submit/buildCurlStatement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildCurlStatement.d.ts","sourceRoot":"","sources":["../../src/submit/buildCurlStatement.ts"],"names":[],"mappings":"AASA,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQxF;AAED,mDAAmD;AACnD,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAER;AAED,MAAM,WAAW,gCAAgC;IAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B;AAED,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,WAAgB,EAChB,WAAW,GACZ,EAAE,gCAAgC,GAAG,MAAM,CAQ3C;AAED,8DAA8D;AAC9D,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,OAAO,EAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAC1B,MAAM,CAKR"}
+{"version":3,"file":"buildCurlStatement.d.ts","sourceRoot":"","sources":["../../src/submit/buildCurlStatement.ts"],"names":[],"mappings":"AAiBA,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CASR;AAED,mDAAmD;AACnD,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAER;AAED,MAAM,WAAW,gCAAgC;IAC/C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACjC;AAED,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,WAAgB,EAChB,WAAW,EACX,OAAO,GACR,EAAE,gCAAgC,GAAG,MAAM,CAS3C;AAED,8DAA8D;AAC9D,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,OAAO,EAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CAKR"}

package/dist/submit/submitAnswerAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submitAnswerAgent.d.ts","sourceRoot":"","sources":["../../src/submit/submitAnswerAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,kBAAkB,CAAA;AAEzB,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,WAAW,CAAC,EAAE,wBAAwB,CAAA;IACtC,kDAAkD;IAClD,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACvC;AAqCD,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,oBAAoB,GAC3B;IAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAchD;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CA4B/B"}
+{"version":3,"file":"submitAnswerAgent.d.ts","sourceRoot":"","sources":["../../src/submit/submitAnswerAgent.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,kBAAkB,CAAA;AAEzB,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,WAAW,CAAC,EAAE,wBAAwB,CAAA;IACtC,kDAAkD;IAClD,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACvC;AAwDD,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,oBAAoB,GAC3B;IAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAchD;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAmB/B"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Skopon form rendering SDK (A2UI + form_definition) with submit helpers",
   "type": "module",
   "sideEffects": [

package/src/client/authStorage.test.ts

@@ -8,6 +8,7 @@ import {
   DEFAULT_AUTH_STORAGE_KEY,
   resolveAnswerAgentCallbackUrl,
   resolveSkoponAuthHeaders,
+  resolveSubmitAuthHeaders,
 } from './authStorage'
 
 describe('resolveSkoponAuthHeaders', () => {
@@ -63,6 +64,33 @@ describe('resolveSkoponAuthHeaders', () => {
   })
 })
 
+describe('resolveSubmitAuthHeaders', () => {
+  afterEach(() => {
+    sessionStorage.clear()
+    localStorage.clear()
+  })
+
+  it('merges session auth with explicit headers, explicit wins', () => {
+    sessionStorage.setItem(
+      DEFAULT_AUTH_STORAGE_KEY,
+      JSON.stringify({ token: 'session-tok' }),
+    )
+    expect(
+      resolveSubmitAuthHeaders({ Authorization: 'Bearer explicit-tok' }),
+    ).toEqual({ Authorization: 'Bearer explicit-tok' })
+  })
+
+  it('falls back to session auth when explicit headers missing', () => {
+    sessionStorage.setItem(
+      DEFAULT_AUTH_STORAGE_KEY,
+      JSON.stringify({ token: 'session-tok' }),
+    )
+    expect(resolveSubmitAuthHeaders()).toEqual({
+      Authorization: 'Bearer session-tok',
+    })
+  })
+})
+
 describe('resolveAnswerAgentCallbackUrl', () => {
   afterEach(() => {
     sessionStorage.clear()
@@ -86,7 +114,18 @@ describe('resolveAnswerAgentCallbackUrl', () => {
     expect(resolveAnswerAgentCallbackUrl()).toBe(DEFAULT_ANSWER_AGENT_CALLBACK_URL)
   })
 
-  it('returns default mock url when session is missing', () => {
+  it('returns empty string when session is missing', () => {
+    expect(resolveAnswerAgentCallbackUrl()).toBe('')
+  })
+
+  it('returns default mock url when field is empty string', () => {
+    sessionStorage.setItem(
+      DEFAULT_AUTH_STORAGE_KEY,
+      JSON.stringify({
+        token: 'tok',
+        [DEFAULT_AUTH_ANSWER_AGENT_CALLBACK_URL_FIELD]: '   ',
+      }),
+    )
     expect(resolveAnswerAgentCallbackUrl()).toBe(DEFAULT_ANSWER_AGENT_CALLBACK_URL)
   })
 })

package/src/client/authStorage.ts

@@ -46,7 +46,10 @@ function readTokenFromSessionJson(
     : ''
 }
 
-/** 从宿主登录缓存读取 answer_agent_callback_url（无则返回空串）。 */
+/**
+ * 从宿主登录缓存读取 answer_agent_callback_url。
+ * 无 session / 无法读取时返回空串；session 存在但字段缺失或为空时回落到默认 mock 路径（与 skopon-admin 登录迁移一致）。
+ */
 export function resolveAnswerAgentCallbackUrl(
   options: SkoponAuthStorageOptions & {
     answerAgentCallbackUrlField?: string
@@ -58,19 +61,30 @@ export function resolveAnswerAgentCallbackUrl(
     options.answerAgentCallbackUrlField ?? DEFAULT_AUTH_ANSWER_AGENT_CALLBACK_URL_FIELD
 
   const storage = readStorage(storageKind)
-  if (!storage) return DEFAULT_ANSWER_AGENT_CALLBACK_URL
+  if (!storage) return ''
 
   const raw = storage.getItem(storageKey)
-  if (!raw) return DEFAULT_ANSWER_AGENT_CALLBACK_URL
+  if (!raw) return ''
 
   const parsed = readSessionJson(raw)
-  if (!parsed) return DEFAULT_ANSWER_AGENT_CALLBACK_URL
+  if (!parsed) return ''
 
   const url = parsed[field]
   const trimmed = typeof url === 'string' ? url.trim() : ''
   return trimmed || DEFAULT_ANSWER_AGENT_CALLBACK_URL
 }
 
+/** 合并 session 鉴权头与宿主显式 headers；显式 headers 优先。 */
+export function resolveSubmitAuthHeaders(
+  explicit?: Record<string, string>,
+  authStorage?: SkoponAuthStorageOptions,
+): Record<string, string> {
+  return {
+    ...resolveSkoponAuthHeaders(authStorage),
+    ...(explicit ?? {}),
+  }
+}
+
 /** 从宿主登录缓存读取 Bearer token，返回 Authorization 头（无 token 时返回空对象）。 */
 export function resolveSkoponAuthHeaders(
   options: SkoponAuthStorageOptions = {},

package/src/components/AskUserFormCard.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { Button, Spin, Tag, Tooltip } from 'antd'
 import type { FormDetailResult, FormSchema, SubmitMode } from '../types/index'
+import { resolveSubmitAuthHeaders } from '../client/authStorage'
 import { buildAskUserSurface } from '../adapter/resolveSurface'
 import {
   buildAnswerAgentBody,
@@ -46,6 +47,8 @@ export interface AskUserFormCardProps {
   callbackUrl?: string | null
   submitMode?: SubmitMode
   answerAgentContext?: AskUserAnswerAgentContext
+  /** 显式提交 headers，与 session 鉴权合并；显式优先 */
+  submitHeaders?: Record<string, string>
   /** 需 useCallback 稳定引用，避免重复拉取 */
   fetchFormDetail: (ref: { formUniqueId: string }) => Promise<FormDetailResult>
   onNotify?: (type: 'success' | 'error', message: string) => void
@@ -61,6 +64,7 @@ export default function AskUserFormCard({
   callbackUrl,
   submitMode = 'curl',
   answerAgentContext,
+  submitHeaders,
   fetchFormDetail,
   onNotify,
   resumeSearch = null,
@@ -77,6 +81,11 @@ export default function AskUserFormCard({
 
   const resolvedFormUniqueId = formUniqueId?.trim() ?? ''
 
+  const resolvedSubmitHeaders = useMemo(
+    () => resolveSubmitAuthHeaders(submitHeaders),
+    [submitHeaders],
+  )
+
   const resolvedAnswerAgentContext = useMemo(
     (): AskUserAnswerAgentContext => ({
       ...answerAgentContext,
@@ -188,6 +197,7 @@ export default function AskUserFormCard({
           payload={payload}
           callbackUrl={callbackUrl}
           answerAgentContext={resolvedAnswerAgentContext}
+          submitHeaders={submitHeaders}
           unpublishedFormId={formDisabled && resolvedFormUniqueId ? resolvedFormUniqueId : undefined}
           onNotify={onNotify}
         />
@@ -213,7 +223,9 @@ export default function AskUserFormCard({
           onNotifyRef.current?.('error', 'callback_url 为空，无法提交')
           return
         }
-        const result = await submitFormJson(url, answer)
+        const result = await submitFormJson(url, answer, {
+          headers: resolvedSubmitHeaders,
+        })
         if (!mountedRef.current) return
         if (result.ok) {
           onNotifyRef.current?.('success', '提交成功')
@@ -229,7 +241,9 @@ export default function AskUserFormCard({
         form: formDef ?? payloadDef,
         answer,
       })
-      const result = await submitAnswerAgent(body)
+      const result = await submitAnswerAgent(body, {
+        headers: resolvedSubmitHeaders,
+      })
       if (!mountedRef.current) return
       const notify = formatAnswerAgentSubmitMessage(result)
       onNotifyRef.current?.(notify.type, notify.message)

package/src/components/CurlSubmitBlock.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { Button, Tag, Tooltip, Typography } from 'antd'
+import { resolveSubmitAuthHeaders } from '../client/authStorage'
 import { buildCurlStatement } from '../submit/buildCurlStatement'
 import {
   buildAnswerAgentBody,
@@ -25,6 +26,8 @@ export interface CurlSubmitBlockProps {
   /** display：复制与显示一致；submitFields：复制向 callback 提交返回字段的 curl */
   copyMode?: CurlSubmitBlockCopyMode
   answerAgentContext?: AskUserAnswerAgentContext
+  /** 显式提交 headers，与 session 鉴权合并；显式优先 */
+  submitHeaders?: Record<string, string>
   onNotify?: (type: 'success' | 'error', message: string) => void
 }
 
@@ -44,6 +47,7 @@ export default function CurlSubmitBlock({
   unpublishedFormId,
   incompleteFormId,
   answerAgentContext,
+  submitHeaders,
   onNotify,
 }: CurlSubmitBlockProps) {
   const [submitting, setSubmitting] = useState(false)
@@ -56,9 +60,14 @@ export default function CurlSubmitBlock({
     }
   }, [])
 
+  const resolvedSubmitHeaders = useMemo(
+    () => resolveSubmitAuthHeaders(submitHeaders),
+    [submitHeaders],
+  )
+
   const displayCurl = useMemo(
-    () => buildCurlStatement(payload, callbackUrl),
-    [payload, callbackUrl],
+    () => buildCurlStatement(payload, callbackUrl, resolvedSubmitHeaders),
+    [payload, callbackUrl, resolvedSubmitHeaders],
   )
 
   const resolvedContext = useMemo(
@@ -79,7 +88,9 @@ export default function CurlSubmitBlock({
         payload,
         answer,
       })
-      const result = await submitAnswerAgent(body)
+      const result = await submitAnswerAgent(body, {
+        headers: resolvedSubmitHeaders,
+      })
       if (!mountedRef.current) return
       const notify = formatAnswerAgentSubmitMessage(result)
       onNotify?.(notify.type, notify.message)

package/src/index.ts

@@ -80,6 +80,7 @@ export {
 export {
   resolveAnswerAgentCallbackUrl,
   resolveSkoponAuthHeaders,
+  resolveSubmitAuthHeaders,
   resolveClientHeaders,
   DEFAULT_AUTH_STORAGE_KEY,
   DEFAULT_AUTH_TOKEN_FIELD,

package/src/submit/buildCurlStatement.ts

@@ -7,12 +7,25 @@ function escapeSingleQuotes(text: string): string {
   return text.replace(/'/g, `'\\''`)
 }
 
-export function buildCurlStatement(payload: unknown, callbackUrl?: string | null): string {
+function resolveAuthorizationCurlHeader(headers?: Record<string, string>): string {
+  const authorization = headers?.Authorization?.trim()
+  if (authorization) {
+    return `  -H 'Authorization: ${escapeSingleQuotes(authorization)}' \\`
+  }
+  return `  -H 'Authorization: Bearer <token>' \\`
+}
+
+export function buildCurlStatement(
+  payload: unknown,
+  callbackUrl?: string | null,
+  headers?: Record<string, string>,
+): string {
   const url = (callbackUrl ?? '').trim() || '<callback_url>'
   const body = JSON.stringify(payload ?? {}, null, 2)
   return [
     `curl -X POST '${url}' \\`,
     `  -H 'Content-Type: application/json' \\`,
+    resolveAuthorizationCurlHeader(headers),
     `  -d '${escapeSingleQuotes(body)}'`,
   ].join('\n')
 }
@@ -29,18 +42,21 @@ export interface BuildAskUserCurlStatementOptions {
   cardValues: Record<string, unknown>
   extraValues?: Record<string, unknown>
   callbackUrl?: string | null
+  headers?: Record<string, string>
 }
 
 export function buildAskUserCurlStatement({
   cardValues,
   extraValues = {},
   callbackUrl,
+  headers,
 }: BuildAskUserCurlStatementOptions): string {
   const url = (callbackUrl ?? '').trim() || '<callback_url>'
   const body = buildAskUserCurlBodyJson(cardValues, extraValues)
   return [
     `curl -X POST '${url}' \\`,
     `  -H 'Content-Type: application/json' \\`,
+    resolveAuthorizationCurlHeader(headers),
     `  -d '${escapeSingleQuotes(body)}'`,
   ].join('\n')
 }
@@ -49,9 +65,10 @@ export function buildAskUserCurlStatement({
 export function buildAskUserSubmitCurlFromPayload(
   payload: unknown,
   callbackUrl?: string | null,
+  headers?: Record<string, string>,
 ): string {
   const def = parsePayloadBlocksJson(payload)
-  if (!def) return buildCurlStatement(payload, callbackUrl)
+  if (!def) return buildCurlStatement(payload, callbackUrl, headers)
   const cardValues = extractExtraBlockValues(def.blocks)
-  return buildAskUserCurlStatement({ cardValues, callbackUrl })
+  return buildAskUserCurlStatement({ cardValues, callbackUrl, headers })
 }

package/src/submit/submit.test.ts

@@ -30,6 +30,16 @@ describe('buildCurlStatement', () => {
     const curl = buildCurlStatement({ name: "O'Brien" }, 'https://example.com/hook')
     expect(curl).toContain("curl -X POST 'https://example.com/hook'")
     expect(curl).toContain("O'\\''Brien")
+    expect(curl).toContain("Authorization: Bearer <token>")
+  })
+
+  it('includes Authorization header when provided', () => {
+    const curl = buildCurlStatement(
+      { a: 1 },
+      'https://example.com/hook',
+      { Authorization: 'Bearer tok-1' },
+    )
+    expect(curl).toContain("Authorization: Bearer tok-1")
   })
 
   it('uses placeholder when callback url missing', () => {
@@ -90,6 +100,21 @@ describe('buildAskUserSubmitCurlFromPayload', () => {
       buildCurlStatement(payload, callbackUrl),
     )
   })
+
+  it('includes Authorization header in submit-fields curl', () => {
+    const payload = {
+      title: 'Ask',
+      blocks: [
+        { id: 'p1', type: 'text', name: 'video_title', label: '标题', defaultValue: 'hello' },
+      ],
+    }
+    const curl = buildAskUserSubmitCurlFromPayload(
+      payload,
+      'https://example.com/hook',
+      { Authorization: 'Bearer tok-1' },
+    )
+    expect(curl).toContain("Authorization: Bearer tok-1")
+  })
 })
 
 describe('parsePayloadBlocksJson', () => {
@@ -409,6 +434,35 @@ describe('submitAnswerAgent', () => {
       'callback_url 为空，无法提交',
     )
   })
+
+  it('throws when explicit answer agent callback url is empty', async () => {
+    await expect(
+      submitAnswerAgent(
+        {
+          mission_id: 1,
+          tenant_id: 1001,
+          tenant_user_id: 'u1',
+          request_id: 'req-1',
+          callback_url: 'https://example.com/cb',
+          answer: {},
+        },
+        { answerAgentCallbackUrl: '   ' },
+      ),
+    ).rejects.toThrow('answer_agent_callback_url 未配置，无法提交')
+  })
+
+  it('throws when answer agent callback url cannot be resolved', async () => {
+    await expect(
+      submitAnswerAgent({
+        mission_id: 1,
+        tenant_id: 1001,
+        tenant_user_id: 'u1',
+        request_id: 'req-1',
+        callback_url: 'https://example.com/cb',
+        answer: {},
+      }),
+    ).rejects.toThrow('answer_agent_callback_url 未配置，无法提交')
+  })
 })
 
 describe('submitFormJson', () => {
@@ -434,6 +488,33 @@ describe('submitFormJson', () => {
       }),
     )
   })
+
+  it('POSTs JSON payload with Authorization header', async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      status: 200,
+      headers: { get: () => 'application/json' },
+      json: async () => ({ ok: true }),
+    })) as unknown as typeof fetch
+
+    await submitFormJson(
+      'https://example.com/hook',
+      { a: 1 },
+      {
+        fetch: fetchMock,
+        headers: { Authorization: 'Bearer tok-1' },
+      },
+    )
+    expect(fetchMock).toHaveBeenCalledWith(
+      'https://example.com/hook',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer tok-1',
+          'Content-Type': 'application/json',
+        }),
+      }),
+    )
+  })
 })
 
 describe('validateFormSubmitValues', () => {

package/src/submit/submitAnswerAgent.ts

@@ -1,7 +1,6 @@
 import {
-  DEFAULT_ANSWER_AGENT_CALLBACK_URL,
   resolveAnswerAgentCallbackUrl,
-  resolveSkoponAuthHeaders,
+  resolveSubmitAuthHeaders,
   type SkoponAuthStorageOptions,
 } from '../client/authStorage'
 import { validateAnswerAgentBody } from './buildAnswerAgentBody'
@@ -17,6 +16,25 @@ export interface SubmitAnswerAgentOptions extends SubmitFormJsonOptions {
   answerAgentCallbackUrl?: string | null
 }
 
+const ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR =
+  'answer_agent_callback_url 未配置，无法提交'
+
+function resolveSubmitAnswerAgentUrl(options?: SubmitAnswerAgentOptions): string {
+  if (options?.answerAgentCallbackUrl != null) {
+    const explicit = options.answerAgentCallbackUrl.trim()
+    if (!explicit) {
+      throw new Error(ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR)
+    }
+    return explicit
+  }
+
+  const resolved = resolveAnswerAgentCallbackUrl(options?.authStorage).trim()
+  if (!resolved) {
+    throw new Error(ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR)
+  }
+  return resolved
+}
+
 interface AnswerAgentResponseData {
   callback_ok?: boolean
   callback_status?: number
@@ -79,20 +97,11 @@ export async function submitAnswerAgent(
     throw new Error(validationError)
   }
 
-  const url = (
-    options?.answerAgentCallbackUrl?.trim() ||
-    resolveAnswerAgentCallbackUrl(options?.authStorage) ||
-    DEFAULT_ANSWER_AGENT_CALLBACK_URL
-  ).trim()
-
-  const storageHeaders = resolveSkoponAuthHeaders(options?.authStorage)
+  const url = resolveSubmitAnswerAgentUrl(options)
 
   const result = await submitFormJson(url, body, {
     ...options,
-    headers: {
-      ...storageHeaders,
-      ...(options?.headers ?? {}),
-    },
+    headers: resolveSubmitAuthHeaders(options?.headers, options?.authStorage),
   })
 
   const data = extractAnswerAgentData(result.body)