vtcode 0.146.4

A Rust-based terminal coding agent with modular architecture supporting multiple LLM providers
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
use serde_json::{Map, Value};

use crate::agent::runloop::text_tools::parser::{ParseResult, ParsedToolCall, TextualToolParser};

const DSML_MARKER: &str = "DSML";

#[derive(Debug, Clone, Copy)]
struct DsmlTag<'a> {
    start: usize,
    end: usize,
    closing: bool,
    name: &'a str,
    attributes: &'a str,
}

fn is_dsml_bar(ch: char) -> bool {
    matches!(ch, '\u{ff5c}' | '|')
}

fn skip_dsml_whitespace(text: &str, mut cursor: usize) -> usize {
    while let Some(ch) = text[cursor..].chars().next() {
        if !ch.is_whitespace() {
            break;
        }
        cursor += ch.len_utf8();
    }
    cursor
}

fn consume_dsml_bars(text: &str, mut cursor: usize) -> Option<usize> {
    let mut count = 0;
    loop {
        cursor = skip_dsml_whitespace(text, cursor);
        let Some(ch) = text[cursor..].chars().next() else {
            break;
        };
        if !is_dsml_bar(ch) {
            break;
        }
        count += 1;
        cursor += ch.len_utf8();
    }

    (count > 0).then_some(cursor)
}

fn parse_dsml_tag_at(text: &str, start: usize) -> Option<DsmlTag<'_>> {
    if !text.get(start..)?.starts_with('<') {
        return None;
    }

    let mut cursor = start + '<'.len_utf8();
    cursor = skip_dsml_whitespace(text, cursor);
    let closing = text[cursor..].starts_with('/');
    if closing {
        cursor += '/'.len_utf8();
    }

    cursor = consume_dsml_bars(text, cursor)?;
    cursor = skip_dsml_whitespace(text, cursor);
    let marker_end = cursor.checked_add(DSML_MARKER.len())?;
    if !text.get(cursor..marker_end)?.eq_ignore_ascii_case(DSML_MARKER) {
        return None;
    }
    cursor = consume_dsml_bars(text, marker_end)?;
    cursor = skip_dsml_whitespace(text, cursor);

    let name_start = cursor;
    while let Some(ch) = text[cursor..].chars().next() {
        if ch.is_ascii_alphanumeric() || matches!(ch, '_' | '-') {
            cursor += ch.len_utf8();
        } else {
            break;
        }
    }
    if name_start == cursor {
        return None;
    }

    let name = &text[name_start..cursor];
    let attributes_start = cursor;
    let close_offset = text[attributes_start..].find('>')?;
    let close_start = attributes_start + close_offset;

    Some(DsmlTag {
        start,
        end: close_start + '>'.len_utf8(),
        closing,
        name,
        attributes: &text[attributes_start..close_start],
    })
}

fn find_dsml_tag<'a>(text: &'a str, from: usize, name: &str, closing: bool) -> Option<DsmlTag<'a>> {
    let mut search_start = from;
    while let Some(relative_start) = text[search_start..].find('<') {
        let start = search_start + relative_start;
        if let Some(tag) = parse_dsml_tag_at(text, start)
            && tag.closing == closing
            && tag.name.eq_ignore_ascii_case(name)
        {
            return Some(tag);
        }
        search_start = start + '<'.len_utf8();
    }
    None
}

fn find_dsml_attribute<'a>(attributes: &'a str, key: &str) -> Option<&'a str> {
    let mut search_start = 0;
    while let Some(relative_start) = attributes[search_start..].find(key) {
        let key_start = search_start + relative_start;
        let has_identifier_prefix = attributes[..key_start]
            .chars()
            .next_back()
            .is_some_and(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '-'));
        if has_identifier_prefix {
            search_start = key_start + key.len();
            continue;
        }

        let mut cursor = skip_dsml_whitespace(attributes, key_start + key.len());
        if !attributes[cursor..].starts_with('=') {
            search_start = key_start + key.len();
            continue;
        }
        cursor += '='.len_utf8();
        cursor = skip_dsml_whitespace(attributes, cursor);
        let quote = attributes[cursor..].chars().next()?;
        if quote != '"' && quote != '\'' {
            return None;
        }
        let value_start = cursor + quote.len_utf8();
        let value_end = attributes[value_start..].find(quote)?;
        return Some(&attributes[value_start..value_start + value_end]);
    }
    None
}

