Skip to content

Commit 0233735

Browse files
committed
fix(command-surface): narrow projection names and pin formatter bindings
1 parent 76d014e commit 0233735

11 files changed

Lines changed: 118 additions & 19 deletions

File tree

‎packages/command-surface/src/batch/index.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { defineCommandFacet, defineCommandFamilyFromFacets } from '../family/typ
66
import { commonToClientOptions } from '../common-input-fields.ts';
77
import { createBatchCommandMetadata, type BatchCommandStep, type BatchInput } from './metadata.ts';
88
import { STRUCTURED_BATCH_COMMAND_NAMES } from '@agent-device/command-registry/batch-policy';
9-
import { createBatchDaemonWriter } from './projection.ts';
109

1110
const batchCommandMetadata = createBatchCommandMetadata();
1211

@@ -81,8 +80,6 @@ export const batchCommandFamily = defineCommandFamilyFromFacets({
8180
commands: [batchCommandFacet],
8281
});
8382

84-
export { createBatchDaemonWriter };
85-
8683
function toBatchOptions(input: BatchInput): BatchRunOptions {
8784
return {
8885
...commonToClientOptions(input),

‎packages/command-surface/src/cli-grammar.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/command-surface/src/family/registry.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ export const commandFamilies = [
3838
export type CommandFamilyCommandName = (typeof commandFamilies)[number]['metadata'][number]['name'];
3939
export type CommandFamilyMetadata = (typeof commandFamilies)[number]['metadata'][number];
4040
export type CommandFamilyDefinition = (typeof commandFamilies)[number]['definitions'][number];
41+
type CommandFamilyDaemonCommandName = (typeof commandFamilies)[number] extends infer Family
42+
? Family extends { daemonWriters: infer Writers }
43+
? keyof Writers
44+
: never
45+
: never;
4146

4247
export function commandFamilyName(command: string): string | undefined {
4348
return commandFamilies.find((family) =>
@@ -61,8 +66,14 @@ export function listCommandFamilyCliReaders(): Record<CommandFamilyCommandName,
6166
return mergeFamilyRecords('cliReaders') as Record<CommandFamilyCommandName, CliReader>;
6267
}
6368

64-
export function listCommandFamilyDaemonWriters(): Record<string, AnyDaemonWriter> {
65-
return mergeFamilyRecords('daemonWriters');
69+
export function listCommandFamilyDaemonWriters(): Record<
70+
CommandFamilyDaemonCommandName,
71+
AnyDaemonWriter
72+
> {
73+
return mergeFamilyRecords('daemonWriters') as Record<
74+
CommandFamilyDaemonCommandName,
75+
AnyDaemonWriter
76+
>;
6677
}
6778

6879
function mergeFamilyRecords<TKey extends keyof CommandFamilyRecordMap>(

‎packages/command-surface/src/family/types.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,17 @@ type CommandFacetDefinitions<TCommands extends readonly CommandFacet[]> = {
7070
};
7171

7272
type CommandFacetName<TCommands extends readonly CommandFacet[]> = TCommands[number]['name'];
73+
type DaemonCommandFacetName<TCommands extends readonly CommandFacet[]> = Extract<
74+
TCommands[number],
75+
{ daemonWriter: AnyDaemonWriter }
76+
>['name'];
7377

78+
export function defineCommandFacet<const TCommandName extends string, Input, Result>(
79+
command: CommandFacetInput<TCommandName, Input, Result> & { daemonWriter: AnyDaemonWriter },
80+
): CommandFacet<TCommandName, Result> & { daemonWriter: AnyDaemonWriter };
81+
export function defineCommandFacet<const TCommandName extends string, Input, Result>(
82+
command: CommandFacetInput<TCommandName, Input, Result>,
83+
): CommandFacet<TCommandName, Result>;
7484
export function defineCommandFacet<const TCommandName extends string, Input, Result>(
7585
command: CommandFacetInput<TCommandName, Input, Result>,
7686
): CommandFacet<TCommandName, Result> {
@@ -113,7 +123,7 @@ export function defineParameterlessCommandFacet<
113123
client: AgentDeviceClient,
114124
input: InferCommandInput<Record<never, never>>,
115125
) => Promise<Result>;
116-
}): CommandFacet<TCommandName, Result> {
126+
}): CommandFacet<TCommandName, Result> & { daemonWriter: AnyDaemonWriter } {
117127
return defineCommandFacet({
118128
name: command.name,
119129
text: command.text,
@@ -150,7 +160,7 @@ export function defineCommandFamilyFromFacets<
150160
) as CommandFacetDefinitions<TCommands>,
151161
cliSchemas: cliSchemas as Partial<Record<CommandFacetName<TCommands>, CommandSchema>>,
152162
cliReaders: cliReaders as Record<CommandFacetName<TCommands>, CliReader>,
153-
daemonWriters,
163+
daemonWriters: daemonWriters as Record<DaemonCommandFacetName<TCommands>, AnyDaemonWriter>,
154164
} satisfies CommandFamilyFacet<CommandFacetName<TCommands>> & {
155165
metadata: CommandFacetMetadata<TCommands>;
156166
definitions: CommandFacetDefinitions<TCommands>;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { expect, test } from 'vitest';
2+
import { prepareDaemonCommandRequest } from './index.ts';
3+
4+
const host = { env: {}, cwd: '/workspace' };
5+
6+
test('projection preserves declared command names and rejects an unknown writer', async () => {
7+
expect(await prepareDaemonCommandRequest('snapshot', {}, host)).toMatchObject({
8+
command: 'snapshot',
9+
});
10+
11+
// @ts-expect-error A misspelled command is outside the literal writer keys.
12+
await expect(prepareDaemonCommandRequest('snaphot', {}, host)).rejects.toThrow(
13+
'Missing daemon writer for command: snaphot',
14+
);
15+
16+
// @ts-expect-error Metro has a client-owned path, not a daemon writer.
17+
await expect(prepareDaemonCommandRequest('metro', {}, host)).rejects.toThrow(
18+
'Missing daemon writer for command: metro',
19+
);
20+
});
21+
22+
test('projection rejects an invalid shared client option', async () => {
23+
// @ts-expect-error The shared client direction field is a string.
24+
await expect(prepareDaemonCommandRequest('scroll', { direction: 3 }, host)).rejects.toThrow(
25+
'scroll requires direction',
26+
);
27+
});

‎packages/command-surface/src/index.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { HostEnvironment } from '@agent-device/kernel/source-value';
2-
import { createBatchDaemonWriter } from './batch/index.ts';
2+
import { createBatchDaemonWriter } from './batch/projection.ts';
33
import type { AnyDaemonWriter, CommandInput, DaemonCommandRequest } from './cli-grammar/types.ts';
44
import { findCommandMetadata } from './command-metadata.ts';
55
import { refuseRetiredCommonInput } from './common-input-fields.ts';
@@ -17,7 +17,7 @@ export { COMMON_INPUT_AUDIENCE } from './common-input-fields.ts';
1717
export { operatorAudience, operatorInputRefusal } from './input-audience.ts';
1818
export { buildRequestFlags } from './command-flags.ts';
1919
export { runCommand } from './command-surface.ts';
20-
export { readInputFromCli } from './cli-grammar.ts';
20+
export { readInputFromCli } from './cli-grammar/registry.ts';
2121
export { readCliBatchStepsJson } from './batch/batch-steps.ts';
2222
export { readMetroPrepareKind } from './metro/prepare-kind.ts';
2323
export {
@@ -36,10 +36,10 @@ export { isFlagSupportedForCommand } from './schema/option-schema.ts';
3636
export { resolveConfigBackedFlagDefaults } from './schema/cli-config.ts';
3737
export { mergeDefinedFlags } from './schema/merge-flags.ts';
3838

39-
const daemonWriters: Record<string, AnyDaemonWriter> = {
39+
const daemonWriters = {
4040
...listCommandFamilyDaemonWriters(),
4141
batch: createBatchDaemonWriter(prepareBatchDaemonCommandRequest),
42-
};
42+
} satisfies Record<string, AnyDaemonWriter>;
4343

4444
export type DaemonCommandName = keyof typeof daemonWriters;
4545

@@ -75,6 +75,7 @@ async function prepareBatchDaemonCommandRequest(
7575
}
7676
}
7777

78+
/** Projects client options; `AgentDeviceClient` owns each command's option contract. */
7879
export async function prepareDaemonCommandRequest(
7980
command: DaemonCommandName,
8081
input: CommandInput,

‎packages/command-surface/src/observability/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { CommandSchemaOverride } from '@agent-device/command-registry/comma
1111
import { defineCommandFacet, defineCommandFamilyFromFacets } from '../family/types.ts';
1212
import { booleanField, enumField, integerField, stringField } from '../command-input.ts';
1313
import { defineFieldCommandMetadata } from '../field-command-contract.ts';
14-
import { LOG_ACTION_VALUES, type LogAction } from './log-command-contract.ts';
14+
import { LOG_ACTION_VALUES, type LogAction } from '@agent-device/contracts/observability';
1515
import {
1616
commonInputFromFlags,
1717
direct,

‎packages/command-surface/src/observability/log-command-contract.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/command-surface/src/perf/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
type PerfArea,
2424
type PerfKind,
2525
type PerfSubject,
26-
} from './perf-command-contract.ts';
26+
} from '@agent-device/contracts/observability';
2727
import { commonInputFromFlags, direct, optionalString } from '../cli-grammar/common.ts';
2828
import type { CliReader, DaemonWriter } from '../cli-grammar/types.ts';
2929

‎packages/command-surface/src/perf/perf-command-contract.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)