Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 55 additions & 0 deletions src/features/permissions/cursor-permissions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,61 @@ describe("CursorPermissions", () => {
expect(parsed.version).toBe(1);
});

it("should default-stamp editor.vimMode and keep allow as an empty array for deny-only configs", async () => {
const logger = createMockLogger();
const rulesyncPermissions = new RulesyncPermissions({
relativeDirPath: RULESYNC_RELATIVE_DIR_PATH,
relativeFilePath: RULESYNC_PERMISSIONS_FILE_NAME,
fileContent: JSON.stringify({
permission: {
bash: { "git push --force*": "deny" },
},
}),
});

const cursorPermissions = await CursorPermissions.fromRulesyncPermissions({
outputRoot: testDir,
rulesyncPermissions,
logger,
});

const parsed = JSON.parse(cursorPermissions.getFileContent());
expect(parsed.editor).toEqual({ vimMode: false });
expect(parsed.permissions.allow).toEqual([]);
expect(parsed.permissions.deny).toEqual(["Shell(git push --force*)"]);
});

it("should preserve a pre-existing editor.vimMode value", async () => {
const logger = createMockLogger();
const cursorDir = join(testDir, ".cursor");
await ensureDir(cursorDir);
await writeFileContent(
join(cursorDir, "cli.json"),
JSON.stringify({
version: 1,
editor: { vimMode: true, fontSize: 14 },
permissions: {},
}),
);

const rulesyncPermissions = new RulesyncPermissions({
relativeDirPath: RULESYNC_RELATIVE_DIR_PATH,
relativeFilePath: RULESYNC_PERMISSIONS_FILE_NAME,
fileContent: JSON.stringify({
permission: { bash: { "git *": "allow" } },
}),
});

const cursorPermissions = await CursorPermissions.fromRulesyncPermissions({
outputRoot: testDir,
rulesyncPermissions,
logger,
});

const parsed = JSON.parse(cursorPermissions.getFileContent());
expect(parsed.editor).toEqual({ vimMode: true, fontSize: 14 });
});

it("should default-stamp version: 1 when generating from a fresh config (global)", async () => {
const logger = createMockLogger();
const rulesyncPermissions = new RulesyncPermissions({
Expand Down
32 changes: 27 additions & 5 deletions src/features/permissions/cursor-permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,14 @@ function buildCursorPermissionEntry(type: string, pattern: string): string {

type CursorCliConfig = {
version?: unknown;
editor?: {
vimMode?: unknown;
[key: string]: unknown;
};
permissions?: {
allow?: string[];
deny?: string[];
[key: string]: unknown;
};
[key: string]: unknown;
};
Expand Down Expand Up @@ -288,6 +293,23 @@ export class CursorPermissions extends ToolPermissions {
Object.keys(config.permission).map((category) => toCursorType(category)),
);

const existingEditorRaw = settings.editor;
let existingEditor: Record<string, unknown>;
if (existingEditorRaw === undefined) {
existingEditor = {};
} else if (
existingEditorRaw !== null &&
typeof existingEditorRaw === "object" &&
!Array.isArray(existingEditorRaw)
) {
existingEditor = existingEditorRaw;
} else {
logger?.warn(
`Cursor CLI config at ${filePath} has a non-object \`editor\` field; ignoring existing editor settings.`,
);
existingEditor = {};
}

const existingPermissionsRaw = settings.permissions;
let existingPermissions: Record<string, unknown>;
if (existingPermissionsRaw === undefined) {
Expand Down Expand Up @@ -328,11 +350,7 @@ export class CursorPermissions extends ToolPermissions {
const mergedAllow = uniq([...preservedAllow, ...allow].toSorted());
const mergedDeny = uniq([...preservedDeny, ...deny].toSorted());

if (mergedAllow.length > 0) {
mergedPermissions.allow = mergedAllow;
} else {
delete mergedPermissions.allow;
}
mergedPermissions.allow = mergedAllow;
if (mergedDeny.length > 0) {
mergedPermissions.deny = mergedDeny;
} else {
Expand All @@ -351,6 +369,10 @@ export class CursorPermissions extends ToolPermissions {
const merged = {
...settings,
version: settings.version ?? 1,
editor: {
...existingEditor,
vimMode: existingEditor.vimMode ?? false,
},
permissions: mergedPermissions,
};
const fileContent = JSON.stringify(merged, null, 2);
Expand Down
Loading