Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
738b39584d | ||
|
|
ccad2c1f6e | ||
|
|
45503de195 | ||
|
|
486c49d50b |
No files matched your search
@@ -3,6 +3,22 @@
|
||||
All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/);
|
||||
until 1.0, minor versions may contain breaking changes.
|
||||
|
||||
## [v202611-00063] – 2026-11-19
|
||||
|
||||
### Added
|
||||
|
||||
- **Factory: Telegram message when an issue needs you** – a question from the review (with the questions) or a failure (build blocked, build/acceptance failed, rework limit reached) is sent to the paired Telegram chat, in the language of your web UI, with a link to the issue. Nothing is sent without a paired bot.
|
||||
|
||||
## [v202611-00062] – 2026-11-18
|
||||
|
||||
### Added
|
||||
|
||||
- **Factory: remove issues from the board** – a "Remove from board" button for issues that are not running, and issues deleted on the forge (404) disappear from the board by themselves at the next poll.
|
||||
|
||||
### Fixed
|
||||
|
||||
- **Factory: the "parallel" limit was exceeded** – phases were counted by their run rows, which appear only after the checkout, so one poll could start more phases than allowed (2 allowed, 4 running). They are now counted by issue state, which is set before a phase starts.
|
||||
|
||||
## [v202611-00061] – 2026-11-18
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img alt="Version v202611-00061" src="https://img.shields.io/badge/version-v202611--00061-d69e2e?style=flat-square">
|
||||
<img alt="Version v202611-00063" src="https://img.shields.io/badge/version-v202611--00063-d69e2e?style=flat-square">
|
||||
<img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-689d6a?style=flat-square">
|
||||
<img alt="Rust backend" src="https://img.shields.io/badge/backend-Rust-b7410e?style=flat-square&logo=rust">
|
||||
<img alt="React PWA" src="https://img.shields.io/badge/frontend-React%20PWA-2d81ff?style=flat-square&logo=react">
|
||||
|
||||
@@ -176,6 +176,7 @@ pub fn router(app: AppState) -> Router {
|
||||
.route("/factory/release/preview", get(factory_release_preview))
|
||||
.route("/factory/release", post(factory_release))
|
||||
.route("/factory/issues/close", post(factory_close_issue))
|
||||
.route("/factory/issues/remove", post(factory_remove_issue))
|
||||
.route("/factory/issues/pr", get(factory_pr))
|
||||
.route("/factory/issues/pr/merge", post(factory_pr_merge))
|
||||
.route("/account/factory/connection/test", post(test_factory_connection))
|
||||
@@ -2836,6 +2837,17 @@ async fn factory_close_issue(Extension(user): Extension<User>, State(app): State
|
||||
Ok(Json(json!({"ok": true})))
|
||||
}
|
||||
|
||||
/// Take an issue off the factory board (the issue on the forge is not touched). Not while a phase runs.
|
||||
async fn factory_remove_issue(Extension(user): Extension<User>, State(app): State<AppState>, headers: axum::http::HeaderMap, Json(b): Json<CloseIssue>) -> ApiResult {
|
||||
let (_, row) = factory_issue_forge(&app, &user, &b.repo, b.number)?;
|
||||
if matches!(row["state"].as_str(), Some("review" | "building" | "testing")) {
|
||||
return Err(ApiError(StatusCode::BAD_REQUEST, "a phase is running – wait for it to end or stop it first".into()));
|
||||
}
|
||||
app.store.factory_issue_delete(&b.repo, b.number)?;
|
||||
app.audit(Some(&user), "factory.issue.remove", &format!("{}#{}", b.repo, b.number), &crate::auth::client_ip(&headers));
|
||||
Ok(Json(json!({"ok": true})))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct PrQuery {
|
||||
repo: String,
|
||||
|
||||
@@ -562,6 +562,14 @@ impl Forge {
|
||||
Ok(!matches!(v["state"].as_str(), Some("closed")))
|
||||
}
|
||||
|
||||
/// Has the issue been deleted on the forge (404)? Other errors (network, token) count as "still there".
|
||||
pub async fn issue_gone(&self, number: u64) -> bool {
|
||||
match self.call(reqwest::Method::GET, self.rp(&format!("/issues/{number}")), None).await {
|
||||
Err(e) => e.to_string().contains("404"),
|
||||
Ok(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn close_issue(&self, number: u64) -> Result<()> {
|
||||
match self.kind {
|
||||
Kind::Gitlab => self.call(reqwest::Method::PUT, self.rp(&format!("/issues/{number}")), Some(json!({"state_event": "close"}))).await.map(|_| ()),
|
||||
@@ -966,6 +974,7 @@ async fn review(app: Arc<App>, user: User, cfg: RepoCfg, issue: Value, comments:
|
||||
let qs: Vec<String> = res["questions"].as_array().map(|a| a.iter().filter_map(|q| q.as_str().map(|q| format!("- {q}"))).collect()).unwrap_or_default();
|
||||
set(&[("state", json!("question")), ("note", json!(summary))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(&cfg, "question")).await;
|
||||
alert(&app, &cfg.url, n, "question", &if qs.is_empty() { summary.clone() } else { qs.join("\n") }).await;
|
||||
bot_comment(&g, n as u64, &format!("**Review: questions before this can be built.** {summary}\n\n{}\n\nAnswer in a comment; the review starts again automatically.", qs.join("\n"))).await;
|
||||
// Remember the newest comment (including this one) so only later answers count.
|
||||
if let Ok(all) = g.comments(n as u64).await {
|
||||
@@ -1059,6 +1068,7 @@ async fn build_fail(app: &Arc<App>, g: &Forge, cfg: &RepoCfg, n: i64, why: &str)
|
||||
if attempts >= cfg.build.max_attempts {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("failed")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(cfg, "failed")).await;
|
||||
alert(&app, &cfg.url, n, "failed", &why).await;
|
||||
bot_comment(g, n as u64, &format!("**Build failed:** {why}.")).await;
|
||||
} else {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("approved")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
@@ -1103,6 +1113,7 @@ async fn build(app: Arc<App>, user: User, cfg: RepoCfg, issue: Value, comments:
|
||||
let reason = res["reason"].as_str().unwrap_or(&summary).trim().to_string();
|
||||
set(&[("state", json!("failed")), ("note", json!(reason))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(&cfg, "failed")).await;
|
||||
alert(&app, &cfg.url, n, "failed", &reason).await;
|
||||
bot_comment(&g, n as u64, &format!("**Build: cannot be built as specified.** {reason}")).await;
|
||||
notify(&app, &user, &format!("Factory #{n}"), &format!("build blocked – {reason}"), n).await;
|
||||
return;
|
||||
@@ -1169,6 +1180,7 @@ async fn qa_fail(app: &Arc<App>, g: &Forge, cfg: &RepoCfg, n: i64, why: &str) {
|
||||
if attempts >= cfg.qa.max_attempts {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("failed")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(cfg, "failed")).await;
|
||||
alert(&app, &cfg.url, n, "failed", &why).await;
|
||||
bot_comment(g, n as u64, &format!("**Acceptance failed to run:** {why}.")).await;
|
||||
} else {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("qa")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
@@ -1243,6 +1255,7 @@ async fn qa(app: Arc<App>, user: User, cfg: RepoCfg, issue: Value) {
|
||||
if round >= cfg.max_rework {
|
||||
set(&[("state", json!("failed")), ("note", json!(findings.clone()))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(&cfg, "failed")).await;
|
||||
alert(&app, &cfg.url, n, "failed", &findings.clone()).await;
|
||||
bot_comment(&g, n as u64, &format!("**Acceptance failed after {} rework rounds.** {summary}\n\n{table}\n{findings}", cfg.max_rework)).await;
|
||||
notify(&app, &user, &format!("Factory #{n}"), "acceptance failed, rework limit reached", n).await;
|
||||
} else {
|
||||
@@ -1279,6 +1292,7 @@ async fn fail_or_retry(app: &Arc<App>, g: &Forge, cfg: &RepoCfg, n: i64, why: &s
|
||||
if attempts >= cfg.review.max_attempts {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("failed")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
let _ = g.set_labels(n as u64, &status_labels(cfg, "failed")).await;
|
||||
alert(&app, &cfg.url, n, "failed", &why).await;
|
||||
bot_comment(g, n as u64, &format!("**Failed:** {why}.")).await;
|
||||
} else {
|
||||
let _ = app.store.factory_issue_set(&cfg.url, n, &[("state", json!("new")), ("attempts", json!(attempts)), ("note", json!(why))]);
|
||||
@@ -1290,6 +1304,23 @@ pub(crate) async fn notify(app: &App, user: &User, title: &str, body: &str, issu
|
||||
let _ = crate::push::send_to_user(app, &user.id, &payload).await;
|
||||
}
|
||||
|
||||
/// Tell the user on Telegram (if paired) that an issue needs them: a question to answer or a failure.
|
||||
pub(crate) async fn alert(app: &App, repo: &str, n: i64, what: &str, detail: &str) {
|
||||
let Ok(Some(row)) = app.store.factory_issue(repo, n) else { return };
|
||||
let Some(owner) = row["owner_id"].as_str() else { return };
|
||||
let de = crate::telegram::german(app, owner);
|
||||
let name = repo.trim_end_matches(".git").rsplit('/').next().unwrap_or(repo);
|
||||
let head = match (what, de) {
|
||||
("question", true) => "❓ Frage zu",
|
||||
("question", false) => "❓ Question on",
|
||||
(_, true) => "❌ Fehlgeschlagen:",
|
||||
(_, false) => "❌ Failed:",
|
||||
};
|
||||
let detail: String = detail.trim().chars().take(600).collect();
|
||||
let text = format!("{head} {name} #{n} – {}\n\n{detail}\n\n{}/issues/{n}", row["title"].as_str().unwrap_or(""), repo.trim_end_matches(".git"));
|
||||
crate::telegram::notify_user(app, owner, &text).await;
|
||||
}
|
||||
|
||||
/// One pass over a repository: take up new issues, restart reviews after answers.
|
||||
pub async fn poll_repo(app: &Arc<App>, user: &User, cfg: &RepoCfg) -> Result<()> {
|
||||
let g = Forge::new(cfg)?;
|
||||
@@ -1353,6 +1384,14 @@ pub async fn poll_repo(app: &Arc<App>, user: &User, cfg: &RepoCfg) -> Result<()>
|
||||
app.store.factory_issue_set(&cfg.url, n, &[("state", json!("closed"))])?;
|
||||
}
|
||||
}
|
||||
// Issues deleted on the forge leave the board (closed ones stay: they still exist there).
|
||||
for row in app.store.factory_issues(&user.id)?.into_iter().filter(|r| r["repo"].as_str() == Some(cfg.url.as_str()) && !matches!(r["state"].as_str(), Some("review" | "building" | "testing"))) {
|
||||
let n = issue_no(&row);
|
||||
if n > 0 && !open.contains(&n) && g.issue_gone(n as u64).await {
|
||||
tracing::info!("factory {}: #{n} was deleted on the forge – removed from the board", cfg.url);
|
||||
app.store.factory_issue_delete(&cfg.url, n)?;
|
||||
}
|
||||
}
|
||||
// Merged issues get their version and tag.
|
||||
if let Err(e) = crate::factory_version::version_pass(app, user, cfg).await {
|
||||
tracing::warn!("factory {}: versions: {e:#}", cfg.url);
|
||||
|
||||
+9
-1
@@ -1497,6 +1497,12 @@ impl Store {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove an issue from the factory board (runs and cost statistics stay).
|
||||
pub fn factory_issue_delete(&self, repo: &str, number: i64) -> Result<()> {
|
||||
self.conn.lock().unwrap().execute("DELETE FROM factory_issues WHERE repo_url = ?1 AND number = ?2", params![repo, number])?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Update the given columns (whitelisted) of an issue.
|
||||
pub fn factory_issue_set(&self, repo: &str, number: i64, fields: &[(&str, Value)]) -> Result<()> {
|
||||
const COLS: [&str; 11] = ["title", "state", "attempts", "rounds", "last_comment", "scenarios", "branch", "pr_url", "note", "author", "version"];
|
||||
@@ -1586,7 +1592,9 @@ impl Store {
|
||||
}
|
||||
|
||||
pub fn factory_running(&self, repo: &str) -> Result<i64> {
|
||||
Ok(self.conn.lock().unwrap().query_row("SELECT COUNT(*) FROM factory_runs WHERE repo_url = ?1 AND status = 'running'", [repo], |r| r.get(0))?)
|
||||
// Counted by issue state, not by run rows: the state is set before the phase is spawned, the run row
|
||||
// only once its checkout is done – counting runs let a single poll start more phases than allowed.
|
||||
Ok(self.conn.lock().unwrap().query_row("SELECT COUNT(*) FROM factory_issues WHERE repo_url = ?1 AND state IN ('review', 'building', 'testing')", [repo], |r| r.get(0))?)
|
||||
}
|
||||
|
||||
/// Runs with token and cost totals (joined from the usage table).
|
||||
|
||||
@@ -260,6 +260,15 @@ fn user(app: &App, user_id: &str) -> Result<User> {
|
||||
app.store.user(user_id)?.filter(|u| !u.disabled).ok_or_else(|| anyhow!("account disabled"))
|
||||
}
|
||||
|
||||
/// Send a message (HTML-escaped) to the user's paired Telegram chat; silent when there is none.
|
||||
pub async fn notify_user(app: &App, user_id: &str, text: &str) {
|
||||
let s = load(app, user_id);
|
||||
let (true, Some(chat)) = (!s.token.is_empty(), s.chat_id) else { return };
|
||||
if let Err(e) = (Bot { token: s.token }).send(chat, &esc(text), None).await {
|
||||
tracing::warn!("telegram: notification not sent: {e:#}");
|
||||
}
|
||||
}
|
||||
|
||||
/// The user reads German (language preference of the web UI).
|
||||
pub fn german(app: &App, user_id: &str) -> bool {
|
||||
let prefs: Value = app.store.user_setting(user_id, "prefs").unwrap_or_default();
|
||||
|
||||
@@ -348,6 +348,20 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
const removeIssue = async () => {
|
||||
if (!selected) return;
|
||||
if (!(await confirmDialog({ message: t("factory.removeConfirm", { n: selected.number }), confirmLabel: t("factory.remove"), danger: true }))) return;
|
||||
setBusy(true);
|
||||
try {
|
||||
await post("/factory/issues/remove", { repo: selected.repo, number: selected.number });
|
||||
setSel("");
|
||||
await reload();
|
||||
} catch (e: any) {
|
||||
toast(e.message);
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
const closeIssue = async () => {
|
||||
if (!selected) return;
|
||||
const comment = await promptDialog({ title: t("factory.closeTitle"), message: t("factory.closeMsg", { n: selected.number }), defaultValue: t("factory.closeDefault"), confirmLabel: t("factory.close") });
|
||||
@@ -503,6 +517,11 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{selected && !["review", "building", "testing"].includes(selected.state) && (
|
||||
<button className="small" onClick={removeIssue} disabled={busy} title={t("factory.removeHint")}>
|
||||
<Icon name="trash" /> {t("factory.remove")}
|
||||
</button>
|
||||
)}
|
||||
{selected && selected.state === "done" && (
|
||||
<button className="small" onClick={closeIssue} disabled={busy}>
|
||||
<Icon name="check" /> {t("factory.close")}
|
||||
|
||||
@@ -1294,6 +1294,9 @@ export const de: Messages = {
|
||||
"factory.closeTitle": "Issue schließen",
|
||||
"factory.closeMsg": "Kommentar zum Schließen von Issue #{n}. Er wird im Issue veröffentlicht, danach wird das Issue geschlossen.",
|
||||
"factory.closeDefault": "Erledigt und abgenommen.",
|
||||
"factory.remove": "Vom Board entfernen",
|
||||
"factory.removeHint": "Nimmt das Issue vom Factory-Board; das Issue im Forge bleibt unberührt. Gelöschte Issues verschwinden von selbst.",
|
||||
"factory.removeConfirm": "#{n} vom Factory-Board entfernen? Das Issue im Forge bleibt unverändert.",
|
||||
"factory.closed": "Issue geschlossen",
|
||||
"factory.skills": "Skills",
|
||||
"factory.skillAdd": "Skill hinzufügen…",
|
||||
|
||||
@@ -1293,6 +1293,9 @@ export const en = {
|
||||
"factory.closeTitle": "Close issue",
|
||||
"factory.closeMsg": "Comment for closing issue #{n}. It is posted on the issue, then the issue is closed.",
|
||||
"factory.closeDefault": "Done and accepted.",
|
||||
"factory.remove": "Remove from board",
|
||||
"factory.removeHint": "Take the issue off the factory board; the issue on the forge is not touched. Deleted issues disappear by themselves.",
|
||||
"factory.removeConfirm": "Remove #{n} from the factory board? The issue on the forge stays as it is.",
|
||||
"factory.closed": "Issue closed",
|
||||
"factory.skills": "Skills",
|
||||
"factory.skillAdd": "Add skill…",
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
* under "unreleased"; scripts/release.sh renames the key to the release version.
|
||||
*/
|
||||
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
|
||||
"202611-00063": {
|
||||
en: ["Factory: Telegram message when an issue gets a question or fails"],
|
||||
de: ["Factory: Telegram-Nachricht, wenn ein Issue eine Frage hat oder fehlschlägt"],
|
||||
},
|
||||
"202611-00062": {
|
||||
en: ["Factory: the parallel limit per project is now respected exactly", "Factory: remove issues from the board; issues deleted on the forge disappear by themselves"],
|
||||
de: ["Factory: das Parallel-Limit pro Projekt wird jetzt genau eingehalten", "Factory: Issues vom Board entfernen; im Forge gelöschte Issues verschwinden von selbst"],
|
||||
},
|
||||
"202611-00061": {
|
||||
en: ["Factory: projects are chosen from a dropdown (all projects or a single one)"],
|
||||
de: ["Factory: Projekte werden per Dropdown gewählt (alle oder nur eins)"],
|
||||
|
||||
Reference in new issue
Block a user