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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import type { ComputerUseToolSet, MakaTool, MakaToolContext } from '@maka/runtime';
import {
buildComputerUseTools,
type ComputerUseToolSet,
type CuDispatchBackend,
type MakaTool,
type MakaToolContext,
} from '@maka/runtime';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
decodeClientCapabilityReplaceInput,
Expand DownExpand Up@@ -54,6 +60,27 @@ test('publishes self-described session-affine Browser and Computer Use offers',
);
});

test('publishes the real Computer Use schema through the Client Capability protocol', () => {
const computerUseTools = buildComputerUseTools({ backend: computerBackend() });
const provider = createDesktopNativeCapabilityProvider({
browserTools: [],
releaseBrowserSession() {},
computerUseTools,
releaseComputerUseSession: (sessionId) => computerUseTools.clearSession(sessionId),
});

assert.doesNotThrow(() =>
decodeClientCapabilityReplaceInput({
registrationId: 'registration-1',
offers: provider.offers(),
}),
);
const coordinateSchema = provider.offers()[0]?.tools[0]?.inputSchema.properties as
| Record<string, { items?: unknown }>
| undefined;
assert.equal(Array.isArray(coordinateSchema?.coordinate?.items), true);
});

test('validates before admission and invokes the exact offered tool with Host context', async () => {
let admitted = false;
let invoked = false;
Expand DownExpand Up@@ -399,6 +426,17 @@ function computerTools(
return tools;
}

function computerBackend(): CuDispatchBackend {
return {
async preflight() {
return { accessibility: true, screenRecording: true };
},
async run() {
return { outcome: { ok: true, tier: 'ax', verified: true } };
},
};
}

function capabilityFrame(overrides: Partial<ClientCapabilityCallFrame> = {}): ClientCapabilityCallFrame {
return {
kind: 'client.capability.call',
Expand Down
10 changes: 10 additions & 0 deletions packages/computer-use/src/__tests__/maka-cu-backend.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -469,6 +469,16 @@ describe('maka-cu backend', () => {
assert.deepEqual(received(records, 'permissions.check')[0], { prompt: false });
});

it('keeps routine preflight quiet and exposes an explicit Accessibility prompt request', async () => {
const { backend, logPath } = makeBackend();

await backend.preflight(signal());
await backend.requestAccessibilityPermission(signal());

const checks = received(await readRecords(logPath), 'permissions.check');
assert.deepEqual(checks, [{ prompt: false }, { prompt: true }]);
});

it('fails loudly on a protocol version mismatch and does not retry', async () => {
const { backend, logPath } = makeBackend({ protocol: 'maka.cu/99' });
await assert.rejects(backend.preflight(signal()), /service_mismatch/);
Expand Down
9 changes: 8 additions & 1 deletion packages/computer-use/src/maka-cu-backend.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,8 +454,9 @@ export interface MakaCuLaunchedApp {
*/
export type MakaCuBackend = Omit<
CuDispatchBackend,
'runSemantic' | 'observeApp' | 'captureObservation'
'runSemantic' | 'observeApp' | 'captureObservation' | 'requestAccessibilityPermission'
> & {
requestAccessibilityPermission(signal: AbortSignal): Promise<void>;
observeApp(
input: {
app?: string;
Expand DownExpand Up@@ -2251,6 +2252,12 @@ export function createMakaCuBackend(opts: MakaCuBackendOptions): MakaCuBackend {
});
},

async requestAccessibilityPermission(signal) {
await withOperationQueue(signal, async () => {
await service.call('permissions.check', { prompt: true }, signal);
});
},

async listApps(signal) {
return withOperationQueue(signal, async (): Promise<CuAppSummary[]> => {
try {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -281,6 +281,51 @@ describe('Client Capability protocol', () => {
]),
),
);
assert.doesNotThrow(() =>
decodeClientFrame(
replaceFrame([
{
...offer('tuple_schema', 'move'),
tools: [
{
...offer('tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: {
coordinate: {
type: 'array',
items: [{ type: 'integer' }, { type: 'integer' }],
},
},
},
},
],
},
]),
),
);
for (const items of [[], [{ type: 'integer' }, 'not-a-schema']]) {
assert.throws(
() =>
decodeClientFrame(
replaceFrame([
{
...offer('invalid_tuple_schema', 'move'),
tools: [
{
...offer('invalid_tuple_schema', 'move').tools[0],
inputSchema: {
type: 'object',
properties: { coordinate: { type: 'array', items } },
},
},
],
},
]),
),
(error: unknown) => error instanceof RuntimeHostProtocolError,
);
}
assert.throws(
() =>
decodeClientFrame({
Expand Down
18 changes: 16 additions & 2 deletions packages/runtime-host/src/protocol/client-capability.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export const CLIENT_CAPABILITY_MAX_RESULT_CHUNKS = Math.ceil(
const CLIENT_CAPABILITY_INLINE_RESULT_MAX_BYTES = 40 * 1024;
const CLIENT_CAPABILITY_JSON_MAX_DEPTH = 32;
const CLIENT_CAPABILITY_JSON_MAX_NODES = 8_192;
const CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS = 8_192;
const CLIENT_CAPABILITY_ERRORS = [
'host_not_ready',
'host_draining',
Expand DownExpand Up@@ -590,7 +591,11 @@ function decodeToolDescriptor(value: unknown): ClientCapabilityToolDescriptor {
...(record.description === undefined
? {}
: {
description: requireString(record.description, 'description', 4_096),
description: requireString(
record.description,
'description',
CLIENT_CAPABILITY_TOOL_DESCRIPTION_MAX_CHARS,
),
}),
inputSchema,
...(record.annotations === undefined
Expand DownExpand Up@@ -721,7 +726,16 @@ function validateToolInputSchema(root: Record<string, unknown>): void {
) {
visit(schema.additionalProperties);
}
if (schema.items !== undefined) visit(schema.items);
if (schema.items !== undefined) {
if (Array.isArray(schema.items)) {
if (schema.items.length === 0) {
throw invalidProtocolFrame('Invalid Client Capability tool schema items');
}
for (const nested of schema.items) visit(nested);
} else {
visit(schema.items);
}
}
for (const key of ['allOf', 'anyOf', 'oneOf'] as const) {
if (schema[key] === undefined) continue;
if (!Array.isArray(schema[key]) || schema[key].length === 0) {
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime/src/__tests__/computer-use-tools.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1791,6 +1791,28 @@ describe('buildComputerUseTools — the `maka_computer` MakaTool', () => {
assert.match(r.text, /Accessibility/);
});

test('requests Accessibility once on first use while every action still preflights', async () => {
let preflights = 0;
let requests = 0;
const backend = fakeBackend({ accessibility: false });
backend.preflight = async () => {
preflights += 1;
return { accessibility: false, screenRecording: true };
};
backend.requestAccessibilityPermission = async () => {
requests += 1;
};
const [tool] = buildComputerUseTools({ backend });

const first = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };
const second = (await tool.impl({ action: 'wait' } as never, ctx())) as { text: string };

assert.match(first.text, /permission_missing/);
assert.match(second.text, /permission_missing/);
assert.equal(preflights, 2);
assert.equal(requests, 1);
});

test('S12: a capture action fails closed when Screen Recording is not granted', async () => {
const backend = fakeBackend({ screenRecording: false });
backend.observeApp = async () => observation();
Expand Down
Loading
Loading