feat: implement workerStart notifications for tick pickups and enhance tick handling
This commit is contained in:
@@ -12,6 +12,7 @@
|
|||||||
import { execFile } from "node:child_process";
|
import { execFile } from "node:child_process";
|
||||||
import { promisify } from "node:util";
|
import { promisify } from "node:util";
|
||||||
import { log as auditLog } from "./audit.js";
|
import { log as auditLog } from "./audit.js";
|
||||||
|
import type { TickAction } from "./services/tick.js";
|
||||||
|
|
||||||
const execFileAsync = promisify(execFile);
|
const execFileAsync = promisify(execFile);
|
||||||
|
|
||||||
@@ -226,6 +227,43 @@ export async function notify(
|
|||||||
return sendMessage(target, message, channel, opts.workspaceDir);
|
return sendMessage(target, message, channel, opts.workspaceDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send workerStart notifications for each tick pickup.
|
||||||
|
*
|
||||||
|
* Called after projectTick() returns pickups — callers pass the array
|
||||||
|
* so each dispatched task gets a visible start notification in the project group.
|
||||||
|
*/
|
||||||
|
export async function notifyTickPickups(
|
||||||
|
pickups: TickAction[],
|
||||||
|
opts: {
|
||||||
|
workspaceDir: string;
|
||||||
|
config?: NotificationConfig;
|
||||||
|
channel?: string;
|
||||||
|
},
|
||||||
|
): Promise<void> {
|
||||||
|
for (const pickup of pickups) {
|
||||||
|
await notify(
|
||||||
|
{
|
||||||
|
type: "workerStart",
|
||||||
|
project: pickup.project,
|
||||||
|
groupId: pickup.groupId,
|
||||||
|
issueId: pickup.issueId,
|
||||||
|
issueTitle: pickup.issueTitle,
|
||||||
|
issueUrl: pickup.issueUrl,
|
||||||
|
role: pickup.role,
|
||||||
|
tier: pickup.tier,
|
||||||
|
sessionAction: pickup.sessionAction,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
workspaceDir: opts.workspaceDir,
|
||||||
|
config: opts.config,
|
||||||
|
groupId: pickup.groupId,
|
||||||
|
channel: opts.channel,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get notification config from plugin config.
|
* Get notification config from plugin config.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ export type TickAction = {
|
|||||||
groupId: string;
|
groupId: string;
|
||||||
issueId: number;
|
issueId: number;
|
||||||
issueTitle: string;
|
issueTitle: string;
|
||||||
|
issueUrl: string;
|
||||||
role: "dev" | "qa";
|
role: "dev" | "qa";
|
||||||
tier: string;
|
tier: string;
|
||||||
sessionAction: "spawn" | "send";
|
sessionAction: "spawn" | "send";
|
||||||
@@ -147,7 +148,7 @@ export async function projectTick(opts: {
|
|||||||
|
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
pickups.push({
|
pickups.push({
|
||||||
project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title,
|
project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title, issueUrl: issue.web_url,
|
||||||
role, tier: selectedTier,
|
role, tier: selectedTier,
|
||||||
sessionAction: getSessionForTier(worker, selectedTier) ? "send" : "spawn",
|
sessionAction: getSessionForTier(worker, selectedTier) ? "send" : "spawn",
|
||||||
announcement: `[DRY RUN] Would pick up #${issue.iid}`,
|
announcement: `[DRY RUN] Would pick up #${issue.iid}`,
|
||||||
@@ -162,7 +163,7 @@ export async function projectTick(opts: {
|
|||||||
pluginConfig, sessionKey,
|
pluginConfig, sessionKey,
|
||||||
});
|
});
|
||||||
pickups.push({
|
pickups.push({
|
||||||
project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title,
|
project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title, issueUrl: issue.web_url,
|
||||||
role, tier: dr.tier, sessionAction: dr.sessionAction, announcement: dr.announcement,
|
role, tier: dr.tier, sessionAction: dr.sessionAction, announcement: dr.announcement,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import type { InteractionContext } from "./context-guard.js";
|
|||||||
import { detectContext, generateGuardrails } from "./context-guard.js";
|
import { detectContext, generateGuardrails } from "./context-guard.js";
|
||||||
import { readProjects, getProject, type Project, type ProjectsData } from "./projects.js";
|
import { readProjects, getProject, type Project, type ProjectsData } from "./projects.js";
|
||||||
import { createProvider, type ProviderWithType } from "./providers/index.js";
|
import { createProvider, type ProviderWithType } from "./providers/index.js";
|
||||||
|
import { projectTick, type TickAction } from "./services/tick.js";
|
||||||
|
import { notifyTickPickups, getNotificationConfig } from "./notify.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Require workspaceDir from context or throw a clear error.
|
* Require workspaceDir from context or throw a clear error.
|
||||||
@@ -77,3 +79,41 @@ export function groupOnlyError(toolName: string, context: InteractionContext) {
|
|||||||
export function getPluginConfig(api: OpenClawPluginApi): Record<string, unknown> | undefined {
|
export function getPluginConfig(api: OpenClawPluginApi): Record<string, unknown> | undefined {
|
||||||
return api.pluginConfig as Record<string, unknown> | undefined;
|
return api.pluginConfig as Record<string, unknown> | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run projectTick (non-fatal) and send workerStart notifications for any pickups.
|
||||||
|
* Returns the pickups array (empty on failure).
|
||||||
|
*/
|
||||||
|
export async function tickAndNotify(opts: {
|
||||||
|
workspaceDir: string;
|
||||||
|
groupId: string;
|
||||||
|
agentId?: string;
|
||||||
|
pluginConfig?: Record<string, unknown>;
|
||||||
|
sessionKey?: string;
|
||||||
|
targetRole?: "dev" | "qa";
|
||||||
|
channel?: string;
|
||||||
|
}): Promise<TickAction[]> {
|
||||||
|
let pickups: TickAction[] = [];
|
||||||
|
try {
|
||||||
|
const result = await projectTick({
|
||||||
|
workspaceDir: opts.workspaceDir,
|
||||||
|
groupId: opts.groupId,
|
||||||
|
agentId: opts.agentId,
|
||||||
|
pluginConfig: opts.pluginConfig,
|
||||||
|
sessionKey: opts.sessionKey,
|
||||||
|
targetRole: opts.targetRole,
|
||||||
|
});
|
||||||
|
pickups = result.pickups;
|
||||||
|
} catch { /* non-fatal: tick failure shouldn't break the caller */ }
|
||||||
|
|
||||||
|
if (pickups.length) {
|
||||||
|
const notifyConfig = getNotificationConfig(opts.pluginConfig);
|
||||||
|
await notifyTickPickups(pickups, {
|
||||||
|
workspaceDir: opts.workspaceDir,
|
||||||
|
config: notifyConfig,
|
||||||
|
channel: opts.channel,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return pickups;
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { jsonResult } from "openclaw/plugin-sdk";
|
|||||||
import type { ToolContext } from "../types.js";
|
import type { ToolContext } from "../types.js";
|
||||||
import { readProjects } from "../projects.js";
|
import { readProjects } from "../projects.js";
|
||||||
import { log as auditLog } from "../audit.js";
|
import { log as auditLog } from "../audit.js";
|
||||||
import { notify, getNotificationConfig } from "../notify.js";
|
import { notify, notifyTickPickups, getNotificationConfig } from "../notify.js";
|
||||||
import { checkWorkerHealth, type HealthFix } from "../services/health.js";
|
import { checkWorkerHealth, type HealthFix } from "../services/health.js";
|
||||||
import { projectTick, type TickAction } from "../services/tick.js";
|
import { projectTick, type TickAction } from "../services/tick.js";
|
||||||
import { requireWorkspaceDir, resolveContext, resolveProvider, getPluginConfig } from "../tool-helpers.js";
|
import { requireWorkspaceDir, resolveContext, resolveProvider, getPluginConfig } from "../tool-helpers.js";
|
||||||
@@ -91,6 +91,12 @@ export function createAutoPickupTool(api: OpenClawPluginApi) {
|
|||||||
pickups.push(...result.pickups.map((p) => ({ ...p, project: current.name })));
|
pickups.push(...result.pickups.map((p) => ({ ...p, project: current.name })));
|
||||||
skipped.push(...result.skipped.map((s) => ({ project: current.name, ...s })));
|
skipped.push(...result.skipped.map((s) => ({ project: current.name, ...s })));
|
||||||
pickupCount += result.pickups.length;
|
pickupCount += result.pickups.length;
|
||||||
|
|
||||||
|
// Send workerStart notifications for each pickup in this project
|
||||||
|
if (!dryRun && result.pickups.length > 0) {
|
||||||
|
const notifyConfig = getNotificationConfig(pluginConfig);
|
||||||
|
await notifyTickPickups(result.pickups, { workspaceDir, config: notifyConfig, channel: current.channel ?? "telegram" });
|
||||||
|
}
|
||||||
for (const p of result.pickups) {
|
for (const p of result.pickups) {
|
||||||
if (p.role === "dev") globalActiveDev++; else globalActiveQa++;
|
if (p.role === "dev") globalActiveDev++; else globalActiveQa++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,10 +9,9 @@ import { jsonResult } from "openclaw/plugin-sdk";
|
|||||||
import type { ToolContext } from "../types.js";
|
import type { ToolContext } from "../types.js";
|
||||||
import { getWorker, resolveRepoPath } from "../projects.js";
|
import { getWorker, resolveRepoPath } from "../projects.js";
|
||||||
import { executeCompletion, getRule, NEXT_STATE } from "../services/pipeline.js";
|
import { executeCompletion, getRule, NEXT_STATE } from "../services/pipeline.js";
|
||||||
import { projectTick, type TickResult } from "../services/tick.js";
|
|
||||||
import { log as auditLog } from "../audit.js";
|
import { log as auditLog } from "../audit.js";
|
||||||
import { notify, getNotificationConfig } from "../notify.js";
|
import { notify, getNotificationConfig } from "../notify.js";
|
||||||
import { requireWorkspaceDir, resolveProject, resolveProvider, getPluginConfig } from "../tool-helpers.js";
|
import { requireWorkspaceDir, resolveProject, resolveProvider, getPluginConfig, tickAndNotify } from "../tool-helpers.js";
|
||||||
|
|
||||||
export function createWorkFinishTool(api: OpenClawPluginApi) {
|
export function createWorkFinishTool(api: OpenClawPluginApi) {
|
||||||
return (ctx: ToolContext) => ({
|
return (ctx: ToolContext) => ({
|
||||||
@@ -68,28 +67,26 @@ export function createWorkFinishTool(api: OpenClawPluginApi) {
|
|||||||
...completion,
|
...completion,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Tick: fill free slots after completion
|
// Notify completion
|
||||||
const pluginConfig = getPluginConfig(api);
|
const pluginConfig = getPluginConfig(api);
|
||||||
let tickResult: TickResult | null = null;
|
|
||||||
try {
|
|
||||||
tickResult = await projectTick({
|
|
||||||
workspaceDir, groupId, agentId: ctx.agentId, pluginConfig, sessionKey: ctx.sessionKey,
|
|
||||||
});
|
|
||||||
} catch { /* non-fatal: tick failure shouldn't break work_finish */ }
|
|
||||||
if (tickResult?.pickups.length) output.tickPickups = tickResult.pickups;
|
|
||||||
|
|
||||||
// Notify
|
|
||||||
const notifyConfig = getNotificationConfig(pluginConfig);
|
const notifyConfig = getNotificationConfig(pluginConfig);
|
||||||
await notify(
|
await notify(
|
||||||
{ type: "workerComplete", project: project.name, groupId, issueId, role, result: result as "done" | "pass" | "fail" | "refine" | "blocked", summary, nextState: NEXT_STATE[`${role}:${result}`] },
|
{ type: "workerComplete", project: project.name, groupId, issueId, role, result: result as "done" | "pass" | "fail" | "refine" | "blocked", summary, nextState: NEXT_STATE[`${role}:${result}`] },
|
||||||
{ workspaceDir, config: notifyConfig, groupId, channel: project.channel ?? "telegram" },
|
{ workspaceDir, config: notifyConfig, groupId, channel: project.channel ?? "telegram" },
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Tick: fill free slots + notify starts
|
||||||
|
const tickPickups = await tickAndNotify({
|
||||||
|
workspaceDir, groupId, agentId: ctx.agentId, pluginConfig, sessionKey: ctx.sessionKey,
|
||||||
|
channel: project.channel ?? "telegram",
|
||||||
|
});
|
||||||
|
if (tickPickups.length) output.tickPickups = tickPickups;
|
||||||
|
|
||||||
// Audit
|
// Audit
|
||||||
await auditLog(workspaceDir, "work_finish", {
|
await auditLog(workspaceDir, "work_finish", {
|
||||||
project: project.name, groupId, issue: issueId, role, result,
|
project: project.name, groupId, issue: issueId, role, result,
|
||||||
summary: summary ?? null, labelTransition: completion.labelTransition,
|
summary: summary ?? null, labelTransition: completion.labelTransition,
|
||||||
tickPickups: tickResult?.pickups.length ?? 0,
|
tickPickups: tickPickups.length,
|
||||||
});
|
});
|
||||||
|
|
||||||
return jsonResult(output);
|
return jsonResult(output);
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ import { selectTier } from "../model-selector.js";
|
|||||||
import { getWorker } from "../projects.js";
|
import { getWorker } from "../projects.js";
|
||||||
import { dispatchTask } from "../dispatch.js";
|
import { dispatchTask } from "../dispatch.js";
|
||||||
import { notify, getNotificationConfig } from "../notify.js";
|
import { notify, getNotificationConfig } from "../notify.js";
|
||||||
import { findNextIssue, detectRoleFromLabel, detectTierFromLabels, projectTick, type TickResult } from "../services/tick.js";
|
import { findNextIssue, detectRoleFromLabel, detectTierFromLabels } from "../services/tick.js";
|
||||||
import { requireWorkspaceDir, resolveContext, resolveProject, resolveProvider, groupOnlyError, getPluginConfig } from "../tool-helpers.js";
|
import { requireWorkspaceDir, resolveContext, resolveProject, resolveProvider, groupOnlyError, getPluginConfig, tickAndNotify } from "../tool-helpers.js";
|
||||||
|
|
||||||
export function createWorkStartTool(api: OpenClawPluginApi) {
|
export function createWorkStartTool(api: OpenClawPluginApi) {
|
||||||
return (ctx: ToolContext) => ({
|
return (ctx: ToolContext) => ({
|
||||||
@@ -109,14 +109,12 @@ export function createWorkStartTool(api: OpenClawPluginApi) {
|
|||||||
{ workspaceDir, config: notifyConfig, groupId, channel: context.channel },
|
{ workspaceDir, config: notifyConfig, groupId, channel: context.channel },
|
||||||
);
|
);
|
||||||
|
|
||||||
// Tick: fill parallel slots
|
// Tick: fill parallel slots + notify starts
|
||||||
let tickResult: TickResult | null = null;
|
const tickPickups = await tickAndNotify({
|
||||||
try {
|
|
||||||
tickResult = await projectTick({
|
|
||||||
workspaceDir, groupId, agentId: ctx.agentId, pluginConfig, sessionKey: ctx.sessionKey,
|
workspaceDir, groupId, agentId: ctx.agentId, pluginConfig, sessionKey: ctx.sessionKey,
|
||||||
targetRole: role === "dev" ? "qa" : "dev",
|
targetRole: role === "dev" ? "qa" : "dev",
|
||||||
|
channel: context.channel,
|
||||||
});
|
});
|
||||||
} catch { /* non-fatal */ }
|
|
||||||
|
|
||||||
const output: Record<string, unknown> = {
|
const output: Record<string, unknown> = {
|
||||||
success: true, project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title,
|
success: true, project: project.name, groupId, issueId: issue.iid, issueTitle: issue.title,
|
||||||
@@ -125,7 +123,7 @@ export function createWorkStartTool(api: OpenClawPluginApi) {
|
|||||||
tierReason, tierSource,
|
tierReason, tierSource,
|
||||||
autoDetected: { projectGroupId: !groupIdParam, role: !roleParam, issueId: issueIdParam === undefined, tier: !tierParam },
|
autoDetected: { projectGroupId: !groupIdParam, role: !roleParam, issueId: issueIdParam === undefined, tier: !tierParam },
|
||||||
};
|
};
|
||||||
if (tickResult?.pickups.length) output.tickPickups = tickResult.pickups;
|
if (tickPickups.length) output.tickPickups = tickPickups;
|
||||||
|
|
||||||
return jsonResult(output);
|
return jsonResult(output);
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user