dirge-agent 0.7.6

Minimalistic coding agent written in Rust, optimized for memory footprint and performance
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
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
//! Scavenge tool calls from reasoning content.
//!
//! Faithful port of `DeepSeek-Reasonix/src/repair/scavenge.ts` (201 lines).
//!
//! DeepSeek R1 sometimes emits tool-call JSON inside reasoning_content
//! and forgets to include it in the structured `tool_calls` field.
//! This module recovers those calls from the reasoning text.
//!
//! Three patterns are recognized:
//!
//! 1. DSML invoke blocks: `<|DSML|invoke name="tool_name">...</>`
//! 2. Raw JSON objects matching:
//!    - `{name, arguments}` (simplest form)
//!    - `{type: "function", function: {name, arguments}}` (OpenAI-style)
//!    - `{tool_name, tool_args}` (R1 free-form variant)
//!
//! Only tools whose name appears in the allowed set are returned.
//! A max-calls cap defends against runaway extraction.
//! Inputs over 100KB are skipped (defense against regex O(n²)).

use crate::agent::agent_loop::tools::ToolCall;

use std::sync::LazyLock;

use regex::Regex;

/// Maximum input size before we skip scavenging.
/// Port of `MAX_SCAVENGE_INPUT` (scavenge.ts:18).
const MAX_SCAVENGE_INPUT: usize = 100 * 1024;

// Module-level compiled regexes to avoid per-call recompilation.
static RE_DSML_FUNC: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(r"<[||]DSML[||]function_calls>[\s\S]*?</?[||]DSML[||]function_calls>")
        .expect("DSML function_calls regex must compile")
});
static RE_DSML_INVOKE_STRIP: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(r"<[||]DSML[||]invoke\s+[^>]*>[\s\S]*?</[||]DSML[||]invoke>")
        .expect("DSML invoke strip regex must compile")
});
static RE_DSML_INVOKE: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(r#"<[||]DSML[||]invoke\s+name="([^"]+)">([\s\S]*?)</[||]DSML[||]invoke>"#)
        .expect("DSML invoke regex must compile")
});
static RE_DSML_PARAM: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(
        r#"<[||]DSML[||]parameter\s+name="([^"]+)"(?:\s+string="(true|false)")?\s*>([\s\S]*?)</[||]DSML[||]parameter>"#
    ).expect("DSML parameter regex must compile")
});

/// Result of a scavenge pass.
#[derive(Debug, Clone)]
pub struct ScavengeResult {
    pub calls: Vec<ToolCall>,
    #[allow(dead_code)]
    pub notes: Vec<String>,
}

/// Scan reasoning content for tool calls the model forgot to emit.
/// Port of `scavengeToolCalls` (scavenge.ts:20-65).
pub fn scavenge_tool_calls(
    reasoning_content: Option<&str>,
    allowed_names: &std::collections::HashSet<String>,
    max_calls: usize,
) -> ScavengeResult {
    let content = match reasoning_content {
        Some(c) if !c.is_empty() => c,
        _ => {
            return ScavengeResult {
                calls: vec![],
                notes: vec![],
            };
        }
    };

    if content.len() > MAX_SCAVENGE_INPUT {
        return ScavengeResult {
            calls: vec![],
            notes: vec![format!(
                "scavenge skipped: reasoning_content too large ({} chars)",
                content.len()
            )],
        };
    }

    let max = if max_calls == 0 { 4 } else { max_calls };
    let mut notes: Vec<String> = Vec::new();
    let mut out: Vec<ToolCall> = Vec::new();

    // Pattern A: DSML invoke blocks.
    for invoke in iterate_dsml_invokes(content) {
        if out.len() >= max {
            break;
        }
        if !allowed_names.contains(&invoke.name) {
            continue;
        }
        out.push(ToolCall {
            id: String::new(),
            name: invoke.name.clone(),
            arguments: invoke.args,
        });
        notes.push(format!("scavenged DSML call: {}", invoke.name));
    }

    // Pattern B: raw JSON objects.
    let non_dsml = strip_dsml_blocks(content);
    for candidate in iterate_json_objects(&non_dsml) {
        if out.len() >= max {
            break;
        }
        if let Some(call) = coerce_to_tool_call(&candidate, allowed_names) {
            notes.push(format!("scavenged call: {}", call.name));
            out.push(call);
        }
    }

    ScavengeResult { calls: out, notes }
}

