hanh.tonguyen/paperclip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: tighten Windows adapter command handling

Browse Source
This commit is contained in:
online5880
2026-03-09 22:08:50 +09:00
parent d7b98a72b4
commit f4a9788f2d
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/adapter-utils/src/server-utils.ts
View File

@@ -136,7 +136,7 @@ function windowsPathExts(env: NodeJS.ProcessEnv): string[] {
async function pathExists(candidate: string) { async function pathExists(candidate: string) {
try { try {
await fs.access(candidate, fsConstants.X_OK); await fs.access(candidate, process.platform === "win32" ? fsConstants.F_OK : fsConstants.X_OK);
return true; return true;
} catch { } catch {
return false; return false;
@@ -173,7 +173,7 @@ async function resolveCommandPath(command: string, cwd: string, env: NodeJS.Proc
function quoteForCmd(arg: string) { function quoteForCmd(arg: string) {
if (!arg.length) return '""'; if (!arg.length) return '""';
const escaped = arg.replace(/"/g, '""').replace(/%/g, "%%"); const escaped = arg.replace(/"/g, '""');
return /[\s"&<>|^()]/.test(escaped) ? `"${escaped}"` : escaped; return /[\s"&<>|^()]/.test(escaped) ? `"${escaped}"` : escaped;
} }

13
pnpm-lock.yaml generated
View File

@@ -321,6 +321,9 @@ importers:
'@types/ws': '@types/ws':
specifier: ^8.18.1 specifier: ^8.18.1
version: 8.18.1 version: 8.18.1
cross-env:
specifier: ^10.1.0
version: 10.1.0
supertest: supertest:
specifier: ^7.0.0 specifier: ^7.0.0
version: 7.2.2 version: 7.2.2
@@ -8930,6 +8933,14 @@ snapshots:
chai: 5.3.3 chai: 5.3.3
tinyrainbow: 2.0.0 tinyrainbow: 2.0.0
'@vitest/mocker@3.2.4(vite@7.3.1(@types/node@24.12.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0))':
dependencies:
'@vitest/spy': 3.2.4
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
vite: 7.3.1(@types/node@24.12.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)
'@vitest/mocker@3.2.4(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0))': '@vitest/mocker@3.2.4(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0))':
dependencies: dependencies:
'@vitest/spy': 3.2.4 '@vitest/spy': 3.2.4
@@ -11707,7 +11718,7 @@ snapshots:
dependencies: dependencies:
'@types/chai': 5.2.3 '@types/chai': 5.2.3
'@vitest/expect': 3.2.4 '@vitest/expect': 3.2.4
'@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)) '@vitest/mocker': 3.2.4(vite@7.3.1(@types/node@24.12.0)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0))
'@vitest/pretty-format': 3.2.4 '@vitest/pretty-format': 3.2.4
'@vitest/runner': 3.2.4 '@vitest/runner': 3.2.4
'@vitest/snapshot': 3.2.4 '@vitest/snapshot': 3.2.4

1
server/package.json
View File

@@ -61,6 +61,7 @@
"@types/node": "^24.6.0", "@types/node": "^24.6.0",
"@types/supertest": "^6.0.2", "@types/supertest": "^6.0.2",
"@types/ws": "^8.18.1", "@types/ws": "^8.18.1",
"cross-env": "^10.1.0",
"supertest": "^7.0.0", "supertest": "^7.0.0",
"tsx": "^4.19.2", "tsx": "^4.19.2",
"typescript": "^5.7.3", "typescript": "^5.7.3",

6
server/src/__tests__/codex-local-adapter-environment.test.ts
View File

@@ -4,6 +4,8 @@ import os from "node:os";
import path from "node:path"; import path from "node:path";
import { testEnvironment } from "@paperclipai/adapter-codex-local/server"; import { testEnvironment } from "@paperclipai/adapter-codex-local/server";
const itWindows = process.platform === "win32" ? it : it.skip;
describe("codex_local environment diagnostics", () => { describe("codex_local environment diagnostics", () => {
it("creates a missing working directory when cwd is absolute", async () => { it("creates a missing working directory when cwd is absolute", async () => {
const cwd = path.join( const cwd = path.join(
@@ -30,9 +32,7 @@ describe("codex_local environment diagnostics", () => {
await fs.rm(path.dirname(cwd), { recursive: true, force: true }); await fs.rm(path.dirname(cwd), { recursive: true, force: true });
}); });
it("runs the hello probe when Codex is available via a Windows .cmd wrapper", async () => { itWindows("runs the hello probe when Codex is available via a Windows .cmd wrapper", async () => {
if (process.platform !== "win32") return;
const root = path.join( const root = path.join(
os.tmpdir(), os.tmpdir(),
`paperclip-codex-local-probe-${Date.now()}-${Math.random().toString(16).slice(2)}`, `paperclip-codex-local-probe-${Date.now()}-${Math.random().toString(16).slice(2)}`,