/// Strips DSML markup from text, including tokenized variants with whitespace
/// around the separator bars, while preserving non-tag content (including
/// parameter values).
pub(crate) fn strip_dsml_markup(text: &str) -> String {
    let mut out = String::with_capacity(text.len());
    let mut cursor = 0;

    while cursor < text.len() {
        if text.as_bytes()[cursor] == b'<'
            && let Some(tag) = parse_dsml_tag_at(text, cursor)
        {
            cursor = tag.end;
            continue;
        }

        if let Some(ch) = text[cursor..].chars().next() {
            out.push(ch);
            cursor += ch.len_utf8();
        }
    }

    out
}

pub(crate) fn contains_dsml_markup(text: &str) -> bool {
    let mut search_start = 0;
    while let Some(relative_start) = text[search_start..].find('<') {
        let start = search_start + relative_start;
        if parse_dsml_tag_at(text, start).is_some() {
            return true;
        }
        search_start = start + '<'.len_utf8();
    }
    false
}

/// Public wrapper for tests
#[cfg(test)]
fn parse_dsml_tool_call(text: &str) -> Option<(String, Value)> {
    parse_dsml_tool_call_raw(text)
}

#[cfg_attr(feature = "profiling", hotpath::measure)]
fn parse_dsml_tool_call_raw(text: &str) -> Option<(String, Value)> {
    let invoke = find_dsml_tag(text, 0, "invoke", false)?;
    let name = find_dsml_attribute(invoke.attributes, "name")?.trim().to_string();
    if name.is_empty() {
        return None;
    }

    let invoke_close = find_dsml_tag(text, invoke.end, "invoke", true)?;
    let content = &text[invoke.end..invoke_close.start];

    let mut object = Map::new();
    let mut search_start = 0;

    while let Some(param) = find_dsml_tag(content, search_start, "parameter", false) {
        let param_close = find_dsml_tag(content, param.end, "parameter", true)?;
        let param_name = find_dsml_attribute(param.attributes, "name")?.trim().to_string();
        let is_string =
            find_dsml_attribute(param.attributes, "string").is_some_and(|value| value.eq_ignore_ascii_case("true"));
        let raw_value = content[param.end..param_close.start].trim();

        let value = if is_string {
            Value::String(raw_value.to_string())
        } else {
            serde_json::from_str::<Value>(raw_value).unwrap_or_else(|_| Value::String(raw_value.to_string()))
        };

        object.insert(param_name, value);
        search_start = param_close.end;
    }

    if object.is_empty() {
        return None;
    }

    Some((name, Value::Object(object)))
}

/// Collects DSML invoke regions for stripping.
pub(super) fn collect_dsml_regions(text: &str, regions: &mut Vec<(usize, usize)>) {
    let mut search_start = 0;
    while let Some(invoke) = find_dsml_tag(text, search_start, "invoke", false) {
        let end = find_dsml_tag(text, invoke.end, "invoke", true).map_or(text.len(), |close| close.end);
        if invoke.start < end {
            regions.push((invoke.start, end));
        }
        search_start = end.max(invoke.end);
    }
}

/// Parser for DeepSeek DSML v2 format tool calls.
pub(crate) struct DsmlToolParser;

