diff --git a/packages/agent/src/activities/agent.ts b/packages/agent/src/activities/agent.ts index da83e722..365d1092 100644 --- a/packages/agent/src/activities/agent.ts +++ b/packages/agent/src/activities/agent.ts @@ -1,7 +1,7 @@ import { - type AgentMessage, - type AgentTool, - type SessionTreeEntry, + type AgentMessage, + type AgentTool, + type SessionTreeEntry, } from '@earendil-works/pi-agent-core' import { type ImageContent } from '@earendil-works/pi-ai' import { assetService } from '@shumai/core/src/asset/asset' @@ -13,16 +13,16 @@ import { s3Service } from '@shumai/core/src/s3/s3' import { uploadService } from '@shumai/core/src/upload/upload' import { VersionStackService } from '@shumai/core/src/versionStack/versionStack' import { AssetType, prisma, Prisma, type Skill } from '@shumai/db' -import { ApplicationFailure, Context } from '@temporalio/activity' import { registerLocalCancelHandler, unregisterLocalCancelHandler } from '@shumai/workflow-core' +import { ApplicationFailure, Context } from '@temporalio/activity' import { generateKeyBetween } from 'jittered-fractional-indexing' import { ulid } from 'ulid' import { DatabaseSessionStorage } from '../database-session-storage' import { - createAgentSession, - fieldsToTypeBoxSchema, - type AutofillField, - type DbProviderInfo, + createAgentSession, + fieldsToTypeBoxSchema, + type AutofillField, + type DbProviderInfo, } from '../index' import { aiUsageService } from '@shumai/core/src/ai-usage/ai-usage' diff --git a/packages/agent/src/index.ts b/packages/agent/src/index.ts index 2cdb9ba7..4740676e 100644 --- a/packages/agent/src/index.ts +++ b/packages/agent/src/index.ts @@ -320,6 +320,8 @@ export function fieldsToTypeBoxSchema(fields: AutofillField[]) { const properties: Record = {} for (const f of fields) { let schema: TSchema + const fieldName = f.config.name + const fieldDesc = f.description || fieldName switch (f.config.type) { case 'text': case 'longText': @@ -332,17 +334,36 @@ export function fieldsToTypeBoxSchema(fields: AutofillField[]) { case 'toggle': schema = Type.Boolean() break - case 'select': + case 'select': { + const options = f.config.select?.options || [] schema = Type.String({ - enum: f.config.select?.options?.map((o) => o.id) || [], + enum: options.map((o) => o.id), }) + if (options.length > 0) { + const optionLines = options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n') + schema.description = `The field '${fieldName}' represents ${fieldDesc}.\nSelect one option and return the option ID as the value.\n\nAvailable options:\n${optionLines}` + } break + } + case 'selectMulti': { + const options = f.config.selectMulti?.options || [] + schema = Type.Array( + Type.String({ + enum: options.map((o) => o.id), + }), + ) + if (options.length > 0) { + const optionLines = options.map((o) => `- ${o.displayName} => ${o.id}`).join('\n') + schema.description = `The field '${fieldName}' represents ${fieldDesc}.\nSelect applicable options and return the option IDs as the value.\n\nAvailable options:\n${optionLines}` + } + break + } default: schema = Type.String() } - if (f.description) { - schema.description = f.description + if (!schema.description) { + schema.description = `The field '${fieldName}' represents ${fieldDesc}.` } properties[f.id] = schema } diff --git a/packages/agent/src/schema-conversion.test.ts b/packages/agent/src/schema-conversion.test.ts index 898c8da5..9a101659 100644 --- a/packages/agent/src/schema-conversion.test.ts +++ b/packages/agent/src/schema-conversion.test.ts @@ -9,8 +9,9 @@ describe('fieldsToTypeBoxSchema', () => { ] const schema = fieldsToTypeBoxSchema(fields) expect(schema.properties.f1.type).toBe('string') - expect(schema.properties.f1.description).toBe('The title') + expect(schema.properties.f1.description).toBe("The field 'Title' represents The title.") expect(schema.properties.f2.type).toBe('string') + expect(schema.properties.f2.description).toBe("The field 'Desc' represents Desc.") }) it('converts numeric fields', () => { @@ -29,12 +30,13 @@ describe('fieldsToTypeBoxSchema', () => { expect(schema.properties.f1.type).toBe('boolean') }) - it('converts select fields with enums', () => { + it('converts select fields with enums and option descriptions', () => { const fields: AutofillField[] = [ { id: 'f1', + description: 'Species of animal', config: { - name: 'Status', + name: 'Species', type: 'select', select: { options: [ @@ -48,6 +50,33 @@ describe('fieldsToTypeBoxSchema', () => { const schema = fieldsToTypeBoxSchema(fields) expect(schema.properties.f1.type).toBe('string') expect(schema.properties.f1.enum).toEqual(['opt1', 'opt2']) + expect(schema.properties.f1.description).toBe( + "The field 'Species' represents Species of animal.\nSelect one option and return the option ID as the value.\n\nAvailable options:\n- Option 1 => opt1\n- Option 2 => opt2", + ) + }) + + it('converts selectMulti fields with array enums and option descriptions', () => { + const fields: AutofillField[] = [ + { + id: 'f1', + config: { + name: 'Tags', + type: 'selectMulti', + selectMulti: { + options: [ + { id: 'opt1', displayName: 'Tag 1', color: 'red' }, + { id: 'opt2', displayName: 'Tag 2', color: 'blue' }, + ], + }, + }, + }, + ] + const schema = fieldsToTypeBoxSchema(fields) + expect(schema.properties.f1.type).toBe('array') + expect(schema.properties.f1.items.enum).toEqual(['opt1', 'opt2']) + expect(schema.properties.f1.description).toBe( + "The field 'Tags' represents Tags.\nSelect applicable options and return the option IDs as the value.\n\nAvailable options:\n- Tag 1 => opt1\n- Tag 2 => opt2", + ) }) it('defaults to string for unknown types', () => { diff --git a/packages/core/src/upload/upload.ts b/packages/core/src/upload/upload.ts index a7595c9c..9df9eb86 100644 --- a/packages/core/src/upload/upload.ts +++ b/packages/core/src/upload/upload.ts @@ -1,13 +1,7 @@ import { assetService } from '@shumai/core/src/asset/asset' import { PaginatedData, PaginationParams, paginateQuery } from '@shumai/core/src/pagination' import { s3Service } from '@shumai/core/src/s3/s3' -import { - AssetStatus, - AssetType, - Prisma, - TaskStatus, - prisma, -} from '@shumai/db' +import { AssetStatus, AssetType, Prisma, TaskStatus, prisma } from '@shumai/db' import { ConfirmFileUploadRequest, CreateUploadTaskRequest,