Compare commits

..
Author SHA1 Message Date
Richard Zink f8b85beb70 Release v202611-00077 2026-11-20 20:34:17 +01:00
Richard ZinkandClaude Sonnet 5.5 3623896464 Changelog: base image entry belongs to the next release
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 20:34:16 +01:00
Richard ZinkandClaude Sonnet 5.5 d0e7cea117 Test runner: shared base image for acceptance containers, log installed apt packages
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 20:33:59 +01:00
Richard Zink 23fbc6f302 Release v202611-00076 2026-11-20 20:15:48 +01:00
Richard ZinkandClaude Sonnet 5.5 6804139be7 Test runner: log start time, seed hit/miss and install time per environment
Merges the v73 changelog section into v74.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 20:15:47 +01:00
Richard Zink 87eafb3108 Release v202611-00075 2026-11-20 13:56:03 +01:00
Richard ZinkandClaude Sonnet 5.5 537aac820d Factory: theme-specific preparing lamp colour, no menu button in the chat overlay
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 13:56:00 +01:00
Richard Zink 836377ac38 Release v202611-00074 2026-11-20 13:23:56 +01:00
Richard ZinkandClaude Sonnet 5.5 391db43949 Factory: merge and close buttons on the issue card, enforced order
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 13:23:52 +01:00
Richard Zink 0e54714436 Release v202611-00073 2026-11-20 13:15:10 +01:00
Richard ZinkandClaude Sonnet 5.5 b9df00422a Test runner: per-project cache (tool caches, shared dirs, seeds)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 13:15:07 +01:00
Richard Zink a083798d7f Release v202611-00072 2026-11-20 12:46:01 +01:00
Richard ZinkandClaude Sonnet 5.5 724405b245 Factory: blinking blue lamp while a phase is being prepared
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-20 12:45:59 +01:00
49 changed files with 520 additions and 28 deletions

No files matched your search

