Skip to content

fix(mxc): treat cmd /R as a command-mode switch #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shanselman merged 3 commits into from
Sep 27, 2026
Merged

fix(mxc): treat cmd /R as a command-mode switch #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
502e854
fix(mxc): treat cmd /R as a command-mode switch
SebTardif Sep 23, 2026
a4a9c93
fix(mxc): drop redundant cmd command-mode prefixes
SebTardif Sep 23, 2026
84a3315
Merge main for BaseContainer validation
shanselman Sep 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/OpenClaw.Shared/Mxc/MxcConfigBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,10 +550,9 @@ private static bool SelectsCmdCommandMode(IReadOnlyList<string> argv)
if (!argument.StartsWith("/", StringComparison.Ordinal))
continue;

if (argument.StartsWith("/c", StringComparison.OrdinalIgnoreCase)
|| argument.StartsWith("/k", StringComparison.OrdinalIgnoreCase)
|| argument.Contains("/c", StringComparison.OrdinalIgnoreCase)
|| argument.Contains("/k", StringComparison.OrdinalIgnoreCase))
if (argument.Contains("/c", StringComparison.OrdinalIgnoreCase)
|| argument.Contains("/k", StringComparison.OrdinalIgnoreCase)
|| argument.Contains("/r", StringComparison.OrdinalIgnoreCase))
{
return true;
}
Expand Down
18 changes: 18 additions & 0 deletions tests/OpenClaw.Shared.Tests/Mxc/MxcConfigBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,24 @@ public void Build_DirectArgv_LateCmdCommandMode_FailsClosed()
Assert.Contains("canonical argv", error.Message, StringComparison.Ordinal);
}

[Theory]
[InlineData("/R", "echo hi")]
[InlineData("/r", "prog", "hello&calc")]
[InlineData("/Recho hi")]
[InlineData("/rcommand")]
[InlineData("/d/s/recho hi")]
public void Build_DirectArgv_CmdSlashRCommandMode_FailsClosed(params string[] tail)
{
string[] argv = [ExpectedSystemCmdExe(), .. tail];
using var argsDoc = JsonDocument.Parse(JsonSerializer.Serialize(new { argv }));
var request = RequestFor(BalancedPolicy()) with { Args = argsDoc.RootElement.Clone() };

var error = Assert.Throws<NotSupportedException>(
() => BuildConfig(request, pathEnvVar: ""));

Assert.Contains("canonical argv", error.Message, StringComparison.Ordinal);
}

[Fact]
public void Build_CmdBootstrapRefsWithDelayedExpansionSyntax_FailsClosed()
{
Expand Down
Loading