lisone/ds2api
1
0
Fork 0
mirror of https://github.com/CJackHwang/ds2api.git synced 2026-05-09 18:57:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(toolcall): correct DSML closing tag slash position

Browse Source 
The closing tag format was <｜/DSML｜tag> but must be </｜DSML｜tag>.
The scanner's closing-tag detection checks text[1] == '/', so the
slash must come immediately after '<', before the first full-width
pipe (U+FF5C). Tags like <｜/DSML｜tool_calls> would not set
closing=true and would not match any tool markup name.

Files fixed:
- internal/toolcall/tool_prompt.go: all closing tags
- internal/promptcompat/prompt_build_test.go: 1 test expectation
This commit is contained in:
waiwai
2026-05-09 16:42:22 +08:00
parent 1e00e482a6
commit f33789399e
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/promptcompat/prompt_build_test.go
View File

@@ -74,7 +74,7 @@ func TestBuildOpenAIFinalPrompt_VercelPreparePathKeepsFinalAnswerInstruction(t *
}
finalPrompt, _ := buildOpenAIFinalPrompt(messages, tools, "", false)
if !strings.Contains(finalPrompt, "Remember: The ONLY valid way to use tools is the <｜DSML｜tool_calls>...<｜/DSML｜tool_calls> block at the end of your response.") {
if !strings.Contains(finalPrompt, "Remember: The ONLY valid way to use tools is the <｜DSML｜tool_calls>...</｜DSML｜tool_calls> block at the end of your response.") {
t.Fatalf("vercel prepare finalPrompt missing final tool-call anchor instruction: %q", finalPrompt)
}
if !strings.Contains(finalPrompt, "TOOL CALL FORMAT") {

28
internal/toolcall/tool_prompt.go
View File

@@ -13,43 +13,43 @@ func BuildToolCallInstructions(toolNames []string) string {
<｜DSML｜tool_calls>
<｜DSML｜invoke name="TOOL_NAME_HERE">
<｜DSML｜parameter name="PARAMETER_NAME"><![CDATA[PARAMETER_VALUE]]><｜/DSML｜parameter>
<｜/DSML｜invoke>
<｜/DSML｜tool_calls>
<｜DSML｜parameter name="PARAMETER_NAME"><![CDATA[PARAMETER_VALUE]]></｜DSML｜parameter>
</｜DSML｜invoke>
</｜DSML｜tool_calls>
RULES:
1) Use the <｜DSML｜tool_calls> wrapper format.
2) Put one or more <｜DSML｜invoke> entries under a single <｜DSML｜tool_calls> root.
3) Put the tool name in the invoke name attribute: <｜DSML｜invoke name="TOOL_NAME">.
4) All string values must use <![CDATA[...]]>, even short ones. This includes code, scripts, file contents, prompts, paths, names, and queries.
5) Every top-level argument must be a <｜DSML｜parameter name="ARG_NAME">...<｜/DSML｜parameter> node.
5) Every top-level argument must be a <｜DSML｜parameter name="ARG_NAME">...</｜DSML｜parameter> node.
6) Objects use nested XML elements inside the parameter body. Arrays may repeat <item> children.
7) Numbers, booleans, and null stay plain text.
8) Use only the parameter names in the tool schema. Do not invent fields.
9) Do NOT wrap XML in markdown fences. Do NOT output explanations, role markers, or internal monologue.
10) If you call a tool, the first non-whitespace characters of that tool block must be exactly <｜DSML｜tool_calls>.
11) Never omit the opening <｜DSML｜tool_calls> tag, even if you already plan to close with <｜/DSML｜tool_calls>.
11) Never omit the opening <｜DSML｜tool_calls> tag, even if you already plan to close with </｜DSML｜tool_calls>.
12) Compatibility note: the runtime also accepts the legacy XML tags <tool_calls> / <invoke> / <parameter>, but prefer the DSML-prefixed form above.
PARAMETER SHAPES:
- string => <｜DSML｜parameter name="x"><![CDATA[value]]><｜/DSML｜parameter>
- object => <｜DSML｜parameter name="x"><field>...</field><｜/DSML｜parameter>
- array => <｜DSML｜parameter name="x"><item>...</item><item>...</item><｜/DSML｜parameter>
- number/bool/null => <｜DSML｜parameter name="x">plain_text<｜/DSML｜parameter>
- string => <｜DSML｜parameter name="x"><![CDATA[value]]></｜DSML｜parameter>
- object => <｜DSML｜parameter name="x"><field>...</field></｜DSML｜parameter>
- array => <｜DSML｜parameter name="x"><item>...</item><item>...</item></｜DSML｜parameter>
- number/bool/null => <｜DSML｜parameter name="x">plain_text</｜DSML｜parameter>
【WRONG — Do NOT do these】:
Wrong 1 — mixed text after XML:
<｜DSML｜tool_calls>...<｜/DSML｜tool_calls> I hope this helps.
<｜DSML｜tool_calls>...</｜DSML｜tool_calls> I hope this helps.
Wrong 2 — Markdown code fences:
` + "```xml" + `
<｜DSML｜tool_calls>...<｜/DSML｜tool_calls>
<｜DSML｜tool_calls>...</｜DSML｜tool_calls>
` + "```" + `
Wrong 3 — missing opening wrapper:
<｜DSML｜invoke name="TOOL_NAME">...<｜/DSML｜invoke>
<｜/DSML｜tool_calls>
<｜DSML｜invoke name="TOOL_NAME">...</｜DSML｜invoke>
</｜DSML｜tool_calls>
Remember: The ONLY valid way to use tools is the <｜DSML｜tool_calls>...<｜/DSML｜tool_calls> block at the end of your response.
Remember: The ONLY valid way to use tools is the <｜DSML｜tool_calls>...</｜DSML｜tool_calls> block at the end of your response.
` + buildCorrectToolExamples(toolNames)
}