@crosshands/cli 0.1.6 → 0.2.1

package/dist/intent/log.js

@@ -0,0 +1,124 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { JsonlFileWriter, diagnosticsDirectory } from '@crosshands/runtime';
+import { localClientPaths } from '../local-client.js';
+import { parseJevEnv } from './env.js';
+import { elapsedMs } from './http.js';
+export function hashGoal(goal) {
+    return createHash('sha256').update(goal).digest('hex');
+}
+const OMIT = new Set(['goal', 'apiKey', 'treeText', 'text', 'value', 'TYPESAFE_API_KEY']);
+export function createJevCall(operation, goal) {
+    return {
+        callId: randomUUID(),
+        operation,
+        ...(goal === undefined ? {} : { goal }),
+        ranks: 0,
+        httpMs: 0,
+        brokerCalls: 0
+    };
+}
+export function recordRank(log, call, phase, stats, suggestion) {
+    if (call !== undefined) {
+        call.phase = phase;
+        call.ranks += 1;
+        if (stats.http !== undefined)
+            call.httpMs += stats.http.durationMs;
+    }
+    if (log === undefined || call === undefined)
+        return;
+    const shared = {
+        callId: call.callId,
+        operation: call.operation,
+        snapshotId: stats.snapshotId,
+        phase,
+        ...(call.goal === undefined ? {} : { goal: call.goal })
+    };
+    if (stats.http !== undefined) {
+        log.emit({
+            kind: 'jev.http',
+            ...shared,
+            status: stats.http.status,
+            durationMs: stats.http.durationMs,
+            requestBytes: stats.http.requestBytes,
+            responseBytes: stats.http.responseBytes,
+            candidateCount: stats.candidateCount
+        });
+    }
+    if (suggestion === undefined)
+        return;
+    const move = suggestion.move;
+    log.emit({
+        kind: 'jev.decision',
+        ...shared,
+        ...(stats.app === undefined ? {} : { app: stats.app }),
+        move: move.kind,
+        ...(move.kind === 'click' ||
+            move.kind === 'setValue' ||
+            move.kind === 'secondary' ||
+            move.kind === 'scroll'
+            ? { elementIndex: move.elementIndex }
+            : {}),
+        ...(move.kind === 'blocked' ? { reason: move.reason } : {}),
+        ...(suggestion.confidence === undefined ? {} : { confidence: suggestion.confidence }),
+        goalChars: stats.goalChars,
+        treeChars: stats.treeChars,
+        elementCount: stats.elementCount,
+        candidateCount: stats.candidateCount,
+        parseMs: stats.parseMs,
+        ...(stats.evaluateMs === undefined ? {} : { evaluateMs: stats.evaluateMs })
+    });
+}
+export function emitCall(log, call, started, extra = {}) {
+    if (log === undefined || call === undefined)
+        return;
+    log.emit({
+        kind: 'jev.call',
+        callId: call.callId,
+        operation: call.operation,
+        durationMs: elapsedMs(started),
+        httpMs: call.httpMs,
+        brokerCalls: call.brokerCalls,
+        ranks: call.ranks,
+        ...(call.phase === undefined ? {} : { phase: call.phase }),
+        ...(extra.bound === undefined ? {} : { bound: extra.bound }),
+        ...(extra.error === undefined ? {} : { error: extra.error }),
+        ...(call.goal === undefined ? {} : { goal: call.goal })
+    });
+}
+export function createJevLogger(graphicalSessionId, env = process.env) {
+    const writer = new JsonlFileWriter({
+        directory: diagnosticsDirectory(graphicalSessionId, { env }),
+        generation: `jev-${randomUUID()}`
+    });
+    writer.start();
+    return {
+        emit(record) {
+            try {
+                const raw = record;
+                const goal = raw.goal;
+                const rest = {
+                    ...raw,
+                    kind: record.kind,
+                    v: 1,
+                    ts: new Date().toISOString()
+                };
+                for (const key of OMIT)
+                    delete rest[key];
+                writer.emit({
+                    ...rest,
+                    ...(typeof goal === 'string' ? { goalSha256: hashGoal(goal) } : {})
+                });
+            }
+            catch {
+                // Jev logs must not fail computer-use.
+            }
+        },
+        close: () => writer.close()
+    };
+}
+export function createCliJevLogger(env = process.env) {
+    if (parseJevEnv(env).kind === 'off')
+        return undefined;
+    return createJevLogger(localClientPaths().identity.graphicalSessionId, env);
+}
+//# sourceMappingURL=log.js.map