// ---- internal helpers ----

struct DsmlInvoke {
    name: String,
    args: serde_json::Value,
}

/// Strip DSML blocks so the raw-JSON scanner doesn't re-scavenge
/// parameter payloads. Port of `stripDsmlBlocks` (scavenge.ts:73-78).
fn strip_dsml_blocks(text: &str) -> String {
    let out = RE_DSML_FUNC.replace_all(text, "");
    RE_DSML_INVOKE_STRIP.replace_all(&out, "").to_string()
}

/// Yield every DSML invoke block found in text.
/// Port of `iterateDsmlInvokes` (scavenge.ts:80-90).
fn iterate_dsml_invokes(text: &str) -> Vec<DsmlInvoke> {
    let mut out = Vec::new();
    for caps in RE_DSML_INVOKE.captures_iter(text) {
        let name = match caps.get(1) {
            Some(m) => m.as_str().to_string(),
            None => continue,
        };
        let body = match caps.get(2) {
            Some(m) => m.as_str(),
            None => continue,
        };
        out.push(DsmlInvoke {
            name,
            args: parse_dsml_parameters(body),
        });
    }
    out
}

/// Parse DSML parameter blocks into a JSON Value.
/// Port of `parseDsmlParameters` (scavenge.ts:92-113).
/// Falls back to literal text when `string="false"` JSON parse fails.
fn parse_dsml_parameters(body: &str) -> serde_json::Value {
    let mut map = serde_json::Map::new();
    for caps in RE_DSML_PARAM.captures_iter(body) {
        let key = match caps.get(1) {
            Some(m) => m.as_str().to_string(),
            None => continue,
        };
        if key.is_empty() {
            continue;
        }
        let string_flag = caps.get(2).map(|m| m.as_str());
        let raw = caps
            .get(3)
            .map(|m| m.as_str())
            .unwrap_or("")
            .trim()
            .to_string();

        if string_flag == Some("false") {
            match serde_json::from_str::<serde_json::Value>(&raw) {
                Ok(v) => {
                    map.insert(key, v);
                    continue;
                }
                Err(_) => {
                    // Fall through — keep as literal string.
                }
            }
        }
        map.insert(key, serde_json::Value::String(raw));
    }
    serde_json::Value::Object(map)
}

/// Yield every top-level JSON object substring in text.
/// Port of `iterateJsonObjects` (scavenge.ts:116-148).
fn iterate_json_objects(text: &str) -> Vec<String> {
    let chars: Vec<char> = text.chars().collect();
    let mut out = Vec::new();
    let mut i = 0;

    while i < chars.len() {
        if chars[i] != '{' {
            i += 1;
            continue;
        }
        let mut depth: i32 = 0;
        let mut in_string = false;
        let mut escaped = false;

        for j in i..chars.len() {
            let c = chars[j];
            if escaped {
                escaped = false;
                continue;
            }
            if in_string {
                if c == '\\' {
                    escaped = true;
                    continue;
                }
                if c == '"' {
                    in_string = false;
                }
                continue;
            }
            if c == '"' {
                in_string = true;
            } else if c == '{' {
                depth += 1;
            } else if c == '}' {
                depth -= 1;
                if depth == 0 {
                    let candidate: String = chars[i..=j].iter().collect();
                    out.push(candidate);
                    i = j;
                    break;
                }
            }
        }
        // Unmatched brace — skip past it to avoid O(n²) rescan.
        i += 1;
    }
    out
}

