fix(agent-jobs): close maintenance jobs after decision
This commit is contained in:
@@ -1765,6 +1765,10 @@ export const sendWorkspaceMessage = async (
|
|||||||
contentType: 'application/json',
|
contentType: 'application/json',
|
||||||
});
|
});
|
||||||
await applyMaintenanceDecision(claim.job._id, decision);
|
await applyMaintenanceDecision(claim.job._id, decision);
|
||||||
|
await stopWorkspace(claim.job._id).catch((error: unknown) => {
|
||||||
|
console.error(error);
|
||||||
|
});
|
||||||
|
return;
|
||||||
} else {
|
} else {
|
||||||
await updateStatus(claim.job._id, 'changes_ready', {
|
await updateStatus(claim.job._id, 'changes_ready', {
|
||||||
summary:
|
summary:
|
||||||
|
|||||||
@@ -1540,6 +1540,12 @@ export const applyMaintenanceDecision = mutation({
|
|||||||
}
|
}
|
||||||
if (!job.threadId) return { success: true };
|
if (!job.threadId) return { success: true };
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
await ctx.db.patch(args.jobId, {
|
||||||
|
workspaceStatus: 'stopped',
|
||||||
|
summary: args.summary,
|
||||||
|
completedAt: job.completedAt ?? now,
|
||||||
|
updatedAt: now,
|
||||||
|
});
|
||||||
const outcome =
|
const outcome =
|
||||||
args.decision === 'sync'
|
args.decision === 'sync'
|
||||||
? 'sync_recommended'
|
? 'sync_recommended'
|
||||||
|
|||||||
@@ -0,0 +1,112 @@
|
|||||||
|
import { convexTest } from 'convex-test';
|
||||||
|
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
|
||||||
|
|
||||||
|
import { api } from '../../convex/_generated/api.js';
|
||||||
|
import schema from '../../convex/schema';
|
||||||
|
|
||||||
|
const modules = import.meta.glob('../../convex/**/*.*s');
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
process.env.SPOON_WORKER_TOKEN = 'test-worker-token';
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(() => {
|
||||||
|
delete process.env.SPOON_WORKER_TOKEN;
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('applyMaintenanceDecision', () => {
|
||||||
|
test('resolves a low-risk sync and stops its maintenance job', async () => {
|
||||||
|
const t = convexTest(schema, modules);
|
||||||
|
const { jobId, threadId } = await t.mutation(async (ctx) => {
|
||||||
|
const now = Date.now();
|
||||||
|
const ownerId = await ctx.db.insert('users', {
|
||||||
|
email: 'maintenance@example.com',
|
||||||
|
name: 'Maintenance Reviewer',
|
||||||
|
});
|
||||||
|
const spoonId = await ctx.db.insert('spoons', {
|
||||||
|
ownerId,
|
||||||
|
name: 'Maintenance Spoon',
|
||||||
|
provider: 'gitea',
|
||||||
|
upstreamOwner: 'upstream',
|
||||||
|
upstreamRepo: 'maintenance',
|
||||||
|
upstreamDefaultBranch: 'main',
|
||||||
|
upstreamUrl: 'https://git.example.com/upstream/maintenance',
|
||||||
|
forkOwner: 'team',
|
||||||
|
forkRepo: 'maintenance-spoon',
|
||||||
|
forkUrl: 'https://git.example.com/team/maintenance-spoon',
|
||||||
|
visibility: 'private',
|
||||||
|
maintenanceMode: 'watch',
|
||||||
|
syncCadence: 'daily',
|
||||||
|
productionRefStrategy: 'default_branch',
|
||||||
|
status: 'active',
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
});
|
||||||
|
const requestId = await ctx.db.insert('agentRequests', {
|
||||||
|
spoonId,
|
||||||
|
ownerId,
|
||||||
|
prompt: 'Review upstream maintenance changes',
|
||||||
|
requestType: 'upstream_review',
|
||||||
|
status: 'running',
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
});
|
||||||
|
const threadId = await ctx.db.insert('threads', {
|
||||||
|
ownerId,
|
||||||
|
spoonId,
|
||||||
|
title: 'Upstream maintenance review',
|
||||||
|
source: 'upstream_update',
|
||||||
|
status: 'running',
|
||||||
|
priority: 'normal',
|
||||||
|
relatedAgentRequestId: requestId,
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
});
|
||||||
|
const jobId = await ctx.db.insert('agentJobs', {
|
||||||
|
spoonId,
|
||||||
|
ownerId,
|
||||||
|
agentRequestId: requestId,
|
||||||
|
threadId,
|
||||||
|
jobType: 'maintenance_review',
|
||||||
|
status: 'running',
|
||||||
|
workspaceStatus: 'active',
|
||||||
|
prompt: 'Review upstream maintenance changes',
|
||||||
|
runtime: 'opencode',
|
||||||
|
baseBranch: 'main',
|
||||||
|
workBranch: 'spoon/maintenance-review',
|
||||||
|
forkOwner: 'team',
|
||||||
|
forkRepo: 'maintenance-spoon',
|
||||||
|
forkUrl: 'https://git.example.com/team/maintenance-spoon',
|
||||||
|
upstreamOwner: 'upstream',
|
||||||
|
upstreamRepo: 'maintenance',
|
||||||
|
selectedSecretIds: [],
|
||||||
|
model: '',
|
||||||
|
reasoningEffort: 'medium',
|
||||||
|
claimedBy: 'w1',
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
});
|
||||||
|
return { jobId, threadId };
|
||||||
|
});
|
||||||
|
|
||||||
|
await t.mutation(api.agentJobs.applyMaintenanceDecision, {
|
||||||
|
workerToken: 'test-worker-token',
|
||||||
|
workerId: 'w1',
|
||||||
|
jobId,
|
||||||
|
decision: 'sync',
|
||||||
|
risk: 'low',
|
||||||
|
summary: 'Safe to sync automatically.',
|
||||||
|
ignoredCommitShas: [],
|
||||||
|
recommendedAction: 'Sync the upstream changes.',
|
||||||
|
requiresUserApproval: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { job, thread } = await t.run(async (ctx) => ({
|
||||||
|
job: await ctx.db.get(jobId),
|
||||||
|
thread: await ctx.db.get(threadId),
|
||||||
|
}));
|
||||||
|
expect(thread?.status).toBe('resolved');
|
||||||
|
expect(job?.workspaceStatus).toBe('stopped');
|
||||||
|
expect(job?.completedAt).toEqual(expect.any(Number));
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user