releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 24 Wiki Activity

fix(worker): harden CLI injection, stuck-Running, chain wedge, and Fail guard

Browse Source 
1. ArgumentList (fix injection): ClaudeArgsBuilder.Build() now returns
   IReadOnlyList<string>; ClaudeProcess populates ProcessStartInfo.ArgumentList
   instead of Arguments, so values like system prompts are never shell-split.
   DailyPrepPrompt, RefinePrompt, and WeekReportService migrated similarly.
   All IClaudeProcess fakes updated.

2. ContinueAsync exception guard: wrap RunOnceAsync in try/catch matching
   the RunAsync pattern so an unexpected exception never leaves the task
   stuck in Running status.

3. Planning chain cascade: OnChildFinishedAsync now calls CancelAsync on
   the immediate blocked successor when a child fails or is cancelled,
   triggering a recursive cascade that clears the entire remaining chain
   instead of leaving it wedged.

4. FailAsync guard: restrict valid source states to Running and Queued;
   WaitingForReview -> Failed is now rejected, preventing an invalid
   transition that could corrupt the review workflow.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-06-09 10:05:40 +02:00
co-authored by Claude Sonnet 4.6
parent 763732a9b3
commit 33bdff8a6e
20 changed files with 331 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Worker/Runner/ClaudeArgsBuilder.cs
+32 -27
View File
@@ -27,12 +27,12 @@ public sealed class ClaudeArgsBuilder
required = new[] { "summary" },
});
public string Build(ClaudeRunConfig config)
public IReadOnlyList<string> Build(ClaudeRunConfig config)
{
var args = new List<string>
{
"-p",
"--output-format stream-json",
"--output-format", "stream-json",
"--verbose",
};
@@ -40,50 +40,55 @@ public sealed class ClaudeArgsBuilder
|| config.PermissionMode.Equals("bypassPermissions", StringComparison.OrdinalIgnoreCase)
? "auto"
: config.PermissionMode;
args.Add($"--permission-mode {permissionMode}");
args.Add("--permission-mode");
args.Add(permissionMode);
if (config.Model is not null)
args.Add($"--model {config.Model}");
{
args.Add("--model");
args.Add(config.Model);
}
if (config.MaxTurns is int turns && turns > 0)
args.Add($"--max-turns {turns}");
{
args.Add("--max-turns");
args.Add(turns.ToString());
}
if (config.SystemPrompt is not null)
args.Add($"--append-system-prompt {Escape(config.SystemPrompt)}");
{
args.Add("--append-system-prompt");
args.Add(config.SystemPrompt);
}
if (config.AgentPath is not null)
{
var agentJson = JsonSerializer.Serialize(new[] { new { file = config.AgentPath } });
args.Add($"--agents {Escape(agentJson)}");
args.Add("--agents");
args.Add(agentJson);
}
args.Add($"--json-schema {Escape(ResultSchema)}");
args.Add("--json-schema");
args.Add(ResultSchema);
if (config.McpConfigPath is not null)
args.Add($"--mcp-config {Escape(config.McpConfigPath)}");
{
args.Add("--mcp-config");
args.Add(config.McpConfigPath);
}
if (config.AllowedTools is not null)
args.Add($"--allowedTools {config.AllowedTools}");
{
args.Add("--allowedTools");
args.Add(config.AllowedTools);
}
if (config.ResumeSessionId is not null)
args.Add($"--resume {config.ResumeSessionId}");
return string.Join(" ", args);
}
private static string Escape(string value)
{
if (value.Contains(' ') || value.Contains('"') || value.Contains('\'')
|| value.Contains('\t') || value.Contains('\n') || value.Contains('\r'))
{
var escaped = value
.Replace("\\", "\\\\")
.Replace("\"", "\\\"")
.Replace("\n", "\\n")
.Replace("\r", "\\r")
.Replace("\t", "\\t");
return $"\"{escaped}\"";
args.Add("--resume");
args.Add(config.ResumeSessionId);
}
return value;
return args;
}
}