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(codex): validate Windows Review capabilities before startup

DavidShen7f5951fc8d7e
diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.ts
index 62e73f634e..77295f37a9 100644
--- a/packages/maker-core/src/agents/codex/index.test.ts
+++ b/packages/maker-core/src/agents/codex/index.test.ts
@@ -1918,6 +1918,42 @@ describe('CodexAgent permissions', () => {
expect(host.request.mock.calls.some(([method]) => method === Method.ThreadStart)).toBe(false);
});
+ it.skipIf(process.platform !== 'win32').each([
+ { providerId: 'xai', model: 'grok-4' },
+ { providerId: ' xai ', model: 'grok-4' },
+ { providerId: undefined, model: 'xai/grok-4' },
+ ])('rejects unsupported Windows Review dynamic-tool routes before startup ($providerId, $model)', async ({ providerId, model }) => {
+ const agent = new CodexAgent(createDeps());
+ const host = installFakeHost(agent, undefined, { userAgent: 'mock-codex/0.156.0' });
+ const realpath = vi.spyOn(fs, 'realpath');
+ await expect(agent.startSession({
+ sessionId: 'review-unsupported-provider', providerId, model,
+ workingDir: 'C:\\review', reviewMode: true,
+ })).rejects.toThrow('requires a provider that supports dynamic tools');
+ expect(realpath).not.toHaveBeenCalled();
+ expect(host.request).not.toHaveBeenCalled();
+ realpath.mockRestore();
+ });
+
+ it.skipIf(process.platform !== 'win32').each([
+ { workingDir: '\\\\server\\share\\review', reviewReadPaths: [] },
+ { workingDir: 'C:\\review', reviewReadPaths: ['\\\\server\\share\\artifact.md'] },
+ { workingDir: 'C:\\review', reviewReadPaths: ['file://server/share/artifact.md'] },
+ { workingDir: 'C:\\review', reviewReadPaths: [' \\\\server\\share\\artifact.md '] },
+ { workingDir: '\\\\?\\C:\\review', reviewReadPaths: [] },
+ { workingDir: 'C:\\review', reviewReadPaths: ['artifact.md:stream'] },
+ ])('rejects unreadable Windows Review scopes before filesystem access ($workingDir, $reviewReadPaths)', async ({ workingDir, reviewReadPaths }) => {
+ const agent = new CodexAgent(createDeps());
+ const host = installFakeHost(agent, undefined, { userAgent: 'mock-codex/0.156.0' });
+ const realpath = vi.spyOn(fs, 'realpath');
+ await expect(agent.startSession({
+ sessionId: 'review-unsupported-path', model: 'gpt-5.5', workingDir, reviewReadPaths, reviewMode: true,
+ })).rejects.toThrow('requires local drive paths');
+ expect(realpath).not.toHaveBeenCalled();
+ expect(host.request).not.toHaveBeenCalled();
+ realpath.mockRestore();
+ });
+
it('keeps Bot identity and MCP config while honoring the selected task permission mode', async () => {
const agent = new CodexAgent(createDeps());
const host = installFakeHost(agent, undefined, {
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.ts
index 74d314409c..426574287e 100644
--- a/packages/maker-core/src/agents/codex/index.ts
+++ b/packages/maker-core/src/agents/codex/index.ts
@@ -93,7 +93,7 @@ import {
assertReviewMessageContentPaths,
buildReviewReadGrants,
} from '../shared/review-read-scope.js';
-import { REVIEW_READ_TOOLS, callReviewReadTool, reviewReadDenied } from './review-read-tools.js';
+import { REVIEW_READ_TOOLS, callReviewReadTool, isWindowsReviewLocalPath, reviewReadDenied } from './review-read-tools.js';
import {
annotatePermissionRequestForUnavailableReview,
composeAutoReviewIntentWithApprovedPlan,
@@ -4830,7 +4830,18 @@ assertRouteCurrent();
let reviewReadGrants: Awaited<ReturnType<typeof buildReviewReadGrants>> = [];
if (reviewMode) {
try {
+ if (process.platform === 'win32') {
+ if (!supportsCodexDynamicTools(opts)) {
+ throw new Error('Windows Cindy Review requires a provider that supports dynamic tools. Select a supported provider before retrying Review.');
+ }
+ if ([opts.workingDir, ...(opts.reviewReadPaths ?? [])].some((candidate) => !isWindowsReviewLocalPath(candidate, opts.workingDir))) {
+ throw new Error('Windows Cindy Review requires local drive paths; UNC shares, device paths and alternate data streams are not supported. Use a local copy before retrying Review.');
+ }
+ }
reviewReadGrants = await buildReviewReadGrants(opts.workingDir, opts.reviewReadPaths ?? []);
+ if (process.platform === 'win32' && reviewReadGrants.some((grant) => !isWindowsReviewLocalPath(grant.realPath, opts.workingDir))) {
+ throw new Error('Windows Cindy Review requires evidence paths that resolve to a local drive. Use a local copy before retrying Review.');
+ }
} catch (error) {
// Codex app-server has not been contacted before review grants are validated.
throw new AgentStartupStoppedError(error);
diff --git a/packages/maker-core/src/agents/codex/review-read-tools.test.ts b/packages/maker-core/src/agents/codex/review-read-tools.test.ts
index cc3d929599..76bcb9725d 100644
--- a/packages/maker-core/src/agents/codex/review-read-tools.test.ts
+++ b/packages/maker-core/src/agents/codex/review-read-tools.test.ts
@@ -3,7 +3,19 @@ import { tmpdir } from 'node:os';
import path from 'node:path';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { buildReviewReadGrants, type ReviewReadGrant } from '../shared/review-read-scope.js';
-import { callReviewReadTool } from './review-read-tools.js';
+import { callReviewReadTool, isWindowsReviewLocalPath } from './review-read-tools.js';
+
+describe('Windows Review path support', () => {
+ it.each(['C:\\review', 'c:/review/file.md', './file.md', '../artifact.md'])('accepts local drive evidence %s', (target) => {
+ expect(isWindowsReviewLocalPath(target, 'C:\\review')).toBe(true);
+ });
+ it.each(['\\\\server\\share\\file', '//server/share/file', '\\\\?\\C:\\file', '\\\\.\\pipe\\name', 'C:\\file:stream'])('rejects unsupported evidence %s', (target) => {
+ expect(isWindowsReviewLocalPath(target, 'C:\\review')).toBe(false);
+ });
+ it('rejects relative paths rooted at a network share', () => {
+ expect(isWindowsReviewLocalPath('file.md', '\\\\server\\share\\review')).toBe(false);
+ });
+});
describe('Windows Review host reads', () => {
let root: string;
diff --git a/packages/maker-core/src/agents/codex/review-read-tools.ts b/packages/maker-core/src/agents/codex/review-read-tools.ts
index b1e21e9cb6..a48bc97b96 100644
--- a/packages/maker-core/src/agents/codex/review-read-tools.ts
+++ b/packages/maker-core/src/agents/codex/review-read-tools.ts
@@ -1,5 +1,6 @@
import { promises as fs } from 'node:fs';
import path from 'node:path';
+import { fileURLToPath } from 'node:url';
import { resolveReviewReadPath, type ReviewReadGrant } from '../shared/review-read-scope.js';
import type { DynamicToolCallResponse, DynamicToolSpec } from './app-server/protocol.js';
@@ -8,6 +9,18 @@ const MAX_IMAGE_BYTES = 10 * 1024 * 1024;
const PAGE_SIZE = 200;
const DENIED = 'Review refused this read: invalid arguments, unavailable file, or outside the approved read scope.';
+/** Also used before startup so an unreadable network scope never starts Review. */
+export function isWindowsReviewLocalPath(rawPath: string, workingDir: string): boolean {
+ try {
+ const value = rawPath.trim();
+ const target = /^file:/i.test(value) ? fileURLToPath(value) : value;
+ const resolved = path.win32.resolve(workingDir, target);
+ return /^[a-z]:\\/i.test(resolved) && !resolved.slice(2).includes(':');
+ } catch {
+ return false;
+ }
+}
+
export const REVIEW_READ_TOOLS: DynamicToolSpec[] = [
{
type: 'function', name: 'review_read_file',
@@ -47,8 +60,7 @@ export async function callReviewReadTool(
}
// Reject Windows device paths, network shares and alternate data streams
// before making any filesystem request (including realpath).
- const localPath = path.resolve(workingDir, input.path);
- if (process.platform === 'win32' && (localPath.startsWith('\\\\') || localPath.slice(2).includes(':'))) {
+ if (process.platform === 'win32' && !isWindowsReviewLocalPath(input.path, workingDir)) {
return reviewReadDenied();
}
try {