Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(remote-agent): POSIX 本机目录名里的反斜杠在沙箱 glob 中按字面匹配

fmfsaisai765f8b8dc824
diff --git a/apps/desktop/src/main/remote-agent/executor/__tests__/virtualWorkspace.test.ts b/apps/desktop/src/main/remote-agent/executor/__tests__/virtualWorkspace.test.ts
index dac8485fa9..92aa2a0a0b 100644
--- a/apps/desktop/src/main/remote-agent/executor/__tests__/virtualWorkspace.test.ts
+++ b/apps/desktop/src/main/remote-agent/executor/__tests__/virtualWorkspace.test.ts
@@ -466,6 +466,14 @@ describe('virtual workspace', () => {
expect(posix.localGlobFromAgent('/home/agent/workspace/\\*.lock')).toBe(literal + '/\\*.lock');
});
+ it.skipIf(process.platform === 'win32')('escapes a backslash in a POSIX local directory name when mapping absolute sandbox globs', () => {
+ // POSIX 目录名可以含反斜杠;Codex 的 POSIX glob 把它当转义符,不转义的话禁止规则会对不上真实目录。
+ const project = path.join(root, 'project\\name');
+ fs.mkdirSync(project);
+ const workspace = new ExecutorWorkspace({ workingDir: project, aliases: [{ from: 'C:\\Agent\\mirror\\workspace', to: project }] });
+ expect(workspace.localGlobFromAgent('C:\\Agent\\mirror\\workspace\\**\\*.env')).toBe(root + '/project\\\\name/**/*.env');
+ });
+
it('maps Codex sandbox permissions from a POSIX agent and keeps deny rules that are valid on this computer', async () => {
const { workspace, project, executor } = setup('/home/agent/workspace');
const sandbox = {
diff --git a/apps/desktop/src/main/remote-agent/executor/workspace.ts b/apps/desktop/src/main/remote-agent/executor/workspace.ts
index e86e2a3bc0..9e3be2593b 100644
--- a/apps/desktop/src/main/remote-agent/executor/workspace.ts
+++ b/apps/desktop/src/main/remote-agent/executor/workspace.ts
@@ -606,15 +606,18 @@ export class ExecutorWorkspace {
}
/**
- * Agent 给的绝对 glob:影子前缀换成本机目录,目录名里的通配字符写成字符类按字面匹配(`[` → `[[]`,
- * 两种路径约定都认);前缀后面的模式保持 Agent 的写法,POSIX 模式里的反斜杠转义不当成分隔符。
+ * Agent 给的绝对 glob:影子前缀换成本机目录,目录名按字面匹配——通配字符写成字符类(`[` → `[[]`,
+ * 两种路径约定都认),POSIX 本机目录名里合法的反斜杠写成 `\\`(Codex 在 POSIX 约定下把它当转义符);
+ * 前缀后面的模式保持 Agent 的写法,POSIX 模式里的反斜杠转义不当成分隔符。
*/
localGlobFromAgent(pattern: string): string | null {
+ const windows = process.platform === 'win32';
for (const alias of this.aliases) {
if (stripAliasPrefix(pattern, alias.from) === null) continue;
const from = alias.from.replace(/[\\/]+$/, '');
const rest = pattern.slice(from.length).replace(/^[\\/]/, '');
- const base = alias.to.replace(/[\\/]+$/, '').replace(/[*?[\]{}]/g, (char) => `[${char}]`);
+ const local = alias.to.replace(windows ? /[\\/]+$/ : /\/+$/, '');
+ const base = (windows ? local : local.replace(/\\/g, '\\\\')).replace(/[*?[\]{}]/g, (char) => `[${char}]`);
if (!rest) return base;
return `${base}/${WINDOWS_PATH.test(from) ? rest.replace(/\\/g, '/') : rest}`;
}