Skip to content

fix: Windows Claude Desktop stdio + Codex beta/timeout config #650

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
dsarno merged 2 commits into from
Jan 29, 2026
Merged

fix: Windows Claude Desktop stdio + Codex beta/timeout config #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934b2cd
fix: Remove cmd.exe wrapper for Claude Desktop on Windows
dsarno Jan 29, 2026
0de5f19
fix: Codex config uses centralized beta args and adds startup timeout
dsarno Jan 29, 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
22 changes: 14 additions & 8 deletions MCPForUnity/Editor/Helpers/CodexConfigHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ public static string BuildCodexServerBlock(string uvPath)
else
{
// Stdio mode: Use command and args
var (uvxPath, fromUrl, packageName) = AssetPathUtility.GetUvxCommandParts();
var (uvxPath, _, packageName) = AssetPathUtility.GetUvxCommandParts();

unityMCP["command"] = uvxPath;

var args = new TomlArray();
AddDevModeArgs(args);
if (!string.IsNullOrEmpty(fromUrl))
// Use centralized helper for beta server / prerelease args
foreach (var arg in AssetPathUtility.GetBetaServerFromArgsList())
{
args.Add(new TomlString { Value = "--from" });
args.Add(new TomlString { Value = fromUrl });
args.Add(new TomlString { Value = arg });
}
args.Add(new TomlString { Value = packageName });
args.Add(new TomlString { Value = "--transport" });
Expand All @@ -73,6 +73,9 @@ public static string BuildCodexServerBlock(string uvPath)
envTable["SystemRoot"] = new TomlString { Value = platformService.GetSystemRoot() };
unityMCP["env"] = envTable;
}

// Allow extra time for uvx to download packages on first run
unityMCP["startup_timeout_sec"] = new TomlInteger { Value = 60 };
}

mcpServers["unityMCP"] = unityMCP;
Expand Down Expand Up @@ -197,16 +200,16 @@ private static TomlTable CreateUnityMcpTable(string uvPath)
else
{
// Stdio mode: Use command and args
var (uvxPath, fromUrl, packageName) = AssetPathUtility.GetUvxCommandParts();
var (uvxPath, _, packageName) = AssetPathUtility.GetUvxCommandParts();

unityMCP["command"] = new TomlString { Value = uvxPath };

var argsArray = new TomlArray();
AddDevModeArgs(argsArray);
if (!string.IsNullOrEmpty(fromUrl))
// Use centralized helper for beta server / prerelease args
foreach (var arg in AssetPathUtility.GetBetaServerFromArgsList())
{
argsArray.Add(new TomlString { Value = "--from" });
argsArray.Add(new TomlString { Value = fromUrl });
argsArray.Add(new TomlString { Value = arg });
}
argsArray.Add(new TomlString { Value = packageName });
argsArray.Add(new TomlString { Value = "--transport" });
Expand All @@ -221,6 +224,9 @@ private static TomlTable CreateUnityMcpTable(string uvPath)
envTable["SystemRoot"] = new TomlString { Value = platformService.GetSystemRoot() };
unityMCP["env"] = envTable;
}

// Allow extra time for uvx to download packages on first run
unityMCP["startup_timeout_sec"] = new TomlInteger { Value = 60 };
}

return unityMCP;
Expand Down
40 changes: 2 additions & 38 deletions MCPForUnity/Editor/Helpers/ConfigJsonBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using MCPForUnity.Editor.Clients.Configurators;
using MCPForUnity.Editor.Constants;
using MCPForUnity.Editor.Services;
using MCPForUnity.Editor.Models;
Expand Down Expand Up @@ -90,20 +88,8 @@ private static void PopulateUnityNode(JObject unity, string uvPath, McpClient cl

var toolArgs = BuildUvxArgs(fromUrl, packageName);

if (ShouldUseWindowsCmdShim(client))
{
unity["command"] = ResolveCmdPath();

var cmdArgs = new List<string> { "/c", uvxPath };
cmdArgs.AddRange(toolArgs);

unity["args"] = JArray.FromObject(cmdArgs.ToArray());
}
else
{
unity["command"] = uvxPath;
unity["args"] = JArray.FromObject(toolArgs.ToArray());
}
unity["command"] = uvxPath;
unity["args"] = JArray.FromObject(toolArgs.ToArray());

// Remove url/serverUrl if they exist from previous config
if (unity["url"] != null) unity.Remove("url");
Expand Down Expand Up @@ -184,27 +170,5 @@ private static IList<string> BuildUvxArgs(string fromUrl, string packageName)
return args;
}

private static bool ShouldUseWindowsCmdShim(McpClient client)
{
if (client == null)
{
return false;
}

return Application.platform == RuntimePlatform.WindowsEditor &&
string.Equals(client.name, ClaudeDesktopConfigurator.ClientName, StringComparison.OrdinalIgnoreCase);
}

private static string ResolveCmdPath()
{
var comSpec = Environment.GetEnvironmentVariable("ComSpec");
if (!string.IsNullOrEmpty(comSpec) && File.Exists(comSpec))
{
return comSpec;
}

string system32Cmd = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe");
return File.Exists(system32Cmd) ? system32Cmd : "cmd.exe";
}
}
}