cloving 1.0.1 → 1.1.0

package/dist/workflows/develop-ticket.js

@@ -1,77 +1,11 @@
 import { decisionGate } from "cloving/workflows/steps/decision-gate";
 import { protectedEffect } from "cloving/workflows/steps/protected-effect";
 import { finishIssue, labelIssue } from "./issue-labels.js";
-const lastRound = 3;
+import { fields, part, lastRound, review, prompt, turnPrompt, pullTitle, pullBody, } from "./ticket-prompts.js";
 const lastFix = 3;
-const publicRule = "The branch becomes a public pull request. Do not write local file paths, such as the path of your home folder, in files or in commit messages.";
-function instructions(repository) {
-    return [
-        "You work on one ticket of this repository. Your current directory is a git work tree on its own branch.",
-        `The main repository is at ${repository}. Do not change files there.`,
-        `If this work tree has no node_modules folder and the main repository has one, make a copy-on-write clone: cp -c -R ${repository}/node_modules node_modules`,
-        "Follow the instructions of the repository (AGENTS.md and CLAUDE.md).",
-        "Use test-driven development: write a test that fails, see it fail, then write the code.",
-        "Run the checks of the repository before you finish.",
-        "Commit your work on the current branch. Do not push. Do not change a different branch.",
-        "End with a short report: what you changed, the checks that you ran with their results, and what is not done.",
-    ].join("\n");
-}
-function named(input) {
-    return input.ticketId === undefined
-        ? "this ticket"
-        : `the ticket ${input.ticketId}`;
-}
-function fields(text) {
-    const value = JSON.parse(text ?? "{}");
-    return typeof value === "object" && value !== null ? { ...value } : {};
-}
-function part(turn, name) {
-    const value = turn[name];
-    if (Array.isArray(value))
-        return value.join("\n");
-    if (typeof value === "number")
-        return value.toFixed(2);
-    return typeof value === "string" ? value : "";
-}
-function denial(round) {
-    return round < lastRound
-        ? "Deny with a feedback text to send the work back to the worker for one more round. Deny with no text to reject the work."
-        : "Deny to reject the work. This is the last round.";
-}
-function review(input, turnResult) {
-    const turn = fields(turnResult.result);
-    return [
-        `Review the work of the Claude worker for ${named(input)}.`,
-        `Round: ${String(turnResult.round)} of ${String(lastRound)}`,
-        `Branch: ${part(turn, "branch")}`,
-        `Work tree: ${part(turn, "worktree")}`,
-        `Cost (USD): ${part(turn, "costUsd")}`,
-        "",
-        "Commits:",
-        part(turn, "commits"),
-        "",
-        "Changed files:",
-        part(turn, "files"),
-        "",
-        "Not committed:",
-        part(turn, "uncommitted"),
-        "",
-        "Report of the worker:",
-        part(turn, "summary"),
-        "",
-        "Approve to accept the branch, then merge the branch yourself.",
-        denial(turnResult.round),
-    ].join("\n");
-}
 function blocked(cycleId, cause) {
     return { kind: "blocked", cycleId, ...cause };
 }
-function prompt(input, round) {
-    const ticket = `${instructions(input.repository)}\n\nThe text of ${named(input)}:\n\n${input.ticket}`;
-    if (round.feedback === null)
-        return ticket;
-    return `${ticket}\n\nThis is round ${String(round.number)}. The branch has the commits of the earlier rounds. The operator denied the work of round ${String(round.number - 1)} with this feedback:\n\n${round.feedback}`;
-}
 function decided(cycleId, decision) {
     const number = Number(decision.gateId.slice("review-".length));
     if (decision.decision === "approved")
@@ -92,61 +26,6 @@ function decided(cycleId, decision) {
         });
     return { number: number + 1, feedback: decision.answer };
 }
