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
6 changes: 6 additions & 0 deletions apps/web/src/app/config.json/extras.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* 3. Paste that shape into the right bucket below:
* - Top-level: `top`
* - New primary agent: `agents`
* - Permission key: `permissions`
* - Under `experimental`: `experimental`
* - Anywhere else nested: add a new bucket here AND extend the merge
* logic in `./route.ts` to overlay that section.
Expand Down Expand Up @@ -92,6 +93,11 @@ export const kiloExtras = {
debug: agentConfig,
orchestrator: agentConfig,
},
permissions: {
notebook_read: { $ref: '#/$defs/PermissionRuleConfig' },
notebook_edit: { $ref: '#/$defs/PermissionRuleConfig' },
notebook_execute: { $ref: '#/$defs/PermissionRuleConfig' },
},
experimental: {
codebase_search: {
description: 'Enable AI-powered codebase search',
Expand Down
17 changes: 16 additions & 1 deletion apps/web/src/app/config.json/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,29 @@ export function merge(schema: Schema): Schema {
};
properties.agent = agent;

const defs = isObject(schema.$defs) ? { ...schema.$defs } : undefined;
if (defs && isObject(defs.PermissionConfig)) {
const permissionConfig = { ...defs.PermissionConfig };
if (Array.isArray(permissionConfig.anyOf)) {
permissionConfig.anyOf = permissionConfig.anyOf.map(variant => {
if (!isObject(variant) || !isObject(variant.properties)) return variant;
return {
...variant,
properties: { ...variant.properties, ...kiloExtras.permissions },
};
});
defs.PermissionConfig = permissionConfig;
}
}

const experimental = isObject(properties.experimental) ? { ...properties.experimental } : {};
experimental.properties = {
...(isObject(experimental.properties) ? experimental.properties : {}),
...kiloExtras.experimental,
};
properties.experimental = experimental;

return { ...schema, properties };
return { ...schema, ...(defs ? { $defs: defs } : {}), properties };
}

export async function GET() {
Expand Down
33 changes: 33 additions & 0 deletions apps/web/src/tests/cli-config-schema.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ const upstream: Schema = {
$schema: 'https://json-schema.org/draft/2020-12/schema',
ref: 'Config',
type: 'object',
$defs: {
PermissionConfig: {
anyOf: [
{ $ref: '#/$defs/PermissionActionConfig' },
{
type: 'object',
properties: {
read: { $ref: '#/$defs/PermissionRuleConfig' },
},
additionalProperties: { $ref: '#/$defs/PermissionRuleConfig' },
},
],
},
},
properties: {
agent: {
type: 'object',
Expand Down Expand Up @@ -75,6 +89,25 @@ describe('kilo config.json schema merge', () => {
expect(agent.properties.build).toBeDefined(); // upstream key preserved
});

test('adds notebook permission keys without dropping upstream', () => {
const defs = out.$defs as Record<string, unknown>;
const permissionConfig = defs.PermissionConfig as { anyOf: Array<Record<string, unknown>> };
const permissionObject = permissionConfig.anyOf.find(variant => variant.type === 'object') as {
properties: Record<string, unknown>;
};

expect(permissionObject.properties.notebook_read).toEqual({
$ref: '#/$defs/PermissionRuleConfig',
});
expect(permissionObject.properties.notebook_edit).toEqual({
$ref: '#/$defs/PermissionRuleConfig',
});
expect(permissionObject.properties.notebook_execute).toEqual({
$ref: '#/$defs/PermissionRuleConfig',
});
expect(permissionObject.properties.read).toBeDefined();
});

test('adds kilo experimental keys without dropping upstream', () => {
const exp = props.experimental as { properties: Record<string, unknown> };
expect(exp.properties.codebase_search).toBeDefined();
Expand Down