package/dist/intent/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/intent/log.ts"],"names":[],"mappings":"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"}

package/dist/intent/tree.d.ts

@@ -0,0 +1,13 @@
+export type TreeMove = {
+    elementIndex: number;
+    role: string;
+    label: string;
+    line: string;
+    disabled: boolean;
+    clickable: boolean;
+    settable: boolean;
+};
+export declare function parseTreeMoves(treeText: string): TreeMove[];
+export declare const JEV_CHOICE_CAP = 255;
+export declare function clickableMoves(moves: readonly TreeMove[]): TreeMove[];
+//# sourceMappingURL=tree.d.ts.map

package/dist/intent/tree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../src/intent/tree.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAgED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE,CA2B3D;AAED,eAAO,MAAM,cAAc,MAAM,CAAA;AAEjC,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAIrE"}

package/dist/intent/tree.js

@@ -0,0 +1,99 @@
+const ROW_START = /^(\t*)(\d+) (.+)$/;
+const MULTI_WORD_ROLES = [
+    'search text field',
+    'text field',
+    'text area',
+    'menu button',
+    'pop up button',
+    'popup button',
+    'radio button',
+    'check box',
+    'combo box',
+    'disclosure triangle',
+    'standard window',
+    'scroll area',
+    'split group',
+    'outline row',
+    'table row'
+];
+const CLICKABLE_ROLE = new Set([
+    'button',
+    'link',
+    'checkbox',
+    'check box',
+    'radio button',
+    'radio',
+    'tab',
+    'menu button',
+    'pop up button',
+    'popup button',
+    'combo box',
+    'disclosure triangle'
+]);
+const SETTABLE_ROLE = new Set(['text field', 'search text field', 'text area', 'combo box']);
+function isHeaderOrFooter(line) {
+    if (line.length === 0)
+        return true;
+    if (line.startsWith('App='))
+        return true;
+    if (line.startsWith('Window:'))
+        return true;
+    if (line.startsWith('The focused UI element'))
+        return true;
+    if (line.startsWith('No UI element'))
+        return true;
+    return false;
+}
+function roleAndLabel(body) {
+    const lower = body.toLowerCase();
+    const multi = MULTI_WORD_ROLES.find((role) => lower.startsWith(role) && (body.length === role.length || /[\s,(]/.test(body[role.length])));
+    if (multi !== undefined) {
+        return {
+            role: body.slice(0, multi.length),
+            label: body.slice(multi.length).replace(/^[\s,]+/, '')
+        };
+    }
+    const comma = body.indexOf(',');
+    const head = (comma === -1 ? body : body.slice(0, comma)).trim();
+    const space = head.indexOf(' ');
+    if (space === -1)
+        return { role: head, label: '' };
+    return { role: head.slice(0, space), label: head.slice(space + 1).trim() };
+}
+export function parseTreeMoves(treeText) {
+    const rows = [];
+    for (const line of treeText.split('\n')) {
+        const match = ROW_START.exec(line);
+        if (match !== null && match[2] !== undefined && match[3] !== undefined) {
+            rows.push({ elementIndex: Number(match[2]), body: match[3] });
+            continue;
+        }
+        const previous = rows[rows.length - 1];
+        if (previous !== undefined && !isHeaderOrFooter(line))
+            previous.body += `\n${line}`;
+    }
+    return rows.map((row) => {
+        const { role, label } = roleAndLabel(row.body);
+        const disabled = /\(disabled\)/.test(row.body);
+        const roleKey = role.toLowerCase();
+        const settable = /\(settable\)/.test(row.body) || SETTABLE_ROLE.has(roleKey);
+        const clickable = !disabled && (CLICKABLE_ROLE.has(roleKey) || settable);
+        return {
+            elementIndex: row.elementIndex,
+            role,
+            label,
+            line: `${row.elementIndex} ${row.body}`,
+            disabled,
+            clickable,
+            settable
+        };
+    });
+}
+export const JEV_CHOICE_CAP = 255;
+export function clickableMoves(moves) {
+    const selected = moves.filter((move) => move.clickable);
+    if (selected.length <= JEV_CHOICE_CAP)
+        return selected;
+    return selected.slice(0, JEV_CHOICE_CAP);
+}
+//# sourceMappingURL=tree.js.map

package/dist/intent/tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../src/intent/tree.ts"],"names":[],"mappings":"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"}

package/dist/local-client.d.ts

@@ -13,5 +13,6 @@ export type ProductionClientOptions = {
     spawnBroker?: (entrypoint: string) => void | Promise<void>;
     paths?: LocalClientPaths;
 };
+export declare function brokerSpawnEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function createProductionBrokerClient(options?: ProductionClientOptions): Promise<CliBrokerClient>;
 //# sourceMappingURL=local-client.d.ts.map

package/dist/local-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-client.d.ts","sourceRoot":"","sources":["../src/local-client.ts"],"names":[],"mappings":"AAOA,OAAO,EAAsB,cAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,oBAAoB,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CAC5C,CAAA;AAED,wBAAgB,gBAAgB,IAAI,gBAAgB,CA2BnD;AAuDD,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAK,CAAC,EAAE,gBAAgB,CAAA;CACzB,CAAA;AAkBD,wBAAsB,4BAA4B,CAChD,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,eAAe,CAAC,CAqC1B"}
+{"version":3,"file":"local-client.d.ts","sourceRoot":"","sources":["../src/local-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,cAAc,EAGd,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,oBAAoB,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;CAC5C,CAAA;AAED,wBAAgB,gBAAgB,IAAI,gBAAgB,CA2BnD;AAwDD,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAK,CAAC,EAAE,gBAAgB,CAAA;CACzB,CAAA;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAOxE;AAkBD,wBAAsB,4BAA4B,CAChD,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,eAAe,CAAC,CAqC1B"}

package/dist/local-client.js

@@ -1,10 +1,10 @@
 import { spawn } from 'node:child_process';
-import { createHash } from 'node:crypto';
-import { chmod, lstat, mkdir, readFile } from 'node:fs/promises';
+import { lstat, readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { isAbsolute, join, resolve } from 'node:path';
 import { CONTRACT_VERSIONS, createComputerError } from '@crosshands/contract';
-import { LocalControlClient, brokerEndpoint } from '@crosshands/runtime';
+import { LocalControlClient, brokerEndpoint, ensurePrivateDirectory, graphicalSessionKey } from '@crosshands/runtime';
+import { unwrapBrokerResult } from './broker-result.js';
 export function localClientPaths() {
     const uid = process.getuid?.();
     const osIdentity = process.env.CROSSHANDS_OS_IDENTITY ??
@@ -16,7 +16,7 @@ export function localClientPaths() {
         process.env.SECURITYSESSIONID ??
         process.env.SESSIONNAME ??
         `interactive:${osIdentity}`;
-    const sessionKey = createHash('sha256').update(graphicalSessionId).digest('hex').slice(0, 12);
+    const sessionKey = graphicalSessionKey(graphicalSessionId);
     const runtimeDirectory = process.env.CROSSHANDS_RUNTIME_DIR ?? defaultRuntimeDirectory(sessionKey);
     const identity = { osIdentity, graphicalSessionId };
     return {
@@ -48,14 +48,13 @@ function defaultRuntimeDirectory(sessionKey) {
     }
     return join(localAppData, 'CrossHands', 'runtime', sessionKey);
 }
-async function prepareRuntimeDirectory(path) {
-    await mkdir(path, { recursive: true, mode: 0o700 });
-    const info = await lstat(path);
-    if (!info.isDirectory() || info.isSymbolicLink())
-        throw createComputerError('provider_unavailable', 'CrossHands runtime path is unsafe');
-    if (process.getuid !== undefined && info.uid !== process.getuid())
-        throw createComputerError('provider_unavailable', 'CrossHands runtime path has another owner');
-    await chmod(path, 0o700);
+function prepareRuntimeDirectory(path) {
+    try {
+        ensurePrivateDirectory(path);
+    }
+    catch (cause) {
+        throw createComputerError('provider_unavailable', cause instanceof Error ? cause.message : 'CrossHands directory is unsafe');
+    }
 }
 async function readSecureToken(path) {
     const info = await lstat(path);
@@ -74,12 +73,21 @@ async function connect(paths) {
         identity: paths.identity
     });
 }
+export function brokerSpawnEnv(env) {
+    const next = { ...env };
+    delete next.CROSSHANDS_JEV;
+    for (const key of Object.keys(next)) {
+        if (key === 'TYPESAFE_API_KEY' || key.startsWith('TYPESAFE_'))
+            delete next[key];
+    }
+    return next;
+}
 function defaultSpawnBroker(entrypoint) {
     const child = spawn(process.execPath, [entrypoint, 'broker'], {
         detached: true,
         stdio: 'ignore',
         windowsHide: true,
-        env: process.env
+        env: brokerSpawnEnv(process.env)
     });
     child.unref();
 }
@@ -91,7 +99,7 @@ function brokerIsAbsent(cause) {
 }
 export async function createProductionBrokerClient(options = {}) {
     const paths = options.paths ?? localClientPaths();
-    await prepareRuntimeDirectory(paths.runtimeDirectory);
+    prepareRuntimeDirectory(paths.runtimeDirectory);
     try {
         const control = await connect(paths);
         return controlAdapter(control);
@@ -124,7 +132,7 @@ export async function createProductionBrokerClient(options = {}) {
 }
 function controlAdapter(control) {
     return {
-        request: async (operation, input) => control.request({ operation, input }, { deadlineMs: 30_000 }),
+        request: async (operation, input) => unwrapBrokerResult(await control.request({ operation, input }, { deadlineMs: 30_000 })),
         close: () => control.close()
     };
 }

package/dist/local-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-client.js","sourceRoot":"","sources":["../src/local-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-client.js","sourceRoot":"","sources":["../src/local-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EAEpB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAUvD,MAAM,UAAU,gBAAgB;IAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAA;IAC9B,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB;QAClC,CAAC,GAAG,KAAK,SAAS;YAChB,CAAC,CAAC,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,EAAE;YACjE,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,CAAA;IACnB,MAAM,kBAAkB,GACtB,OAAO,CAAC,GAAG,CAAC,+BAA+B;QAC3C,OAAO,CAAC,GAAG,CAAC,cAAc;QAC1B,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC7B,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,eAAe,UAAU,EAAE,CAAA;IAC7B,MAAM,UAAU,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;IAC1D,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,uBAAuB,CAAC,UAAU,CAAC,CAAA;IAClG,MAAM,QAAQ,GAAG,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAA;IACnD,OAAO;QACL,QAAQ;QACR,gBAAgB;QAChB,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC;QAClD,QAAQ,EAAE,cAAc,CAAC;YACvB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU;YACV,kBAAkB;YAClB,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC;SAC9D,CAAC;KACH,CAAA;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,UAAkB;IACjD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAClF,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAA;QACvD,IAAI,mBAAmB,KAAK,SAAS,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,mBAAmB,CACvB,qBAAqB,EACrB,wEAAwE,CACzE,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAA;IAC7C,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5D,MAAM,mBAAmB,CACvB,qBAAqB,EACrB,kEAAkE,CACnE,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AAChE,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAY;IAC3C,IAAI,CAAC;QACH,sBAAsB,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,mBAAmB,CACvB,sBAAsB,EACtB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAC1E,CAAA;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY;IACzC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;QACtE,MAAM,mBAAmB,CAAC,sBAAsB,EAAE,wCAAwC,CAAC,CAAA;IAC7F,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,MAAM,EAAE;QAC/D,MAAM,mBAAmB,CAAC,sBAAsB,EAAE,2CAA2C,CAAC,CAAA;IAChG,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AAC9C,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,KAAuB;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/F,OAAO,kBAAkB,CAAC,OAAO,CAAC;QAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,KAAK;QACL,QAAQ,EAAE,iBAAiB;QAC3B,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAA;AACJ,CAAC;AASD,MAAM,UAAU,cAAc,CAAC,GAAsB;IACnD,MAAM,IAAI,GAAsB,EAAE,GAAG,GAAG,EAAE,CAAA;IAC1C,OAAO,IAAI,CAAC,cAAc,CAAA;IAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,GAAG,KAAK,kBAAkB,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IACjF,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAkB;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;QAC5D,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,QAAQ;QACf,WAAW,EAAE,IAAI;QACjB,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC;KACjC,CAAC,CAAA;IACF,KAAK,CAAC,KAAK,EAAE,CAAA;AACf,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAA;IAC/C,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,cAAc,CAAA;AACrD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,UAAmC,EAAE;IAErC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,gBAAgB,EAAE,CAAA;IACjD,uBAAuB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC/C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAA;QACpC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAA;QACvC,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC3D,IAAI,aAAa,KAAK,SAAS;YAC7B,MAAM,mBAAmB,CACvB,sBAAsB,EACtB,mDAAmD,CACpD,CAAA;QACH,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QACrF,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,KAAK,CAAC,CAAA;IAC5D,IAAI,SAAkB,CAAA;IACtB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,mFAAmF;YACnF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAA;YACpC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAA;YACjB,gEAAgE;YAChE,mFAAmF;YACnF,MAAM,IAAI,OAAO,CAAO,CAAC,YAAY,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAA;QACzE,CAAC;IACH,CAAC;IACD,MAAM,mBAAmB,CACvB,sBAAsB,EACtB,iFAAiF,EACjF,EAAE,KAAK,EAAE,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,CACtE,CAAA;AACH,CAAC;AAED,SAAS,cAAc,CAAC,OAA2B;IACjD,OAAO;QACL,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,CAClC,kBAAkB,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACzF,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE;KAC7B,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crosshands/cli",
-  "version": "0.1.6",
+  "version": "0.2.1",
   "description": "Agent-agnostic local computer-use CLI",
   "license": "MIT",
   "bin": {
@@ -23,8 +23,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@crosshands/contract": "0.1.6",
-    "@crosshands/runtime": "0.1.6"
+    "@crosshands/runtime": "0.2.1",
+    "@crosshands/contract": "0.2.1"
   },
   "devDependencies": {
     "@types/node": "24.10.1",
@@ -32,9 +32,9 @@
     "vitest": "4.1.5"
   },
   "optionalDependencies": {
-    "@crosshands/platform-darwin": "0.1.6",
-    "@crosshands/platform-windows": "0.1.6",
-    "@crosshands/platform-linux": "0.1.6"
+    "@crosshands/platform-darwin": "0.2.1",
+    "@crosshands/platform-windows": "0.2.1",
+    "@crosshands/platform-linux": "0.2.1"
   },
   "engines": {
     "node": ">=22"

package/src/bin.ts

@@ -3,9 +3,7 @@
 import { stdin, stderr, stdout } from 'node:process'
 import { StringDecoder } from 'node:string_decoder'
 
-import { runBrokerHost } from './broker-host.js'
-import { runCli, type CliIo } from './index.js'
-import { createProductionBrokerClient } from './local-client.js'
+import type { CliIo } from './index.js'
 
 async function readStdin(): Promise<string> {
   const decoder = new StringDecoder('utf8')
@@ -25,9 +23,12 @@ async function readStdin(): Promise<string> {
 async function main(): Promise<number> {
   const argv = process.argv.slice(2)
   if (argv[0] === 'broker') {
+    const { runBrokerHost } = await import('./broker-host.js')
     await runBrokerHost()
     return 0
   }
+  const { runCli } = await import('./index.js')
+  const { createProductionBrokerClient } = await import('./local-client.js')
   const io: CliIo = {
     stdin: readStdin,
     stdout: (value) => stdout.write(value),

package/src/broker-host.ts

@@ -1,3 +1,5 @@
+import { randomUUID } from 'node:crypto'
+
 import {
   CONTRACT_VERSIONS,
   createComputerError,
@@ -7,9 +9,13 @@ import {
   type ReferenceBindings
 } from '@crosshands/contract'
 import {
+  JsonlDiagnosticsWriter,
   LocalBroker,
   LocalControlServer,
+  diagnosticsDirectory,
+  emitDiagnostic,
   type BrokerEndpoint,
+  type ControlHandshakeEvent,
   type LocalControlIdentity,
   type LocalControlRequest,
   type StableAppIdentity,
@@ -25,6 +31,7 @@ type ProviderModule = {
     endpoint: BrokerEndpoint
     identity: LocalControlIdentity
     handler: (request: LocalControlRequest) => Promise<unknown>
+    onHandshake?: (event: ControlHandshakeEvent) => void
   }) => Promise<{ start(): Promise<void>; close(): Promise<void> }>
   inspectTarget?: (
     operation: ComputerOperationName,
@@ -76,9 +83,16 @@ export async function runBrokerHost(): Promise<void> {
   const providerModule = await loadProviderModule()
   const paths = localClientPaths()
   const peer = { ...paths.identity, verified: true, local: true }
+  const generation = `broker-${randomUUID()}`
+  const diagnostics = new JsonlDiagnosticsWriter({
+    directory: diagnosticsDirectory(paths.identity.graphicalSessionId),
+    generation
+  })
   const broker = new LocalBroker({
     identity: peer,
+    generation,
     providerFactory: () => providerModule.createProvider(),
+    diagnostics,
     ...(providerModule.inspectTarget === undefined
       ? {}
       : {
@@ -88,45 +102,61 @@ export async function runBrokerHost(): Promise<void> {
           ): Promise<TargetInspection | null> => providerModule.inspectTarget!(operation, input)
         })
   })
-  await broker.connect({ peer, versions: CONTRACT_VERSIONS })
-  const handler = async ({ payload, deadlineAt }: LocalControlRequest): Promise<unknown> => {
-    if (payload === null || typeof payload !== 'object') throw new Error('Invalid broker request')
-    const record = payload as Record<string, unknown>
-    if (typeof record.operation !== 'string') throw new Error('Missing operation')
-    const operation = record.operation as ComputerOperationName
-    let input: unknown
-    try {
-      input = parseOperationInput(operation, record.input)
-    } catch (cause) {
-      if (cause instanceof Error && cause.name === 'ZodError') {
-        throw createComputerError('invalid_argument', 'Invalid input for the selected operation')
+  try {
+    await broker.connect({ peer, versions: CONTRACT_VERSIONS })
+    const handler = async ({ payload, deadlineAt }: LocalControlRequest): Promise<unknown> => {
+      if (payload === null || typeof payload !== 'object') throw new Error('Invalid broker request')
+      const record = payload as Record<string, unknown>
+      if (typeof record.operation !== 'string') throw new Error('Missing operation')
+      const operation = record.operation as ComputerOperationName
+      let input: unknown
+      try {
+        input = parseOperationInput(operation, record.input)
+      } catch (cause) {
+        if (cause instanceof Error && cause.name === 'ZodError') {
+          throw createComputerError('invalid_argument', 'Invalid input for the selected operation')
+        }
+        throw cause
       }
-      throw cause
+      return broker.request({ operation, input, deadlineMs: Math.max(1, deadlineAt - Date.now()) })
     }
-    return broker.request({ operation, input, deadlineMs: Math.max(1, deadlineAt - Date.now()) })
+    const onHandshake = (event: ControlHandshakeEvent): void => {
+      emitDiagnostic(diagnostics, {
+        kind: 'client.handshake',
+        ...broker.diagnosticEnvelope(),
+        accepted: event.accepted,
+        requestId: event.requestId,
+        ...(event.code === undefined ? {} : { code: event.code })
+      })
+    }
+    const server =
+      paths.endpoint.transport === 'named-pipe'
+        ? await (providerModule.createControlServer?.({
+            endpoint: paths.endpoint,
+            identity: paths.identity,
+            handler,
+            onHandshake
+          }) ??
+            Promise.reject(
+              new Error('The Windows payload has no native DACL and peer-token control relay')
+            ))
+        : new LocalControlServer({
+            endpoint: paths.endpoint,
+            runtimeDirectory: paths.runtimeDirectory,
+            tokenFile: paths.tokenFile,
+            identity: paths.identity,
+            handler,
+            onHandshake
+          })
+    await server.start()
+    emitDiagnostic(diagnostics, { kind: 'broker.start', ...broker.diagnosticEnvelope() })
+    await new Promise<void>((resolve) => {
+      const stop = (): void => resolve()
+      process.once('SIGINT', stop)
+      process.once('SIGTERM', stop)
+    })
+    await server.close()
+  } finally {
+    await broker.close('signal')
   }
-  const server =
-    paths.endpoint.transport === 'named-pipe'
-      ? await (providerModule.createControlServer?.({
-          endpoint: paths.endpoint,
-          identity: paths.identity,
-          handler
-        }) ??
-          Promise.reject(
-            new Error('The Windows payload has no native DACL and peer-token control relay')
-          ))
-      : new LocalControlServer({
-          endpoint: paths.endpoint,
-          runtimeDirectory: paths.runtimeDirectory,
-          tokenFile: paths.tokenFile,
-          identity: paths.identity,
-          handler
-        })
-  await server.start()
-  await new Promise<void>((resolve) => {
-    const stop = (): void => resolve()
-    process.once('SIGINT', stop)
-    process.once('SIGTERM', stop)
-  })
-  await server.close()
 }

package/src/broker-result.ts

@@ -0,0 +1,14 @@
+export type BrokerResultEnvelope = {
+  requestId: string
+  result: unknown
+}
+
+export function isBrokerResultEnvelope(value: unknown): value is BrokerResultEnvelope {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) return false
+  const record = value as Record<string, unknown>
+  return typeof record.requestId === 'string' && 'result' in record
+}
+
+export function unwrapBrokerResult(value: unknown): unknown {
+  return isBrokerResultEnvelope(value) ? value.result : value
+}