bkinnightskytw
/
agent-orchestrator
mirror of https://github.com/ComposioHQ/agent-orchestrator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: address PR review feedback (#131)

This commit is contained in:
harshitsinghbhandari 2026-04-17 22:01:52 +05:30
parent e7ad928812
commit 542a3b6a89
3 changed files with 82 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.changeset/late-lions-share.md
View File

@ -1,6 +1,6 @@
---
"@aoagents/ao-core": minor
"@aoagents/ao-cli": minor
---
Allow workers to report non-terminal PR workflow events like `pr-created`, `draft-pr-created`, and `ready-for-review` with optional PR URL/number metadata, while keeping merged and closed PR state SCM-owned.

47
packages/core/src/__tests__/agent-report.test.ts
View File

@ -310,6 +310,53 @@ describe("applyAgentReport", () => {
expect(payload.pr.number).toBe(44);
});
it("preserves prior PR URL when ready_for_review only supplies a PR number", () => {
applyAgentReport(dataDir, sessionId, {
state: "draft_pr_created",
prUrl: "https://github.com/test/repo/pull/45",
now: new Date("2025-01-02T10:00:00.000Z"),
});
applyAgentReport(dataDir, sessionId, {
state: "ready_for_review",
prNumber: 45,
now: new Date("2025-01-02T10:05:00.000Z"),
});
const meta = readMetadataRaw(dataDir, sessionId)!;
expect(meta[AGENT_REPORT_METADATA_KEYS.PR_URL]).toBe("https://github.com/test/repo/pull/45");
expect(meta[AGENT_REPORT_METADATA_KEYS.PR_NUMBER]).toBe("45");
});
it("does not clear PR metadata on later non-PR workflow reports", () => {
applyAgentReport(dataDir, sessionId, {
state: "pr_created",
prUrl: "https://github.com/test/repo/pull/46",
now: new Date("2025-01-02T10:00:00.000Z"),
});
applyAgentReport(dataDir, sessionId, {
state: "working",
now: new Date("2025-01-02T10:05:00.000Z"),
});
const meta = readMetadataRaw(dataDir, sessionId)!;
expect(meta[AGENT_REPORT_METADATA_KEYS.PR_URL]).toBe("https://github.com/test/repo/pull/46");
expect(meta[AGENT_REPORT_METADATA_KEYS.PR_NUMBER]).toBe("46");
expect(meta[AGENT_REPORT_METADATA_KEYS.PR_IS_DRAFT]).toBe("false");
});
it("rejects conflicting PR URL and PR number inputs", () => {
expect(() =>
applyAgentReport(dataDir, sessionId, {
state: "pr_created",
prUrl: "https://github.com/test/repo/pull/47",
prNumber: 99,
now: new Date("2025-01-02T10:00:00.000Z"),
}),
).toThrow(/does not match PR URL/);
});
it("sets startedAt on the first working transition", () => {
const now = new Date("2025-01-01T12:00:00.000Z");
// Re-seed with startedAt explicitly null so we exercise the first-start

62
packages/core/src/agent-report.ts
View File

@ -371,13 +371,17 @@ export function applyAgentReport(
typeof input.prNumber === "number" && Number.isInteger(input.prNumber) && input.prNumber > 0
? input.prNumber
: undefined;
const inferredPrNumber =
trimmedPrUrl && parsedPrNumber === undefined
? (() => {
const parsed = parsePrFromUrl(trimmedPrUrl);
return parsed?.number;
})()
: undefined;
const parsedPrFromUrl = trimmedPrUrl ? parsePrFromUrl(trimmedPrUrl) : null;
const urlPrNumber = parsedPrFromUrl?.number;
if (
trimmedPrUrl &&
parsedPrNumber !== undefined &&
urlPrNumber !== undefined &&
parsedPrNumber !== urlPrNumber
) {
throw new Error(`PR number ${parsedPrNumber} does not match PR URL ${trimmedPrUrl}`);
}
const inferredPrNumber = urlPrNumber;
const prNumber = parsedPrNumber ?? inferredPrNumber;
const prIsDraft =
input.state === "draft_pr_created"
@ -385,6 +389,12 @@ export function applyAgentReport(
: input.state === "pr_created" || input.state === "ready_for_review"
? false
: undefined;
const existingPrUrl = raw[AGENT_REPORT_METADATA_KEYS.PR_URL]?.trim() || undefined;
const existingPrNumberRaw = raw[AGENT_REPORT_METADATA_KEYS.PR_NUMBER];
const existingPrNumber =
existingPrNumberRaw && /^\d+$/.test(existingPrNumberRaw)
? Number.parseInt(existingPrNumberRaw, 10)
: undefined;
let before: AgentReportAuditSnapshot | null = null;
let previousState: CanonicalSessionState | null = null;
let nextState: CanonicalSessionState | null = null;
@ -419,17 +429,17 @@ export function applyAgentReport(
current.session.reason = mapped.sessionReason;
current.session.lastTransitionAt = now;
if (isPRWorkflowReport(input.state)) {
const effectivePrUrl = trimmedPrUrl ?? current.pr.url ?? existingPrUrl;
const effectivePrNumber =
prNumber ?? current.pr.number ?? existingPrNumber ?? parsedPrFromUrl?.number;
current.pr.state = "open";
current.pr.reason = input.state === "ready_for_review" ? "review_pending" : "in_progress";
current.pr.lastObservedAt = now;
if (trimmedPrUrl) {
current.pr.url = trimmedPrUrl;
if (effectivePrUrl) {
current.pr.url = effectivePrUrl;
}
if (prNumber !== undefined) {
current.pr.number = prNumber;
} else if (trimmedPrUrl) {
const parsed = parsePrFromUrl(trimmedPrUrl);
current.pr.number = parsed?.number ?? current.pr.number;
if (effectivePrNumber !== undefined) {
current.pr.number = effectivePrNumber;
}
}
if (mapped.sessionState === "working" && current.session.startedAt === null) {
@ -454,20 +464,16 @@ export function applyAgentReport(
// Clear stale notes from previous reports so they don't mislead humans.
metadataUpdates[AGENT_REPORT_METADATA_KEYS.NOTE] = "";
}
if (trimmedPrUrl) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_URL] = trimmedPrUrl;
} else {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_URL] = "";
}
if (prNumber !== undefined) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_NUMBER] = String(prNumber);
} else {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_NUMBER] = "";
}
if (prIsDraft !== undefined) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_IS_DRAFT] = prIsDraft ? "true" : "false";
} else {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_IS_DRAFT] = "";
if (isPRWorkflowReport(input.state)) {
if (trimmedPrUrl) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_URL] = trimmedPrUrl;
}
if (prNumber !== undefined) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_NUMBER] = String(prNumber);
}
if (prIsDraft !== undefined) {
metadataUpdates[AGENT_REPORT_METADATA_KEYS.PR_IS_DRAFT] = prIsDraft ? "true" : "false";
}
}
updateMetadata(dataDir, sessionId, metadataUpdates);