impl TextualToolParser for DsmlToolParser {
    fn name(&self) -> &'static str {
        "dsml"
    }

    fn try_parse(&self, text: &str) -> ParseResult {
        match parse_dsml_tool_call_raw(text) {
            Some((name, args)) => ParseResult::Success(ParsedToolCall { name, args }),
            None => {
                tracing::debug!(parser = "dsml", reason = "no matching DSML v2 pattern", "Rejected textual tool call");
                ParseResult::Reject("no matching DSML v2 pattern")
            }
        }
    }

    fn find_consumed_spans(&self, text: &str) -> Vec<(usize, usize)> {
        let mut regions = Vec::new();
        collect_dsml_regions(text, &mut regions);
        regions
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use serde_json::Value;

    #[test]
    fn parses_single_dsml_invoke_with_string_params() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"code_search\">\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"query\" string=\"true\">Widget</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"path\" string=\"true\">/src</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"result_types\">[\"definition\"]</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>",
        );

        let (name, args) = parse_dsml_tool_call(text).expect("should parse");
        assert_eq!(name, "code_search");
        assert_eq!(args["query"], Value::String("Widget".to_string()));
        assert_eq!(args["path"], Value::String("/src".to_string()));
        assert_eq!(args["result_types"], serde_json::json!(["definition"]));
    }

    #[test]
    fn parses_dsml_invoke_inside_tool_calls_wrapper() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>\n",
            "  <\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"read_file\">\n",
            "    <\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"path\" string=\"true\">/tmp/foo.txt</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "  </\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>",
        );

        let (name, args) = parse_dsml_tool_call(text).expect("should parse");
        assert_eq!(name, "read_file");
        assert_eq!(args["path"], Value::String("/tmp/foo.txt".to_string()));
    }

    #[test]
    fn parses_dsml_with_whitespace_between_special_token_bars() {
        let text = concat!(
            "<\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} invoke name=\"exec_command\">\n",
            "<\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} parameter name=\"cmd\" string=\"true\">true</\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} parameter>\n",
            "</\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} invoke>",
        );

        let (name, args) = parse_dsml_tool_call(text).expect("spaced DSML should parse");
        assert_eq!(name, "exec_command");
        assert_eq!(args["cmd"], Value::String("true".to_string()));
        assert!(contains_dsml_markup(text));
    }

    #[test]
    fn parses_first_invoke_only_when_multiple_present() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"code_search\">\n",
            "  <\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"a\" string=\"true\">1</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"read_file\">\n",
            "  <\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"b\" string=\"true\">2</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>",
        );

        let (name, args) = parse_dsml_tool_call(text).expect("should parse");
        assert_eq!(name, "code_search");
        assert_eq!(args["a"], Value::String("1".to_string()));
        assert!(args.get("b").is_none());
    }

    #[test]
    fn returns_none_for_non_dsml_text() {
        assert!(parse_dsml_tool_call("plain text without any dsml tags").is_none());
    }

    #[test]
    fn handles_json_value_params_without_string_true() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"code_search\">\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"count\">42</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>",
        );

        let (name, args) = parse_dsml_tool_call(text).expect("should parse");
        assert_eq!(name, "code_search");
        assert_eq!(args["count"], Value::Number(serde_json::Number::from(42)));
    }

    #[test]
    fn returns_none_for_empty_invoke_name() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"\">\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>",
        );

        assert!(parse_dsml_tool_call(text).is_none());
    }

    // --- strip_dsml_markup tests ---

    #[test]
    fn strip_dsml_preserves_plain_text() {
        let input = "This is plain text without any DSML tags.";
        let result = strip_dsml_markup(input);
        assert_eq!(result, input);
    }

    #[test]
    fn strip_dsml_removes_single_invoke_with_params() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"task_tracker\">\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"action\" string=\"true\">update</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"item_index\" string=\"false\">1</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>",
        );
        let result = strip_dsml_markup(text);
        assert!(!result.contains("DSML"));
        assert!(!result.contains("\u{ff5c}"));
    }

    #[test]
    fn strip_dsml_preserves_text_around_tags() {
        let text = concat!(
            "Here is my synthesis.\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"read_file\">\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"path\" string=\"true\">/tmp/foo.txt</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>\n",
            "The key finding is...",
        );
        let result = strip_dsml_markup(text);
        assert!(result.contains("Here is my synthesis."));
        assert!(result.contains("The key finding is..."));
        assert!(!result.contains("DSML"));
    }

    #[test]
    fn strip_dsml_removes_spaced_special_token_tags() {
        let text = concat!(
            "Before.\n",
            "<\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} invoke name=\"read_file\">\n",
            "<\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} parameter name=\"path\" string=\"true\">README.md</\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} parameter>\n",
            "</\u{ff5c} \u{ff5c} DSML\u{ff5c} \u{ff5c} invoke>\n",
            "After.",
        );

        let result = strip_dsml_markup(text);
        assert!(result.contains("Before."));
        assert!(result.contains("README.md"));
        assert!(result.contains("After."));
        assert!(!result.contains("DSML"));
        assert!(!contains_dsml_markup(&result));
    }

    #[test]
    fn strip_dsml_empty_for_pure_tags() {
        let text = concat!(
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke name=\"read_file\">\n",
            "<\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter name=\"path\" string=\"true\">/tmp/foo.txt</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}parameter>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}invoke>\n",
            "</\u{ff5c}\u{ff5c}DSML\u{ff5c}\u{ff5c}tool_calls>",
        );
        let result = strip_dsml_markup(text);
        let trimmed = result.trim();
        assert!(trimmed.is_empty() || !trimmed.contains("DSML"));
    }
}