/// Try to coerce a JSON string into a ToolCall.
/// Port of `coerceToToolCall` (scavenge.ts:150-201).
#[allow(clippy::collapsible_if)]
fn coerce_to_tool_call(
    candidate_json: &str,
    allowed_names: &std::collections::HashSet<String>,
) -> Option<ToolCall> {
    let parsed: serde_json::Value = serde_json::from_str(candidate_json).ok()?;
    let obj = parsed.as_object()?;

    // Pattern 1: { name, arguments }
    if let Some(name) = obj.get("name").and_then(|v| v.as_str()) {
        if allowed_names.contains(name) {
            let args = obj
                .get("arguments")
                .cloned()
                .unwrap_or(serde_json::json!({}));
            let args_val = if args.is_string() {
                serde_json::from_str::<serde_json::Value>(args.as_str().unwrap_or("{}"))
                    .unwrap_or(serde_json::json!({}))
            } else {
                args
            };
            return Some(ToolCall {
                id: String::new(),
                name: name.to_string(),
                arguments: args_val,
            });
        }
    }

    // Pattern 2: OpenAI-style { type: "function", function: { name, arguments } }
    if obj.get("type").and_then(|v| v.as_str()) == Some("function") {
        if let Some(func) = obj.get("function").and_then(|v| v.as_object()) {
            if let Some(name) = func.get("name").and_then(|v| v.as_str()) {
                if allowed_names.contains(name) {
                    let args = func
                        .get("arguments")
                        .cloned()
                        .unwrap_or(serde_json::json!({}));
                    let args_val = if args.is_string() {
                        serde_json::from_str::<serde_json::Value>(args.as_str().unwrap_or("{}"))
                            .unwrap_or(serde_json::json!({}))
                    } else {
                        args
                    };
                    return Some(ToolCall {
                        id: String::new(),
                        name: name.to_string(),
                        arguments: args_val,
                    });
                }
            }
        }
    }

    // Pattern 3: { tool_name, tool_args } (R1 free-form variant)
    if let Some(name) = obj.get("tool_name").and_then(|v| v.as_str()) {
        if allowed_names.contains(name) {
            let args = obj
                .get("tool_args")
                .cloned()
                .unwrap_or(serde_json::json!({}));
            return Some(ToolCall {
                id: String::new(),
                name: name.to_string(),
                arguments: args,
            });
        }
    }

    None
}

#[cfg(test)]
mod tests {
    use super::*;
    use std::collections::HashSet;

    fn allowed() -> HashSet<String> {
        ["get_weather", "search"]
            .iter()
            .map(|s| s.to_string())
            .collect()
    }

    fn dsml_allowed() -> HashSet<String> {
        ["filesystem_edit_file", "search"]
            .iter()
            .map(|s| s.to_string())
            .collect()
    }

    #[test]
    fn returns_nothing_for_empty_reasoning() {
        let r = scavenge_tool_calls(None, &allowed(), 4);
        assert!(r.calls.is_empty());
    }

    #[test]
    fn returns_nothing_for_null_reasoning() {
        let r = scavenge_tool_calls(Some(""), &allowed(), 4);
        assert!(r.calls.is_empty());
    }

    #[test]
    fn extracts_pattern_1_name_arguments() {
        let reasoning =
            r#"thinking... I should call {"name": "get_weather", "arguments": {"city": "SF"}}"#;
        let r = scavenge_tool_calls(Some(reasoning), &allowed(), 4);
        assert_eq!(r.calls.len(), 1);
        assert_eq!(r.calls[0].name, "get_weather");
        assert_eq!(r.calls[0].arguments["city"], "SF");
    }

    #[test]
    fn extracts_openai_style_envelope() {
        let reasoning = r#"plan: {"type":"function","function":{"name":"search","arguments":"{\"q\":\"ts\"}"}}"#;
        let r = scavenge_tool_calls(Some(reasoning), &allowed(), 4);
        assert_eq!(r.calls.len(), 1);
        assert_eq!(r.calls[0].name, "search");
        assert_eq!(r.calls[0].arguments["q"], "ts");
    }

    #[test]
    fn extracts_tool_name_tool_args_variant() {
        let reasoning = r#"decide: {"tool_name": "search", "tool_args": {"q": "deepseek"}}"#;
        let r = scavenge_tool_calls(Some(reasoning), &allowed(), 4);
        assert_eq!(r.calls.len(), 1);
        assert_eq!(r.calls[0].name, "search");
        assert_eq!(r.calls[0].arguments["q"], "deepseek");
    }