-function pullPrompt(input) {
-    return `${instructions(input.repository)}\n${publicRule}\n\nThe text of ${named(input)}:\n\n${input.ticket}`;
-}
-function findingLines(findings) {
-    if (!Array.isArray(findings))
-        return "";
-    return findings
-        .map((item) => {
-        const finding = fields(JSON.stringify(item));
-        const line = finding["line"];
-        const place = typeof line === "number" ? `:${String(line)}` : "";
-        return `- ${part(finding, "path")}${place}: ${part(finding, "body")}`;
-    })
-        .join("\n");
-}
-function turnPrompt(input, fix) {
-    if (fix === null)
-        return pullPrompt(input);
-    const { round, pull, review } = fix;
-    if (typeof review["reason"] === "string")
-        return [
-            pullPrompt(input),
-            "",
-            `This is round ${String(round)}. The merge of the pull request ${pull.url} needs a fix: ${review["reason"]}.`,
-            review["reason"] === "merge-conflict"
-                ? "Merge the default branch of origin into the branch, resolve each conflict, run the tests, and commit."
-                : "The check failed on the tree of the merge of the branch with the newest commit of the default branch. Fix the cause and commit the fix.",
-            "",
-            part(review, "output"),
-        ].join("\n");
-    return [
-        pullPrompt(input),
-        "",
-        `This is round ${String(round)}. The branch has the commits of the earlier rounds. Greptile reviewed the pull request ${pull.url} at the commit ${pull.commit.slice(0, 7)} and gave the confidence score ${String(review["score"])}/5. Fix each problem of the review, then commit the fixes. Cloving merges the pull request when the score is 5/5.`,
-        "",
-        "Summary of the review:",
-        "",
-        part(review, "summary"),
-        "",
-        "Findings on lines:",
-        "",
-        findingLines(review["findings"]),
-    ].join("\n");
-}
-function pullTitle(input) {
-    const [first = ""] = input.ticket.split("\n", 1);
-    return first.startsWith("# ")
-        ? first.slice(2).trim().slice(0, 200)
-        : `Cloving task ${input.cycleId}`;
-}
-function pullBody(input) {
-    const issue = /^GitHub issue: ([\w.-]+[/][\w.-]+#\d+)/m.exec(input.ticket);
-    const about = `Cloving made this change for ${named(input)}. Greptile reviews the pull request, and Cloving merges it when the confidence score is 5/5.`;
-    return issue === null ? about : `Closes ${String(issue[1])}\n\n${about}`;
-}
 async function stepped(input, call) {
     const { phase, operation, round, capability, method, payload } = call;
     const done = await protectedEffect({
@@ -202,7 +81,30 @@ async function merged(input, done) {
             reason: `The merge has the result ${merge.result["reason"]} in round ${String(done.round)}, and a run has at most ${String(lastFix)} fix rounds. The pull request stays open: ${done.pull.url}`,
             evidenceId: "github-merge",
         });
-    return { round: done.round + 1, pull: done.pull, review: merge.result };
+    return {
+        round: done.round + 1,
+        pull: done.pull,
+        review: merge.result,
+        report: done.report,
+    };
+}
+async function reviewedPull(input, round) {
+    const opened = await github(input, {
+        method: "open-pr",
+        round,
+        payload: { title: pullTitle(input), body: pullBody(input) },
+    });
+    if (opened.kind !== "done")
+        return opened;
+    const pull = pullOf(opened.result);
+    const reviewed = await github(input, {
+        method: "wait-review",
+        round,
+        payload: { number: pull.number, commit: pull.commit },
+    });
+    return reviewed.kind === "done"
+        ? { kind: "reviewed", pull, review: reviewed.result }
+        : reviewed;
 }
 async function pullRequest(input) {
     const prepared = await github(input, {
@@ -225,26 +127,20 @@ async function pullRequest(input) {
         });
         if (turn.kind !== "done")
             return finishIssue(input, { round, outcome: turn });
-        const opened = await github(input, {
-            method: "open-pr",
-            round,
-            payload: { title: pullTitle(input), body: pullBody(input) },
-        });
-        if (opened.kind !== "done")
-            return finishIssue(input, { round, outcome: opened });
-        const pull = pullOf(opened.result);
-        const reviewed = await github(input, {
-            method: "wait-review",
-            round,
-            payload: { number: pull.number, commit: pull.commit },
-        });
-        if (reviewed.kind !== "done")
+        const reviewed = await reviewedPull(input, round);
+        if (reviewed.kind !== "reviewed")
             return finishIssue(input, { round, outcome: reviewed });
-        const score = reviewed.result["score"];
+        const { pull } = reviewed;
+        const score = reviewed.review["score"];
         if (score === 5) {
-            const result = await merged(input, { round, pull });
+            const result = await merged(input, { round, pull, report: turn.result });
             if ("kind" in result)
-                return finishIssue(input, { round, outcome: result });
+                return finishIssue(input, {
+                    round,
+                    outcome: result,
+                    summary: part(turn.result, "summary"),
+                    status: turn.result["ticketStatus"],
+                });
             fix = result;
             continue;
         }
@@ -256,7 +152,12 @@ async function pullRequest(input) {
                     evidenceId: "github-wait-review",
                 }),
             });
-        fix = { round: round + 1, pull, review: reviewed.result };
+        fix = {
+            round: round + 1,
+            pull,
+            review: reviewed.review,
+            report: turn.result,
+        };
     }
 }
 export async function developTicket(input, decision) {

package/dist/workflows/issue-labels.d.ts

@@ -1,4 +1,4 @@
-import type { CycleOutcome } from "cloving/workflows";
+import { type CycleOutcome } from "cloving/workflows";
 interface IssueTicket {
     readonly cycleId: string;
     readonly ticket: string;
@@ -10,5 +10,7 @@ export declare function labelIssue(input: IssueTicket, state: {
 export declare function finishIssue(input: IssueTicket, ending: {
     readonly round: number;
     readonly outcome: CycleOutcome;
+    readonly summary?: string;
+    readonly status?: unknown;
 }): Promise<CycleOutcome>;
 export {};

package/dist/workflows/issue-labels.js

@@ -1,3 +1,4 @@
+import { ticketStatus } from "cloving/workflows";
 import { protectedEffect } from "cloving/workflows/steps/protected-effect";
 export async function labelIssue(input, state) {
     const issue = /^GitHub issue: ([\w.-]+)\/([\w.-]+)#(\d+)/m.exec(input.ticket);
@@ -28,9 +29,42 @@ export async function labelIssue(input, state) {
     });
 }
 export async function finishIssue(input, ending) {
+    if (ending.outcome.kind === "handoff_requested")
+        return finishMergedIssue(input, ending);
     await labelIssue(input, {
         round: ending.round,
         key: ending.outcome.kind === "blocked" ? "blocked" : "done",
     });
     return ending.outcome;
 }
+async function finishMergedIssue(input, ending) {
+    if (ending.outcome.kind !== "handoff_requested")
+        return ending.outcome;
+    const status = ticketStatus(ending.summary ?? "", ending.status);
+    const method = status.kind === "complete" ? "close-issue" : "partial-issue";
+    const issue = /^GitHub issue: ([\w.-]+)\/([\w.-]+)#(\d+)/m.exec(input.ticket);
+    const outcome = { ...ending.outcome, ticketStatus: status.kind };
+    if (issue === null)
+        return outcome;
+    const update = await protectedEffect({
+        scope: {
+            phase: "pull-request",
+            operation: `github-${method}`,
+            round: ending.round,
+        },
+        capability: "github",
+        method,
+        target: input.cycleId,
+        units: 1,
+        payload: JSON.stringify({
+            owner: issue[1],
+            repository: issue[2],
+            number: Number(issue[3]),
+            pullRequest: Number(ending.outcome.promotionId.slice("pull-request-".length)),
+            ...(status.kind === "partial" ? { remaining: status.remaining } : {}),
+        }),
+    });
+    if (update.kind === "completed")
+        return outcome;
+    return { ...outcome, issueUpdate: "failed" };
+}

package/dist/workflows/ticket-prompts.d.ts

@@ -0,0 +1,35 @@
+export interface Ticket {
+    readonly cycleId: string;
+    readonly ticket: string;
+    readonly ticketId?: string;
+    readonly repository: string;
+    readonly delivery?: string;
+}
+export interface Round {
+    readonly number: number;
+    readonly feedback: string | null;
+}
+export interface Pull {
+    readonly number: number;
+    readonly url: string;
+    readonly commit: string;
+}
+export interface Fix {
+    readonly round: number;
+    readonly pull: Pull;
+    readonly review: Fields;
+    readonly report: Fields;
+}
+export declare const lastRound = 3;
+type Fields = Readonly<Record<string, unknown>>;
+export declare function fields(text: string | null): Readonly<Record<string, unknown>>;
+export declare function part(turn: Readonly<Record<string, unknown>>, name: string): string;
+export declare function review(input: Ticket, turnResult: {
+    readonly round: number;
+    readonly result: string | null;
+}): string;
+export declare function prompt(input: Ticket, round: Round): string;
+export declare function turnPrompt(input: Ticket, fix: Fix | null): string;
+export declare function pullTitle(input: Ticket): string;
+export declare function pullBody(input: Ticket): string;
+export {};

package/dist/workflows/ticket-prompts.js

@@ -0,0 +1,133 @@
+import { ticketStatus } from "cloving/workflows";
+export const lastRound = 3;
+const publicRule = "The branch becomes a public pull request. Do not write local file paths, such as the path of your home folder, in files or in commit messages.";
+function instructions(repository) {
+    return [
+        "You work on one ticket of this repository. Your current directory is a git work tree on its own branch.",
+        `The main repository is at ${repository}. Do not change files there.`,
+        `If this work tree has no node_modules folder and the main repository has one, make a copy-on-write clone: cp -c -R ${repository}/node_modules node_modules`,
+        "Follow the instructions of the repository (AGENTS.md and CLAUDE.md).",
+        "Use test-driven development: write a test that fails, see it fail, then write the code.",
+        "Run the checks of the repository before you finish.",
+        "Commit your work on the current branch. Do not push. Do not change a different branch.",
+        "End with a short report: what you changed, the checks that you ran with their results, and what is not done. End the report with exactly one of the lines Ticket status: complete or Ticket status: partial. Before a partial status line, include Remaining: followed by a list with one item on each line, using a dash and a space before each item.",
+    ].join("\n");
+}
+function named(input) {
+    return input.ticketId === undefined
+        ? "this ticket"
+        : `the ticket ${input.ticketId}`;
+}
+export function fields(text) {
+    const value = JSON.parse(text ?? "{}");
+    return typeof value === "object" && value !== null ? { ...value } : {};
+}
+export function part(turn, name) {
+    const value = turn[name];
+    if (Array.isArray(value))
+        return value.join("\n");
+    if (typeof value === "number")
+        return value.toFixed(2);
+    return typeof value === "string" ? value : "";
+}
+function denial(round) {
+    return round < lastRound
+        ? "Deny with a feedback text to send the work back to the worker for one more round. Deny with no text to reject the work."
+        : "Deny to reject the work. This is the last round.";
+}
+export function review(input, turnResult) {
+    const turn = fields(turnResult.result);
+    return [
+        `Review the work of the Claude worker for ${named(input)}.`,
+        `Round: ${String(turnResult.round)} of ${String(lastRound)}`,
+        `Branch: ${part(turn, "branch")}`,
+        `Work tree: ${part(turn, "worktree")}`,
+        `Cost (USD): ${part(turn, "costUsd")}`,
+        "",
+        "Commits:",
+        part(turn, "commits"),
+        "",
+        "Changed files:",
+        part(turn, "files"),
+        "",
+        "Not committed:",
+        part(turn, "uncommitted"),
+        "",
+        "Report of the worker:",
+        part(turn, "summary"),
+        "",
+        "Approve to accept the branch, then merge the branch yourself.",
+        denial(turnResult.round),
+    ].join("\n");
+}
+export function prompt(input, round) {
+    const ticket = `${instructions(input.repository)}\n\nThe text of ${named(input)}:\n\n${input.ticket}`;
+    if (round.feedback === null)
+        return ticket;
+    return `${ticket}\n\nThis is round ${String(round.number)}. The branch has the commits of the earlier rounds. The operator denied the work of round ${String(round.number - 1)} with this feedback:\n\n${round.feedback}`;
+}
+function pullPrompt(input) {
+    return `${instructions(input.repository)}\n${publicRule}\n\nThe text of ${named(input)}:\n\n${input.ticket}`;
+}
+function findingLines(findings) {
+    if (!Array.isArray(findings))
+        return "";
+    return findings
+        .map((item) => {
+        const finding = fields(JSON.stringify(item));
+        const line = finding["line"];
+        const place = typeof line === "number" ? `:${String(line)}` : "";
+        return `- ${part(finding, "path")}${place}: ${part(finding, "body")}`;
+    })
+        .join("\n");
+}
+export function turnPrompt(input, fix) {
+    if (fix === null)
+        return pullPrompt(input);
+    const { round, pull, review } = fix;
+    const status = ticketStatus(part(fix.report, "summary"), fix.report["ticketStatus"]);
+    const continuation = status.kind === "complete"
+        ? ""
+        : [
+            "",
+            "Remaining work from the previous worker report:",
+            ...status.remaining.map((item) => `- ${item}`),
+            "Reassess each remaining item before reporting Ticket status: complete. Keep every unfinished item in the next Remaining: list.",
+        ].join("\n");
+    const ticket = pullPrompt(input) + continuation;
+    if (typeof review["reason"] === "string")
+        return [
+            ticket,
+            "",
+            `This is round ${String(round)}. The merge of the pull request ${pull.url} needs a fix: ${review["reason"]}.`,
+            review["reason"] === "merge-conflict"
+                ? "Merge the default branch of origin into the branch, resolve each conflict, run the tests, and commit."
+                : "The check failed on the tree of the merge of the branch with the newest commit of the default branch. Fix the cause and commit the fix.",
+            "",
+            part(review, "output"),
+        ].join("\n");
+    return [
+        ticket,
+        "",
+        `This is round ${String(round)}. The branch has the commits of the earlier rounds. Greptile reviewed the pull request ${pull.url} at the commit ${pull.commit.slice(0, 7)} and gave the confidence score ${String(review["score"])}/5. Fix each problem of the review, then commit the fixes. Cloving merges the pull request when the score is 5/5.`,
+        "",
+        "Summary of the review:",
+        "",
+        part(review, "summary"),
+        "",
+        "Findings on lines:",
+        "",
+        findingLines(review["findings"]),
+    ].join("\n");
+}
+export function pullTitle(input) {
+    const [first = ""] = input.ticket.split("\n", 1);
+    return first.startsWith("# ")
+        ? first.slice(2).trim().slice(0, 200)
+        : `Cloving task ${input.cycleId}`;
+}
+export function pullBody(input) {
+    const issue = /^GitHub issue: ([\w.-]+[/][\w.-]+#\d+)/m.exec(input.ticket);
+    const about = `Cloving made this change for ${named(input)}. Greptile reviews the pull request, and Cloving merges it when the confidence score is 5/5.`;
+    return issue === null ? about : `Refs ${String(issue[1])}\n\n${about}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Local durable development workflow service",
   "license": "MIT",
   "repository": {
@@ -46,10 +46,12 @@
     "npm": ">=11.19.1 <12"
   },
   "os": [
-    "darwin"
+    "darwin",
+    "linux"
   ],
   "cpu": [
-    "arm64"
+    "arm64",
+    "x64"
   ],
   "scripts": {
     "build": "tsc --project tsconfig.build.json && node tools/copy-workflow-declarations.ts workflows dist/workflows",