Factory: versions and tags, releases, retry settings, pull of the default branch
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
06c1b8df1b
commit
cb1e31b6e9
13 files changed
+1082
-19
No files matched your search
@@ -6,6 +6,7 @@ import { choiceDialog, confirmDialog, promptDialog, toast } from "../dialogs";
|
||||
import { Icon } from "./Icon";
|
||||
import { Spinner } from "./Activity";
|
||||
import { ModelSelect } from "./ModelSelect";
|
||||
import { ReleaseDialog, ReleasesPanel, type ReleaseRow } from "./FactoryRelease";
|
||||
|
||||
interface PrInfo {
|
||||
number: number;
|
||||
@@ -27,6 +28,7 @@ interface PhaseCfg {
|
||||
agent: string;
|
||||
permission_mode: string;
|
||||
timeout_minutes: number;
|
||||
max_attempts: number;
|
||||
extra_prompt: string;
|
||||
}
|
||||
interface RepoCfg {
|
||||
@@ -36,6 +38,7 @@ interface RepoCfg {
|
||||
token: string;
|
||||
label: string;
|
||||
max_parallel: number;
|
||||
max_rework: number;
|
||||
allowed_users: string[];
|
||||
enabled: boolean;
|
||||
review: PhaseCfg;
|
||||
@@ -98,12 +101,14 @@ interface RepoInfo {
|
||||
has_token: boolean;
|
||||
models: Record<Phase, string>;
|
||||
running: number;
|
||||
version?: string | null;
|
||||
}
|
||||
interface Overview {
|
||||
area: boolean;
|
||||
repos: RepoInfo[];
|
||||
issues: Issue[];
|
||||
runs: Run[];
|
||||
releases: ReleaseRow[];
|
||||
}
|
||||
|
||||
/** Board columns: a column collects one or more issue states. */
|
||||
@@ -192,6 +197,22 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
}
|
||||
};
|
||||
|
||||
const [releaseRepo, setReleaseRepo] = useState("");
|
||||
const startRelease = async () => {
|
||||
if (!data) return;
|
||||
let target = repo;
|
||||
if (!target) {
|
||||
const repos = data.repos.filter((r) => r.enabled);
|
||||
if (repos.length === 1) target = repos[0].url;
|
||||
else {
|
||||
const pick = await choiceDialog({ message: t("issues.pickRepo"), choices: repos.map((r) => ({ value: r.url, label: repoName(r.url) })) });
|
||||
if (!pick) return;
|
||||
target = pick;
|
||||
}
|
||||
}
|
||||
setReleaseRepo(target);
|
||||
};
|
||||
|
||||
/** Start a chat that works out a feature or cuts a milestone into issues. */
|
||||
const issueChat = async (mode: "feature" | "slice") => {
|
||||
if (!data) return;
|
||||
@@ -349,6 +370,7 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
<button key={r.url} className={`factory-repo ${repo === r.url ? "active" : ""} ${r.enabled ? "" : "off"}`} onClick={() => setRepo(r.url)}>
|
||||
<b>{repoName(r.url)}</b>
|
||||
<span className="chip">{KIND_NAME[r.kind] ?? r.kind}</span>
|
||||
{r.version && <span className="chip ok mono">v{r.version}</span>}
|
||||
<span className="hint">
|
||||
{r.running > 0 && <span className="factory-pulse" />}
|
||||
{t("factory.repoLine", { n: mine.length, run: r.running })}
|
||||
@@ -367,6 +389,9 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
<button className="small" onClick={() => issueChat("slice")} disabled={busy} title={t("issues.sliceHint")}>
|
||||
<Icon name="sparkle" /> {t("issues.slice")}
|
||||
</button>
|
||||
<button className="small" onClick={startRelease} disabled={busy} title={t("release.hint")}>
|
||||
<Icon name="download" /> {t("release.button")}
|
||||
</button>
|
||||
<button className="small" onClick={poll} disabled={busy} title={t("factory.pollNow")}>
|
||||
<Icon name="refresh" /> {t("factory.pollNow")}
|
||||
</button>
|
||||
@@ -406,6 +431,9 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
})}
|
||||
</div>
|
||||
|
||||
<ReleasesPanel releases={(data.releases ?? []).filter((r) => !repo || r.repo === repo)} />
|
||||
{releaseRepo && <ReleaseDialog repo={releaseRepo} onClose={() => setReleaseRepo("")} onStarted={() => void reload()} />}
|
||||
|
||||
<div className="panel" style={{ marginTop: 16 }}>
|
||||
<div className="row">
|
||||
<h3 style={{ margin: 0 }}>{selected ? `${repoName(selected.repo)} #${selected.number} – ${selected.title}` : t("factory.latestRuns")}</h3>
|
||||
@@ -526,8 +554,8 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
);
|
||||
}
|
||||
|
||||
const blankPhase = (): PhaseCfg => ({ model: "", agent: "codecraft", permission_mode: "auto", timeout_minutes: 60, extra_prompt: "" });
|
||||
const blankRepo = (connection = "", kind = "gitea"): RepoCfg => ({ url: "", kind, connection, token: "", label: "factory", max_parallel: 1, allowed_users: [], enabled: true, review: blankPhase(), build: blankPhase(), qa: blankPhase() });
|
||||
const blankPhase = (): PhaseCfg => ({ model: "", agent: "codecraft", permission_mode: "auto", timeout_minutes: 60, max_attempts: 2, extra_prompt: "" });
|
||||
const blankRepo = (connection = "", kind = "gitea"): RepoCfg => ({ url: "", kind, connection, token: "", label: "factory", max_parallel: 1, max_rework: 2, allowed_users: [], enabled: true, review: blankPhase(), build: blankPhase(), qa: blankPhase() });
|
||||
const blankConn = (): Connection => ({ id: "", name: "", kind: "gitea", url: "", token: "", owner: "" });
|
||||
const MODES = ["default", "auto", "accept_edits", "bypass"];
|
||||
|
||||
@@ -561,6 +589,10 @@ function PhaseForm({ phase, value, onChange }: { phase: Phase; value: PhaseCfg;
|
||||
<span>{t("factory.timeout")}</span>
|
||||
<input type="number" min={1} value={value.timeout_minutes} onChange={(e) => onChange({ timeout_minutes: Number(e.target.value) || 60 })} />
|
||||
</label>
|
||||
<label>
|
||||
<span>{t("factory.attempts")}</span>
|
||||
<input type="number" min={1} max={10} value={value.max_attempts} title={t("factory.attemptsHint")} onChange={(e) => onChange({ max_attempts: Math.max(1, Number(e.target.value) || 1) })} />
|
||||
</label>
|
||||
<label>
|
||||
<span>{t("factory.extraPrompt")}</span>
|
||||
<textarea rows={3} value={value.extra_prompt} onChange={(e) => onChange({ extra_prompt: e.target.value })} />
|
||||
@@ -780,6 +812,10 @@ function FactorySettings() {
|
||||
<span>{t("factory.parallel")}</span>
|
||||
<input type="number" min={1} max={4} value={r.max_parallel} onChange={(e) => up(i, { max_parallel: Number(e.target.value) || 1 })} />
|
||||
</label>
|
||||
<label>
|
||||
<span>{t("factory.rework")}</span>
|
||||
<input type="number" min={0} max={10} value={r.max_rework} title={t("factory.reworkHint")} onChange={(e) => up(i, { max_rework: Math.max(0, Number(e.target.value) || 0) })} />
|
||||
</label>
|
||||
<label>
|
||||
<span>{t("factory.allowed")}</span>
|
||||
<input value={r.allowed_users.join(", ")} placeholder={t("factory.allowedPlaceholder")} onChange={(e) => up(i, { allowed_users: e.target.value.split(",").map((u) => u.trim()).filter(Boolean) })} />
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { get, post } from "../api";
|
||||
import { fmtRelative, useT } from "../i18n";
|
||||
import { toast } from "../dialogs";
|
||||
import { Icon } from "./Icon";
|
||||
import { Spinner } from "./Activity";
|
||||
|
||||
export interface ReleaseRow {
|
||||
id: string;
|
||||
repo: string;
|
||||
version: string;
|
||||
state: "running" | "done" | "failed";
|
||||
log: string;
|
||||
url: string;
|
||||
started_at: number;
|
||||
ended_at: number | null;
|
||||
}
|
||||
|
||||
interface Preview {
|
||||
current: string;
|
||||
suggested: string;
|
||||
spec: string | null;
|
||||
running: boolean;
|
||||
}
|
||||
|
||||
const repoName = (url: string) => url.replace(/\.git$/, "").split("/").slice(-2).join("/");
|
||||
|
||||
/** Confirm and start a release: version, the recipe that will run, then tag + image + downloads. */
|
||||
export function ReleaseDialog({ repo, onClose, onStarted }: { repo: string; onClose: () => void; onStarted: () => void }) {
|
||||
const t = useT();
|
||||
const [pv, setPv] = useState<Preview>();
|
||||
const [version, setVersion] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
get<Preview>(`/factory/release/preview?repo=${encodeURIComponent(repo)}`)
|
||||
.then((p) => {
|
||||
setPv(p);
|
||||
setVersion(p.suggested);
|
||||
})
|
||||
.catch((e) => {
|
||||
toast(e.message);
|
||||
onClose();
|
||||
});
|
||||
}, [repo]);
|
||||
|
||||
if (!pv)
|
||||
return (
|
||||
<div className="modal-backdrop">
|
||||
<div className="modal">
|
||||
<Spinner />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
const start = async () => {
|
||||
setBusy(true);
|
||||
try {
|
||||
await post("/factory/release", { repo, version });
|
||||
toast(t("release.started", { v: version }), "success");
|
||||
onStarted();
|
||||
onClose();
|
||||
} catch (e: any) {
|
||||
toast(e.message);
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="modal-backdrop" onClick={busy ? undefined : onClose}>
|
||||
<div className="modal draft-modal" role="dialog" aria-label={t("release.title")} onClick={(e) => e.stopPropagation()}>
|
||||
<h3>
|
||||
{t("release.title")} – {repoName(repo)}
|
||||
</h3>
|
||||
<div className="hint">{t("release.current", { v: pv.current })}</div>
|
||||
<label className="factory-form" style={{ display: "block", margin: "8px 0" }}>
|
||||
<span>{t("release.version")}</span>
|
||||
<input className="mono" value={version} onChange={(e) => setVersion(e.target.value.trim().replace(/^v/, ""))} />
|
||||
</label>
|
||||
<div className="notice">{t("release.what")}</div>
|
||||
{pv.spec ? (
|
||||
<details open>
|
||||
<summary>{t("release.recipe")}</summary>
|
||||
<pre className="draft-spec">{pv.spec}</pre>
|
||||
<div className="notice err">{t("release.trust")}</div>
|
||||
</details>
|
||||
) : (
|
||||
<div className="hint">{t("release.noRecipe")}</div>
|
||||
)}
|
||||
{pv.running && <div className="notice err">{t("release.running")}</div>}
|
||||
<div className="row" style={{ justifyContent: "flex-end", gap: 8, marginTop: 12 }}>
|
||||
<button onClick={onClose} disabled={busy}>
|
||||
{t("common.cancel")}
|
||||
</button>
|
||||
<button className="primary" onClick={start} disabled={busy || pv.running || !/^\d+\.\d+\.\d+$/.test(version)}>
|
||||
{busy ? <Spinner small /> : <Icon name="check" />} {t("release.go", { v: version })}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** The latest releases with their log. */
|
||||
export function ReleasesPanel({ releases }: { releases: ReleaseRow[] }) {
|
||||
const t = useT();
|
||||
if (releases.length === 0) return null;
|
||||
return (
|
||||
<div className="panel" style={{ marginTop: 16 }}>
|
||||
<h3 style={{ margin: "0 0 8px" }}>{t("release.list")}</h3>
|
||||
{releases.map((r) => (
|
||||
<details key={r.id} className="release-row" open={r.state === "running"}>
|
||||
<summary>
|
||||
<b>
|
||||
{repoName(r.repo)} v{r.version}
|
||||
</b>{" "}
|
||||
<span className={`chip ${r.state === "done" ? "ok" : r.state === "running" ? "" : "warn"}`}>
|
||||
{r.state === "running" && <span className="factory-pulse" />}
|
||||
{t(`release.state.${r.state}` as any)}
|
||||
</span>{" "}
|
||||
<span className="hint">{fmtRelative(r.started_at)}</span>
|
||||
{r.url && (
|
||||
<>
|
||||
{" "}
|
||||
<a href={r.url} target="_blank" rel="noreferrer" onClick={(e) => e.stopPropagation()}>
|
||||
<Icon name="external" />
|
||||
</a>
|
||||
</>
|
||||
)}
|
||||
</summary>
|
||||
<pre className="draft-spec">{r.log || "–"}</pre>
|
||||
</details>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1241,6 +1241,26 @@ export const de: Messages = {
|
||||
"issues.featureHint": "Ein neues Feature mit einem Modell ausarbeiten und daraus Issues anlegen",
|
||||
"issues.slice": "Meilenstein zerlegen",
|
||||
"issues.sliceHint": "Ein Modell zerlegt einen Meilenstein in nummerierte Deliverables und legt die Issues an",
|
||||
"factory.attempts": "Versuche",
|
||||
"factory.attemptsHint": "Wie oft diese Phase bei technischem Scheitern (Zeitüberschreitung, kein Ergebnis, keine Änderungen) versucht wird, bevor das Issue als fehlgeschlagen gilt",
|
||||
"factory.rework": "Nachbesserungsrunden",
|
||||
"factory.reworkHint": "Wie oft eine durchgefallene Abnahme das Issue zurück an den Build schickt (0 = nie, das Issue scheitert sofort)",
|
||||
"release.button": "Release",
|
||||
"release.hint": "Release erstellen: Tag, Docker-Image und Downloads",
|
||||
"release.title": "Release",
|
||||
"release.current": "Aktuelle Version: v{v}",
|
||||
"release.version": "Neue Version",
|
||||
"release.what": "Die Factory schreibt VERSION, baut, was das Rezept beschreibt, pusht den Tag und erstellt das Release auf der Forge mit Quell-ZIP und den Dateien des Rezepts. Das Docker-Image geht in die Registry des Image-Namens.",
|
||||
"release.recipe": "Release-Rezept (.factory/release.json)",
|
||||
"release.trust": "Die Befehle in diesem Rezept laufen auf dem Server mit Docker-Zugriff außerhalb der Sandbox. Starte das Release nur, wenn du sie gelesen hast und ihnen vertraust.",
|
||||
"release.noRecipe": "Keine .factory/release.json auf dem Default-Branch: es werden nur Tag, Release und Quell-ZIP erstellt, kein Docker-Image.",
|
||||
"release.running": "Für dieses Repository läuft bereits ein Release.",
|
||||
"release.go": "Release v{v}",
|
||||
"release.started": "Release v{v} gestartet",
|
||||
"release.list": "Releases",
|
||||
"release.state.running": "läuft",
|
||||
"release.state.done": "fertig",
|
||||
"release.state.failed": "fehlgeschlagen",
|
||||
"factory.pr": "Pull Request",
|
||||
"factory.round": "Runde {n}",
|
||||
"factory.openChat": "Chat öffnen",
|
||||
|
||||
@@ -1240,6 +1240,26 @@ export const en = {
|
||||
"issues.featureHint": "Work out a new feature with a model and create issues from it",
|
||||
"issues.slice": "Cut a milestone",
|
||||
"issues.sliceHint": "Let a model cut a milestone into numbered deliverables and create the issues",
|
||||
"factory.attempts": "Tries",
|
||||
"factory.attemptsHint": "How often this phase is tried when it fails technically (timeout, no result, no changes) before the issue is marked failed",
|
||||
"factory.rework": "Rework rounds",
|
||||
"factory.reworkHint": "How often a failed acceptance sends the issue back to the build (0 = never, the issue fails right away)",
|
||||
"release.button": "Release",
|
||||
"release.hint": "Make a release: tag, Docker image and downloads",
|
||||
"release.title": "Release",
|
||||
"release.current": "Current version: v{v}",
|
||||
"release.version": "New version",
|
||||
"release.what": "The factory writes VERSION, builds what the recipe describes, pushes the tag and creates the release on the forge with the source zip and the files of the recipe. The Docker image goes to the registry of the image name.",
|
||||
"release.recipe": "Release recipe (.factory/release.json)",
|
||||
"release.trust": "The commands in this recipe run on the server with Docker access, outside the sandbox. Only start the release if you have read and trust them.",
|
||||
"release.noRecipe": "No .factory/release.json on the default branch: only the tag, the release and the source zip are made, no Docker image.",
|
||||
"release.running": "A release of this repository is already running.",
|
||||
"release.go": "Release v{v}",
|
||||
"release.started": "Release v{v} started",
|
||||
"release.list": "Releases",
|
||||
"release.state.running": "running",
|
||||
"release.state.done": "done",
|
||||
"release.state.failed": "failed",
|
||||
"factory.pr": "Pull request",
|
||||
"factory.round": "round {n}",
|
||||
"factory.openChat": "Open chat",
|
||||
|
||||
@@ -5195,3 +5195,8 @@ td.fold-indent {
|
||||
.issue-item textarea {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.release-row {
|
||||
border-top: 1px solid var(--border);
|
||||
padding: 6px 0;
|
||||
}
|
||||
@@ -3,6 +3,10 @@
|
||||
* under "unreleased"; scripts/release.sh renames the key to the release version.
|
||||
*/
|
||||
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
|
||||
unreleased: {
|
||||
en: ["Factory: every merged issue gets a version and a git tag (patch per issue, minor per finished milestone)", "Factory: start a release with Docker image (amd64 + arm64), downloads and a release on the forge", "Factory: set the number of rework rounds and tries per phase"],
|
||||
de: ["Factory: jedes gemergte Issue bekommt eine Version und einen Git-Tag (Patch je Issue, Minor je abgeschlossenem Meilenstein)", "Factory: Release mit Docker-Image (amd64 + arm64), Downloads und Release auf der Forge anstoßen", "Factory: Anzahl der Nachbesserungsrunden und Versuche je Phase einstellbar"],
|
||||
},
|
||||
"202611-00048": {
|
||||
en: ["Fixed: the factory page was blank"],
|
||||
de: ["Behoben: die Factory-Seite blieb leer"],
|
||||
|
||||
Reference in new issue
Block a user