    #[test]
    fn ignores_tools_not_in_allowed_set() {
        let reasoning = r#"{"name": "rm_rf_slash", "arguments": {}}"#;
        let r = scavenge_tool_calls(Some(reasoning), &allowed(), 4);
        assert!(r.calls.is_empty());
    }

    #[test]
    fn respects_max_calls() {
        let reasoning: String = (0..6)
            .map(|_| r#"{"name": "search", "arguments": {"q": "x"}}"#)
            .collect::<Vec<_>>()
            .join(" then ");
        let r = scavenge_tool_calls(Some(&reasoning), &allowed(), 2);
        assert_eq!(r.calls.len(), 2);
    }

    #[test]
    fn extracts_dsml_invoke_block_with_params() {
        let input = [
            "Let me make the edit.",
            "",
            "<|DSML|function_calls> <|DSML|invoke name=\"filesystem_edit_file\">",
            "  <|DSML|parameter name=\"path\" string=\"true\">F:/x.html</|DSML|parameter>",
            "  <|DSML|parameter name=\"edits\" string=\"false\">[{\"oldText\":\"a\",\"newText\":\"b\"}]</|DSML|parameter>",
            "</|DSML|invoke> </|DSML|function_calls>",
        ].join("\n");
        let r = scavenge_tool_calls(Some(&input), &dsml_allowed(), 4);
        assert_eq!(r.calls.len(), 1);
        let call = &r.calls[0];
        assert_eq!(call.name, "filesystem_edit_file");
        assert_eq!(call.arguments["path"], "F:/x.html");
        assert_eq!(
            call.arguments["edits"],
            serde_json::json!([{"oldText": "a", "newText": "b"}])
        );
        assert!(r.notes.iter().any(|n| n.contains("DSML")));
    }

    #[test]
    fn accepts_ascii_pipe_dsml_variant() {
        let dsml_search: HashSet<String> = ["search"].iter().map(|s| s.to_string()).collect();
        let input = "<|DSML|invoke name=\"search\"><|DSML|parameter name=\"q\" string=\"true\">ts</|DSML|parameter></|DSML|invoke>";
        let r = scavenge_tool_calls(Some(input), &dsml_search, 4);
        assert_eq!(r.calls.len(), 1);
        assert_eq!(r.calls[0].arguments["q"], "ts");
    }

    #[test]
    fn dsml_call_with_unknown_tool_is_skipped() {
        let input = "<|DSML|invoke name=\"rm_rf_slash\"><|DSML|parameter name=\"x\" string=\"true\">y</|DSML|parameter></|DSML|invoke>";
        let r = scavenge_tool_calls(Some(input), &allowed(), 4);
        assert!(r.calls.is_empty());
    }

    #[test]
    fn dsml_string_false_malformed_json_falls_back_to_literal() {
        let dsml_search: HashSet<String> = ["search"].iter().map(|s| s.to_string()).collect();
        let input = "<|DSML|invoke name=\"search\"><|DSML|parameter name=\"q\" string=\"false\">not valid json</|DSML|parameter></|DSML|invoke>";
        let r = scavenge_tool_calls(Some(input), &dsml_search, 4);
        assert_eq!(r.calls.len(), 1);
        assert_eq!(r.calls[0].arguments["q"], "not valid json");
    }

    #[test]
    fn does_not_double_count_json_inside_dsml_block() {
        // Inner JSON is a param value — should not become a separate call
        let input = "<|DSML|invoke name=\"filesystem_edit_file\"><|DSML|parameter name=\"edits\" string=\"false\">{\"name\": \"filesystem_edit_file\", \"arguments\": {}}</|DSML|parameter></|DSML|invoke>";
        let r = scavenge_tool_calls(Some(input), &dsml_allowed(), 4);
        assert_eq!(
            r.calls.len(),
            1,
            "should be exactly one call — DSML wrapper, not inner JSON"
        );
    }

    #[test]
    fn skips_large_inputs() {
        let large = "x".repeat(MAX_SCAVENGE_INPUT + 1);
        let r = scavenge_tool_calls(Some(&large), &allowed(), 4);
        assert!(r.calls.is_empty());
        assert!(r.notes.iter().any(|n| n.contains("too large")));
    }
}