+1 -1
View File
@@ -38,4 +38,4 @@ CODECRAFT_LOG_FORMAT=
# Optional limits per environment and the image used when .factory/setup.json names none: # Optional limits per environment and the image used when .factory/setup.json names none:
#RUNNER_MEMORY=2g #RUNNER_MEMORY=2g
#RUNNER_CPUS=2 #RUNNER_CPUS=2
#RUNNER_DEFAULT_IMAGE=node:22-bookworm #RUNNER_DEFAULT_IMAGE=git.familie-zink.org/zink/codecraft-testbase:latest
+36
View File
@@ -3,6 +3,42 @@
All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/); All notable changes to CodeCraft. Versions follow [Semantic Versioning](https://semver.org/);
until 1.0, minor versions may contain breaking changes. until 1.0, minor versions may contain breaking changes.
## [v202611-00077] – 2026-11-20
### Added
- **Shared base image for acceptance containers** (`git.familie-zink.org/zink/codecraft-testbase`, built from `docker/testbase/Dockerfile` by the release script): Node 24, Python 3, gcc/g++/make/cmake, Chromium with Playwright and common tools (git, curl, e2fsprogs, xz, zsh, sudo, jq, …). It is the runner's default image (`RUNNER_DEFAULT_IMAGE`), so setups that installed these again and again start faster; plain `node:24-bookworm` is the fallback if it cannot be pulled. Projects with their own `image` or `dockerfile` are unchanged.
- The runner also logs the apt packages an environment's setup installed (`apt installed: …`), to see what the base image still lacks.
## [v202611-00076] – 2026-11-20
### Changed
- **Test runner: the cache is now visible.** The runner logs for every environment how long it took until the app answered, whether the seed was a hit or a miss, and how long `install` took (e.g. `test env abc (git-…-penguin31) ready after 42 s; cache on; seed 07be…: hit; install took 3 s`).
## [v202611-00075] – 2026-11-20
### Changed
- **Factory: the "preparing" lamp** (checkout, test environment) now has a colour that differs from the theme's accent colour in every theme – the lamp of a running chat keeps the accent. Set per theme with the new variable `--prep`.
- **Factory overlay:** the chat's menu button is hidden in the overlay (it could only close the overlay).
## [v202611-00074] – 2026-11-20
### Added
- **Test runner: cache between acceptance runs.** Every project gets a cache volume (`cc-cache-<project>`) in the runner. Tool caches are shared automatically: npm and Yarn, pip, Go modules and build cache, the Cargo registry and the Cargo target directory (so the second build of a Rust project is incremental). `.factory/setup.json` can add `"cache": {"dirs": [...]}` for directories that persist (downloads – inputs only) and `"cache": {"seed": {"paths": [...], "key": [...]}}` for expensive *results* of `install`, such as a built disk image: the seed is stored after a successful install under a key made from the image, the install command, the seed paths and the contents of the `key` files, and copied into fresh containers only while the key matches – a run never sees changes of an earlier run, and a change of the listed sources builds it anew (the three newest seeds are kept). `"cache": false` turns everything off; `DELETE /v1/cache/<project>` on the runner forgets a project's cache.
### Changed
- **Factory: merge and close on the issue card.** A finished issue shows a *Merge* button on its card once the acceptance has passed (the pull request is open); after the merge the card shows *Close*. Before that neither button is shown. The server enforces the order: a pull request is merged only when the acceptance passed, an issue is closed only when its pull request is merged (a merge done on the forge itself counts). The issue also gets its version and tag right after a merge instead of at the next poll.
## [v202611-00072] – 2026-11-20
### Added
- **Factory: "preparing" lamp.** An issue card whose phase has been started but whose chat does not exist yet – checkout and, for acceptance, installing and starting the app in its throw-away container – shows a blinking blue lamp with the elapsed time instead of staying silent. (Active chats keep their accent-coloured lamp.)
## [v202611-00071] – 2026-11-20 ## [v202611-00071] – 2026-11-20
### Added ### Added
+25 -3
View File
@@ -11,7 +11,7 @@
</p> </p>
<p align="center"> <p align="center">
<img alt="Version v202611-00071" src="https://img.shields.io/badge/version-v202611--00071-d69e2e?style=flat-square"> <img alt="Version v202611-00077" src="https://img.shields.io/badge/version-v202611--00077-d69e2e?style=flat-square">
<img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-689d6a?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="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"> <img alt="React PWA" src="https://img.shields.io/badge/frontend-React%20PWA-2d81ff?style=flat-square&logo=react">
@@ -292,7 +292,8 @@ the server.
On *pass* the factory opens the pull request (if none is open) and comments a result table On *pass* the factory opens the pull request (if none is open) and comments a result table
in the issue. On *fail* the issue goes back to the build with the findings (*rework*). in the issue. On *fail* the issue goes back to the build with the findings (*rework*).
4. **Done, merge, version.** You review the pull request in the factory (diff, description) and 4. **Done, merge, version.** You review the pull request in the factory (diff, description) and
merge it there. The factory then pulls the merge, gives the issue its version, commits merge it there – on the page or with the *Merge* button of the issue card, which appears once
the acceptance has passed (closing an issue by hand is possible only after its merge). The factory then pulls the merge, gives the issue its version, commits
`VERSION`, pushes an annotated tag, comments on the issue and closes it. `VERSION`, pushes an annotated tag, comments on the issue and closes it.
Issue text is treated as data, never as instructions for the factory itself. Issue text is treated as data, never as instructions for the factory itself.
@@ -373,7 +374,28 @@ helper services and network are removed (leftovers are swept at startup and afte
} }
``` ```
`image` defaults to `RUNNER_DEFAULT_IMAGE`; `"dockerfile": "path"` builds the image from the Between runs of one project the runner keeps a cache volume: npm/Yarn, pip, Go and Cargo caches
(including the Cargo target directory) are shared automatically. For more, add to `setup.json`:
```json
"cache": {
"dirs": ["build/downloads"],
"seed": { "paths": ["data/ubuntu.ext4"], "key": ["guest", "lib", "scripts", "package-lock.json"] }
}
```
`dirs` persist and are shared by all runs (use them for downloads, not for results). A `seed`
holds expensive *results* of `install`: it is stored after a successful install under a key made
from the image, the install command, the seed paths and the contents of the `key` files or
directories, and copied into a fresh container only while that key matches – so a run never
inherits changes from an earlier one, and editing a listed source rebuilds it. `"cache": false`
disables caching; `DELETE /v1/cache/<project>` on the runner clears one project.
`image` defaults to `RUNNER_DEFAULT_IMAGE`, by default the shared base image
`codecraft-testbase` (Node 24, Python 3, gcc/cmake, Chromium with Playwright and common tools; see
`docker/testbase/Dockerfile`; plain Node 24 is the fallback when it cannot be pulled). The runner logs
per environment the start time, the seed hit/miss and the apt packages the setup installed.
The image can be changed per project with `"image"`; `"dockerfile": "path"` builds the image from the
repository instead; helper services are reachable by their name. Containers run without extra repository instead; helper services are reachable by their name. Containers run without extra
capabilities, with memory/CPU/process limits (`RUNNER_MEMORY`, `RUNNER_CPUS`), and cannot see the capabilities, with memory/CPU/process limits (`RUNNER_MEMORY`, `RUNNER_CPUS`), and cannot see the
host. Without the runner, or without a `setup.json`, nothing changes. Note that the runner holds host. Without the runner, or without a `setup.json`, nothing changes. Note that the runner holds
+1 -1
View File
@@ -75,7 +75,7 @@ services:
RUNNER_FACTORY_DIR: /factory RUNNER_FACTORY_DIR: /factory
RUNNER_MEMORY: ${RUNNER_MEMORY:-2g} RUNNER_MEMORY: ${RUNNER_MEMORY:-2g}
RUNNER_CPUS: ${RUNNER_CPUS:-2} RUNNER_CPUS: ${RUNNER_CPUS:-2}
RUNNER_DEFAULT_IMAGE: ${RUNNER_DEFAULT_IMAGE:-node:22-bookworm} RUNNER_DEFAULT_IMAGE: ${RUNNER_DEFAULT_IMAGE:-git.familie-zink.org/zink/codecraft-testbase:latest}
HOME: /tmp HOME: /tmp
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
+1 -1
View File
@@ -71,7 +71,7 @@ services:
RUNNER_FACTORY_DIR: /factory RUNNER_FACTORY_DIR: /factory
RUNNER_MEMORY: ${RUNNER_MEMORY:-2g} RUNNER_MEMORY: ${RUNNER_MEMORY:-2g}
RUNNER_CPUS: ${RUNNER_CPUS:-2} RUNNER_CPUS: ${RUNNER_CPUS:-2}
RUNNER_DEFAULT_IMAGE: ${RUNNER_DEFAULT_IMAGE:-node:22-bookworm} RUNNER_DEFAULT_IMAGE: ${RUNNER_DEFAULT_IMAGE:-git.familie-zink.org/zink/codecraft-testbase:latest}
HOME: /tmp HOME: /tmp
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
+14
View File
@@ -0,0 +1,14 @@
# Base image of the factory's throw-away acceptance containers (used when .factory/setup.json names no image).
# Node 24, Python 3, a C/C++ toolchain, the Chromium that Playwright needs, and the small tools
# that acceptance setups installed again and again (see the runner log "apt installed: ...").
FROM node:24-bookworm
ENV DEBIAN_FRONTEND=noninteractive PIP_BREAK_SYSTEM_PACKAGES=1 PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential cmake pkg-config git curl wget ca-certificates unzip xz-utils zip \
e2fsprogs util-linux zsh sudo nano procps iproute2 netcat-openbsd jq sqlite3 \
python3 python3-pip python3-venv \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g playwright \
&& playwright install --with-deps chromium \
&& rm -rf /var/lib/apt/lists/* /root/.npm \
&& chmod -R a+rX /ms-playwright
+4
View File
@@ -94,6 +94,10 @@ if (( image )); then
run docker buildx build --builder "$BUILDER" --platform "$PLATFORMS" \ run docker buildx build --builder "$BUILDER" --platform "$PLATFORMS" \
--build-arg GIT_COMMIT="$(git rev-parse --short HEAD)" --build-arg CODECRAFT_VERSION="$version" \ --build-arg GIT_COMMIT="$(git rev-parse --short HEAD)" --build-arg CODECRAFT_VERSION="$version" \
"${tags[@]}" --push . "${tags[@]}" --push .
# Base image of the factory's acceptance containers (cached layers: cheap unless the Dockerfile changed).
step "Building and pushing ${REGISTRY}-testbase for $PLATFORMS"
run docker buildx build --builder "$BUILDER" --platform "$PLATFORMS" \
-t "${REGISTRY}-testbase:latest" -t "${REGISTRY}-testbase:$tag" --push docker/testbase
fi fi
step "Creating the Gitea release $tag" step "Creating the Gitea release $tag"
+21 -1
View File
@@ -3011,6 +3011,15 @@ async fn factory_close_issue(Extension(user): Extension<User>, State(app): State
return Err(ApiError(StatusCode::BAD_REQUEST, "only finished issues can be closed here".into())); return Err(ApiError(StatusCode::BAD_REQUEST, "only finished issues can be closed here".into()));
} }
let bad = |e: anyhow::Error| ApiError(StatusCode::BAD_GATEWAY, format!("{e:#}")); let bad = |e: anyhow::Error| ApiError(StatusCode::BAD_GATEWAY, format!("{e:#}"));
// Closing comes after the merge. A merge done on the forge itself counts too: ask the forge when we do not know yet.
if row["merged"].as_bool() != Some(true) {
let pr_n: u64 = row["pr_url"].as_str().unwrap_or("").trim_end_matches('/').rsplit('/').next().and_then(|n| n.parse().ok()).unwrap_or(0);
let merged = pr_n > 0 && g.pr(pr_n).await.map(|p| p["state"].as_str() == Some("merged")).unwrap_or(false);
if !merged {
return Err(ApiError(StatusCode::BAD_REQUEST, "merge the pull request first".into()));
}
app.store.factory_issue_set(&b.repo, b.number, &[("merged", json!(1))])?;
}
let text = if b.comment.trim().is_empty() { "Closed.".to_string() } else { b.comment.trim().to_string() }; let text = if b.comment.trim().is_empty() { "Closed.".to_string() } else { b.comment.trim().to_string() };
g.comment(b.number as u64, &format!("{}\n**Closed** by {}: {text}", crate::factory::BOT, user.username)).await.map_err(bad)?; g.comment(b.number as u64, &format!("{}\n**Closed** by {}: {text}", crate::factory::BOT, user.username)).await.map_err(bad)?;
g.close_issue(b.number as u64).await.map_err(bad)?; g.close_issue(b.number as u64).await.map_err(bad)?;
@@ -3072,6 +3081,10 @@ struct MergePr {
/// Merge the pull request of an issue – only on the user's own click in the factory page. /// Merge the pull request of an issue – only on the user's own click in the factory page.
async fn factory_pr_merge(Extension(user): Extension<User>, State(app): State<AppState>, headers: axum::http::HeaderMap, Json(b): Json<MergePr>) -> ApiResult { async fn factory_pr_merge(Extension(user): Extension<User>, State(app): State<AppState>, headers: axum::http::HeaderMap, Json(b): Json<MergePr>) -> ApiResult {
let (g, row) = factory_issue_forge(&app, &user, &b.repo, b.number)?; let (g, row) = factory_issue_forge(&app, &user, &b.repo, b.number)?;
// Merging comes after a positive acceptance (the issue is "done").
if row["state"].as_str() != Some("done") {
return Err(ApiError(StatusCode::BAD_REQUEST, "the pull request can be merged once the acceptance has passed".into()));
}
let method = if b.method.is_empty() { "merge" } else { b.method.as_str() }; let method = if b.method.is_empty() { "merge" } else { b.method.as_str() };
if !["merge", "squash", "rebase"].contains(&method) { if !["merge", "squash", "rebase"].contains(&method) {
return Err(ApiError(StatusCode::BAD_REQUEST, "unknown merge method".into())); return Err(ApiError(StatusCode::BAD_REQUEST, "unknown merge method".into()));
@@ -3082,8 +3095,15 @@ async fn factory_pr_merge(Extension(user): Extension<User>, State(app): State<Ap
return Err(ApiError(StatusCode::BAD_REQUEST, "this is not the open pull request of the issue".into())); return Err(ApiError(StatusCode::BAD_REQUEST, "this is not the open pull request of the issue".into()));
} }
g.merge_pr(b.pr, method).await.map_err(|e| ApiError(StatusCode::BAD_GATEWAY, format!("{e:#}")))?; g.merge_pr(b.pr, method).await.map_err(|e| ApiError(StatusCode::BAD_GATEWAY, format!("{e:#}")))?;
app.store.factory_issue_set(&b.repo, b.number, &[("pr_url", json!(pr["html_url"].as_str().unwrap_or("")))])?; app.store.factory_issue_set(&b.repo, b.number, &[("pr_url", json!(pr["html_url"].as_str().unwrap_or(""))), ("merged", json!(1))])?;
app.audit(Some(&user), "factory.pr.merge", &format!("{}#{}", b.repo, b.number), &crate::auth::client_ip(&headers)); app.audit(Some(&user), "factory.pr.merge", &format!("{}#{}", b.repo, b.number), &crate::auth::client_ip(&headers));
// Give the issue its version and tag right away instead of at the next poll.
if let Ok(cfg) = factory_repo_cfg(&app, &user, &b.repo) {
let (app2, user2) = (app.clone(), user.clone());
tokio::spawn(async move {
let _ = crate::factory::poll_repo(&app2, &user2, &cfg).await;
});
}
Ok(Json(json!({"ok": true}))) Ok(Json(json!({"ok": true})))
} }
+4 -2
View File
@@ -1240,11 +1240,13 @@ impl TestEnv {
/// Start the app of `work` in a throw-away container when a test runner is configured /// Start the app of `work` in a throw-away container when a test runner is configured
/// (`CODECRAFT_RUNNER_URL`) and `.factory/setup.json` says how. `Ok(None)` = run it the old way. /// (`CODECRAFT_RUNNER_URL`) and `.factory/setup.json` says how. `Ok(None)` = run it the old way.
async fn start_test_env(work: &std::path::Path) -> Result<Option<TestEnv>> { async fn start_test_env(work: &std::path::Path, repo_url: &str) -> Result<Option<TestEnv>> {
use crate::testrunner as tr; use crate::testrunner as tr;
let Some(client) = tr::Client::from_env() else { return Ok(None) }; let Some(client) = tr::Client::from_env() else { return Ok(None) };
let Some(mut req) = std::fs::read_to_string(work.join(".factory/setup.json")).ok().and_then(|t| tr::parse_setup(&t)) else { return Ok(None) }; let Some(mut req) = std::fs::read_to_string(work.join(".factory/setup.json")).ok().and_then(|t| tr::parse_setup(&t)) else { return Ok(None) };
req.work = work.display().to_string(); req.work = work.display().to_string();
// One cache per project: tool caches, download directories and seeds survive between acceptance runs.
req.cache_id = slugify(repo_url.trim_end_matches(".git").rsplit("://").next().unwrap_or(repo_url)).chars().take(80).collect();
let started = client.start(&req).await?; let started = client.start(&req).await?;
let (local, forward) = match tr::forward_local(req.port, client.host(), started.port).await { let (local, forward) = match tr::forward_local(req.port, client.host(), started.port).await {
Ok(x) => x, Ok(x) => x,
@@ -1342,7 +1344,7 @@ async fn qa(app: Arc<App>, user: User, cfg: RepoCfg, issue: Value) {
} }
} }
// With a test runner the app starts in a throw-away container; without one the agent starts it itself. // With a test runner the app starts in a throw-away container; without one the agent starts it itself.
let env = match start_test_env(&work).await { let env = match start_test_env(&work, &cfg.url).await {
Ok(e) => e, Ok(e) => e,
Err(e) => { Err(e) => {
cleanup_worktree(&app, &user, &cfg, &work).await; cleanup_worktree(&app, &user, &cfg, &work).await;
+2
View File
@@ -235,6 +235,8 @@ pub async fn version_pass(app: &Arc<App>, user: &User, cfg: &RepoCfg) -> Result<
if pr["state"].as_str() != Some("merged") { if pr["state"].as_str() != Some("merged") {
continue; continue;
} }
// Remember it at once: if the version step below fails, the issue can still be closed by hand.
let _ = app.store.factory_issue_set(&cfg.url, n, &[("merged", json!(1))]);
let title = r["title"].as_str().unwrap_or("").to_string(); let title = r["title"].as_str().unwrap_or("").to_string();
let others: Vec<String> = g.open_issue_titles().await?.into_iter().filter(|(num, _)| *num != n).map(|(_, t)| t).collect(); let others: Vec<String> = g.open_issue_titles().await?.into_iter().filter(|(num, _)| *num != n).map(|(_, t)| t).collect();
let dir = checkout(app, user, cfg).await?; let dir = checkout(app, user, cfg).await?;
+4 -3
View File
@@ -262,6 +262,7 @@ impl Store {
("images", "blob", "ALTER TABLE images ADD COLUMN blob TEXT"), ("images", "blob", "ALTER TABLE images ADD COLUMN blob TEXT"),
("usage", "allowance", "ALTER TABLE usage ADD COLUMN allowance REAL"), ("usage", "allowance", "ALTER TABLE usage ADD COLUMN allowance REAL"),
("factory_issues", "version", "ALTER TABLE factory_issues ADD COLUMN version TEXT NOT NULL DEFAULT ''"), ("factory_issues", "version", "ALTER TABLE factory_issues ADD COLUMN version TEXT NOT NULL DEFAULT ''"),
("factory_issues", "merged", "ALTER TABLE factory_issues ADD COLUMN merged INTEGER NOT NULL DEFAULT 0"),
] { ] {
let exists: bool = conn let exists: bool = conn
.prepare(&format!("SELECT 1 FROM pragma_table_info('{table}') WHERE name = ?1"))? .prepare(&format!("SELECT 1 FROM pragma_table_info('{table}') WHERE name = ?1"))?
@@ -1489,8 +1490,8 @@ impl Store {
pub fn factory_issue(&self, repo: &str, number: i64) -> Result<Option<Value>> { pub fn factory_issue(&self, repo: &str, number: i64) -> Result<Option<Value>> {
let conn = self.conn.lock().unwrap(); let conn = self.conn.lock().unwrap();
Ok(conn Ok(conn
.query_row("SELECT title, author, state, attempts, rounds, last_comment, scenarios, branch, pr_url, note, created_at, updated_at, owner_id, version FROM factory_issues WHERE repo_url = ?1 AND number = ?2", params![repo, number], |r| { .query_row("SELECT title, author, state, attempts, rounds, last_comment, scenarios, branch, pr_url, note, created_at, updated_at, owner_id, version, merged FROM factory_issues WHERE repo_url = ?1 AND number = ?2", params![repo, number], |r| {
Ok(json!({"repo": repo, "number": number, "title": r.get::<_, String>(0)?, "author": r.get::<_, String>(1)?, "state": r.get::<_, String>(2)?, "attempts": r.get::<_, i64>(3)?, "rounds": r.get::<_, i64>(4)?, "last_comment": r.get::<_, i64>(5)?, "scenarios": r.get::<_, String>(6)?, "branch": r.get::<_, String>(7)?, "pr_url": r.get::<_, String>(8)?, "note": r.get::<_, String>(9)?, "created_at": r.get::<_, i64>(10)?, "updated_at": r.get::<_, i64>(11)?, "owner_id": r.get::<_, String>(12)?, "version": r.get::<_, String>(13)?})) Ok(json!({"repo": repo, "number": number, "title": r.get::<_, String>(0)?, "author": r.get::<_, String>(1)?, "state": r.get::<_, String>(2)?, "attempts": r.get::<_, i64>(3)?, "rounds": r.get::<_, i64>(4)?, "last_comment": r.get::<_, i64>(5)?, "scenarios": r.get::<_, String>(6)?, "branch": r.get::<_, String>(7)?, "pr_url": r.get::<_, String>(8)?, "note": r.get::<_, String>(9)?, "created_at": r.get::<_, i64>(10)?, "updated_at": r.get::<_, i64>(11)?, "owner_id": r.get::<_, String>(12)?, "version": r.get::<_, String>(13)?, "merged": r.get::<_, i64>(14)? != 0}))
}) })
.optional()?) .optional()?)
} }
@@ -1512,7 +1513,7 @@ impl Store {
/// Update the given columns (whitelisted) of an issue. /// Update the given columns (whitelisted) of an issue.
pub fn factory_issue_set(&self, repo: &str, number: i64, fields: &[(&str, Value)]) -> Result<()> { 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"]; const COLS: [&str; 12] = ["title", "state", "attempts", "rounds", "last_comment", "scenarios", "branch", "pr_url", "note", "author", "version", "merged"];
let conn = self.conn.lock().unwrap(); let conn = self.conn.lock().unwrap();
for (k, v) in fields { for (k, v) in fields {
if !COLS.contains(k) { if !COLS.contains(k) {
+214 -3
View File
@@ -30,6 +30,32 @@ use tokio::process::Command;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
const LABEL: &str = "codecraft.testrunner=1"; const LABEL: &str = "codecraft.testrunner=1";
const CACHE_LABEL: &str = "codecraft.testrunner.cache=1";
/// What every environment container runs: link the shared directories, restore a matching seed, run
/// `install`, store a new seed (only after a successful install, so it is pristine), start the app.
const FALLBACK_IMAGE: &str = "node:24-bookworm";
const ENTRY_SCRIPT: &str = r#"cd /app
hit=0
if [ -d /cache ]; then
for d in $CC_CACHE_DIRS; do mkdir -p "/cache/dirs/$d" "$(dirname "$d")" && rm -rf "$d" && ln -s "/cache/dirs/$d" "$d"; done
if [ -d /usr/local/cargo ]; then for d in registry git; do mkdir -p "/cache/cargo/$d"; rm -rf "/usr/local/cargo/$d"; ln -s "/cache/cargo/$d" "/usr/local/cargo/$d"; done; fi
if [ -n "$CC_SEED_KEY" ]; then for p in $CC_SEED_PATHS; do if [ -e "/cache/seed/$CC_SEED_KEY/$p" ]; then mkdir -p "$(dirname "$p")" && cp -a "/cache/seed/$CC_SEED_KEY/$p" "$p" && hit=1 && echo "[runner] restored $p from the cache"; fi; done; fi
fi
if [ -n "$CC_SEED_KEY" ]; then if [ "$hit" = 1 ]; then echo "[runner] seed $CC_SEED_KEY: hit"; else echo "[runner] seed $CC_SEED_KEY: miss"; fi; fi
t0=$(date +%s); st=$(date -u '+%Y-%m-%d %H:%M:%S')
if [ -n "$CC_INSTALL" ]; then sh -c "$CC_INSTALL" || exit 1; fi
echo "[runner] install took $(( $(date +%s) - t0 )) s"
pk=$(awk -v s="$st" '$3=="install" && ($1" "$2)>=s {sub(/:.*/,"",$4); print $4}' /var/log/dpkg.log 2>/dev/null | sort -u | head -40 | tr '\n' ' ')
if [ -n "$pk" ]; then echo "[runner] apt installed: $pk"; fi
if [ -d /cache ] && [ -n "$CC_SEED_KEY" ] && [ ! -d "/cache/seed/$CC_SEED_KEY" ]; then
t="/cache/seed/.tmp-$$"; rm -rf "$t"; mkdir -p "$t"; ok=1
for p in $CC_SEED_PATHS; do if [ -e "$p" ]; then mkdir -p "$t/$(dirname "$p")" && cp -a "$p" "$t/$p" || ok=0; fi; done
if [ "$ok" = 1 ]; then mv "$t" "/cache/seed/$CC_SEED_KEY" && echo "[runner] stored the seed $CC_SEED_KEY"; else rm -rf "$t"; fi
ls -1t /cache/seed 2>/dev/null | grep -v '^\.tmp' | tail -n +4 | while read -r o; do rm -rf "/cache/seed/$o"; done
fi
exec sh -c "$CC_START""#;
// --- what a repository asks for (.factory/setup.json) ------------------------------------ // --- what a repository asks for (.factory/setup.json) ------------------------------------
@@ -41,6 +67,29 @@ pub struct Service {
pub env: BTreeMap<String, String>, pub env: BTreeMap<String, String>,
} }
/// What stays between runs of one project (kept in a Docker volume of the runner).
///
/// * `dirs`: directories of the sources that persist and are shared by all runs (downloads, caches –
/// inputs only: whatever lands there is visible to the next run).
/// * `seed`: expensive *results* of `install` (e.g. a built disk image). They are stored after a successful
/// `install` under a key made from the image, the install command, the seed paths and the contents of the
/// `key` files/directories, and copied into fresh containers whenever that key matches – so a run never
/// sees changes of an earlier run, and a change of the listed sources builds the seed anew.
///
/// Tool caches (npm, yarn, pip, Go, Cargo registry and target directory) are always shared per project
/// unless `"cache": false`.
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
pub struct CacheCfg {
#[serde(default)]
pub disabled: bool,
#[serde(default)]
pub dirs: Vec<String>,
#[serde(default)]
pub seed_paths: Vec<String>,
#[serde(default)]
pub seed_key: Vec<String>,
}
/// The request to start an environment. /// The request to start an environment.
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)] #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
pub struct StartReq { pub struct StartReq {
@@ -63,6 +112,11 @@ pub struct StartReq {
/// How long to wait until the port answers (seconds, default 300). /// How long to wait until the port answers (seconds, default 300).
#[serde(default)] #[serde(default)]
pub ready_secs: u64, pub ready_secs: u64,
/// Stable name of the project: its cache lives in the volume `cc-cache-<cache_id>`. Empty = no cache.
#[serde(default)]
pub cache_id: String,
#[serde(default)]
pub cache: CacheCfg,
} }
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -110,9 +164,19 @@ pub fn parse_setup(text: &str) -> Option<StartReq> {
env: strs("env"), env: strs("env"),
services, services,
ready_secs: v["ready_seconds"].as_u64().unwrap_or(0), ready_secs: v["ready_seconds"].as_u64().unwrap_or(0),
cache_id: String::new(),
cache: parse_cache(&v["cache"]),
}) })
} }
fn parse_cache(v: &Value) -> CacheCfg {
let list = |x: &Value| -> Vec<String> { x.as_array().map(|a| a.iter().filter_map(|s| s.as_str().map(|s| s.trim().trim_end_matches('/').to_string())).filter(|s| !s.is_empty()).collect()).unwrap_or_default() };
if v.as_bool() == Some(false) {
return CacheCfg { disabled: true, ..Default::default() };
}
CacheCfg { disabled: false, dirs: list(&v["dirs"]), seed_paths: list(&v["seed"]["paths"]), seed_key: list(&v["seed"]["key"]) }
}
/// Port of `http://host:1234/path` (80/443 by scheme when missing). /// Port of `http://host:1234/path` (80/443 by scheme when missing).
pub fn port_of(url: &str) -> Option<u16> { pub fn port_of(url: &str) -> Option<u16> {
let (scheme, rest) = url.trim().split_once("://")?; let (scheme, rest) = url.trim().split_once("://")?;
@@ -132,6 +196,61 @@ fn image_ok(s: &str) -> bool {
ident_ok(s, "._/:@-") && !s.starts_with('-') ident_ok(s, "._/:@-") && !s.starts_with('-')
} }
/// A path inside the sources: relative, no `..`, only plain characters (it ends up in a shell loop).
fn rel_ok(p: &str) -> bool {
ident_ok(p, "._/-") && !p.starts_with('/') && !p.starts_with('-') && !p.split('/').any(|c| c.is_empty() || c == "..") && !p.split('/').any(|c| c == ".git")
}
/// Key of a seed: image, install command, seed paths and the contents of the key files (directories: recursively).
pub fn seed_key(work: &Path, image: &str, req: &StartReq) -> Option<String> {
use sha2::{Digest, Sha256};
let c = &req.cache;
if c.disabled || c.seed_paths.is_empty() {
return None;
}
fn walk(base: &Path, rel: &Path, out: &mut Vec<std::path::PathBuf>) {
let full = base.join(rel);
if full.is_dir() {
let mut kids: Vec<_> = std::fs::read_dir(&full).map(|d| d.filter_map(|e| e.ok()).map(|e| e.file_name()).collect()).unwrap_or_default();
kids.sort();
for k in kids {
if k == ".git" || k == "node_modules" {
continue;
}
walk(base, &rel.join(k), out);
}
} else if full.is_file() {
out.push(rel.to_path_buf());
}
}
let mut h = Sha256::new();
for part in [image, &req.install, &c.seed_paths.join("\n"), &req.dockerfile] {
h.update(part.as_bytes());
h.update([0]);
}
let mut files = Vec::new();
let mut keys = c.seed_key.clone();
keys.sort();
for k in &keys {
h.update(k.as_bytes());
h.update([1]);
walk(work, Path::new(k), &mut files);
}
let mut total = 0u64;
for f in files {
let data = std::fs::read(work.join(&f)).ok()?;
total += data.len() as u64;
if total > 200 << 20 {
return None;
}
h.update(f.to_string_lossy().as_bytes());
h.update([2]);
h.update(&data);
}
let d = h.finalize();
Some(d.iter().take(10).map(|b| format!("{b:02x}")).collect())
}
fn env_ok(m: &BTreeMap<String, String>) -> bool { fn env_ok(m: &BTreeMap<String, String>) -> bool {
m.len() <= 64 && m.iter().all(|(k, v)| k.chars().next().is_some_and(|c| c.is_ascii_alphabetic() || c == '_') && ident_ok(k, "_") && v.len() <= 4096 && !v.contains('\0')) m.len() <= 64 && m.iter().all(|(k, v)| k.chars().next().is_some_and(|c| c.is_ascii_alphabetic() || c == '_') && ident_ok(k, "_") && v.len() <= 4096 && !v.contains('\0'))
} }
@@ -158,6 +277,16 @@ fn validate(req: &StartReq, factory_dir: &Path) -> Result<PathBuf> {
if !env_ok(&req.env) { if !env_ok(&req.env) {
bail!("invalid environment variable"); bail!("invalid environment variable");
} }
if !req.cache_id.is_empty() && !ident_ok(&req.cache_id, "-_.") {
bail!("invalid cache id");
}
let c = &req.cache;
if c.dirs.len() > 16 || c.seed_paths.len() > 8 || c.seed_key.len() > 32 || !c.dirs.iter().chain(&c.seed_paths).chain(&c.seed_key).all(|p| rel_ok(p)) {
bail!("invalid cache path (relative, letters, digits and ._-/ only)");
}
if !c.seed_paths.is_empty() && c.seed_key.is_empty() {
bail!("cache.seed needs a key (the sources the seed depends on)");
}
let root = factory_dir.canonicalize().with_context(|| format!("factory area {} is not mounted", factory_dir.display()))?; let root = factory_dir.canonicalize().with_context(|| format!("factory area {} is not mounted", factory_dir.display()))?;
let work = Path::new(&req.work).canonicalize().context("source directory not found")?; let work = Path::new(&req.work).canonicalize().context("source directory not found")?;
if !work.starts_with(&root) || !work.is_dir() { if !work.starts_with(&root) || !work.is_dir() {
@@ -230,7 +359,7 @@ pub async fn serve() -> Result<()> {
ports: (lo, hi), ports: (lo, hi),
memory: std::env::var("RUNNER_MEMORY").unwrap_or_else(|_| "2g".into()), memory: std::env::var("RUNNER_MEMORY").unwrap_or_else(|_| "2g".into()),
cpus: std::env::var("RUNNER_CPUS").unwrap_or_else(|_| "2".into()), cpus: std::env::var("RUNNER_CPUS").unwrap_or_else(|_| "2".into()),
default_image: std::env::var("RUNNER_DEFAULT_IMAGE").unwrap_or_else(|_| "node:22-bookworm".into()), default_image: std::env::var("RUNNER_DEFAULT_IMAGE").unwrap_or_else(|_| "git.familie-zink.org/zink/codecraft-testbase:latest".into()),
max_age: Duration::from_secs(60 * std::env::var("RUNNER_MAX_MINUTES").ok().and_then(|s| s.parse().ok()).unwrap_or(90)), max_age: Duration::from_secs(60 * std::env::var("RUNNER_MAX_MINUTES").ok().and_then(|s| s.parse().ok()).unwrap_or(90)),
me: std::env::var("RUNNER_SELF").or_else(|_| std::env::var("HOSTNAME")).unwrap_or_default(), me: std::env::var("RUNNER_SELF").or_else(|_| std::env::var("HOSTNAME")).unwrap_or_default(),
envs: Mutex::new(HashMap::new()), envs: Mutex::new(HashMap::new()),
@@ -254,6 +383,7 @@ pub async fn serve() -> Result<()> {
.route("/v1/envs", post(start_env)) .route("/v1/envs", post(start_env))
.route("/v1/envs/{id}", delete(stop_env)) .route("/v1/envs/{id}", delete(stop_env))
.route("/v1/envs/{id}/log", get(log_env)) .route("/v1/envs/{id}/log", get(log_env))
.route("/v1/cache/{id}", delete(clear_cache))
.with_state(runner); .with_state(runner);
let bind = std::env::var("RUNNER_BIND").unwrap_or_else(|_| "0.0.0.0:8788".into()); let bind = std::env::var("RUNNER_BIND").unwrap_or_else(|_| "0.0.0.0:8788".into());
let l = TcpListener::bind(&bind).await?; let l = TcpListener::bind(&bind).await?;
@@ -312,6 +442,7 @@ async fn start_env(State(r): State<Arc<Runner>>, h: HeaderMap, Json(req): Json<S
} }
async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Result<Started> { async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Result<Started> {
let began = Instant::now();
let net = format!("cc-run-{id}"); let net = format!("cc-run-{id}");
let app = format!("cc-run-{id}"); let app = format!("cc-run-{id}");
// Register first, so a failure at any step is cleaned up by stop(). // Register first, so a failure at any step is cleaned up by stop().
@@ -331,7 +462,7 @@ async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Resul
r.envs.lock().unwrap().get_mut(id).unwrap().containers.push(cname); r.envs.lock().unwrap().get_mut(id).unwrap().containers.push(cname);
} }
let image = if req.dockerfile.is_empty() { let image = if req.dockerfile.is_empty() {
if req.image.is_empty() { r.default_image.clone() } else { req.image.clone() } if req.image.is_empty() { default_image_or_fallback(&r.default_image).await } else { req.image.clone() }
} else { } else {
let tag = format!("cc-run-{id}"); let tag = format!("cc-run-{id}");
let df = work.join(&req.dockerfile); let df = work.join(&req.dockerfile);
@@ -350,12 +481,42 @@ async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Resul
a.push("-e".into()); a.push("-e".into());
a.push(format!("{k}={v}")); a.push(format!("{k}={v}"));
} }
// Per-project cache volume: tool caches, shared download directories and seeds (see CacheCfg).
let cached = !req.cache_id.is_empty() && !req.cache.disabled;
if cached {
let vol = format!("cc-cache-{}", req.cache_id);
docker(&["volume", "create", "--label", CACHE_LABEL, &vol]).await.context("cache volume")?;
a.push("-v".into());
a.push(format!("{vol}:/cache"));
for (k, v) in [
("npm_config_cache", "/cache/npm"),
("YARN_CACHE_FOLDER", "/cache/yarn"),
("PIP_CACHE_DIR", "/cache/pip"),
("GOMODCACHE", "/cache/go/mod"),
("GOCACHE", "/cache/go/build"),
("CARGO_TARGET_DIR", "/cache/target"),
("XDG_CACHE_HOME", "/cache/xdg"),
] {
if !req.env.contains_key(k) {
a.push("-e".into());
a.push(format!("{k}={v}"));
}
}
a.push("-e".into());
a.push(format!("CC_CACHE_DIRS={}", req.cache.dirs.join(" ")));
if let Some(key) = seed_key(work, &image, req) {
a.push("-e".into());
a.push(format!("CC_SEED_KEY={key}"));
a.push("-e".into());
a.push(format!("CC_SEED_PATHS={}", req.cache.seed_paths.join(" ")));
}
}
a.push("-e".into()); a.push("-e".into());
a.push(format!("CC_INSTALL={}", req.install)); a.push(format!("CC_INSTALL={}", req.install));
a.push("-e".into()); a.push("-e".into());
a.push(format!("CC_START={}", req.start)); a.push(format!("CC_START={}", req.start));
a.push(image); a.push(image);
a.extend(["sh", "-c", r#"if [ -n "$CC_INSTALL" ]; then sh -c "$CC_INSTALL" || exit 1; fi; exec sh -c "$CC_START""#].map(String::from)); a.extend(["sh", "-c", ENTRY_SCRIPT].map(String::from));
let refs: Vec<&str> = a.iter().map(String::as_str).collect(); let refs: Vec<&str> = a.iter().map(String::as_str).collect();
docker(&refs).await.context("docker create")?; docker(&refs).await.context("docker create")?;
// Copy the sources in (without .git); the container never sees the host directory. // Copy the sources in (without .git); the container never sees the host directory.
@@ -390,6 +551,11 @@ async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Resul
} }
tokio::time::sleep(Duration::from_millis(700)).await; tokio::time::sleep(Duration::from_millis(700)).await;
} }
// Report what the cache brought: seed hit/miss, install time, total time until the app answered.
let facts: Vec<String> = logs(&app).await.lines().filter(|l| l.starts_with("[runner] seed ") || l.starts_with("[runner] install took") || l.starts_with("[runner] apt installed")).map(|l| l.trim_start_matches("[runner] ").to_string()).collect();
let took = began.elapsed().as_secs();
let cache = if cached { "on" } else { "off" };
tracing::info!("test env {id} ({}) ready after {took} s; cache {cache}{}{}", req.cache_id, if facts.is_empty() { "" } else { "; " }, facts.join("; "));
let (listener, port) = bind_forward(r).await?; let (listener, port) = bind_forward(r).await?;
let (target, tport) = (ip, req.port); let (target, tport) = (ip, req.port);
let fwd = tokio::spawn(async move { let fwd = tokio::spawn(async move {
@@ -410,6 +576,15 @@ async fn create(r: &Arc<Runner>, id: &str, req: &StartReq, work: &Path) -> Resul
Ok(Started { id: id.to_string(), port }) Ok(Started { id: id.to_string(), port })
} }
/// The shared base image; when it can neither be found nor pulled, fall back to plain Node so runs still work.
async fn default_image_or_fallback(img: &str) -> String {
if docker(&["image", "inspect", img]).await.is_ok() || docker(&["pull", "-q", img]).await.is_ok() {
return img.to_string();
}
tracing::warn!("test runner: base image {img} is not available, using {FALLBACK_IMAGE}");
FALLBACK_IMAGE.to_string()
}
async fn logs(container: &str) -> String { async fn logs(container: &str) -> String {
match Command::new("docker").args(["logs", "--tail", "400", container]).output().await { match Command::new("docker").args(["logs", "--tail", "400", container]).output().await {
Ok(o) => format!("{}{}", String::from_utf8_lossy(&o.stdout), String::from_utf8_lossy(&o.stderr)), Ok(o) => format!("{}{}", String::from_utf8_lossy(&o.stdout), String::from_utf8_lossy(&o.stderr)),
@@ -443,6 +618,16 @@ async fn stop_env(State(r): State<Arc<Runner>>, h: HeaderMap, AxPath(id): AxPath
Ok(Json(json!({"ok": true}))) Ok(Json(json!({"ok": true})))
} }
/// Forget the cache of a project (fails while an environment of it is running).
async fn clear_cache(State(r): State<Arc<Runner>>, h: HeaderMap, AxPath(id): AxPath<String>) -> Resp<Json<Value>> {
authed(&r, &h)?;
if !ident_ok(&id, "-_.") {
return Err((StatusCode::BAD_REQUEST, "invalid cache id".into()));
}
docker(&["volume", "rm", &format!("cc-cache-{id}")]).await.map_err(|e| (StatusCode::CONFLICT, format!("{e:#}")))?;
Ok(Json(json!({"ok": true})))
}
#[derive(Deserialize)] #[derive(Deserialize)]
struct LogQ { struct LogQ {
tail: Option<usize>, tail: Option<usize>,
@@ -574,6 +759,32 @@ mod tests {
let _ = std::fs::remove_dir_all(&dir); let _ = std::fs::remove_dir_all(&dir);
} }
#[test]
fn cache_config_and_seed_key() {
let r = parse_setup(r#"{"start":"x","port":1,"cache":{"dirs":["build/downloads/"],"seed":{"paths":["data/ubuntu.ext4"],"key":["guest","package-lock.json"]}}}"#).unwrap();
assert_eq!(r.cache.dirs, vec!["build/downloads"]);
assert_eq!(r.cache.seed_key, vec!["guest", "package-lock.json"]);
assert!(parse_setup(r#"{"start":"x","port":1,"cache":false}"#).unwrap().cache.disabled);
assert!(!parse_setup(r#"{"start":"x","port":1}"#).unwrap().cache.disabled);
assert!(rel_ok("build/downloads") && !rel_ok("../x") && !rel_ok("/etc") && !rel_ok("a b") && !rel_ok("a/.git/b") && !rel_ok("a//b"));
// The key follows the contents of the key files, not of anything else.
let dir = std::env::temp_dir().join(format!("ccs-{}", std::process::id()));
std::fs::create_dir_all(dir.join("guest")).unwrap();
std::fs::write(dir.join("guest/a.c"), "one").unwrap();
std::fs::write(dir.join("other.txt"), "x").unwrap();
let mut req = r.clone();
req.install = "npm ci".into();
let k1 = seed_key(&dir, "node:24", &req).unwrap();
std::fs::write(dir.join("other.txt"), "changed").unwrap();
assert_eq!(seed_key(&dir, "node:24", &req).unwrap(), k1);
std::fs::write(dir.join("guest/a.c"), "two").unwrap();
assert_ne!(seed_key(&dir, "node:24", &req).unwrap(), k1);
assert_ne!(seed_key(&dir, "node:22", &req).unwrap(), seed_key(&dir, "node:24", &req).unwrap());
req.cache.seed_paths.clear();
assert!(seed_key(&dir, "node:24", &req).is_none());
let _ = std::fs::remove_dir_all(&dir);
}
#[test] #[test]
fn tokens_compare() { fn tokens_compare() {
assert!(eq_const("abc", "abc")); assert!(eq_const("abc", "abc"));
+56 -13
View File
@@ -78,6 +78,8 @@ interface Issue {
branch: string; branch: string;
rounds: number; rounds: number;
/** Newest phase chat that still exists. */ /** Newest phase chat that still exists. */
/** The pull request is merged (merging comes after a positive acceptance, closing after the merge). */
merged?: boolean;
chat_session?: string; chat_session?: string;
chat_phase?: Phase; chat_phase?: Phase;
created_at: number; created_at: number;
@@ -188,6 +190,20 @@ export function Factory({ onMenu, overlayId }: { onMenu: () => void; overlayId?:
); );
} }
/** A button inside an issue card (the card itself is a button, so this is a span with the button role). */
function CardAction({ children, onClick, title, primary, disabled }: { children: React.ReactNode; onClick: () => void; title?: string; primary?: boolean; disabled?: boolean }) {
const run = (e: React.SyntheticEvent) => {
e.stopPropagation();
e.preventDefault();
if (!disabled) onClick();
};
return (
<span role="button" tabIndex={disabled ? -1 : 0} aria-disabled={disabled} className={`factory-card-action ${primary ? "primary" : ""} ${disabled ? "disabled" : ""}`} title={title} onClick={run} onKeyDown={(e) => (e.key === "Enter" || e.key === " ") && run(e)}>
{children}
</span>
);
}
/** The factory's main switch, coloured by state: green = running, yellow = stopping, red = stopped. */ /** The factory's main switch, coloured by state: green = running, yellow = stopping, red = stopped. */
function PowerSwitch({ power, onToggle }: { power: Power; onToggle: (on: boolean) => void }) { function PowerSwitch({ power, onToggle }: { power: Power; onToggle: (on: boolean) => void }) {
const t = useT(); const t = useT();
@@ -402,20 +418,24 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
setBusy(false); setBusy(false);
} }
}; };
const mergePr = async () => { const prNo = (i: Issue) => Number(i.pr_url.replace(/\/$/, "").split("/").pop()) || 0;
if (!selected || !pr) return; /** Merge the pull request of an issue; only offered once the acceptance has passed. */
if (!(await confirmDialog({ message: t("factory.mergeConfirm", { n: pr.number, method: t(`factory.merge.${prMethod}` as any) }) }))) return; const mergeIssue = async (i: Issue, n = prNo(i)) => {
if (!n || i.state !== "done") return;
if (!(await confirmDialog({ message: t("factory.mergeConfirm", { n, method: t(`factory.merge.${prMethod}` as any) }) }))) return;
setBusy(true); setBusy(true);
try { try {
await post("/factory/issues/pr/merge", { repo: selected.repo, number: selected.number, pr: pr.number, method: prMethod }); await post("/factory/issues/pr/merge", { repo: i.repo, number: i.number, pr: n, method: prMethod });
toast(t("factory.merged")); toast(t("factory.merged"));
await loadPr(); await loadPr();
await reload();
} catch (e: any) { } catch (e: any) {
toast(e.message); toast(e.message);
} finally { } finally {
setBusy(false); setBusy(false);
} }
}; };
const mergePr = () => (selected && pr ? mergeIssue(selected, pr.number) : Promise.resolve());
const removeIssue = async () => { const removeIssue = async () => {
if (!selected) return; if (!selected) return;
if (!(await confirmDialog({ message: t("factory.removeConfirm", { n: selected.number }), confirmLabel: t("factory.remove"), danger: true }))) return; if (!(await confirmDialog({ message: t("factory.removeConfirm", { n: selected.number }), confirmLabel: t("factory.remove"), danger: true }))) return;
@@ -430,15 +450,16 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
setBusy(false); setBusy(false);
} }
}; };
const closeIssue = async () => { /** Close an issue; only offered once its pull request is merged. */
if (!selected) return; const closeIssueOf = async (i: Issue) => {
const comment = await promptDialog({ title: t("factory.closeTitle"), message: t("factory.closeMsg", { n: selected.number }), defaultValue: t("factory.closeDefault"), confirmLabel: t("factory.close") }); if (i.state !== "done" || !i.merged) return;
const comment = await promptDialog({ title: t("factory.closeTitle"), message: t("factory.closeMsg", { n: i.number }), defaultValue: t("factory.closeDefault"), confirmLabel: t("factory.close") });
if (comment === null) return; if (comment === null) return;
setBusy(true); setBusy(true);
try { try {
await post("/factory/issues/close", { repo: selected.repo, number: selected.number, comment }); await post("/factory/issues/close", { repo: i.repo, number: i.number, comment });
toast(t("factory.closed"), "success"); toast(t("factory.closed"), "success");
setSel(""); if (selected && selected.number === i.number && selected.repo === i.repo) setSel("");
await reload(); await reload();
} catch (e: any) { } catch (e: any) {
toast(e.message); toast(e.message);
@@ -446,6 +467,7 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
setBusy(false); setBusy(false);
} }
}; };
const closeIssue = () => (selected ? closeIssueOf(selected) : Promise.resolve());
const phaseRunning = !!selected && ["review", "building", "testing"].includes(selected.state); const phaseRunning = !!selected && ["review", "building", "testing"].includes(selected.state);
/** Master switch: a soft stop – no new agent starts, running ones finish their phase. */ /** Master switch: a soft stop – no new agent starts, running ones finish their phase. */
const setPower = async (on: boolean) => { const setPower = async (on: boolean) => {
@@ -577,9 +599,11 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
const rs = runsOf(i); const rs = runsOf(i);
const active = rs.find((r) => !r.ended_at); const active = rs.find((r) => !r.ended_at);
const latest = active ?? rs[0]; const latest = active ?? rs[0];
// Claimed by a phase but no chat yet: checkout, and – for acceptance – installing and starting the app in its throw-away container.
const preparing = !active && ["review", "building", "testing"].includes(i.state);
const tokens = rs.reduce((a, r) => a + r.input_tokens + r.output_tokens, 0); const tokens = rs.reduce((a, r) => a + r.input_tokens + r.output_tokens, 0);
return ( return (
<button key={`${i.repo}#${i.number}`} data-state={i.state} className={`factory-card ${sel === `${i.repo}#${i.number}` ? "active" : ""} ${active ? "running" : ""}`} onClick={() => setSel(sel === `${i.repo}#${i.number}` ? "" : `${i.repo}#${i.number}`)}> <button key={`${i.repo}#${i.number}`} data-state={i.state} className={`factory-card ${sel === `${i.repo}#${i.number}` ? "active" : ""} ${active ? "running" : ""} ${preparing ? "preparing" : ""}`} onClick={() => setSel(sel === `${i.repo}#${i.number}` ? "" : `${i.repo}#${i.number}`)}>
<span className="factory-card-head"> <span className="factory-card-head">
<span className="hint"> <span className="hint">
{repoName(i.repo)} #{i.number} {repoName(i.repo)} #{i.number}
@@ -608,13 +632,32 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
)} )}
</span> </span>
<b>{i.title || `#${i.number}`}</b> <b>{i.title || `#${i.number}`}</b>
{latest && ( {preparing && (
<span className="hint" title={t("factory.preparing.hint")}>
<span className="factory-pulse prep" />
{i.state === "testing" ? t("factory.preparing.env") : t("factory.preparing.start")} · {fmtDuration(now - i.updated_at)}
</span>
)}
{latest && !preparing && (
<span className="hint"> <span className="hint">
{active && <span className="factory-pulse" />} {active && <span className="factory-pulse" />}
{t(`factory.phase.${latest.phase}` as any)} · {(latest.model || "").split("/").pop()} · {fmtDuration(runMs(latest, now))} {t(`factory.phase.${latest.phase}` as any)} · {(latest.model || "").split("/").pop()} · {fmtDuration(runMs(latest, now))}
</span> </span>
)} )}
{tokens > 0 && <span className="hint">{fmtCompact(tokens)} {t("factory.tokens")}</span>} {tokens > 0 && <span className="hint">{fmtCompact(tokens)} {t("factory.tokens")}</span>}
{i.state === "done" && (i.merged || prNo(i) > 0) && (
<span className="factory-card-actions">
{!i.merged ? (
<CardAction primary disabled={busy} title={t("factory.mergeHint")} onClick={() => void mergeIssue(i)}>
<Icon name="fork" /> {t("factory.mergeBtn")}
</CardAction>
) : (
<CardAction disabled={busy} title={t("factory.closeHint")} onClick={() => void closeIssueOf(i)}>
<Icon name="check" /> {t("factory.close")}
</CardAction>
)}
</span>
)}
</button> </button>
); );
})} })}
@@ -650,7 +693,7 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
<Icon name="trash" /> {t("factory.remove")} <Icon name="trash" /> {t("factory.remove")}
</button> </button>
)} )}
{selected && selected.state === "done" && ( {selected && selected.state === "done" && selected.merged && (
<button className="small" onClick={closeIssue} disabled={busy}> <button className="small" onClick={closeIssue} disabled={busy}>
<Icon name="check" /> {t("factory.close")} <Icon name="check" /> {t("factory.close")}
</button> </button>
@@ -683,7 +726,7 @@ function FactoryOverview({ onSettings }: { onSettings: () => void }) {
</span> </span>
)} )}
<span className="spacer" /> <span className="spacer" />
{pr.state === "open" && ( {pr.state === "open" && selected?.state === "done" && (
<> <>
<select value={prMethod} onChange={(e) => setPrMethod(e.target.value)} disabled={busy}> <select value={prMethod} onChange={(e) => setPrMethod(e.target.value)} disabled={busy}>
{["merge", "squash", "rebase"].map((m) => ( {["merge", "squash", "rebase"].map((m) => (
+5
View File
@@ -1243,6 +1243,11 @@ export const de: Messages = {
"factory.power.stopped": "Factory gestoppt", "factory.power.stopped": "Factory gestoppt",
"factory.power.stopHint": "Klicken zum Stoppen: keine neuen Agenten, laufende werden fertig", "factory.power.stopHint": "Klicken zum Stoppen: keine neuen Agenten, laufende werden fertig",
"factory.power.startHint": "Klicken, um die Factory zu starten", "factory.power.startHint": "Klicken, um die Factory zu starten",
"factory.preparing.env": "Testumgebung wird vorbereitet",
"factory.preparing.start": "Lauf wird vorbereitet",
"factory.preparing.hint": "Der Agent-Chat startet, sobald der Checkout fertig ist und – bei der Abnahme – die App in ihrem Wegwerf-Container installiert ist und läuft",
"factory.mergeHint": "Pull Request mergen – die Abnahme war erfolgreich",
"factory.closeHint": "Issue schließen – der Pull Request ist gemerged",
"factory.col.review": "Prüfung", "factory.col.review": "Prüfung",
"factory.col.question": "Rückfragen", "factory.col.question": "Rückfragen",
"factory.col.approved": "Freigegeben", "factory.col.approved": "Freigegeben",
+5
View File
@@ -1242,6 +1242,11 @@ export const en = {
"factory.power.stopped": "Factory stopped", "factory.power.stopped": "Factory stopped",
"factory.power.stopHint": "Click to stop: no new agents start, running ones finish", "factory.power.stopHint": "Click to stop: no new agents start, running ones finish",
"factory.power.startHint": "Click to start the factory", "factory.power.startHint": "Click to start the factory",
"factory.preparing.env": "Preparing the test environment",
"factory.preparing.start": "Preparing the run",
"factory.preparing.hint": "The agent chat starts when the checkout is done and – for acceptance – the app is installed and running in its throw-away container",
"factory.mergeHint": "Merge the pull request – the acceptance has passed",
"factory.closeHint": "Close the issue – the pull request is merged",
"factory.col.review": "Review", "factory.col.review": "Review",
"factory.col.question": "Questions", "factory.col.question": "Questions",
"factory.col.approved": "Approved", "factory.col.approved": "Approved",
+43
View File
@@ -5263,6 +5263,10 @@ td.fold-indent {
background: var(--bg1); background: var(--bg1);
border-bottom: 1px solid var(--bg2); border-bottom: 1px solid var(--bg2);
} }
/* The sidebar is not reachable from the overlay: its menu button would only be confusing. */
.chat-overlay .menu-btn {
display: none !important;
}
.chat-overlay-body { .chat-overlay-body {
flex: 1; flex: 1;
min-height: 0; min-height: 0;
@@ -5278,6 +5282,38 @@ td.fold-indent {
border: 0; border: 0;
} }
} }
.factory-card-actions {
display: flex;
gap: 6px;
margin-top: 4px;
}
.factory-card-action {
display: inline-flex;
align-items: center;
gap: 5px;
padding: 3px 9px;
font-size: 12.5px;
border-radius: 6px;
border: 1px solid var(--bg3);
background: var(--bg1);
color: var(--fg0);
cursor: pointer;
}
.factory-card-action:hover {
background: var(--bg2);
}
.factory-card-action.primary {
background: var(--accent);
border-color: var(--accent);
color: var(--on-accent, var(--bg0));
}
.factory-card-action.primary:hover {
filter: brightness(1.08);
}
.factory-card-action.disabled {
opacity: 0.5;
cursor: default;
}
.factory-card-head { .factory-card-head {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -5319,6 +5355,13 @@ td.fold-indent {
margin-right: 5px; margin-right: 5px;
animation: factory-pulse 1.4s ease-in-out infinite; animation: factory-pulse 1.4s ease-in-out infinite;
} }
/* Preparing (checkout, test environment): same lamp, other colour than an active chat. */
.factory-pulse.prep {
background: var(--prep, var(--blue, var(--accent2)));
}
.factory-card.preparing {
border-left: 3px solid var(--prep, var(--blue, var(--accent2)));
}
@keyframes factory-pulse { @keyframes factory-pulse {
50% { 50% {
opacity: 0.25; opacity: 0.25;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #8f9a5c; --power-on: #8f9a5c;
--power-warn: #d9b45a; --power-warn: #d9b45a;
--power-off: #c15c46; --power-off: #c15c46;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #8aa89a; --aqua: #8aa89a;
--blue: #7c9aa1; --blue: #7c9aa1;
--purple: #b47e99; --purple: #b47e99;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #5c6631; --power-on: #5c6631;
--power-warn: #9a7413; --power-warn: #9a7413;
--power-off: #96392a; --power-off: #96392a;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #3d6b72; --aqua: #3d6b72;
--blue: #3d6b72; --blue: #3d6b72;
--purple: #7c4a66; --purple: #7c4a66;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #a6e3a1; --power-on: #a6e3a1;
--power-warn: #f9e2af; --power-warn: #f9e2af;
--power-off: #f38ba8; --power-off: #f38ba8;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #94e2d5; --aqua: #94e2d5;
--blue: #89b4fa; --blue: #89b4fa;
--purple: #f5c2e7; --purple: #f5c2e7;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #40a02b; --power-on: #40a02b;
--power-warn: #df8e1d; --power-warn: #df8e1d;
--power-off: #d20f39; --power-off: #d20f39;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #179299; --aqua: #179299;
--blue: #1e66f5; --blue: #1e66f5;
--purple: #ea76cb; --purple: #ea76cb;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #a9b86a; --power-on: #a9b86a;
--power-warn: #e8c36a; --power-warn: #e8c36a;
--power-off: #d4694f; --power-off: #d4694f;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #9fb8a8; --aqua: #9fb8a8;
--blue: #a3b4c7; --blue: #a3b4c7;
--purple: #cf90a2; --purple: #cf90a2;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #4f6b00; --power-on: #4f6b00;
--power-warn: #a8780a; --power-warn: #a8780a;
--power-off: #a93a2e; --power-off: #a93a2e;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--aqua);
--aqua: #3f6b5e; --aqua: #3f6b5e;
--blue: #8e2d53; --blue: #8e2d53;
--purple: #7a003b; --purple: #7a003b;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #50fa7b; --power-on: #50fa7b;
--power-warn: #f1fa8c; --power-warn: #f1fa8c;
--power-off: #ff5555; --power-off: #ff5555;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #8be9fd; --aqua: #8be9fd;
--blue: #8be9fd; --blue: #8be9fd;
--purple: #ff79c6; --purple: #ff79c6;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #14710a; --power-on: #14710a;
--power-warn: #846e15; --power-warn: #846e15;
--power-off: #cb3a2a; --power-off: #cb3a2a;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #036a96; --aqua: #036a96;
--blue: #036a96; --blue: #036a96;
--purple: #a3144d; --purple: #a3144d;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #a7c080; --power-on: #a7c080;
--power-warn: #dbbc7f; --power-warn: #dbbc7f;
--power-off: #e67e80; --power-off: #e67e80;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--purple);
--aqua: #83c092; --aqua: #83c092;
--blue: #7fbbb3; --blue: #7fbbb3;
--purple: #d699b6; --purple: #d699b6;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #8da101; --power-on: #8da101;
--power-warn: #dfa000; --power-warn: #dfa000;
--power-off: #f85552; --power-off: #f85552;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #35a77c; --aqua: #35a77c;
--blue: #3a94c5; --blue: #3a94c5;
--purple: #df69ba; --purple: #df69ba;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #3fb950; --power-on: #3fb950;
--power-warn: #d29922; --power-warn: #d29922;
--power-off: #f85149; --power-off: #f85149;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #39c5cf; --aqua: #39c5cf;
--blue: #58a6ff; --blue: #58a6ff;
--purple: #bc8cff; --purple: #bc8cff;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #1a7f37; --power-on: #1a7f37;
--power-warn: #9a6700; --power-warn: #9a6700;
--power-off: #d1242f; --power-off: #d1242f;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #1b7c83; --aqua: #1b7c83;
--blue: #0969da; --blue: #0969da;
--purple: #8250df; --purple: #8250df;
+2
View File
@@ -26,6 +26,8 @@
--power-on: #b8bb26; --power-on: #b8bb26;
--power-warn: #fabd2f; --power-warn: #fabd2f;
--power-off: #fb4934; --power-off: #fb4934;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #8ec07c; --aqua: #8ec07c;
--blue: #83a598; --blue: #83a598;
--purple: #d3869b; --purple: #d3869b;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #79740e; --power-on: #79740e;
--power-warn: #b57614; --power-warn: #b57614;
--power-off: #9d0006; --power-off: #9d0006;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #427b58; --aqua: #427b58;
--blue: #076678; --blue: #076678;
--purple: #8f3f71; --purple: #8f3f71;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #8fae72; --power-on: #8fae72;
--power-warn: #e0b350; --power-warn: #e0b350;
--power-off: #f44336; --power-off: #f44336;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--blue);
--aqua: #8a9ba6; --aqua: #8a9ba6;
--blue: #77838a; --blue: #77838a;
--purple: #e58980; --purple: #e58980;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #5a7a43; --power-on: #5a7a43;
--power-warn: #a87b1a; --power-warn: #a87b1a;
--power-off: #b14752; --power-off: #b14752;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #3d727d; --aqua: #3d727d;
--blue: #4c6c94; --blue: #4c6c94;
--purple: #8a5b81; --purple: #8a5b81;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #98bb6c; --power-on: #98bb6c;
--power-warn: #e6c384; --power-warn: #e6c384;
--power-off: #e46876; --power-off: #e46876;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #7aa89f; --aqua: #7aa89f;
--blue: #7fb4ca; --blue: #7fb4ca;
--purple: #957fb8; --purple: #957fb8;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #6f894e; --power-on: #6f894e;
--power-warn: #b07a00; --power-warn: #b07a00;
--power-off: #c84053; --power-off: #c84053;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #597b75; --aqua: #597b75;
--blue: #4d699b; --blue: #4d699b;
--purple: #624c83; --purple: #624c83;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #a3be8c; --power-on: #a3be8c;
--power-warn: #ebcb8b; --power-warn: #ebcb8b;
--power-off: #bf616a; --power-off: #bf616a;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #8fbcbb; --aqua: #8fbcbb;
--blue: #81a1c1; --blue: #81a1c1;
--purple: #b48ead; --purple: #b48ead;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #5f7d48; --power-on: #5f7d48;
--power-warn: #9a7b2f; --power-warn: #9a7b2f;
--power-off: #a9434d; --power-off: #a9434d;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #4d8a89; --aqua: #4d8a89;
--blue: #5e81ac; --blue: #5e81ac;
--purple: #8f6a8a; --purple: #8f6a8a;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #98c379; --power-on: #98c379;
--power-warn: #e5c07b; --power-warn: #e5c07b;
--power-off: #e06c75; --power-off: #e06c75;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #56b6c2; --aqua: #56b6c2;
--blue: #61afef; --blue: #61afef;
--purple: #c678dd; --purple: #c678dd;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #50a14f; --power-on: #50a14f;
--power-warn: #c18401; --power-warn: #c18401;
--power-off: #e45649; --power-off: #e45649;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #0184bc; --aqua: #0184bc;
--blue: #4078f2; --blue: #4078f2;
--purple: #a626a4; --purple: #a626a4;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #95b88f; --power-on: #95b88f;
--power-warn: #f6c177; --power-warn: #f6c177;
--power-off: #eb6f92; --power-off: #eb6f92;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #9ccfd8; --aqua: #9ccfd8;
--blue: #31748f; --blue: #31748f;
--purple: #c4a7e7; --purple: #c4a7e7;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #5e8f60; --power-on: #5e8f60;
--power-warn: #c98a1b; --power-warn: #c98a1b;
--power-off: #b4637a; --power-off: #b4637a;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #56949f; --aqua: #56949f;
--blue: #286983; --blue: #286983;
--purple: #907aa9; --purple: #907aa9;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #859900; --power-on: #859900;
--power-warn: #b58900; --power-warn: #b58900;
--power-off: #dc322f; --power-off: #dc322f;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--purple);
--aqua: #2aa198; --aqua: #2aa198;
--blue: #268bd2; --blue: #268bd2;
--purple: #6c71c4; --purple: #6c71c4;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #859900; --power-on: #859900;
--power-warn: #b58900; --power-warn: #b58900;
--power-off: #dc322f; --power-off: #dc322f;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--purple);
--aqua: #2aa198; --aqua: #2aa198;
--blue: #268bd2; --blue: #268bd2;
--purple: #6c71c4; --purple: #6c71c4;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #8fb98a; --power-on: #8fb98a;
--power-warn: #e0b860; --power-warn: #e0b860;
--power-off: #d47a6a; --power-off: #d47a6a;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #96b4bc; --aqua: #96b4bc;
--blue: #7aa0cc; --blue: #7aa0cc;
--purple: #c896b2; --purple: #c896b2;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #4a6b3a; --power-on: #4a6b3a;
--power-warn: #9a7218; --power-warn: #9a7218;
--power-off: #8a3028; --power-off: #8a3028;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #3a5a6a; --aqua: #3a5a6a;
--blue: #3a5a8a; --blue: #3a5a8a;
--purple: #5a4a72; --purple: #5a4a72;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #9ece6a; --power-on: #9ece6a;
--power-warn: #e0af68; --power-warn: #e0af68;
--power-off: #f7768e; --power-off: #f7768e;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #73daca; --aqua: #73daca;
--blue: #7aa2f7; --blue: #7aa2f7;
--purple: #bb9af7; --purple: #bb9af7;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #587539; --power-on: #587539;
--power-warn: #8c6c3e; --power-warn: #8c6c3e;
--power-off: #f52a65; --power-off: #f52a65;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #118c74; --aqua: #118c74;
--blue: #2e7de9; --blue: #2e7de9;
--purple: #9854f1; --purple: #9854f1;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #89d185; --power-on: #89d185;
--power-warn: #cca700; --power-warn: #cca700;
--power-off: #f14c4c; --power-off: #f14c4c;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #4ec9b0; --aqua: #4ec9b0;
--blue: #3794ff; --blue: #3794ff;
--purple: #c586c0; --purple: #c586c0;
+2
View File
@@ -25,6 +25,8 @@
--power-on: #388a34; --power-on: #388a34;
--power-warn: #bf8803; --power-warn: #bf8803;
--power-off: #cd3131; --power-off: #cd3131;
/* Lamp of a phase that is still being prepared: a colour that differs from --accent */
--prep: var(--power-warn);
--aqua: #267f99; --aqua: #267f99;
--blue: #005fb8; --blue: #005fb8;
--purple: #af00db; --purple: #af00db;
+20
View File
@@ -3,6 +3,26 @@
* under "unreleased"; scripts/release.sh renames the key to the release version. * under "unreleased"; scripts/release.sh renames the key to the release version.
*/ */
export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = { export const WHATS_NEW: Record<string, { en: string[]; de: string[] }> = {
"202611-00077": {
en: ["Factory test runner: shared base image (Node 24, Python, gcc, Chromium/Playwright) for acceptance containers; logs start time, cache hits and installed packages"],
de: ["Factory-Test-Runner: gemeinsames Basis-Image (Node 24, Python, gcc, Chromium/Playwright) für Abnahme-Container; protokolliert Startzeit, Cache-Treffer und installierte Pakete"],
},
"202611-00076": {
en: ["Factory test runner: logs how long an environment took to start and whether the cache seed was a hit"],
de: ["Factory-Test-Runner: protokolliert, wie lange eine Umgebung zum Start brauchte und ob der Cache-Seed getroffen hat"],
},
"202611-00075": {
en: ["Factory: the lamp of a phase being prepared now differs in colour from the accent in every theme"],
de: ["Factory: die Lampe einer Phase in Vorbereitung unterscheidet sich in jedem Theme farblich vom Akzent"],
},
"202611-00074": {
en: ["Factory: Merge and Close buttons on the issue card – merge after a positive acceptance, close after the merge", "Factory test runner: caches between acceptance runs (npm, Cargo, pip, Go and optional seeds of the install step) – the test environment starts much faster"],
de: ["Factory: Merge- und Schließen-Knopf auf der Issue-Karte – Merge nach erfolgreicher Abnahme, Schließen nach dem Merge", "Factory-Test-Runner: Caches zwischen Abnahmeläufen (npm, Cargo, pip, Go und optionale Seeds des Install-Schritts) – die Testumgebung startet deutlich schneller"],
},
"202611-00072": {
en: ["Factory: a blinking blue lamp shows that a phase is being prepared (checkout, test environment) before its chat starts"],
de: ["Factory: eine blinkende blaue Lampe zeigt, dass eine Phase vorbereitet wird (Checkout, Testumgebung), bevor der Chat startet"],
},
"202611-00071": { "202611-00071": {
en: ["Unsent messages are saved per chat and can be continued on another device (web and terminal client)", "Factory: main switch (green running, yellow stopping, red stopped) with a soft stop – running agents finish", "Factory: chats open in an overlay on the desktop; every issue card has an open-chat button; the overview uses the full width"], en: ["Unsent messages are saved per chat and can be continued on another device (web and terminal client)", "Factory: main switch (green running, yellow stopping, red stopped) with a soft stop – running agents finish", "Factory: chats open in an overlay on the desktop; every issue card has an open-chat button; the overview uses the full width"],
de: ["Ungesendete Nachrichten werden pro Chat gespeichert und lassen sich auf einem anderen Gerät fortsetzen (Web und Terminal-Client)", "Factory: Hauptschalter (grün läuft, gelb stoppt, rot gestoppt) mit sanftem Stopp – laufende Agenten werden fertig", "Factory: Chats öffnen auf dem Desktop in einem Overlay; jede Issue-Karte hat einen Chat-Knopf; die Übersicht nutzt die volle Breite"], de: ["Ungesendete Nachrichten werden pro Chat gespeichert und lassen sich auf einem anderen Gerät fortsetzen (Web und Terminal-Client)", "Factory: Hauptschalter (grün läuft, gelb stoppt, rot gestoppt) mit sanftem Stopp – laufende Agenten werden fertig", "Factory: Chats öffnen auf dem Desktop in einem Overlay; jede Issue-Karte hat einen Chat-Knopf; die Übersicht nutzt die volle Breite"],