[Init] Initial commit - NetMesh terminal manager
Some checks failed
build-packages / resolve bundled mosh-client (push) Has been cancelled
build-packages / resolve bundled et-client (push) Has been cancelled
build-packages / build-macos (push) Has been cancelled
build-packages / build-windows (push) Has been cancelled
build-packages / build-linux-x64 (push) Has been cancelled
build-packages / build-linux-arm64 (push) Has been cancelled
build-packages / release (push) Has been cancelled
build-packages / update Nix release metadata (push) Has been cancelled
build-packages / bump homebrew tap (push) Has been cancelled
test / lint-and-test (push) Has been cancelled
AI automation / Route event (push) Has been cancelled
AI automation / Hand reopened issue to maintainers (push) Has been cancelled
AI automation / Clean source issue state (push) Has been cancelled
AI automation / Reconcile handoffs (push) Has been cancelled
AI automation / Classify issue (push) Has been cancelled
AI automation / Claude Code smoke (push) Has been cancelled
AI automation / Review issue follow-up (push) Has been cancelled
AI automation / Publish issue follow-up (push) Has been cancelled
AI automation / Implement with Claude Code (push) Has been cancelled
AI automation / Publish implement PR (push) Has been cancelled
AI automation / Continue queued issue comments (push) Has been cancelled
AI automation / Codex review loop (push) Has been cancelled
AI automation / Publish Codex fix (push) Has been cancelled
AI automation / Clear Codex dispatch marker (push) Has been cancelled
AI automation / Own PR re-request Codex (push) Has been cancelled
AI automation / External PR re-request Codex (push) Has been cancelled
AI automation / Poll Codex reaction / retry (push) Has been cancelled
build-et-binaries / build-linux-x64 (push) Has been cancelled
build-et-binaries / build-linux-arm64 (push) Has been cancelled
build-et-binaries / build-macos-universal (push) Has been cancelled
build-et-binaries / build-windows-x64 (push) Has been cancelled
build-et-binaries / release (push) Has been cancelled
Some checks failed
build-packages / resolve bundled mosh-client (push) Has been cancelled
build-packages / resolve bundled et-client (push) Has been cancelled
build-packages / build-macos (push) Has been cancelled
build-packages / build-windows (push) Has been cancelled
build-packages / build-linux-x64 (push) Has been cancelled
build-packages / build-linux-arm64 (push) Has been cancelled
build-packages / release (push) Has been cancelled
build-packages / update Nix release metadata (push) Has been cancelled
build-packages / bump homebrew tap (push) Has been cancelled
test / lint-and-test (push) Has been cancelled
AI automation / Route event (push) Has been cancelled
AI automation / Hand reopened issue to maintainers (push) Has been cancelled
AI automation / Clean source issue state (push) Has been cancelled
AI automation / Reconcile handoffs (push) Has been cancelled
AI automation / Classify issue (push) Has been cancelled
AI automation / Claude Code smoke (push) Has been cancelled
AI automation / Review issue follow-up (push) Has been cancelled
AI automation / Publish issue follow-up (push) Has been cancelled
AI automation / Implement with Claude Code (push) Has been cancelled
AI automation / Publish implement PR (push) Has been cancelled
AI automation / Continue queued issue comments (push) Has been cancelled
AI automation / Codex review loop (push) Has been cancelled
AI automation / Publish Codex fix (push) Has been cancelled
AI automation / Clear Codex dispatch marker (push) Has been cancelled
AI automation / Own PR re-request Codex (push) Has been cancelled
AI automation / External PR re-request Codex (push) Has been cancelled
AI automation / Poll Codex reaction / retry (push) Has been cancelled
build-et-binaries / build-linux-x64 (push) Has been cancelled
build-et-binaries / build-linux-arm64 (push) Has been cancelled
build-et-binaries / build-macos-universal (push) Has been cancelled
build-et-binaries / build-windows-x64 (push) Has been cancelled
build-et-binaries / release (push) Has been cancelled
This commit is contained in:
173
electron/bridges/externalMcp/desktopCliResolver.test.cjs
Normal file
173
electron/bridges/externalMcp/desktopCliResolver.test.cjs
Normal file
@@ -0,0 +1,173 @@
|
||||
"use strict";
|
||||
|
||||
const { describe, it } = require("node:test");
|
||||
const assert = require("node:assert/strict");
|
||||
const path = require("node:path");
|
||||
|
||||
const {
|
||||
resolveDesktopManagedCli,
|
||||
} = require("./desktopCliResolver.cjs");
|
||||
|
||||
function createFileDeps(files, directories = {}, options = {}) {
|
||||
const fileSet = new Set(files);
|
||||
const nonExecutable = new Set(options.nonExecutable || []);
|
||||
return {
|
||||
existsSync: (filePath) => fileSet.has(filePath),
|
||||
statSync: (filePath) => ({
|
||||
isFile: () => fileSet.has(filePath),
|
||||
// mode is only used when accessSync is omitted
|
||||
mode: nonExecutable.has(filePath) ? 0o100644 : 0o100755,
|
||||
}),
|
||||
readdirSync: (directoryPath) => {
|
||||
if (!(directoryPath in directories)) throw new Error("ENOENT");
|
||||
return directories[directoryPath].map((name) => ({
|
||||
name,
|
||||
isDirectory: () => true,
|
||||
}));
|
||||
},
|
||||
accessSync: (filePath) => {
|
||||
if (!fileSet.has(filePath)) {
|
||||
const err = new Error("ENOENT");
|
||||
err.code = "ENOENT";
|
||||
throw err;
|
||||
}
|
||||
if (nonExecutable.has(filePath)) {
|
||||
const err = new Error("EACCES");
|
||||
err.code = "EACCES";
|
||||
throw err;
|
||||
}
|
||||
},
|
||||
X_OK: 1,
|
||||
};
|
||||
}
|
||||
|
||||
describe("macOS desktop-managed CLI resolution", () => {
|
||||
it("finds the Codex CLI bundled with ChatGPT Desktop", () => {
|
||||
const codexPath = "/Applications/ChatGPT.app/Contents/Resources/codex";
|
||||
assert.equal(resolveDesktopManagedCli("codex", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([codexPath]),
|
||||
}), codexPath);
|
||||
});
|
||||
|
||||
it("finds a user-installed Codex Desktop bundle", () => {
|
||||
const codexPath = "/Users/test/Applications/Codex.app/Contents/Resources/codex";
|
||||
assert.equal(resolveDesktopManagedCli("codex", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([codexPath]),
|
||||
}), codexPath);
|
||||
});
|
||||
|
||||
it("uses the newest valid Claude Code managed by Claude Desktop", () => {
|
||||
const root = path.join(
|
||||
"/Users/test",
|
||||
"Library",
|
||||
"Application Support",
|
||||
"Claude",
|
||||
"claude-code",
|
||||
);
|
||||
const newestPath = path.join(root, "2.10.0", "claude.app", "Contents", "MacOS", "claude");
|
||||
const olderPath = path.join(root, "2.9.9", "claude.app", "Contents", "MacOS", "claude");
|
||||
assert.equal(resolveDesktopManagedCli("claude", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([newestPath, olderPath], {
|
||||
[root]: ["2.9.9", "2.10.0"],
|
||||
}),
|
||||
}), newestPath);
|
||||
});
|
||||
|
||||
it("falls back to the newest installed Claude version that has an executable", () => {
|
||||
const root = path.join(
|
||||
"/Users/test",
|
||||
"Library",
|
||||
"Application Support",
|
||||
"Claude",
|
||||
"claude-code",
|
||||
);
|
||||
const validPath = path.join(root, "2.9.9", "claude.app", "Contents", "MacOS", "claude");
|
||||
assert.equal(resolveDesktopManagedCli("claude", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([validPath], {
|
||||
[root]: ["2.10.0", "2.9.9"],
|
||||
}),
|
||||
}), validPath);
|
||||
});
|
||||
|
||||
it("skips newer Claude installs that are not executable and uses an older runnable one", () => {
|
||||
const root = path.join(
|
||||
"/Users/test",
|
||||
"Library",
|
||||
"Application Support",
|
||||
"Claude",
|
||||
"claude-code",
|
||||
);
|
||||
const newestPath = path.join(root, "2.10.0", "claude.app", "Contents", "MacOS", "claude");
|
||||
const olderPath = path.join(root, "2.9.9", "claude.app", "Contents", "MacOS", "claude");
|
||||
assert.equal(resolveDesktopManagedCli("claude", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([newestPath, olderPath], {
|
||||
[root]: ["2.10.0", "2.9.9"],
|
||||
}, { nonExecutable: [newestPath] }),
|
||||
}), olderPath);
|
||||
});
|
||||
|
||||
it("skips non-executable Codex desktop candidates", () => {
|
||||
const systemPath = "/Applications/ChatGPT.app/Contents/Resources/codex";
|
||||
const userPath = "/Users/test/Applications/Codex.app/Contents/Resources/codex";
|
||||
assert.equal(resolveDesktopManagedCli("codex", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([systemPath, userPath], {}, { nonExecutable: [systemPath] }),
|
||||
}), userPath);
|
||||
});
|
||||
|
||||
it("ignores the plain version/claude helper (Linux VM binary on current installs)", () => {
|
||||
const root = path.join(
|
||||
"/Users/test",
|
||||
"Library",
|
||||
"Application Support",
|
||||
"Claude",
|
||||
"claude-code",
|
||||
);
|
||||
const linuxHelper = path.join(root, "2.10.0", "claude");
|
||||
const olderAppPath = path.join(root, "2.9.9", "claude.app", "Contents", "MacOS", "claude");
|
||||
assert.equal(resolveDesktopManagedCli("claude", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([linuxHelper, olderAppPath], {
|
||||
[root]: ["2.10.0", "2.9.9"],
|
||||
}),
|
||||
}), olderAppPath);
|
||||
});
|
||||
|
||||
it("does not select a plain version/claude helper when no app-bundle CLI exists", () => {
|
||||
const root = path.join(
|
||||
"/Users/test",
|
||||
"Library",
|
||||
"Application Support",
|
||||
"Claude",
|
||||
"claude-code",
|
||||
);
|
||||
const linuxHelper = path.join(root, "2.10.0", "claude");
|
||||
assert.equal(resolveDesktopManagedCli("claude", {
|
||||
platform: "darwin",
|
||||
homeDir: "/Users/test",
|
||||
...createFileDeps([linuxHelper], {
|
||||
[root]: ["2.10.0"],
|
||||
}),
|
||||
}), null);
|
||||
});
|
||||
|
||||
it("does not probe desktop locations on other platforms", () => {
|
||||
assert.equal(resolveDesktopManagedCli("codex", {
|
||||
platform: "linux",
|
||||
homeDir: "/home/test",
|
||||
...createFileDeps(["/Applications/ChatGPT.app/Contents/Resources/codex"]),
|
||||
}), null);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user