Skip to content

dispatcher: remove TypeScript schema stitch mode #2759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
curtisman merged 1 commit into from
Jul 30, 2026
Merged

dispatcher: remove TypeScript schema stitch mode #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions ts/packages/cli/src/commands/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ export default class Schema extends Command {
description: "Show all assistant selection schema",
default: false,
}),
generated: Flags.boolean({
description: "Generated schema",
allowNo: true,
default: true,
}),
activity: Flags.boolean({
description: "Show activity schema",
allowNo: true,
Expand Down Expand Up @@ -92,7 +87,7 @@ export default class Schema extends Command {
activity: flags.activity,
multiple: flags.multiple,
},
flags.generated ? { exact: true } : undefined,
{ exact: true },
),
);
} else {
Expand Down
2 changes: 0 additions & 2 deletions ts/packages/dispatcher/dispatcher/src/context/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export type DispatcherConfig = {
};
schema: {
generation: {
enabled: boolean;
jsonSchema: boolean;
jsonSchemaFunction: boolean;
jsonSchemaWithTs: boolean; // only applies when jsonSchema or jsonSchemaFunction is true
Expand Down Expand Up @@ -429,7 +428,6 @@ const defaultSessionConfig: SessionConfig = {
},
schema: {
generation: {
enabled: true,
jsonSchema: false,
jsonSchemaFunction: false,
jsonSchemaWithTs: false,
Expand Down
17 changes: 0 additions & 17 deletions ts/packages/dispatcher/dispatcher/src/context/system/handlers/configCommandHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,23 +1386,6 @@ const configTranslationCommandHandlers: CommandHandlerTable = {
generation: {
description: "Generated action schema",
commands: {
...getToggleCommandHandlers(
"generated action schema",
async (context, enable: boolean) => {
await changeContextConfig(
{
translation: {
schema: {
generation: {
enabled: enable,
},
},
},
},
context,
);
},
),
json: getToggleHandlerTable(
"use generate json schema if model supports it",
async (context, enable: boolean) => {
Expand Down
188 changes: 22 additions & 166 deletions ts/packages/dispatcher/dispatcher/src/translation/agentTranslators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@ import {
enableJsonTranslatorStreaming,
JsonTranslatorOptions,
TypeAgentJsonValidator,
TranslatorSchemaDef,
composeTranslatorSchemas,
IncrementalJsonValueCallBack,
} from "@typeagent/typechat-utils";
import { AppAction, SchemaTypeNames } from "@typeagent/agent-sdk";
import { Result } from "typechat";
import { getPackageFilePath } from "../utils/getPackageFilePath.js";
import {
getMultipleActionSchemaDef,
MultipleActionOptions,
} from "./multipleActionSchema.js";
import { HistoryContext, ParamObjectType } from "@typeagent/agent-cache";
import {
createTypeAgentRequestPrompt,
Expand All @@ -32,14 +25,12 @@ import {
import {
ActionSchemaTypeDefinition,
generateActionSchema,
generateSchemaTypeDefinition,
ActionSchemaObject,
SchemaCreator as sc,
GenerateSchemaOptions,
} from "@typeagent/action-schema";
import { ActionConfig, getSchemaContent } from "./actionConfig.js";
import { ActionConfig } from "./actionConfig.js";
import { ActionConfigProvider } from "./actionConfigProvider.js";
import { createTypeScriptJsonValidator } from "typechat/ts";
import { CompleteUsageStatsCallback } from "@typeagent/aiclient";
import { PromptLogger } from "@typeagent/telemetry";
import type { UserContext } from "./userContext.js";
Expand Down Expand Up @@ -100,23 +91,6 @@ export function createChangeAssistantActionSchema(
);
}

function getChangeAssistantSchemaDef(
switchActionConfigs: ActionConfig[],
): TranslatorSchemaDef | undefined {
if (switchActionConfigs.length === 0) {
return undefined;
}
const definition = createChangeAssistantActionSchema(switchActionConfigs);
if (definition === undefined) {
return undefined;
}
return {
kind: "inline",
typeName: additionalActionLookupTypeName,
schema: generateSchemaTypeDefinition(definition, { exact: true }),
};
}

export function getActionSchemaTypeName(schemaType: string | SchemaTypeNames) {
return typeof schemaType === "string" ? schemaType : schemaType.action;
}
Expand Down Expand Up @@ -156,104 +130,6 @@ export function getCombinedActionSchemaTypeName(
);
}

function getTranslatorSchemaDef(
actionConfig: ActionConfig,
): TranslatorSchemaDef {
const actionTypeName = getActionSchemaTypeName(actionConfig.schemaType);
const activityTypeName = getActivitySchemaTypeName(actionConfig.schemaType);

// Cannot disable activity if we don't regenerate the schema
let typeName: string;
if (actionTypeName === undefined) {
if (activityTypeName === undefined) {
throw new Error(
`Action config ${actionConfig.schemaName} does not have any action or activity schema type`,
);
}
typeName = activityTypeName;
} else {
typeName = activityTypeName
? `${actionTypeName} | ${activityTypeName}`
: actionTypeName;
}

// For the TypeChat path, we need the .ts source file.
// Use originalSchemaFilePath if schemaFile is not .ts format.
if (typeof actionConfig.schemaFile === "string") {
return {
kind: "file",
typeName,
fileName: getPackageFilePath(actionConfig.schemaFile),
};
}

const schemaContent = getSchemaContent(actionConfig);
if (schemaContent.format === "ts") {
return {
kind: "inline",
typeName,
schema: schemaContent.content,
};
}

// schemaFile is .pas format; fall back to the original .ts source
if (actionConfig.originalSchemaFilePath) {
return {
kind: "file",
typeName,
fileName: getPackageFilePath(actionConfig.originalSchemaFilePath),
};
}

throw new Error(
`TypeScript schema source not available for ${actionConfig.schemaName}. ` +
`Add 'originalSchemaFile' to the manifest pointing to the .ts source.`,
);
}

function getTranslatorSchemaDefs(
actionConfigs: ActionConfig[],
switchActionConfigs: ActionConfig[],
multipleActionOptions: MultipleActionOptions = false,
): TranslatorSchemaDef[] {
// Cannot disable activity if we don't regenerate the schema
const translationSchemaDefs = actionConfigs.map(getTranslatorSchemaDef);

// subAction for multiple action
const subActionType = actionConfigs.flatMap((s) => {
const returnTypes: string[] = [];
const actionType = getActionSchemaTypeName(s.schemaType);
if (actionType) {
returnTypes.push(actionType);
}
const activityType = getActivitySchemaTypeName(s.schemaType);
if (activityType) {
returnTypes.push(activityType);
}
return returnTypes;
});

// Add change assistant schema if needed
const changeAssistantSchemaDef =
getChangeAssistantSchemaDef(switchActionConfigs);

if (changeAssistantSchemaDef) {
translationSchemaDefs.push(changeAssistantSchemaDef);
subActionType.push(changeAssistantSchemaDef.typeName);
}

// Add multiple action schema
const multipleActionSchemaDef = multipleActionOptions
? getMultipleActionSchemaDef(subActionType, multipleActionOptions)
: undefined;

if (multipleActionSchemaDef) {
translationSchemaDefs.push(multipleActionSchemaDef);
}

return translationSchemaDefs;
}

export type TypeAgentTranslator<T = TranslatedAction> = {
translate(
request: string,
Expand All @@ -279,30 +155,18 @@ function createTypeAgentValidator<T extends TranslatedAction>(
switchActionConfigs: ActionConfig[],
provider: ActionConfigProvider,
composeOptions?: ComposeSchemaOptions,
generateOptions?: GenerateSchemaOptions | null, // null means not generated
generateOptions?: GenerateSchemaOptions,
) {
return generateOptions !== null
? createActionSchemaJsonValidator<T>(
composeActionSchema(
actionConfigs,
switchActionConfigs,
provider,
composeOptions,
),
generateOptions,
buildInjectedSchemaNameMap(actionConfigs, provider),
)
: createTypeScriptJsonValidator<T>(
composeTranslatorSchemas(
"AllActions",
getTranslatorSchemaDefs(
actionConfigs,
switchActionConfigs,
composeOptions?.multiple,
),
),
"AllActions",
);
return createActionSchemaJsonValidator<T>(
composeActionSchema(
actionConfigs,
switchActionConfigs,
provider,
composeOptions,
),
generateOptions,
buildInjectedSchemaNameMap(actionConfigs, provider),
);
}

// Build a fallback map: actionName → schemaName for injected sub-schemas that
Expand Down Expand Up @@ -376,7 +240,7 @@ export function loadAgentJsonTranslator<
switchActionConfigs: ActionConfig[],
provider: ActionConfigProvider,
options?: ComposeSchemaOptions,
generateOptions?: GenerateSchemaOptions | null, // null means not generated
generateOptions?: GenerateSchemaOptions,
model?: string,
promptLogger?: PromptLogger,
entityPromptShape: EntityPromptShape = "facets",
Expand Down Expand Up @@ -539,7 +403,7 @@ export function getFullSchemaText(
activeSchemas: string[] = [],
changeAgentAction: boolean,
options?: ComposeSchemaOptions,
generateOptions?: GenerateSchemaOptions | null, // null means not generated
generateOptions?: GenerateSchemaOptions,
): string {
const actionConfigs: ActionConfig[] = [
provider.getActionConfig(schemaName),
Expand All @@ -560,21 +424,13 @@ export function getFullSchemaText(
}
}

if (generateOptions !== null) {
return generateActionSchema(
composeActionSchema(
actionConfigs,
switchActionConfigs,
provider,
options,
),
generateOptions,
);
}
const schemaDefs = getTranslatorSchemaDefs(
actionConfigs,
switchActionConfigs,
options?.multiple,
return generateActionSchema(
composeActionSchema(
actionConfigs,
switchActionConfigs,
provider,
options,
),
generateOptions,
);
return composeTranslatorSchemas("AllActions", schemaDefs);
}
16 changes: 7 additions & 9 deletions ts/packages/dispatcher/dispatcher/src/translation/translateRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,13 @@ export function getTranslatorForSchema(
.map((actionConfig) => actionConfig.schemaName)
.join(",")}`,
);
const generateOptions = config.schema.generation.enabled
? {
exact: !config.schema.optimize.enabled,
jsonSchema: config.schema.generation.jsonSchema,
jsonSchemaFunction: config.schema.generation.jsonSchemaFunction,
jsonSchemaWithTs: config.schema.generation.jsonSchemaWithTs,
jsonSchemaValidate: config.schema.generation.jsonSchemaValidate,
}
: null;
const generateOptions = {
exact: !config.schema.optimize.enabled,
jsonSchema: config.schema.generation.jsonSchema,
jsonSchemaFunction: config.schema.generation.jsonSchemaFunction,
jsonSchemaWithTs: config.schema.generation.jsonSchemaWithTs,
jsonSchemaValidate: config.schema.generation.jsonSchemaValidate,
};
const newTranslator = loadAgentJsonTranslator(
actionConfigs,
switchActionConfigs,
Expand Down
Loading