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
37 changes: 35 additions & 2 deletions apps/sim/blocks/blocks/azure_devops.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ const buildParams = (
/**
* On an agent call the model supplies `continuationToken`/`top`/`iterationPath`/`format` under the
* tool's own names; the per-operation fields (`pipelinesContinuationToken`, `queryTop`, …) are never
* rendered in the agent tool input. The handler forwards `{ ...inputs, ...mapped }`.
* rendered in the agent tool input. A tool call carries the operation only in `context`, and the
* handler forwards `{ ...inputs, ...mapped }`.
*/
describe('AzureDevOpsBlock agent tool calls', () => {
const agentCall = (operation: string, args: Record<string, unknown>): Record<string, unknown> => {
const inputs = { ...args, operation, organization: 'org', project: 'proj' }
const inputs = { ...args, organization: 'org', project: 'proj' }
return { ...inputs, ...buildParams(inputs, { operation }) }
}

Expand All @@ -28,6 +29,21 @@ describe('AzureDevOpsBlock agent tool calls', () => {
}
)

it.each(['azure_devops_create_work_item', 'azure_devops_update_work_item'])(
'keeps a model zero for remainingWork, completedWork and effort on %s',
(operation) => {
const mapped = agentCall(operation, {
workItemId: 5,
workItemType: 'Task',
title: 't',
remainingWork: 0,
completedWork: 0,
effort: 0,
})
expect([mapped.remainingWork, mapped.completedWork, mapped.effort]).toEqual([0, 0, 0])
}
)

it('keeps the model top on azure_devops_query_work_items', () => {
expect(agentCall('azure_devops_query_work_items', { wiqlQuery: 'q', top: 5 }).top).toBe(5)
})
Expand All @@ -45,6 +61,23 @@ describe('AzureDevOpsBlock agent tool calls', () => {
expect(mapped.format).toBe('markdown')
})

it('keeps the model ids on azure_devops_get_work_items_batch', () => {
expect(agentCall('azure_devops_get_work_items_batch', { ids: '1,2' }).ids).toBe('1,2')
})

it('keeps the model text on azure_devops_add_comment', () => {
expect(agentCall('azure_devops_add_comment', { workItemId: 1, text: 'hi' }).text).toBe('hi')
})

it('expands a bare model start date on azure_devops_create_work_item', () => {
const mapped = agentCall('azure_devops_create_work_item', {
workItemType: 'Epic',
title: 't',
startDate: '2026-01-15',
})
expect(mapped.startDate).toBe('2026-01-15T00:00:00Z')
})

it('drops a List Builds token left over on the canvas under list pipelines', () => {
const inputs = { operation: 'azure_devops_list_pipelines', continuationToken: 'stale' }
expect({ ...inputs, ...buildParams(inputs) }.continuationToken).toBeUndefined()
Expand Down
28 changes: 18 additions & 10 deletions apps/sim/blocks/blocks/azure_devops.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AzureIcon } from '@/components/icons'
import type { BlockConfig, BlockMeta } from '@/blocks/types'
import { AuthMode, IntegrationType } from '@/blocks/types'
import { toolCallArg, withSavedCredential } from '@/blocks/utils'
import { mapperOperation, toolCallArg, withSavedCredential } from '@/blocks/utils'
import type { AzureDevOpsBasicWorkItemType } from '@/tools/azure_devops/types'
import { AZURE_DEVOPS_BASIC_WORK_ITEM_STATES } from '@/tools/azure_devops/utils'
import { getTrigger } from '@/triggers'
Expand All @@ -22,6 +22,11 @@ function resolveTop(dedicated: unknown, shared: unknown): number | undefined {
return value ? Number(value) : undefined
}

/** Coerces an optional numeric field, keeping `0` (a model may send it to clear remaining work). */
function optionalNumber(value: unknown): number | undefined {
return value === undefined || value === null || value === '' ? undefined : Number(value)
}

export const AzureDevOpsBlock: BlockConfig = {
type: 'azure_devops',
hideFromToolbar: true,
Expand Down Expand Up @@ -724,7 +729,7 @@ export const AzureDevOpsBlock: BlockConfig = {
organization: params.organization as string,
project: params.project as string,
}
switch (params.operation) {
switch (mapperOperation(params, context)) {
case 'azure_devops_list_pipelines':
return {
...base,
Expand Down Expand Up @@ -782,7 +787,10 @@ export const AzureDevOpsBlock: BlockConfig = {
case 'azure_devops_get_work_item':
return { ...base, workItemId: Number(params.workItemId) }
case 'azure_devops_get_work_items_batch':
return { ...base, ids: params.workItemIds as string }
return {
...base,
ids: (params.workItemIds as string) || toolCallArg(context, params.ids as string),
}
case 'azure_devops_create_work_item':
return {
...base,
Expand All @@ -791,12 +799,12 @@ export const AzureDevOpsBlock: BlockConfig = {
description: (params.description as string) || undefined,
assignedTo: (params.assignedTo as string) || undefined,
priority: params.priority ? Number(params.priority) : undefined,
effort: params.effort ? Number(params.effort) : undefined,
effort: optionalNumber(params.effort),
startDate: normalizeDate(params.startDate),
targetDate: normalizeDate(params.targetDate),
activity: (params.activity as string) || undefined,
remainingWork: params.remainingWork ? Number(params.remainingWork) : undefined,
completedWork: params.completedWork ? Number(params.completedWork) : undefined,
remainingWork: optionalNumber(params.remainingWork),
completedWork: optionalNumber(params.completedWork),
areaPath: (params.areaPath as string) || undefined,
iterationPath: (params.iterationPath as string) || undefined,
tags: (params.tags as string) || undefined,
Expand All @@ -809,12 +817,12 @@ export const AzureDevOpsBlock: BlockConfig = {
state: (params.state as string) || undefined,
assignedTo: (params.assignedTo as string) || undefined,
priority: params.priority ? Number(params.priority) : undefined,
effort: params.effort ? Number(params.effort) : undefined,
effort: optionalNumber(params.effort),
startDate: normalizeDate(params.startDate),
targetDate: normalizeDate(params.targetDate),
activity: (params.activity as string) || undefined,
remainingWork: params.remainingWork ? Number(params.remainingWork) : undefined,
completedWork: params.completedWork ? Number(params.completedWork) : undefined,
remainingWork: optionalNumber(params.remainingWork),
completedWork: optionalNumber(params.completedWork),
description: (params.description as string) || undefined,
areaPath: (params.areaPath as string) || undefined,
iterationPath:
Expand All @@ -827,7 +835,7 @@ export const AzureDevOpsBlock: BlockConfig = {
return {
...base,
workItemId: Number(params.workItemId),
text: params.commentText as string,
text: (params.commentText as string) || toolCallArg(context, params.text as string),
format:
(params.commentFormat as string) ||
toolCallArg(context, params.format) ||
Expand Down
33 changes: 33 additions & 0 deletions apps/sim/blocks/blocks/bitbucket.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { describe, expect, it } from 'vitest'
import { BitbucketBlock } from '@/blocks/blocks/bitbucket'

/**
* On a tool call the model supplies args under the tool's param names (`refName`, `reviewerUuids`,
* …) and the operation arrives only in `context`; the handler forwards `{ ...args, ...mapped }`.
*/
const toolCall = (operation: string, args: Record<string, unknown>): Record<string, unknown> => {
const inputs = { workspaceSlug: 'ws', repoSlug: 'repo', ...args }
return { ...inputs, ...BitbucketBlock.tools.config?.params?.(inputs, { operation }) }
}

describe('BitbucketBlock tool calls', () => {
it('defaults the ref type and keeps the model ref name on bitbucket_trigger_pipeline', () => {
const mapped = toolCall('bitbucket_trigger_pipeline', { refName: 'main' })
expect(mapped).toMatchObject({ refType: 'branch', refName: 'main' })
})

it('splits model reviewers and keeps closeSourceBranch on bitbucket_create_pull_request', () => {
const mapped = toolCall('bitbucket_create_pull_request', {
title: 'PR',
sourceBranch: 'feature',
reviewerUuids: '{a}, {b}',
closeSourceBranch: true,
})
expect(mapped).toMatchObject({ reviewerUuids: ['{a}', '{b}'], closeSourceBranch: true })
})

it('keeps the model commit, path and filter on bitbucket_list_directory', () => {
const mapped = toolCall('bitbucket_list_directory', { commit: 'abc', path: 'src', q: 'x' })
expect(mapped).toMatchObject({ commit: 'abc', path: 'src', q: 'x' })
})
})
89 changes: 52 additions & 37 deletions apps/sim/blocks/blocks/bitbucket.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BitbucketIcon } from '@/components/icons'
import type { BlockConfig, BlockMeta } from '@/blocks/types'
import { AuthMode, IntegrationType } from '@/blocks/types'
import { mapperOperation, toolCallArg } from '@/blocks/utils'
import { getTrigger } from '@/triggers'

const WORKSPACE_FIELD = ['workspacePicker', 'workspaceSlugInput'] as const
Expand Down Expand Up @@ -925,10 +926,21 @@ export const BitbucketBlock: BlockConfig = {
}
return params.operation
},
params: (params) => {
if (!isBitbucketOperation(params.operation)) {
throw new Error(`Invalid Bitbucket operation: ${String(params.operation)}`)
params: (params, context) => {
const operation = mapperOperation(params, context)
if (!isBitbucketOperation(operation)) {
throw new Error(`Invalid Bitbucket operation: ${operation}`)
}
/**
* The block field, else (on a tool call only) the model's arg, which arrives under the
* tool's param name rather than the block field id.
*/
const fieldOrModelArg = <T>(
parse: (value: unknown, name: string) => T | undefined,
field: string,
toolParam: string
): T | undefined =>
parse(params[field], field) ?? parse(toolCallArg(context, params[toolParam]), toolParam)

const common = {
oauthCredential: params.oauthCredential,
Expand All @@ -940,7 +952,7 @@ export const BitbucketBlock: BlockConfig = {
nextUrl: optionalString(params.nextUrl, 'nextUrl'),
}

switch (params.operation) {
switch (operation) {
case 'bitbucket_list_workspaces':
return {
oauthCredential: params.oauthCredential,
Expand All @@ -953,30 +965,31 @@ export const BitbucketBlock: BlockConfig = {
oauthCredential: params.oauthCredential,
workspaceSlug: optionalString(params.workspaceSlug, 'workspaceSlug'),
role: optionalString(params.role, 'role'),
q: optionalString(params.query, 'query'),
q: fieldOrModelArg(optionalString, 'query', 'q'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
case 'bitbucket_list_branches':
return {
...common,
q: optionalString(params.query, 'query'),
q: fieldOrModelArg(optionalString, 'query', 'q'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
case 'bitbucket_list_pipelines':
return {
...common,
refType: optionalString(params.pipelineRefType, 'pipelineRefType'),
refName: optionalString(params.pipelineRefName, 'pipelineRefName'),
commitHash: optionalString(params.pipelineCommitHash, 'pipelineCommitHash'),
selectorType: optionalString(params.pipelineSelectorType, 'pipelineSelectorType'),
selectorPattern: optionalString(
params.pipelineSelectorPattern,
'pipelineSelectorPattern'
refType: fieldOrModelArg(optionalString, 'pipelineRefType', 'refType'),
refName: fieldOrModelArg(optionalString, 'pipelineRefName', 'refName'),
commitHash: fieldOrModelArg(optionalString, 'pipelineCommitHash', 'commitHash'),
selectorType: fieldOrModelArg(optionalString, 'pipelineSelectorType', 'selectorType'),
selectorPattern: fieldOrModelArg(
optionalString,
'pipelineSelectorPattern',
'selectorPattern'
),
triggerType: optionalString(params.pipelineTriggerType, 'pipelineTriggerType'),
status: optionalString(params.pipelineStatus, 'pipelineStatus'),
triggerType: fieldOrModelArg(optionalString, 'pipelineTriggerType', 'triggerType'),
status: fieldOrModelArg(optionalString, 'pipelineStatus', 'status'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
Expand All @@ -985,48 +998,48 @@ export const BitbucketBlock: BlockConfig = {
case 'bitbucket_create_branch':
return {
...common,
name: optionalString(params.branchName, 'branchName'),
name: fieldOrModelArg(optionalString, 'branchName', 'name'),
target: optionalString(params.target, 'target'),
}
case 'bitbucket_delete_branch':
return { ...common, name: optionalString(params.branchName, 'branchName') }
return { ...common, name: fieldOrModelArg(optionalString, 'branchName', 'name') }
case 'bitbucket_list_commits':
return {
...common,
include: stringList(params.commitInclude, 'commitInclude'),
exclude: stringList(params.commitExclude, 'commitExclude'),
path: optionalString(params.commitPath, 'commitPath'),
include: fieldOrModelArg(stringList, 'commitInclude', 'include'),
exclude: fieldOrModelArg(stringList, 'commitExclude', 'exclude'),
path: fieldOrModelArg(optionalString, 'commitPath', 'path'),
...pagination,
}
case 'bitbucket_get_commit':
return { ...common, commit: optionalString(params.revision, 'revision') }
return { ...common, commit: fieldOrModelArg(optionalString, 'revision', 'commit') }
case 'bitbucket_list_directory':
return {
...common,
commit: optionalString(params.revision, 'revision'),
commit: fieldOrModelArg(optionalString, 'revision', 'commit'),
path: optionalText(params.path, 'path'),
q: optionalString(params.query, 'query'),
q: fieldOrModelArg(optionalString, 'query', 'q'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
case 'bitbucket_get_file_metadata':
return {
...common,
commit: optionalString(params.revision, 'revision'),
commit: fieldOrModelArg(optionalString, 'revision', 'commit'),
path: optionalText(params.path, 'path'),
}
case 'bitbucket_get_file':
return {
...common,
commit: optionalString(params.revision, 'revision'),
commit: fieldOrModelArg(optionalString, 'revision', 'commit'),
path: optionalText(params.path, 'path'),
maxCharacters: optionalInteger(params.maxCharacters, 'maxCharacters'),
}
case 'bitbucket_list_pull_requests':
return {
...common,
state: optionalString(params.state, 'state'),
q: optionalString(params.query, 'query'),
q: fieldOrModelArg(optionalString, 'query', 'q'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
Expand All @@ -1042,10 +1055,11 @@ export const BitbucketBlock: BlockConfig = {
sourceBranch: optionalString(params.sourceBranch, 'sourceBranch'),
destinationBranch: optionalString(params.destinationBranch, 'destinationBranch'),
description: optionalText(params.description, 'description'),
reviewerUuids: stringList(params.reviewerAccountIds, 'reviewerAccountIds'),
closeSourceBranch: optionalBoolean(
params.createCloseSourceBranch,
'createCloseSourceBranch'
reviewerUuids: fieldOrModelArg(stringList, 'reviewerAccountIds', 'reviewerUuids'),
closeSourceBranch: fieldOrModelArg(
optionalBoolean,
'createCloseSourceBranch',
'closeSourceBranch'
),
draft: optionalBoolean(params.draft, 'draft'),
}
Expand All @@ -1055,9 +1069,10 @@ export const BitbucketBlock: BlockConfig = {
prId: optionalInteger(params.prId, 'prId'),
mergeStrategy: optionalString(params.mergeStrategy, 'mergeStrategy'),
message: optionalText(params.message, 'message'),
closeSourceBranch: optionalBoolean(
params.mergeCloseSourceBranch,
'mergeCloseSourceBranch'
closeSourceBranch: fieldOrModelArg(
optionalBoolean,
'mergeCloseSourceBranch',
'closeSourceBranch'
),
}
case 'bitbucket_get_pull_request_merge_task_status':
Expand All @@ -1080,7 +1095,7 @@ export const BitbucketBlock: BlockConfig = {
return {
...common,
prId: optionalInteger(params.prId, 'prId'),
q: optionalString(params.query, 'query'),
q: fieldOrModelArg(optionalString, 'query', 'q'),
sort: optionalString(params.sort, 'sort'),
...pagination,
}
Expand All @@ -1097,9 +1112,9 @@ export const BitbucketBlock: BlockConfig = {
case 'bitbucket_trigger_pipeline':
return {
...common,
refType: optionalString(params.targetRefType, 'targetRefType') ?? 'branch',
refName: optionalString(params.targetRef, 'targetRef'),
commitHash: optionalString(params.targetCommitHash, 'targetCommitHash'),
refType: fieldOrModelArg(optionalString, 'targetRefType', 'refType') ?? 'branch',
refName: fieldOrModelArg(optionalString, 'targetRef', 'refName'),
commitHash: fieldOrModelArg(optionalString, 'targetCommitHash', 'commitHash'),
}
case 'bitbucket_list_pipeline_steps':
return {
Expand Down
Loading
Loading