6bf8bebf51
CI / Test and Build (push) Failing after 1s
CI / Migrate Dev DB (push) Has been skipped
CI / Migrate DB (push) Has been skipped
CodeQL / Analyze actions (push) Has been cancelled
CodeQL / Analyze javascript-typescript (push) Has been cancelled
CI / Detect Version (push) Has been cancelled
CI / Detect Desktop Changes (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/cron.Dockerfile, ubuntu-latest, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build AMD64 (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build AMD64 (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/cron.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/db.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/pii.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-4vcpu-ubuntu-2404-arm, ./docker/realtime.Dockerfile, ubuntu-24.04-arm, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (blacksmith-8vcpu-ubuntu-2404-arm, ./docker/app.Dockerfile, linux-arm64-8-core, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
Helm Chart / Lint, test, and validate chart (push) Has been cancelled
Helm Chart / Chart version bumped (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Build Dev ECR (blacksmith-8vcpu-ubuntu-2404, ./docker/app.Dockerfile, ECR_APP, linux-x64-8-core) (push) Has been cancelled
CI / Promote Images (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/cron) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-2vcpu-ubuntu-2404, ./docker/db.Dockerfile, ECR_MIGRATIONS, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/pii.Dockerfile, ECR_PII, ubuntu-latest) (push) Has been cancelled
CI / Build Dev ECR (blacksmith-4vcpu-ubuntu-2404, ./docker/realtime.Dockerfile, ECR_REALTIME, ubuntu-latest) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Check Desktop Signing Secrets (push) Has been cancelled
CI / Desktop Release (push) Has been cancelled
CI / Create Desktop Prerelease (push) Has been cancelled
CI / Desktop Prerelease Build (push) Has been cancelled
CI / Publish Desktop Prerelease (push) Has been cancelled
CI / Prune Desktop Prereleases (push) Has been cancelled
Helm Chart / Install on kind and run helm test (push) Has been cancelled
173 lines
4.6 KiB
TypeScript
173 lines
4.6 KiB
TypeScript
import type { MergePRParams, MergeResultResponse } from '@/tools/github/types'
|
|
import type { ToolConfig } from '@/tools/types'
|
|
|
|
export const mergePRTool: ToolConfig<MergePRParams, MergeResultResponse> = {
|
|
id: 'github_merge_pr',
|
|
name: 'GitHub Merge Pull Request',
|
|
description: 'Merge a pull request in a GitHub repository',
|
|
version: '1.0.0',
|
|
|
|
params: {
|
|
owner: {
|
|
type: 'string',
|
|
required: true,
|
|
visibility: 'user-or-llm',
|
|
description: 'Repository owner',
|
|
},
|
|
repo: {
|
|
type: 'string',
|
|
required: true,
|
|
visibility: 'user-or-llm',
|
|
description: 'Repository name',
|
|
},
|
|
pullNumber: {
|
|
type: 'number',
|
|
required: true,
|
|
visibility: 'user-or-llm',
|
|
description: 'Pull request number',
|
|
},
|
|
commit_title: {
|
|
type: 'string',
|
|
required: false,
|
|
visibility: 'user-or-llm',
|
|
description: 'Title for the merge commit',
|
|
},
|
|
commit_message: {
|
|
type: 'string',
|
|
required: false,
|
|
visibility: 'user-or-llm',
|
|
description: 'Extra detail to append to merge commit message',
|
|
},
|
|
merge_method: {
|
|
type: 'string',
|
|
required: false,
|
|
visibility: 'user-or-llm',
|
|
description: 'Merge method: merge, squash, or rebase',
|
|
default: 'merge',
|
|
},
|
|
apiKey: {
|
|
type: 'string',
|
|
required: true,
|
|
visibility: 'user-only',
|
|
description: 'GitHub API token',
|
|
},
|
|
},
|
|
|
|
request: {
|
|
url: (params) =>
|
|
`https://api.github.com/repos/${params.owner}/${params.repo}/pulls/${params.pullNumber}/merge`,
|
|
method: 'PUT',
|
|
headers: (params) => ({
|
|
Accept: 'application/vnd.github.v3+json',
|
|
Authorization: `Bearer ${params.apiKey}`,
|
|
'X-GitHub-Api-Version': '2022-11-28',
|
|
}),
|
|
body: (params) => {
|
|
const body: Record<string, any> = {}
|
|
if (params.commit_title !== undefined) body.commit_title = params.commit_title
|
|
if (params.commit_message !== undefined) body.commit_message = params.commit_message
|
|
if (params.merge_method !== undefined) body.merge_method = params.merge_method
|
|
return body
|
|
},
|
|
},
|
|
|
|
transformResponse: async (response) => {
|
|
if (response.status === 405 || response.status === 409) {
|
|
const error = await response.json()
|
|
const message =
|
|
error.message ||
|
|
(response.status === 409
|
|
? 'Head branch was modified; review and try the merge again'
|
|
: 'Pull request is not mergeable')
|
|
return {
|
|
success: false,
|
|
error: message,
|
|
output: {
|
|
content: '',
|
|
metadata: {
|
|
sha: '',
|
|
merged: false,
|
|
message,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
const result = await response.json()
|
|
|
|
const content = `PR merged successfully!
|
|
SHA: ${result.sha}
|
|
Message: ${result.message}`
|
|
|
|
return {
|
|
success: true,
|
|
output: {
|
|
content,
|
|
metadata: {
|
|
sha: result.sha,
|
|
merged: result.merged,
|
|
message: result.message,
|
|
},
|
|
},
|
|
}
|
|
},
|
|
|
|
outputs: {
|
|
content: { type: 'string', description: 'Human-readable merge confirmation' },
|
|
metadata: {
|
|
type: 'object',
|
|
description: 'Merge result metadata',
|
|
properties: {
|
|
sha: { type: 'string', description: 'Merge commit SHA' },
|
|
merged: { type: 'boolean', description: 'Whether merge was successful' },
|
|
message: { type: 'string', description: 'Response message' },
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
export const mergePRV2Tool: ToolConfig<MergePRParams, any> = {
|
|
id: 'github_merge_pr_v2',
|
|
name: mergePRTool.name,
|
|
description: mergePRTool.description,
|
|
version: '2.0.0',
|
|
params: mergePRTool.params,
|
|
request: mergePRTool.request,
|
|
|
|
transformResponse: async (response: Response) => {
|
|
if (response.status === 405 || response.status === 409) {
|
|
const error = await response.json()
|
|
const message =
|
|
error.message ||
|
|
(response.status === 409
|
|
? 'Head branch was modified; review and try the merge again'
|
|
: 'Pull request is not mergeable')
|
|
return {
|
|
success: false,
|
|
error: message,
|
|
output: {
|
|
sha: null,
|
|
merged: false,
|
|
message,
|
|
},
|
|
}
|
|
}
|
|
|
|
const result = await response.json()
|
|
return {
|
|
success: true,
|
|
output: {
|
|
sha: result.sha,
|
|
merged: result.merged,
|
|
message: result.message,
|
|
},
|
|
}
|
|
},
|
|
|
|
outputs: {
|
|
sha: { type: 'string', description: 'Merge commit SHA', optional: true },
|
|
merged: { type: 'boolean', description: 'Whether merge was successful' },
|
|
message: { type: 'string', description: 'Response message' },
|
|
},
|
|
}
|