Compare commits
31
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
107f0dbced | ||
|
|
09c6496725 | ||
|
|
30eaa50c50 | ||
|
|
e4a395b72e | ||
|
|
6e5ccc25a6 | ||
|
|
2380c2cb0b | ||
|
|
ec85f6c8da | ||
|
|
bb34ef1b7e | ||
|
|
f7e336ff5f | ||
|
|
9bdc3cd89b | ||
|
|
ddab8e35f5 | ||
|
|
1a979f500f | ||
|
|
25d9805806 | ||
|
|
08b2adae23 | ||
|
|
5b53705c97 | ||
|
|
8bad869248 | ||
|
|
e2871c4361 | ||
|
|
3ea288dbb5 | ||
|
|
ca1fd46e08 | ||
|
|
a0e6b16abc | ||
|
|
3a383aede6 | ||
|
|
e089360ac8 | ||
|
|
409ca65ee7 | ||
|
|
322c1be89c | ||
|
|
716ee9a304 | ||
|
|
ea3d145aac | ||
|
|
dd8dad2ad4 | ||
|
|
d90a42b759 | ||
|
|
491449f3ce | ||
|
|
2c7d619cf0 | ||
|
|
9f874bc06a |
Generated
+2
@@ -946,6 +946,7 @@ dependencies = [
|
||||
"cm-config",
|
||||
"cm-db",
|
||||
"cm-domain",
|
||||
"cm-files",
|
||||
"cm-llm",
|
||||
"cm-orchestrator",
|
||||
"cm-runtime",
|
||||
@@ -969,6 +970,7 @@ dependencies = [
|
||||
"serde_yaml",
|
||||
"sha2",
|
||||
"sqlx",
|
||||
"tempfile",
|
||||
"thiserror 2.0.18",
|
||||
"time",
|
||||
"tokio",
|
||||
|
||||
@@ -266,7 +266,7 @@ async fn run() -> Result<(), String> {
|
||||
terminals,
|
||||
providers: provider_registry,
|
||||
},
|
||||
blob,
|
||||
blob.clone(),
|
||||
);
|
||||
// Durable §15 path: expires overdue approvals and resumes decided runs
|
||||
// even if the deciding request's process died mid-flight.
|
||||
@@ -388,6 +388,7 @@ async fn run() -> Result<(), String> {
|
||||
.with_broker(PathBuf::from(&config.broker.socket_path))
|
||||
.with_oauth(config.oauth.clone())
|
||||
.with_billing(config.billing.clone())
|
||||
.with_blobs(blob.clone())
|
||||
.with_file_root(
|
||||
(config.storage.backend == cm_config::StorageBackend::Local)
|
||||
.then(|| PathBuf::from(&config.storage.data_dir)),
|
||||
@@ -402,6 +403,11 @@ async fn run() -> Result<(), String> {
|
||||
.await
|
||||
.map_err(|e| format!("bind {} failed: {e}", config.listen_addr))?;
|
||||
println!("clawmates-server listening on {}", config.listen_addr);
|
||||
// Say plainly whether the mission runtime carries the tools we invoke in
|
||||
// it. The image on the host silently fell behind its Dockerfile once, and
|
||||
// every consequence — an ungated test suite, a scan that scanned nothing —
|
||||
// looked like a normal result rather than a broken deployment.
|
||||
cm_api::runtime_preflight::report_at_boot();
|
||||
// Graceful shutdown: on SIGTERM/Ctrl-C, stop accepting, finish in-flight
|
||||
// requests, then DRAIN the sandbox managers so no container is left running.
|
||||
let shutdown = async move {
|
||||
|
||||
@@ -32,6 +32,7 @@ cm-brain = { path = "../cm-brain" }
|
||||
cm-config = { path = "../cm-config" }
|
||||
cm-db = { path = "../cm-db" }
|
||||
cm-domain = { path = "../cm-domain" }
|
||||
cm-files = { path = "../cm-files" }
|
||||
cm-llm = { path = "../cm-llm" }
|
||||
cm-orchestrator = { path = "../cm-orchestrator", features = ["provider"] }
|
||||
cm-runtime = { path = "../cm-runtime" }
|
||||
@@ -51,6 +52,7 @@ uuid = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
axum = { version = "0.8", features = ["ws"] }
|
||||
tempfile = "3"
|
||||
jsonwebtoken = "9"
|
||||
eventsource-stream = "0.2"
|
||||
reqwest = { version = "0.12", default-features = false, features = [
|
||||
|
||||
@@ -90,7 +90,19 @@ pub async fn exec(
|
||||
argv: &[String],
|
||||
timeout: Duration,
|
||||
) -> Result<ExecOutput, String> {
|
||||
let fut = exec_inner(docker, container, workdir, argv);
|
||||
exec_with_env(docker, container, workdir, argv, &[], timeout).await
|
||||
}
|
||||
|
||||
/// As [`exec`], with extra environment for the command.
|
||||
pub async fn exec_with_env(
|
||||
docker: &Docker,
|
||||
container: &str,
|
||||
workdir: Option<&str>,
|
||||
argv: &[String],
|
||||
env: &[String],
|
||||
timeout: Duration,
|
||||
) -> Result<ExecOutput, String> {
|
||||
let fut = exec_inner(docker, container, workdir, argv, env);
|
||||
match tokio::time::timeout(timeout, fut).await {
|
||||
Err(_) => Err(format!(
|
||||
"timed out after {}s (the command may still be running in {container})",
|
||||
@@ -105,6 +117,7 @@ async fn exec_inner(
|
||||
container: &str,
|
||||
workdir: Option<&str>,
|
||||
argv: &[String],
|
||||
env: &[String],
|
||||
) -> Result<ExecOutput, String> {
|
||||
let created = docker
|
||||
.create_exec(
|
||||
@@ -112,6 +125,11 @@ async fn exec_inner(
|
||||
CreateExecOptions {
|
||||
cmd: Some(argv.to_vec()),
|
||||
working_dir: workdir.map(str::to_string),
|
||||
env: if env.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(env.to_vec())
|
||||
},
|
||||
attach_stdout: Some(true),
|
||||
attach_stderr: Some(true),
|
||||
..Default::default()
|
||||
|
||||
@@ -0,0 +1,466 @@
|
||||
//! What a continuous mission has already covered.
|
||||
//!
|
||||
//! A recurring mission's hard problem is not running the agent — that is 23
|
||||
//! seconds — it is knowing what it already did last time. A research mission
|
||||
//! with no memory of prior runs resurfaces the same papers forever and reports
|
||||
//! success every time.
|
||||
//!
|
||||
//! This module keeps that record. It is deliberately small: an index derived
|
||||
//! from the corpus, never the corpus itself. The vault is the source of truth,
|
||||
//! the index is rebuildable, and a hand-edited note is never "wrong".
|
||||
//!
|
||||
//! # Two kinds, because the real vault forced it
|
||||
//!
|
||||
//! The plan assumed notes would carry `arxiv:` / `doi:` / `url:` frontmatter.
|
||||
//! Measured against the actual vault: **416 notes, 145 with frontmatter, and
|
||||
//! zero with any of those keys.** The dominant keys are repo-sync metadata
|
||||
//! (`node`, `org`, `gitea`) and course-note fields (`presenter`, `session`).
|
||||
//! An ingester keyed only on external identity would have indexed nothing —
|
||||
//! the same shape of failure as everything else this week.
|
||||
//!
|
||||
//! So `note` rows record coverage (what the vault already contains, keyed by
|
||||
//! path) and `source` rows record consumption (external things a mission
|
||||
//! read, keyed by natural id). They answer different questions and a
|
||||
//! continuous mission needs both: "have I already written about this topic?"
|
||||
//! and "have I already read this paper?".
|
||||
|
||||
use sha2::{Digest, Sha256};
|
||||
use uuid::Uuid;
|
||||
|
||||
/// A note parsed out of the vault, ready to be indexed.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ParsedNote {
|
||||
/// Vault-relative path, used as identity for `kind = 'note'`.
|
||||
pub path: String,
|
||||
pub title: Option<String>,
|
||||
pub content_hash: String,
|
||||
/// An external identity the note declares for itself, if any. Nothing in
|
||||
/// the vault does this today; missions writing new notes are expected to.
|
||||
pub declared_source_id: Option<String>,
|
||||
}
|
||||
|
||||
impl ParsedNote {
|
||||
/// `note:<path>` — the `source_id` this note occupies in the index.
|
||||
pub fn source_id(&self) -> String {
|
||||
format!("note:{}", self.path)
|
||||
}
|
||||
}
|
||||
|
||||
/// Hash content for change detection. Not a dedupe key — identity is
|
||||
/// `source_id`; this only distinguishes "unchanged" from "edited".
|
||||
pub fn content_hash(body: &str) -> String {
|
||||
let mut h = Sha256::new();
|
||||
h.update(body.as_bytes());
|
||||
format!("{:x}", h.finalize())
|
||||
}
|
||||
|
||||
/// Split YAML frontmatter from the body.
|
||||
///
|
||||
/// Returns `(frontmatter, body)`. A note without frontmatter — 271 of the 416
|
||||
/// in the real vault — yields `("", whole file)` rather than being skipped.
|
||||
/// Skipping them would drop two thirds of the corpus on the floor.
|
||||
fn split_frontmatter(text: &str) -> (&str, &str) {
|
||||
let Some(rest) = text.strip_prefix("---") else {
|
||||
return ("", text);
|
||||
};
|
||||
let rest = rest.strip_prefix('\n').unwrap_or(rest);
|
||||
match rest.find("\n---") {
|
||||
Some(end) => {
|
||||
let body = &rest[end + 4..];
|
||||
(&rest[..end], body.strip_prefix('\n').unwrap_or(body))
|
||||
}
|
||||
// An opening fence with no close is malformed; treat the whole file as
|
||||
// body rather than swallowing it as frontmatter.
|
||||
None => ("", text),
|
||||
}
|
||||
}
|
||||
|
||||
/// Read one scalar key out of a frontmatter block.
|
||||
///
|
||||
/// Deliberately not a YAML parser. The vault's frontmatter is flat
|
||||
/// `key: value` with occasional quotes and one list (`tags`), and pulling in a
|
||||
/// YAML dependency to read three keys would be more surface than it is worth.
|
||||
fn frontmatter_value<'a>(fm: &'a str, key: &str) -> Option<&'a str> {
|
||||
for line in fm.lines() {
|
||||
let line = line.trim();
|
||||
let Some((k, v)) = line.split_once(':') else {
|
||||
continue;
|
||||
};
|
||||
if !k.trim().eq_ignore_ascii_case(key) {
|
||||
continue;
|
||||
}
|
||||
let v = v.trim().trim_matches('"').trim_matches('\'').trim();
|
||||
if !v.is_empty() {
|
||||
return Some(v);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Which frontmatter keys may declare an external identity, in priority order.
|
||||
///
|
||||
/// None of these appear in the vault today. They are the contract for notes
|
||||
/// that missions write from here on, and the reason a `source:` key is NOT in
|
||||
/// the list: the vault already uses `source:` for local filesystem paths of
|
||||
/// course material (`/Users/quantum/Downloads/...`), which is provenance, not
|
||||
/// a citable external identity. Treating it as one would fill the seen-set
|
||||
/// with 25 rows keyed on a laptop path.
|
||||
const IDENTITY_KEYS: &[&str] = &["source_id", "arxiv", "doi", "url", "permalink"];
|
||||
|
||||
/// Parse a note. `path` must be vault-relative.
|
||||
pub fn parse_note(path: &str, text: &str) -> ParsedNote {
|
||||
let (fm, body) = split_frontmatter(text);
|
||||
|
||||
let declared_source_id = IDENTITY_KEYS.iter().find_map(|k| {
|
||||
frontmatter_value(fm, k).map(|v| {
|
||||
// `source_id` is already qualified; the others name their scheme.
|
||||
if *k == "source_id" || v.contains(':') {
|
||||
v.to_string()
|
||||
} else {
|
||||
format!("{k}:{v}")
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
// Title: the first markdown H1, else the filename stem. Frontmatter has no
|
||||
// consistent title key in this vault.
|
||||
let title = body
|
||||
.lines()
|
||||
.find_map(|l| l.strip_prefix("# ").map(str::trim))
|
||||
.filter(|t| !t.is_empty())
|
||||
.map(str::to_string)
|
||||
.or_else(|| {
|
||||
std::path::Path::new(path)
|
||||
.file_stem()
|
||||
.map(|s| s.to_string_lossy().into_owned())
|
||||
});
|
||||
|
||||
ParsedNote {
|
||||
path: path.to_string(),
|
||||
title,
|
||||
// Hash the body, not the whole file: re-syncing a repo note rewrites
|
||||
// `updated:`/`size_kb:` in frontmatter without the prose changing, and
|
||||
// that should not read as an edit.
|
||||
content_hash: content_hash(body),
|
||||
declared_source_id,
|
||||
}
|
||||
}
|
||||
|
||||
/// What a re-index actually did. `unchanged` is the number that matters: on a
|
||||
/// vault nobody edited it should equal the note count.
|
||||
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
||||
pub struct IndexStats {
|
||||
pub scanned: usize,
|
||||
pub inserted: usize,
|
||||
pub updated: usize,
|
||||
pub unchanged: usize,
|
||||
}
|
||||
|
||||
/// Walk a checkout and index every markdown note.
|
||||
///
|
||||
/// Skips `.git` and Obsidian's own `.obsidian` config directory — indexing an
|
||||
/// editor's workspace state as knowledge would be noise.
|
||||
pub fn collect_notes(root: &std::path::Path) -> Vec<ParsedNote> {
|
||||
fn walk(dir: &std::path::Path, root: &std::path::Path, out: &mut Vec<ParsedNote>) {
|
||||
let Ok(entries) = std::fs::read_dir(dir) else {
|
||||
return;
|
||||
};
|
||||
for entry in entries.flatten() {
|
||||
let path = entry.path();
|
||||
let name = entry.file_name();
|
||||
let name = name.to_string_lossy();
|
||||
if name.starts_with('.') {
|
||||
continue;
|
||||
}
|
||||
if path.is_dir() {
|
||||
walk(&path, root, out);
|
||||
} else if path.extension().and_then(|e| e.to_str()) == Some("md") {
|
||||
let Ok(text) = std::fs::read_to_string(&path) else {
|
||||
continue;
|
||||
};
|
||||
let rel = path
|
||||
.strip_prefix(root)
|
||||
.unwrap_or(&path)
|
||||
.to_string_lossy()
|
||||
.into_owned();
|
||||
out.push(parse_note(&rel, &text));
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut out = Vec::new();
|
||||
walk(root, root, &mut out);
|
||||
out.sort_by(|a, b| a.path.cmp(&b.path));
|
||||
out
|
||||
}
|
||||
|
||||
/// Upsert one item. Returns whether the row was new.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub async fn record(
|
||||
pool: &sqlx::PgPool,
|
||||
workspace_id: Uuid,
|
||||
corpus_id: &str,
|
||||
kind: &str,
|
||||
source_id: &str,
|
||||
title: Option<&str>,
|
||||
path: Option<&str>,
|
||||
url: Option<&str>,
|
||||
content_hash: &str,
|
||||
mission_id: Option<Uuid>,
|
||||
) -> Result<bool, String> {
|
||||
// `last_seen_at` always moves; `first_seen_at` and `mission_id` never do.
|
||||
// The first mission to find a source keeps the credit, which is what makes
|
||||
// "did THIS run contribute anything new" answerable.
|
||||
let row: (bool,) = sqlx::query_as(
|
||||
"INSERT INTO corpus_items
|
||||
(id, workspace_id, corpus_id, kind, source_id, title, path, url,
|
||||
content_hash, mission_id)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
|
||||
ON CONFLICT (workspace_id, corpus_id, source_id) DO UPDATE
|
||||
SET last_seen_at = now(),
|
||||
title = COALESCE(EXCLUDED.title, corpus_items.title),
|
||||
path = COALESCE(EXCLUDED.path, corpus_items.path),
|
||||
url = COALESCE(EXCLUDED.url, corpus_items.url),
|
||||
content_hash = EXCLUDED.content_hash
|
||||
RETURNING (xmax = 0) AS inserted",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(workspace_id)
|
||||
.bind(corpus_id)
|
||||
.bind(kind)
|
||||
.bind(source_id)
|
||||
.bind(title)
|
||||
.bind(path)
|
||||
.bind(url)
|
||||
.bind(content_hash)
|
||||
.bind(mission_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.map_err(|e| format!("record corpus item {source_id}: {e}"))?;
|
||||
Ok(row.0)
|
||||
}
|
||||
|
||||
/// Has this corpus already seen this `source_id`?
|
||||
pub async fn seen(
|
||||
pool: &sqlx::PgPool,
|
||||
workspace_id: Uuid,
|
||||
corpus_id: &str,
|
||||
source_id: &str,
|
||||
) -> Result<bool, String> {
|
||||
// `SELECT 1` is INT4; binding it as i64 fails to decode.
|
||||
let row: Option<(i32,)> = sqlx::query_as(
|
||||
"SELECT 1 FROM corpus_items
|
||||
WHERE workspace_id = $1 AND corpus_id = $2 AND source_id = $3",
|
||||
)
|
||||
.bind(workspace_id)
|
||||
.bind(corpus_id)
|
||||
.bind(source_id)
|
||||
.fetch_optional(pool)
|
||||
.await
|
||||
.map_err(|e| format!("seen({source_id}): {e}"))?;
|
||||
Ok(row.is_some())
|
||||
}
|
||||
|
||||
/// Of these candidate ids, which has this corpus NOT seen?
|
||||
///
|
||||
/// The shape a research agent actually needs: it has ten search hits and wants
|
||||
/// to know which are worth fetching. One round trip, not ten.
|
||||
pub async fn unseen(
|
||||
pool: &sqlx::PgPool,
|
||||
workspace_id: Uuid,
|
||||
corpus_id: &str,
|
||||
candidates: &[String],
|
||||
) -> Result<Vec<String>, String> {
|
||||
if candidates.is_empty() {
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
let rows: Vec<(String,)> = sqlx::query_as(
|
||||
"SELECT source_id FROM corpus_items
|
||||
WHERE workspace_id = $1 AND corpus_id = $2 AND source_id = ANY($3)",
|
||||
)
|
||||
.bind(workspace_id)
|
||||
.bind(corpus_id)
|
||||
.bind(candidates)
|
||||
.fetch_all(pool)
|
||||
.await
|
||||
.map_err(|e| format!("unseen: {e}"))?;
|
||||
let known: std::collections::HashSet<String> = rows.into_iter().map(|r| r.0).collect();
|
||||
Ok(candidates
|
||||
.iter()
|
||||
.filter(|c| !known.contains(*c))
|
||||
.cloned()
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// Index every note in a checkout. Idempotent by construction.
|
||||
pub async fn index_vault(
|
||||
pool: &sqlx::PgPool,
|
||||
workspace_id: Uuid,
|
||||
corpus_id: &str,
|
||||
root: &std::path::Path,
|
||||
) -> Result<IndexStats, String> {
|
||||
let notes = collect_notes(root);
|
||||
let mut stats = IndexStats {
|
||||
scanned: notes.len(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
for note in ¬es {
|
||||
let existing: Option<(String,)> = sqlx::query_as(
|
||||
"SELECT content_hash FROM corpus_items
|
||||
WHERE workspace_id = $1 AND corpus_id = $2 AND source_id = $3",
|
||||
)
|
||||
.bind(workspace_id)
|
||||
.bind(corpus_id)
|
||||
.bind(note.source_id())
|
||||
.fetch_optional(pool)
|
||||
.await
|
||||
.map_err(|e| format!("lookup {}: {e}", note.path))?;
|
||||
|
||||
match existing {
|
||||
Some((hash,)) if hash == note.content_hash => {
|
||||
stats.unchanged += 1;
|
||||
continue;
|
||||
}
|
||||
Some(_) => stats.updated += 1,
|
||||
None => stats.inserted += 1,
|
||||
}
|
||||
|
||||
record(
|
||||
pool,
|
||||
workspace_id,
|
||||
corpus_id,
|
||||
"note",
|
||||
¬e.source_id(),
|
||||
note.title.as_deref(),
|
||||
Some(¬e.path),
|
||||
None,
|
||||
¬e.content_hash,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
|
||||
// A note that declares an external identity also registers as a
|
||||
// consumed source, so a later mission does not re-read what an
|
||||
// earlier one already wrote up.
|
||||
if let Some(sid) = ¬e.declared_source_id {
|
||||
record(
|
||||
pool,
|
||||
workspace_id,
|
||||
corpus_id,
|
||||
"source",
|
||||
sid,
|
||||
note.title.as_deref(),
|
||||
Some(¬e.path),
|
||||
None,
|
||||
¬e.content_hash,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
}
|
||||
Ok(stats)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn frontmatter_is_split_from_body() {
|
||||
let (fm, body) = split_frontmatter("---\ntype: lecture\n---\n# Title\n\ntext\n");
|
||||
assert_eq!(fm, "type: lecture");
|
||||
assert!(body.starts_with("# Title"));
|
||||
}
|
||||
|
||||
/// 271 of the vault's 416 notes have no frontmatter. Dropping them would
|
||||
/// discard two thirds of the corpus.
|
||||
#[test]
|
||||
fn a_note_without_frontmatter_is_still_a_note() {
|
||||
let (fm, body) = split_frontmatter("# Plain\n\nno frontmatter here\n");
|
||||
assert_eq!(fm, "");
|
||||
assert!(body.starts_with("# Plain"));
|
||||
let n = parse_note("Daily/x.md", "# Plain\n\nbody\n");
|
||||
assert_eq!(n.title.as_deref(), Some("Plain"));
|
||||
assert_eq!(n.declared_source_id, None);
|
||||
}
|
||||
|
||||
/// An unterminated fence must not swallow the file.
|
||||
#[test]
|
||||
fn malformed_frontmatter_is_treated_as_body() {
|
||||
let (fm, body) = split_frontmatter("---\nbroken: yes\nno closing fence\n");
|
||||
assert_eq!(fm, "");
|
||||
assert!(body.contains("no closing fence"));
|
||||
}
|
||||
|
||||
/// The vault's real `source:` values are local filesystem paths of course
|
||||
/// material. Treating those as citable identity would fill the seen-set
|
||||
/// with 25 rows keyed on a laptop path.
|
||||
#[test]
|
||||
fn a_local_source_path_is_not_an_external_identity() {
|
||||
let note = parse_note(
|
||||
"50 APESS 2026/Lectures/talk.md",
|
||||
"---\nsource: \"/Users/quantum/Downloads/Material_APESS_2026/x.pdf\"\n\
|
||||
date: 2026-07-27\ntype: lecture\n---\n# Agentic Design\n",
|
||||
);
|
||||
assert_eq!(
|
||||
note.declared_source_id, None,
|
||||
"a Downloads path is provenance, not a citable source id"
|
||||
);
|
||||
assert_eq!(note.title.as_deref(), Some("Agentic Design"));
|
||||
assert_eq!(note.source_id(), "note:50 APESS 2026/Lectures/talk.md");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn declared_identities_are_scheme_qualified() {
|
||||
let a = parse_note("p.md", "---\narxiv: 2401.12345\n---\n# T\n");
|
||||
assert_eq!(a.declared_source_id.as_deref(), Some("arxiv:2401.12345"));
|
||||
|
||||
let d = parse_note("p.md", "---\ndoi: 10.1000/xyz\n---\n# T\n");
|
||||
assert_eq!(d.declared_source_id.as_deref(), Some("doi:10.1000/xyz"));
|
||||
|
||||
// Already-qualified values are not double-prefixed.
|
||||
let s = parse_note("p.md", "---\nsource_id: arxiv:2401.99999\n---\n# T\n");
|
||||
assert_eq!(s.declared_source_id.as_deref(), Some("arxiv:2401.99999"));
|
||||
|
||||
// A URL carries its own scheme and must not become `url:https:...`.
|
||||
let u = parse_note("p.md", "---\nurl: https://example.com/p\n---\n# T\n");
|
||||
assert_eq!(
|
||||
u.declared_source_id.as_deref(),
|
||||
Some("https://example.com/p")
|
||||
);
|
||||
}
|
||||
|
||||
/// Repo-sync notes rewrite `updated:`/`size_kb:` on every sync without the
|
||||
/// prose changing. Hashing the whole file would report 103 phantom edits
|
||||
/// per run and make "unchanged" meaningless.
|
||||
#[test]
|
||||
fn frontmatter_churn_does_not_count_as_an_edit() {
|
||||
let a = parse_note("Repos/x.md", "---\nupdated: 2026-08-01\nsize_kb: 12\n---\n# X\n\nbody\n");
|
||||
let b = parse_note("Repos/x.md", "---\nupdated: 2026-08-03\nsize_kb: 14\n---\n# X\n\nbody\n");
|
||||
assert_eq!(a.content_hash, b.content_hash);
|
||||
|
||||
let c = parse_note("Repos/x.md", "---\nupdated: 2026-08-03\n---\n# X\n\nDIFFERENT\n");
|
||||
assert_ne!(a.content_hash, c.content_hash, "real edits must be visible");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn note_identity_is_its_path() {
|
||||
let n = parse_note("30 Resources/a b.md", "# A\n");
|
||||
assert_eq!(n.source_id(), "note:30 Resources/a b.md");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn collect_skips_dotfiles_and_non_markdown() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let root = tmp.path();
|
||||
std::fs::create_dir_all(root.join(".obsidian")).unwrap();
|
||||
std::fs::create_dir_all(root.join("Daily")).unwrap();
|
||||
std::fs::write(root.join(".obsidian/workspace.md"), "# editor state\n").unwrap();
|
||||
std::fs::write(root.join("Daily/note.md"), "# Real\n").unwrap();
|
||||
std::fs::write(root.join("image.png"), "notmd").unwrap();
|
||||
|
||||
let notes = collect_notes(root);
|
||||
assert_eq!(notes.len(), 1, "only the real note: {notes:?}");
|
||||
assert_eq!(notes[0].path, "Daily/note.md");
|
||||
}
|
||||
}
|
||||
@@ -64,7 +64,16 @@ const ALLOWED_PROGRAMS: &[&str] = &[
|
||||
"cargo", "npm", "pnpm", "yarn", "node", "python", "python3", "pytest", "make", "just", "go",
|
||||
"pnpx", "npx", "bun", "dotnet", "mvn", "gradle", "ruff", "mypy", "eslint", "tsc", "jest",
|
||||
"vitest", "phpunit", "rspec", "bundle", "poetry", "uv", "tox",
|
||||
// Version control, narrowed by subcommand.
|
||||
// Security scanners. These ship in the runtime image specifically so a
|
||||
// `done_when` can be written about them ("gitleaks reports no secrets"),
|
||||
// and a judge that cannot invoke them has to fall back to asking the
|
||||
// agents — which is the failure this module exists to prevent. Installing
|
||||
// them without allow-listing them left exactly that gap.
|
||||
"gitleaks", "trivy", "semgrep",
|
||||
// Locate a tool before running it. Cheap, read-only, and it saves the
|
||||
// judge from concluding a tool is missing when the real answer is that it
|
||||
// guessed the wrong name.
|
||||
"which", // Version control, narrowed by subcommand.
|
||||
"git",
|
||||
];
|
||||
|
||||
@@ -249,11 +258,12 @@ impl Sandbox {
|
||||
Err(e) => return CheckOutcome::could_not_run(argv, format!("COULD NOT RUN: {e}")),
|
||||
};
|
||||
let workdir = self.workdir.display().to_string();
|
||||
let out = crate::container_exec::exec(
|
||||
let out = crate::container_exec::exec_with_env(
|
||||
&docker,
|
||||
&self.container,
|
||||
Some(&workdir),
|
||||
argv,
|
||||
&git_ownership_env(&workdir),
|
||||
COMMAND_TIMEOUT,
|
||||
)
|
||||
.await;
|
||||
@@ -289,6 +299,36 @@ impl Sandbox {
|
||||
}
|
||||
}
|
||||
|
||||
/// Let git read a checkout it does not own — including from inside another
|
||||
/// tool.
|
||||
///
|
||||
/// The server clones the mission repo as uid 65532; the runtime container the
|
||||
/// judge execs into runs as root. Git's ownership check then refuses the
|
||||
/// repository:
|
||||
///
|
||||
/// ```text
|
||||
/// fatal: detected dubious ownership in repository at '/var/lib/clawmates-missions/<id>/repo'
|
||||
/// ```
|
||||
///
|
||||
/// The first fix rewrote `git` argv to carry `-c safe.directory=…`, which
|
||||
/// worked for `git status` and did nothing for `gitleaks`, which runs git
|
||||
/// itself. Observed on mission 019fc073: git reported a clean tree while
|
||||
/// gitleaks "scanned 0 commits" and the judge — correctly — refused to call
|
||||
/// the condition met.
|
||||
///
|
||||
/// `GIT_CONFIG_COUNT`/`_KEY_n`/`_VALUE_n` is git's documented environment form
|
||||
/// of `-c`, and it is inherited, so one setting covers git, gitleaks, trivy,
|
||||
/// semgrep and anything else that shells out. Scoped to this checkout; never
|
||||
/// `--global`, which would disable the protection container-wide for every
|
||||
/// path.
|
||||
fn git_ownership_env(workdir: &str) -> Vec<String> {
|
||||
vec![
|
||||
"GIT_CONFIG_COUNT=1".to_string(),
|
||||
"GIT_CONFIG_KEY_0=safe.directory".to_string(),
|
||||
format!("GIT_CONFIG_VALUE_0={workdir}"),
|
||||
]
|
||||
}
|
||||
|
||||
/// One verification command and what became of it.
|
||||
///
|
||||
/// This exists because the first version recorded *attempted* commands. The
|
||||
@@ -366,6 +406,27 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
/// The scanners exist in the runtime image so conditions can be written
|
||||
/// about them. Shipping the binaries without allow-listing them left the
|
||||
/// judge unable to run the very tools installed for it — observed on
|
||||
/// mission 019fc058, where `gitleaks detect` came back `ran=false` and the
|
||||
/// judge had to say it could not verify.
|
||||
#[test]
|
||||
fn security_scanners_are_runnable() {
|
||||
for cmd in [
|
||||
vec!["gitleaks", "detect", "--no-git"],
|
||||
vec!["trivy", "fs", "."],
|
||||
vec!["semgrep", "--config=auto"],
|
||||
vec!["cargo", "audit"],
|
||||
vec!["which", "gitleaks"],
|
||||
] {
|
||||
assert!(
|
||||
check_argv(&argv(&cmd)).is_ok(),
|
||||
"{cmd:?} must be runnable — it is installed in the runtime image"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn refuses_programs_off_the_list() {
|
||||
assert_eq!(
|
||||
@@ -440,6 +501,26 @@ mod tests {
|
||||
assert!(check_argv(&argv(&["bash", "-c", "ls"])).is_err());
|
||||
}
|
||||
|
||||
/// The exception must reach tools that invoke git internally, not just
|
||||
/// `git` itself — the first version rewrote argv and left gitleaks
|
||||
/// scanning 0 commits.
|
||||
#[test]
|
||||
fn git_ownership_is_set_by_environment_so_subprocesses_inherit_it() {
|
||||
let env = git_ownership_env("/missions/abc/repo");
|
||||
assert_eq!(
|
||||
env,
|
||||
vec![
|
||||
"GIT_CONFIG_COUNT=1".to_string(),
|
||||
"GIT_CONFIG_KEY_0=safe.directory".to_string(),
|
||||
"GIT_CONFIG_VALUE_0=/missions/abc/repo".to_string(),
|
||||
]
|
||||
);
|
||||
// Scoped to the one checkout. `--global`, or a bare `*`, would switch
|
||||
// the protection off for every path in the container.
|
||||
assert!(!env.iter().any(|e| e.contains('*')));
|
||||
assert!(!env.iter().any(|e| e.contains("--global")));
|
||||
}
|
||||
|
||||
// ── What a check may claim about itself ────────────────────────────
|
||||
|
||||
/// The property the whole struct exists for. A refused command and an
|
||||
|
||||
@@ -0,0 +1,227 @@
|
||||
//! One run of the library: find, skip what we have, shelve the rest.
|
||||
//!
|
||||
//! This is the piece that makes the others a *job* rather than parts on a
|
||||
//! bench. Order matters and it is deliberate:
|
||||
//!
|
||||
//! 1. **search** arXiv for candidates
|
||||
//! 2. **skip** everything already on the checkmark list — before any download
|
||||
//! 3. **fetch** the PDF for what is left, and verify it really is a PDF
|
||||
//! 4. **shelve** it in the blob store
|
||||
//! 5. **catalogue** it: write the vault note
|
||||
//! 6. **check it off** so next week skips it
|
||||
//!
|
||||
//! Step 2 comes before step 3 on purpose. Checking after downloading would
|
||||
//! still dedupe the catalogue, but it would re-download every paper we already
|
||||
//! have, every week, forever — and the whole point of the checkmark list is to
|
||||
//! not do the work twice.
|
||||
//!
|
||||
//! # Nothing new is a success, not a failure
|
||||
//!
|
||||
//! A weekly run that finds no new papers has worked correctly. A run that
|
||||
//! *crashed* has not. [`Harvest`] keeps those apart, because collapsing them
|
||||
//! is precisely the "reported success while doing nothing" shape that this
|
||||
//! codebase has been bitten by repeatedly. `shelved == 0` with `failed.empty()`
|
||||
//! is a quiet week; `shelved == 0` with failures is a broken run.
|
||||
|
||||
use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::corpus;
|
||||
use crate::papers::{self, Paper};
|
||||
|
||||
/// What one run did. Every number here is observed, not claimed.
|
||||
#[derive(Debug, Default, Clone)]
|
||||
pub struct Harvest {
|
||||
/// Papers the search returned.
|
||||
pub candidates: usize,
|
||||
/// Of those, how many were already on the checkmark list.
|
||||
pub already_had: usize,
|
||||
/// Successfully downloaded, shelved and catalogued.
|
||||
pub shelved: Vec<String>,
|
||||
/// `(source_id, why)` for each paper that could not be shelved.
|
||||
pub failed: Vec<(String, String)>,
|
||||
/// Vault-relative paths of the notes written.
|
||||
pub notes_written: Vec<String>,
|
||||
}
|
||||
|
||||
impl Harvest {
|
||||
/// Did this run add anything? The verification predicate for a continuous
|
||||
/// research mission: a run that contributes no new source has produced
|
||||
/// nothing, whatever its transcript says.
|
||||
pub fn added_anything(&self) -> bool {
|
||||
!self.shelved.is_empty()
|
||||
}
|
||||
|
||||
/// A run is healthy if nothing errored — including a run that found
|
||||
/// nothing new, which is the normal state of a mature library.
|
||||
pub fn healthy(&self) -> bool {
|
||||
self.failed.is_empty()
|
||||
}
|
||||
|
||||
pub fn summary(&self) -> String {
|
||||
format!(
|
||||
"{} candidates, {} already held, {} shelved, {} failed",
|
||||
self.candidates,
|
||||
self.already_had,
|
||||
self.shelved.len(),
|
||||
self.failed.len()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/// Where a library lives: its records, its shelf, and its catalogue.
|
||||
///
|
||||
/// Grouped rather than passed as loose arguments because these five always
|
||||
/// travel together and always describe one library — splitting them at a call
|
||||
/// site is how a run ends up shelving into one place and cataloguing into
|
||||
/// another.
|
||||
pub struct Library<'a> {
|
||||
pub pool: &'a sqlx::PgPool,
|
||||
/// The shelf: where PDFs are stored.
|
||||
pub blobs: &'a Arc<dyn cm_files::BlobStore>,
|
||||
pub workspace_id: Uuid,
|
||||
/// Which checkmark list, e.g. `"valhalla-vault"`.
|
||||
pub corpus_id: &'a str,
|
||||
/// Checkout the catalogue notes are written into.
|
||||
pub vault_root: &'a Path,
|
||||
}
|
||||
|
||||
/// Shelve a specific set of papers. Split from [`run`] so the skip/shelve
|
||||
/// logic is testable without reaching arXiv.
|
||||
pub async fn shelve(
|
||||
lib: &Library<'_>,
|
||||
candidates: &[Paper],
|
||||
mission_id: Option<Uuid>,
|
||||
) -> Result<Harvest, String> {
|
||||
let Library { pool, blobs, workspace_id, corpus_id, vault_root } = *lib;
|
||||
let mut out = Harvest {
|
||||
candidates: candidates.len(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
// One round trip for the whole batch rather than one query per paper.
|
||||
let ids: Vec<String> = candidates.iter().map(Paper::source_id).collect();
|
||||
let fresh: std::collections::HashSet<String> =
|
||||
corpus::unseen(pool, workspace_id, corpus_id, &ids)
|
||||
.await?
|
||||
.into_iter()
|
||||
.collect();
|
||||
out.already_had = candidates.len() - fresh.len();
|
||||
|
||||
for paper in candidates {
|
||||
let sid = paper.source_id();
|
||||
if !fresh.contains(&sid) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Fetch first. If the PDF cannot be had, nothing is recorded — the
|
||||
// paper stays unseen so a later run retries it, rather than being
|
||||
// checked off with an empty shelf slot behind it.
|
||||
let bytes = match papers::fetch_pdf(paper).await {
|
||||
Ok(b) => b,
|
||||
Err(e) => {
|
||||
out.failed.push((sid, e));
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
let key = paper.blob_key();
|
||||
if let Err(e) = blobs.put(&key, &bytes).await {
|
||||
out.failed.push((sid, format!("shelve {key}: {e}")));
|
||||
continue;
|
||||
}
|
||||
|
||||
// Catalogue note next to the shelf. Written into the vault checkout;
|
||||
// committing and pushing it is the caller's job, through the delivery
|
||||
// path that already exists.
|
||||
let note = papers::catalogue_note(paper, &key);
|
||||
let note_path = vault_root.join(paper.note_path());
|
||||
if let Some(parent) = note_path.parent() {
|
||||
if let Err(e) = std::fs::create_dir_all(parent) {
|
||||
out.failed.push((sid, format!("create {}: {e}", parent.display())));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if let Err(e) = std::fs::write(¬e_path, ¬e) {
|
||||
out.failed
|
||||
.push((sid, format!("write {}: {e}", note_path.display())));
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check it off LAST. If anything above failed we did not get the
|
||||
// paper, and marking it seen would mean never trying again.
|
||||
corpus::record(
|
||||
pool,
|
||||
workspace_id,
|
||||
corpus_id,
|
||||
"source",
|
||||
&sid,
|
||||
Some(&paper.title),
|
||||
Some(&paper.note_path()),
|
||||
Some(&format!("https://arxiv.org/abs/{}", paper.arxiv_id)),
|
||||
&corpus::content_hash(¬e),
|
||||
mission_id,
|
||||
)
|
||||
.await?;
|
||||
|
||||
out.notes_written.push(paper.note_path());
|
||||
out.shelved.push(sid);
|
||||
}
|
||||
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// A full run: search arXiv, then shelve whatever is new.
|
||||
pub async fn run(
|
||||
lib: &Library<'_>,
|
||||
query: &str,
|
||||
limit: usize,
|
||||
mission_id: Option<Uuid>,
|
||||
) -> Result<Harvest, String> {
|
||||
let candidates = papers::search(query, limit).await?;
|
||||
let harvest = shelve(lib, &candidates, mission_id).await?;
|
||||
let corpus_id = lib.corpus_id;
|
||||
eprintln!("harvest[{corpus_id}] query={query:?} → {}", harvest.summary());
|
||||
for (sid, why) in &harvest.failed {
|
||||
eprintln!("harvest[{corpus_id}] FAILED {sid}: {why}");
|
||||
}
|
||||
Ok(harvest)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn a_quiet_week_is_healthy_but_adds_nothing() {
|
||||
let quiet = Harvest {
|
||||
candidates: 5,
|
||||
already_had: 5,
|
||||
..Default::default()
|
||||
};
|
||||
assert!(quiet.healthy(), "finding nothing new is not an error");
|
||||
assert!(
|
||||
!quiet.added_anything(),
|
||||
"but it must not count as having produced something"
|
||||
);
|
||||
|
||||
let broken = Harvest {
|
||||
candidates: 5,
|
||||
already_had: 0,
|
||||
failed: vec![("arxiv:1".into(), "timeout".into())],
|
||||
..Default::default()
|
||||
};
|
||||
assert!(!broken.healthy());
|
||||
assert!(!broken.added_anything());
|
||||
|
||||
let good = Harvest {
|
||||
candidates: 5,
|
||||
already_had: 4,
|
||||
shelved: vec!["arxiv:2".into()],
|
||||
..Default::default()
|
||||
};
|
||||
assert!(good.healthy() && good.added_anything());
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,13 @@ mod mcp_door;
|
||||
mod mcp_skills;
|
||||
pub mod mission_orchestrator;
|
||||
pub mod mission_refiner;
|
||||
pub mod corpus;
|
||||
pub mod harvest;
|
||||
pub mod library;
|
||||
pub mod mission_delivery;
|
||||
pub mod papers;
|
||||
pub mod phase_config;
|
||||
pub mod runtime_preflight;
|
||||
pub mod mission_runtime;
|
||||
pub mod mission_workspace;
|
||||
pub mod node_rules;
|
||||
@@ -61,6 +68,9 @@ pub struct AppState {
|
||||
pub file_root: Option<std::path::PathBuf>,
|
||||
/// Live control channels to connected fleet-node daemons.
|
||||
pub node_hub: std::sync::Arc<fleet::NodeHub>,
|
||||
/// The shelf. Present once the server wires storage; `None` in the
|
||||
/// bare-`new` path used by tests that never touch blobs.
|
||||
pub blobs: Option<std::sync::Arc<dyn cm_files::BlobStore>>,
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
@@ -75,6 +85,7 @@ impl AppState {
|
||||
billing: cm_config::BillingConfig::default(),
|
||||
file_root: None,
|
||||
node_hub: std::sync::Arc::new(fleet::NodeHub::new()),
|
||||
blobs: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,6 +94,12 @@ impl AppState {
|
||||
self
|
||||
}
|
||||
|
||||
/// The shelf — where the paper library stores PDFs.
|
||||
pub fn with_blobs(mut self, blobs: std::sync::Arc<dyn cm_files::BlobStore>) -> AppState {
|
||||
self.blobs = Some(blobs);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn with_oauth(mut self, oauth: cm_config::OAuthConfig) -> AppState {
|
||||
self.oauth = oauth;
|
||||
self
|
||||
@@ -308,6 +325,8 @@ pub fn router(state: AppState) -> Router {
|
||||
.route("/api/sessions", post(routes::sessions::create))
|
||||
.route("/api/sessions/history", get(routes::sessions::history))
|
||||
.route("/api/gateway", post(routes::gateway::gateway))
|
||||
.route("/api/library/runs", post(routes::library::run))
|
||||
.route("/api/library/items", get(routes::library::list))
|
||||
.route("/api/routines", get(routes::routines::list))
|
||||
.route("/api/routines", post(routes::routines::create))
|
||||
.route("/api/routines/runs", get(routes::routines::runs))
|
||||
|
||||
@@ -0,0 +1,263 @@
|
||||
//! A library run end to end: clone the vault, harvest, push the catalogue.
|
||||
//!
|
||||
//! [`harvest`](crate::harvest) writes catalogue notes into a directory. This
|
||||
//! puts that directory somewhere real: a checkout of the vault repo, with the
|
||||
//! new notes committed and pushed.
|
||||
//!
|
||||
//! # Never `main`
|
||||
//!
|
||||
//! The vault is a live Obsidian vault that a human edits and syncs. Pushing
|
||||
//! straight to `main` races that sync and can lose hand-written work. Every
|
||||
//! run lands on its own branch, exactly like the mission delivery path that
|
||||
//! was validated 20/20 earlier — a human merges when they have looked at it.
|
||||
//!
|
||||
//! # The PDFs do not go here
|
||||
//!
|
||||
//! Only notes are committed. PDFs are shelved in the blob store, because a
|
||||
//! few hundred papers is gigabytes and a vault that size is painful to clone
|
||||
//! and slow to open. The note carries the blob key, so the catalogue always
|
||||
//! knows where its shelf is.
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::harvest::{self, Harvest, Library};
|
||||
use crate::mission_workspace;
|
||||
|
||||
/// What a full run produced, including whether it reached the forge.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct LibraryRun {
|
||||
pub harvest: Harvest,
|
||||
pub branch: String,
|
||||
/// `true` only when the push was observed to succeed. A run that shelved
|
||||
/// papers but could not push still has the PDFs and the checkmarks; the
|
||||
/// notes are simply not on the forge yet.
|
||||
pub pushed: bool,
|
||||
pub error: Option<String>,
|
||||
}
|
||||
|
||||
fn git_identity() -> [(&'static str, String); 4] {
|
||||
let (name, email) = crate::mission_delivery::commit_identity();
|
||||
[
|
||||
("GIT_AUTHOR_NAME", name.clone()),
|
||||
("GIT_AUTHOR_EMAIL", email.clone()),
|
||||
("GIT_COMMITTER_NAME", name),
|
||||
("GIT_COMMITTER_EMAIL", email),
|
||||
]
|
||||
}
|
||||
|
||||
async fn git(repo: &Path, args: &[&str]) -> Result<String, String> {
|
||||
let mut cmd = tokio::process::Command::new("git");
|
||||
cmd.arg("-C").arg(repo);
|
||||
cmd.args(["-c", &format!("safe.directory={}", repo.display())]);
|
||||
cmd.args(args);
|
||||
for (k, v) in git_identity() {
|
||||
cmd.env(k, v);
|
||||
}
|
||||
let out = cmd.output().await.map_err(|e| format!("spawn git: {e}"))?;
|
||||
if !out.status.success() {
|
||||
return Err(format!(
|
||||
"git {} → {}: {}",
|
||||
args.first().copied().unwrap_or("?"),
|
||||
out.status,
|
||||
mission_workspace::redact_token(&String::from_utf8_lossy(&out.stderr))
|
||||
.chars()
|
||||
.take(300)
|
||||
.collect::<String>()
|
||||
));
|
||||
}
|
||||
Ok(String::from_utf8_lossy(&out.stdout).into_owned())
|
||||
}
|
||||
|
||||
/// Clone the vault fresh into `work_root`, returning the checkout path.
|
||||
///
|
||||
/// Fresh each run rather than reused: a library run is short, the vault is
|
||||
/// small (measured 6.9 MB / 416 notes), and a stale checkout is how the
|
||||
/// mission path lost work three times this week.
|
||||
pub async fn clone_vault(clone_url: &str, work_root: &Path) -> Result<PathBuf, String> {
|
||||
let path = work_root.join("vault");
|
||||
if path.exists() {
|
||||
tokio::fs::remove_dir_all(&path)
|
||||
.await
|
||||
.map_err(|e| format!("clear {}: {e}", path.display()))?;
|
||||
}
|
||||
tokio::fs::create_dir_all(work_root)
|
||||
.await
|
||||
.map_err(|e| format!("mkdir {}: {e}", work_root.display()))?;
|
||||
|
||||
let auth = mission_workspace::with_ambient_auth(clone_url);
|
||||
let out = tokio::process::Command::new("git")
|
||||
.args(["clone", "--quiet", "--depth", "1", &auth])
|
||||
.arg(&path)
|
||||
.output()
|
||||
.await
|
||||
.map_err(|e| format!("spawn git clone: {e}"))?;
|
||||
if !out.status.success() {
|
||||
return Err(format!(
|
||||
"clone vault → {}: {}",
|
||||
out.status,
|
||||
mission_workspace::redact_token(&String::from_utf8_lossy(&out.stderr))
|
||||
.chars()
|
||||
.take(300)
|
||||
.collect::<String>()
|
||||
));
|
||||
}
|
||||
// The token must not stay in .git/config: the checkout may be handed to a
|
||||
// container later, and a credential in a file an agent can read is a
|
||||
// credential an agent has.
|
||||
mission_workspace::scrub_remote_credentials(&path, &auth);
|
||||
Ok(path)
|
||||
}
|
||||
|
||||
/// One complete library run.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub async fn run_to_vault(
|
||||
pool: &sqlx::PgPool,
|
||||
blobs: &Arc<dyn cm_files::BlobStore>,
|
||||
workspace_id: Uuid,
|
||||
corpus_id: &str,
|
||||
clone_url: &str,
|
||||
work_root: &Path,
|
||||
queries: &[String],
|
||||
per_query: usize,
|
||||
mission_id: Option<Uuid>,
|
||||
) -> Result<LibraryRun, String> {
|
||||
let vault = clone_vault(clone_url, work_root).await?;
|
||||
let lib = Library {
|
||||
pool,
|
||||
blobs,
|
||||
workspace_id,
|
||||
corpus_id,
|
||||
vault_root: &vault,
|
||||
};
|
||||
|
||||
// Accumulate across queries. Topics overlap — "agentic topology" and
|
||||
// "multi-agent orchestration" return some of the same papers — and the
|
||||
// checkmark list dedupes across them within a single run as well as
|
||||
// between runs, because each shelve records before the next query starts.
|
||||
let mut total = Harvest::default();
|
||||
for q in queries {
|
||||
let h = harvest::run(&lib, q, per_query, mission_id).await?;
|
||||
total.candidates += h.candidates;
|
||||
total.already_had += h.already_had;
|
||||
total.shelved.extend(h.shelved);
|
||||
total.failed.extend(h.failed);
|
||||
total.notes_written.extend(h.notes_written);
|
||||
}
|
||||
|
||||
// The TAIL of the uuid, not the head. UUIDv7 leads with a 48-bit
|
||||
// timestamp, so two ids minted in the same millisecond share their first
|
||||
// 12 hex characters exactly — the branch-name collision that hit mission
|
||||
// 019fc42b earlier. The tail is the random part.
|
||||
let branch = format!("clawmates/library-{}", branch_suffix(Uuid::now_v7()));
|
||||
|
||||
if total.notes_written.is_empty() {
|
||||
// A quiet run is a success with nothing to push. Creating an empty
|
||||
// branch every week would be noise.
|
||||
return Ok(LibraryRun {
|
||||
harvest: total,
|
||||
branch,
|
||||
pushed: false,
|
||||
error: None,
|
||||
});
|
||||
}
|
||||
|
||||
git(&vault, &["checkout", "-B", &branch]).await?;
|
||||
git(&vault, &["add", "--", "60 Papers"]).await?;
|
||||
let message = format!(
|
||||
"library: {} new paper(s)\n\n{}\n\nShelved in the blob store; this commit is the catalogue.",
|
||||
total.shelved.len(),
|
||||
total
|
||||
.shelved
|
||||
.iter()
|
||||
.map(|s| format!("- {s}"))
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n")
|
||||
);
|
||||
git(&vault, &["commit", "--no-verify", "-m", &message]).await?;
|
||||
|
||||
let auth = mission_workspace::with_ambient_auth(clone_url);
|
||||
let refspec = format!("HEAD:refs/heads/{branch}");
|
||||
match git(&vault, &["push", &auth, &refspec]).await {
|
||||
Ok(_) => Ok(LibraryRun {
|
||||
harvest: total,
|
||||
branch,
|
||||
pushed: true,
|
||||
error: None,
|
||||
}),
|
||||
Err(e) => Ok(LibraryRun {
|
||||
harvest: total,
|
||||
branch,
|
||||
pushed: false,
|
||||
error: Some(e),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
/// Distinct-per-run branch suffix. See the note at the call site: taking the
|
||||
/// head of a UUIDv7 yields the timestamp, which collides.
|
||||
fn branch_suffix(id: Uuid) -> String {
|
||||
let s = id.simple().to_string();
|
||||
s[s.len() - 12..].to_string()
|
||||
}
|
||||
|
||||
/// The topics this library currently tracks.
|
||||
///
|
||||
/// Drawn from what the project is actually working on: `papers/dynamic-
|
||||
/// agentic-topologies.md` (topology search and evolution, citing ADAS,
|
||||
/// Darwin-Gödel and SwarmAgentic), plus the problems this week's work ran
|
||||
/// into — verifying what an agent actually did, and giving a long-running
|
||||
/// agent memory of what it has already covered.
|
||||
pub fn default_topics() -> Vec<String> {
|
||||
[
|
||||
"all:\"agentic topology\" OR all:\"multi-agent topology\"",
|
||||
"all:\"multi-agent orchestration\" AND all:LLM",
|
||||
"all:\"agent memory\" AND all:\"long-term\"",
|
||||
"all:\"LLM agent\" AND all:verification",
|
||||
"all:\"prompt injection\" AND all:agent",
|
||||
]
|
||||
.iter()
|
||||
.map(|s| s.to_string())
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn topics_are_non_empty_and_arxiv_shaped() {
|
||||
let topics = default_topics();
|
||||
assert!(topics.len() >= 3);
|
||||
for t in &topics {
|
||||
assert!(t.contains("all:"), "arXiv field prefix missing in {t:?}");
|
||||
assert!(!t.trim().is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
/// Two runs in the same millisecond must not collide.
|
||||
///
|
||||
/// This caught a real repeat of the mission-path bug (019fc42b): UUIDv7
|
||||
/// leads with a 48-bit timestamp, so the FIRST 12 hex characters of two
|
||||
/// ids minted together are identical. Taking the tail fixes it. Looping
|
||||
/// rather than sampling twice, because a one-shot check passes by luck
|
||||
/// whenever the millisecond happens to tick between the two calls.
|
||||
#[test]
|
||||
fn every_run_gets_a_distinct_branch() {
|
||||
let ids: Vec<String> = (0..100).map(|_| branch_suffix(Uuid::now_v7())).collect();
|
||||
let unique: std::collections::HashSet<&String> = ids.iter().collect();
|
||||
assert_eq!(unique.len(), ids.len(), "branch suffixes collided: {ids:?}");
|
||||
|
||||
// And the head-based scheme really does collide, so this test has teeth.
|
||||
let heads: Vec<String> = (0..100)
|
||||
.map(|_| Uuid::now_v7().simple().to_string()[..12].to_string())
|
||||
.collect();
|
||||
let head_unique: std::collections::HashSet<&String> = heads.iter().collect();
|
||||
assert!(
|
||||
head_unique.len() < heads.len(),
|
||||
"the head of a UUIDv7 was expected to collide but did not"
|
||||
);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -285,6 +285,24 @@ impl MissionRuntimeProvisioner {
|
||||
let mut env = vec![
|
||||
format!("ZEROCLAW_GATEWAY_PORT={GATEWAY_PORT}"),
|
||||
format!("CM_MISSION_ID={mission_id}"),
|
||||
// Let the agents' git read the checkout.
|
||||
//
|
||||
// The server clones as uid 65532; this container runs as root, so
|
||||
// every `git` an agent runs hits "detected dubious ownership" and
|
||||
// refuses the repository. Agents do not report that as a failure —
|
||||
// they improvise. On mission 019fc3ba one wrote a `.gitconfig_temp`
|
||||
// containing `[safe] directory = /mission/repo` into the repository
|
||||
// root, which then showed up in the captured diff and would have
|
||||
// been committed and pushed to the user's repo alongside the real
|
||||
// work.
|
||||
//
|
||||
// `GIT_CONFIG_*` is git's environment form of `-c` and is
|
||||
// inherited by subprocesses, so it covers the agent's own git, any
|
||||
// tool that shells out to git, and the `git_operations` tool alike.
|
||||
// Scoped to the checkout; never `--global`.
|
||||
"GIT_CONFIG_COUNT=1".to_string(),
|
||||
"GIT_CONFIG_KEY_0=safe.directory".to_string(),
|
||||
"GIT_CONFIG_VALUE_0=/mission/repo".to_string(),
|
||||
];
|
||||
// Provider credentials forwarded into the container.
|
||||
//
|
||||
@@ -699,6 +717,14 @@ async fn sweep_once(pool: &sqlx::PgPool, grace: std::time::Duration) -> Result<(
|
||||
for row in rows {
|
||||
let id: Uuid = row.get("id");
|
||||
let workspace_id: Uuid = row.get("workspace_id");
|
||||
// Last chance. `teardown_container` deletes the checkout, so anything
|
||||
// not captured by now is gone for good. The phase sweep should have
|
||||
// handled this minutes ago; this covers the cases it cannot — a phase
|
||||
// that ended `failed` rather than `completed`, or a capture that kept
|
||||
// erroring until the grace window ran out.
|
||||
if let Err(e) = capture_outstanding_phases(pool, id).await {
|
||||
eprintln!("mission_runtime::sweeper: last-chance capture for {id}: {e}");
|
||||
}
|
||||
if let Err(e) = prov.teardown_container(id).await {
|
||||
// A not-found is expected when the container was already
|
||||
// reaped by a docker restart or a manual op; log at info
|
||||
@@ -716,6 +742,46 @@ async fn sweep_once(pool: &sqlx::PgPool, grace: std::time::Duration) -> Result<(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Capture any phase of `mission_id` that has a repo and no `code_diff` yet,
|
||||
/// regardless of how the phase ended.
|
||||
///
|
||||
/// The phase sweep only captures `completed` phases. A mission that failed
|
||||
/// mid-coding still has real work in its checkout, and deleting it
|
||||
/// unexamined is how a debugging session loses the only evidence of what the
|
||||
/// agents actually did.
|
||||
async fn capture_outstanding_phases(pool: &sqlx::PgPool, mission_id: Uuid) -> Result<(), String> {
|
||||
use sqlx::Row;
|
||||
let rows = sqlx::query(
|
||||
"SELECT mp.id
|
||||
FROM mission_phases mp
|
||||
JOIN missions m ON m.id = mp.mission_id
|
||||
WHERE mp.mission_id = $1
|
||||
AND m.repo_id IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM mission_artifacts a
|
||||
WHERE a.mission_id = mp.mission_id
|
||||
AND a.phase_id = mp.id
|
||||
AND a.kind = 'code_diff'
|
||||
)",
|
||||
)
|
||||
.bind(mission_id)
|
||||
.fetch_all(pool)
|
||||
.await
|
||||
.map_err(|e| format!("select uncaptured phases: {e}"))?;
|
||||
|
||||
for row in rows {
|
||||
let phase_id: Uuid = row.get("id");
|
||||
if let Err(e) =
|
||||
crate::mission_delivery::capture_phase_diff(pool, mission_id, phase_id).await
|
||||
{
|
||||
eprintln!(
|
||||
"mission_runtime::sweeper: capture mission {mission_id} phase {phase_id}: {e}"
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
@@ -23,7 +23,7 @@ use std::path::PathBuf;
|
||||
use tokio::process::Command;
|
||||
use uuid::Uuid;
|
||||
|
||||
fn missions_root() -> PathBuf {
|
||||
pub(crate) fn missions_root() -> PathBuf {
|
||||
std::env::var("CLAWMATES_MISSIONS_ROOT")
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|_| PathBuf::from("/var/lib/clawmates-missions"))
|
||||
@@ -67,7 +67,25 @@ pub async fn ensure_checkout(
|
||||
|
||||
let auth_url = with_ambient_auth(clone_url);
|
||||
if path.join(".git").exists() {
|
||||
fetch_and_reset(&path, default_branch).await?;
|
||||
// Checkouts cloned before this setting existed get it on reuse. It
|
||||
// governs objects created from now on, which is what delivery needs.
|
||||
share_repository_across_uids(&path);
|
||||
// `ensure_checkout` runs at every phase launch, not once per mission.
|
||||
// Freshening a pristine checkout is right; freshening one that already
|
||||
// holds this mission's work destroys it. See `has_local_work`.
|
||||
// Marker first: it is a fact we recorded, not a state we inferred.
|
||||
// The tree checks stay as a second line of defence for checkouts
|
||||
// created before the marker existed, and for the case where the
|
||||
// marker write itself failed.
|
||||
if checkout_in_use(&path) || has_local_work(&path, default_branch) {
|
||||
eprintln!(
|
||||
"mission_workspace: {} already holds mission work — skipping \
|
||||
fetch/reset so earlier phases' output survives",
|
||||
path.display()
|
||||
);
|
||||
} else {
|
||||
fetch_and_reset(&path, default_branch, &auth_url).await?;
|
||||
}
|
||||
} else {
|
||||
clone(&path, &auth_url).await?;
|
||||
}
|
||||
@@ -78,7 +96,7 @@ pub async fn ensure_checkout(
|
||||
/// environment, rewrite it to include the token as basic-auth. Returns
|
||||
/// the URL unchanged otherwise. The token is never logged (we only
|
||||
/// pass the rewritten URL into `git clone` via argv).
|
||||
fn with_ambient_auth(url: &str) -> String {
|
||||
pub(crate) fn with_ambient_auth(url: &str) -> String {
|
||||
let Ok(token) = std::env::var("GITEA_TOKEN") else {
|
||||
return url.to_string();
|
||||
};
|
||||
@@ -92,8 +110,20 @@ fn with_ambient_auth(url: &str) -> String {
|
||||
}
|
||||
|
||||
async fn clone(path: &std::path::Path, url: &str) -> Result<(), String> {
|
||||
// `--filter=blob:none` rather than `--depth 1`. A shallow clone cannot
|
||||
// usually push a new branch back ("shallow update not allowed"), and
|
||||
// mission delivery needs exactly that. A partial clone keeps full history
|
||||
// — so the base commit stays meaningful and a diff has something to be
|
||||
// relative to — while fetching file contents only on demand, which is
|
||||
// nearly as cheap as a shallow clone for a repo that gets read once.
|
||||
let out = Command::new("git")
|
||||
.args(["clone", "--depth", "1", url, &path.display().to_string()])
|
||||
.args([
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"--single-branch",
|
||||
url,
|
||||
&path.display().to_string(),
|
||||
])
|
||||
.output()
|
||||
.await
|
||||
.map_err(|e| format!("spawn git clone: {e}"))?;
|
||||
@@ -107,10 +137,365 @@ async fn clone(path: &std::path::Path, url: &str) -> Result<(), String> {
|
||||
.collect::<String>()
|
||||
));
|
||||
}
|
||||
share_repository_across_uids(path);
|
||||
scrub_remote_credentials(path, url);
|
||||
ignore_agent_scaffolding(path);
|
||||
record_base_commit(path);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn redact_token(s: &str) -> String {
|
||||
/// Record that a phase has started working in this checkout.
|
||||
///
|
||||
/// The explicit half of the "is this checkout in use" question. `ensure_checkout`
|
||||
/// runs per phase launch and refreshes on reuse; whether that refresh is safe
|
||||
/// depends on whether a phase has already run here, which is a fact about the
|
||||
/// *mission* and not about the tree.
|
||||
///
|
||||
/// It was previously inferred from the tree — dirty status, HEAD versus the
|
||||
/// remote tip — and inference is what made delivery depend on what an agent
|
||||
/// happened to do. Mission `019fc444` lost work because its phase committed and
|
||||
/// left a clean tree; `019fc476` lost work because the capture base had advanced
|
||||
/// to match HEAD; `019fc450` survived only because a phase *failed* to commit
|
||||
/// and left the tree dirty. Same code, opposite outcomes, decided by the agent.
|
||||
///
|
||||
/// A marker is not a heuristic. Once a phase has begun, the checkout is in use
|
||||
/// until the mission ends, whatever the agent did or did not do inside it.
|
||||
pub(crate) fn mark_phase_started(path: &std::path::Path) {
|
||||
let marker = path.join(".git/clawmates-in-use");
|
||||
if marker.exists() {
|
||||
return;
|
||||
}
|
||||
if let Err(e) = std::fs::write(&marker, "1\n") {
|
||||
eprintln!(
|
||||
"mission_workspace: could not mark {} as in use ({e}) — a later phase may \
|
||||
refresh the checkout and discard earlier work",
|
||||
path.display()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Has a phase already started work in this checkout?
|
||||
fn checkout_in_use(path: &std::path::Path) -> bool {
|
||||
path.join(".git/clawmates-in-use").exists()
|
||||
}
|
||||
|
||||
/// Has anything happened in this checkout since it was created?
|
||||
///
|
||||
/// `ensure_checkout` is called once per *phase launch*, not once per mission,
|
||||
/// and its reuse path runs `git reset --hard origin/<branch>`. That is correct
|
||||
/// for a checkout being picked up cold and destructive for one mid-mission:
|
||||
/// mission `019fc444` had its phase-0 file deleted from the working tree when
|
||||
/// phase 1 started, so the second phase never saw the first's output.
|
||||
///
|
||||
/// Delivery is what made this reachable. Before the mission branch existed,
|
||||
/// agent output stayed *untracked* and `reset --hard` left it alone. Committing
|
||||
/// it — the whole point of the delivery slice — makes it tracked, and tracked
|
||||
/// files that are absent from `origin/<branch>` are exactly what a hard reset
|
||||
/// removes. The feature that preserves work is what put it in reach of the
|
||||
/// reset.
|
||||
///
|
||||
/// "Local work" is either a commit that is not on the fetched tip, or a dirty
|
||||
/// tree. Both are checked because the two phases of the failure look different:
|
||||
/// an agent that committed leaves a clean tree at a new HEAD, and one that did
|
||||
/// not leaves a dirty tree at the old HEAD.
|
||||
fn has_local_work(path: &std::path::Path, branch: &str) -> bool {
|
||||
let git = |args: &[&str]| -> Option<String> {
|
||||
let out = std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(path)
|
||||
.args(["-c", &format!("safe.directory={}", path.display())])
|
||||
.args(args)
|
||||
.output()
|
||||
.ok()?;
|
||||
out.status
|
||||
.success()
|
||||
.then(|| String::from_utf8_lossy(&out.stdout).trim().to_string())
|
||||
};
|
||||
|
||||
// A dirty tree is unambiguous: someone is mid-work here.
|
||||
if let Some(status) = git(&["status", "--porcelain"]) {
|
||||
if !status.is_empty() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// Otherwise compare HEAD against the *remote tip*, which is the only
|
||||
// fixed point here.
|
||||
//
|
||||
// This deliberately does not use `.git/clawmates-base`. That marker is the
|
||||
// rolling capture base and `advance_base_commit` moves it to each phase's
|
||||
// committed head — so comparing HEAD against it asks "did anything happen
|
||||
// since the last commit we made", which is false immediately after every
|
||||
// successful delivery. Mission `019fc476` lost phase 0's file exactly that
|
||||
// way: phase 0 committed, the base advanced to match HEAD, and phase 1's
|
||||
// launch concluded the checkout was pristine and reset it. The preceding
|
||||
// mission survived only because its phase 0 *failed* to commit and left a
|
||||
// dirty tree.
|
||||
//
|
||||
// `origin/<branch>` does not move for the life of the mission, so "HEAD is
|
||||
// not the remote tip" means a phase committed, whether one commit ago or
|
||||
// five. If the remote ref cannot be resolved the answer is preserve:
|
||||
// wrongly skipping a refresh costs staleness, wrongly resetting destroys a
|
||||
// phase's output.
|
||||
match (
|
||||
git(&["rev-parse", &format!("origin/{branch}")]),
|
||||
git(&["rev-parse", "HEAD"]),
|
||||
) {
|
||||
(Some(tip), Some(head)) => tip != head,
|
||||
_ => true,
|
||||
}
|
||||
}
|
||||
|
||||
/// Let the server and the agent container both write to this checkout.
|
||||
///
|
||||
/// The checkout is one directory bind-mounted into two processes running as
|
||||
/// different users: cm-api is uid 65532, the mission runtime container is
|
||||
/// root. Git creates `.git/objects/xx/` fan-out directories on first write and
|
||||
/// they inherit the writer's ownership, so whichever party commits first locks
|
||||
/// the other out of that directory:
|
||||
///
|
||||
/// ```text
|
||||
/// git add → exit 128: insufficient permission for adding an object
|
||||
/// to repository database .git/objects
|
||||
/// ```
|
||||
///
|
||||
/// The failure is intermittent, which is what makes it dangerous. Mission
|
||||
/// `019fc42b` delivered cleanly because its agents committed their own work,
|
||||
/// so the blobs already existed and the server's `git add` never had to write
|
||||
/// one. Mission `019fc437` ran the same template, its agents left the work
|
||||
/// uncommitted, and delivery lost both phases.
|
||||
///
|
||||
/// `core.sharedRepository` is git's own answer to a repository shared between
|
||||
/// users: it makes git create objects and refs group- and world-writable. Both
|
||||
/// parties read this config from the shared `.git/config`, so it governs the
|
||||
/// agent's commits as much as ours.
|
||||
///
|
||||
/// This grants the agent no access it lacks. It is already root inside a
|
||||
/// container with the entire checkout bind-mounted read-write, and could
|
||||
/// rewrite any of it. The party actually gaining something is the server,
|
||||
/// which is currently the one being locked out.
|
||||
pub fn share_repository_across_uids(path: &std::path::Path) {
|
||||
let out = std::process::Command::new("git")
|
||||
.args([
|
||||
"-C",
|
||||
&path.display().to_string(),
|
||||
"-c",
|
||||
&format!("safe.directory={}", path.display()),
|
||||
"config",
|
||||
"core.sharedRepository",
|
||||
"0777",
|
||||
])
|
||||
.output();
|
||||
match out {
|
||||
Ok(o) if o.status.success() => {}
|
||||
Ok(o) => eprintln!(
|
||||
"mission_workspace: could not set core.sharedRepository on {} ({}) — delivery \
|
||||
may fail to commit if the agent writes git objects first",
|
||||
path.display(),
|
||||
String::from_utf8_lossy(&o.stderr).trim()
|
||||
),
|
||||
Err(e) => eprintln!(
|
||||
"mission_workspace: could not set core.sharedRepository on {} ({e})",
|
||||
path.display()
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
/// Remember the commit the mission started from.
|
||||
///
|
||||
/// Delivery needs to answer "what did this mission change", and the obvious
|
||||
/// reading — working tree versus `HEAD` — is wrong the moment an agent
|
||||
/// commits. `rust_sdlc` has a *committer* role, so committing is the normal
|
||||
/// path, not an edge case: a mission that did its job properly would have a
|
||||
/// clean tree and capture nothing at all. Observed exactly that on mission
|
||||
/// 019fc372, where the agent committed `DELIVERY_PROBE.md` and the diff came
|
||||
/// back empty.
|
||||
///
|
||||
/// Written into `.git/` so it travels with the checkout, is invisible to the
|
||||
/// repository, and cannot be edited by an agent through its pinned workspace.
|
||||
pub(crate) fn record_base_commit(path: &std::path::Path) {
|
||||
let out = std::process::Command::new("git")
|
||||
.args([
|
||||
"-C",
|
||||
&path.display().to_string(),
|
||||
"-c",
|
||||
&format!("safe.directory={}", path.display()),
|
||||
"rev-parse",
|
||||
"HEAD",
|
||||
])
|
||||
.output();
|
||||
let Ok(out) = out else { return };
|
||||
if !out.status.success() {
|
||||
return;
|
||||
}
|
||||
let sha = String::from_utf8_lossy(&out.stdout).trim().to_string();
|
||||
if sha.is_empty() {
|
||||
return;
|
||||
}
|
||||
if let Err(e) = std::fs::write(path.join(".git/clawmates-base"), format!("{sha}\n")) {
|
||||
eprintln!(
|
||||
"mission_workspace: could not record base commit for {} ({e}) — delivery will \
|
||||
fall back to diffing against HEAD and will miss committed work",
|
||||
path.display()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Move the capture base forward to a commit a phase just produced.
|
||||
///
|
||||
/// The base is recorded once at clone time, which is right for the mission's
|
||||
/// first phase and wrong for every phase after it: a later phase would diff
|
||||
/// against the original clone point and claim its predecessors' commits as its
|
||||
/// own work. Mission `019fc42b` showed this plainly — two coding phases, and
|
||||
/// the second phase's artifact reported the *union* of both phases' files.
|
||||
///
|
||||
/// Advancing after each successful commit makes each artifact the incremental
|
||||
/// work of one phase. The pushed branch stays cumulative, because it is built
|
||||
/// from `HEAD` and therefore still carries the earlier commits.
|
||||
pub(crate) fn advance_base_commit(path: &std::path::Path, sha: &str) {
|
||||
let sha = sha.trim();
|
||||
if sha.is_empty() {
|
||||
return;
|
||||
}
|
||||
if let Err(e) = std::fs::write(path.join(".git/clawmates-base"), format!("{sha}\n")) {
|
||||
eprintln!(
|
||||
"mission_workspace: could not advance base commit for {} ({e}) — the next \
|
||||
phase will re-report this phase's work as its own",
|
||||
path.display()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// The commit this mission's checkout started from, if it was recorded.
|
||||
pub(crate) fn base_commit(path: &std::path::Path) -> Option<String> {
|
||||
std::fs::read_to_string(path.join(".git/clawmates-base"))
|
||||
.ok()
|
||||
.map(|s| s.trim().to_string())
|
||||
.filter(|s| !s.is_empty())
|
||||
}
|
||||
|
||||
/// Take the access token back out of `.git/config`.
|
||||
///
|
||||
/// `with_ambient_auth` embeds `GITEA_TOKEN` in the clone URL so the clone can
|
||||
/// authenticate, and git then persists that URL verbatim as the `origin`
|
||||
/// remote. The checkout is bind-mounted into a container the agents run in as
|
||||
/// **root**, so the token sits in a file every mission agent can read, and it
|
||||
/// reaches every repository that token reaches — not just this one.
|
||||
///
|
||||
/// Rewriting the remote to the bare URL costs one command and removes a
|
||||
/// standing credential from the blast radius of any prompt injection that
|
||||
/// lands in a mission. Delivery does not depend on the stored URL: it builds a
|
||||
/// fresh authenticated URL at push time, which also means a rotated token
|
||||
/// starts working immediately instead of after the next clone.
|
||||
///
|
||||
/// Best-effort and non-fatal: a checkout that keeps its token still works, and
|
||||
/// failing the mission over it would trade a real capability for a marginal
|
||||
/// improvement in a situation we have already logged.
|
||||
pub(crate) fn scrub_remote_credentials(path: &std::path::Path, original_url: &str) {
|
||||
if !original_url.contains('@') && !original_url.contains("oauth2:") {
|
||||
// Nothing was injected (SSH remote, or no token configured).
|
||||
return;
|
||||
}
|
||||
let bare = strip_credentials(original_url);
|
||||
let out = std::process::Command::new("git")
|
||||
.args([
|
||||
"-C",
|
||||
&path.display().to_string(),
|
||||
"remote",
|
||||
"set-url",
|
||||
"origin",
|
||||
&bare,
|
||||
])
|
||||
.output();
|
||||
match out {
|
||||
Ok(o) if o.status.success() => {}
|
||||
Ok(o) => eprintln!(
|
||||
"mission_workspace: could not scrub credentials from {} — the access token \
|
||||
remains readable in .git/config: {}",
|
||||
path.display(),
|
||||
redact_token(&String::from_utf8_lossy(&o.stderr))
|
||||
.chars()
|
||||
.take(200)
|
||||
.collect::<String>()
|
||||
),
|
||||
Err(e) => eprintln!(
|
||||
"mission_workspace: could not scrub credentials from {} ({e}) — the access \
|
||||
token remains readable in .git/config",
|
||||
path.display()
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
/// `https://user:secret@host/path` → `https://host/path`.
|
||||
fn strip_credentials(url: &str) -> String {
|
||||
let Some((scheme, rest)) = url.split_once("://") else {
|
||||
return url.to_string();
|
||||
};
|
||||
match rest.split_once('@') {
|
||||
// Only the *authority* may carry credentials; an `@` later in the path
|
||||
// is an ordinary character and must not be treated as a separator.
|
||||
Some((userinfo, host_and_path)) if !userinfo.contains('/') => {
|
||||
format!("{scheme}://{host_and_path}")
|
||||
}
|
||||
_ => url.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Files the agent runtime writes into its own workspace, which is pinned to
|
||||
/// the repository root (`MissionRuntimeProvisioner::pin_agent_workspaces`).
|
||||
///
|
||||
/// They are the agent's identity scaffolding, not the user's code — `SOUL.md`
|
||||
/// opens "Who You Are / You're not a chatbot." Observed on mission 019fc058,
|
||||
/// where all seven appeared as untracked files in a freshly cloned repo.
|
||||
const AGENT_SCAFFOLDING: &[&str] = &[
|
||||
"AGENTS.md",
|
||||
"HEARTBEAT.md",
|
||||
"IDENTITY.md",
|
||||
"MEMORY.md",
|
||||
"SOUL.md",
|
||||
"TOOLS.md",
|
||||
"USER.md",
|
||||
];
|
||||
|
||||
/// Keep the agent's own scaffolding out of the user's repository.
|
||||
///
|
||||
/// Two things went wrong without this. Every mission's tree was permanently
|
||||
/// dirty, so a `done_when` written about a clean tree could never pass. And
|
||||
/// once mission delivery starts committing, `git add -A` would have put the
|
||||
/// agent's `SOUL.md` and `MEMORY.md` into someone's repository and pushed
|
||||
/// them.
|
||||
///
|
||||
/// Written to `.git/info/exclude` rather than `.gitignore`: the exclude file
|
||||
/// is local to this checkout and never itself appears as a change, so the
|
||||
/// repository the user gets back is untouched. Crucially it only suppresses
|
||||
/// *untracked* files — a repo that genuinely tracks its own `AGENTS.md` still
|
||||
/// reports modifications to it, which is the behaviour we want.
|
||||
///
|
||||
/// Best-effort: a checkout that cannot be annotated is noisier, not broken.
|
||||
fn ignore_agent_scaffolding(path: &std::path::Path) {
|
||||
let exclude = path.join(".git/info/exclude");
|
||||
let mut body = std::fs::read_to_string(&exclude).unwrap_or_default();
|
||||
if body.contains("clawmates: agent scaffolding") {
|
||||
return;
|
||||
}
|
||||
body.push_str("\n# clawmates: agent scaffolding — written by the runtime into its\n");
|
||||
body.push_str("# pinned workspace, never part of the repository.\n");
|
||||
for name in AGENT_SCAFFOLDING {
|
||||
body.push_str(&format!("/{name}\n"));
|
||||
}
|
||||
if let Some(dir) = exclude.parent() {
|
||||
let _ = std::fs::create_dir_all(dir);
|
||||
}
|
||||
if let Err(e) = std::fs::write(&exclude, body) {
|
||||
eprintln!(
|
||||
"mission_workspace: could not write {} ({e}) — agent scaffolding will show as \
|
||||
untracked in this checkout",
|
||||
exclude.display()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn redact_token(s: &str) -> String {
|
||||
// Strip any "oauth2:<token>@" segment that git may echo back on
|
||||
// failures. Belt-and-braces: also nuke any raw token env value.
|
||||
let mut out = s.to_string();
|
||||
@@ -127,17 +512,52 @@ fn redact_token(s: &str) -> String {
|
||||
out
|
||||
}
|
||||
|
||||
async fn fetch_and_reset(path: &std::path::Path, branch: &str) -> Result<(), String> {
|
||||
async fn fetch_and_reset(
|
||||
path: &std::path::Path,
|
||||
branch: &str,
|
||||
auth_url: &str,
|
||||
) -> Result<(), String> {
|
||||
// A checkout cloned before delivery existed is shallow, and a shallow repo
|
||||
// cannot push a new branch. Deepen it once, here, rather than discovering
|
||||
// the problem at push time when there is work on the line. `--unshallow`
|
||||
// errors on a repo that is already complete, so it is only attempted when
|
||||
// the marker file is present.
|
||||
if path.join(".git/shallow").exists() {
|
||||
let deepen = Command::new("git")
|
||||
.args([
|
||||
"-C",
|
||||
&path.display().to_string(),
|
||||
"fetch",
|
||||
"--unshallow",
|
||||
auth_url,
|
||||
])
|
||||
.output()
|
||||
.await;
|
||||
match deepen {
|
||||
Ok(o) if o.status.success() => {}
|
||||
Ok(o) => eprintln!(
|
||||
"mission_workspace: could not deepen shallow checkout at {} — a delivery \
|
||||
push may be rejected: {}",
|
||||
path.display(),
|
||||
redact_token(&String::from_utf8_lossy(&o.stderr))
|
||||
.chars()
|
||||
.take(200)
|
||||
.collect::<String>()
|
||||
),
|
||||
Err(e) => eprintln!(
|
||||
"mission_workspace: could not deepen shallow checkout at {} ({e})",
|
||||
path.display()
|
||||
),
|
||||
}
|
||||
}
|
||||
// Fetch from an explicitly authenticated URL rather than the stored
|
||||
// remote. `scrub_remote_credentials` strips the token out of
|
||||
// `.git/config` — the checkout is readable by agents running as root —
|
||||
// so `git fetch origin` has no credentials and fails with
|
||||
// "could not read Username". Building the URL here also means a rotated
|
||||
// token takes effect immediately instead of at the next clone.
|
||||
let fetch = Command::new("git")
|
||||
.args([
|
||||
"-C",
|
||||
&path.display().to_string(),
|
||||
"fetch",
|
||||
"--depth",
|
||||
"1",
|
||||
"origin",
|
||||
branch,
|
||||
])
|
||||
.args(["-C", &path.display().to_string(), "fetch", auth_url, branch])
|
||||
.output()
|
||||
.await
|
||||
.map_err(|e| format!("spawn git fetch: {e}"))?;
|
||||
@@ -145,7 +565,7 @@ async fn fetch_and_reset(path: &std::path::Path, branch: &str) -> Result<(), Str
|
||||
return Err(format!(
|
||||
"git fetch origin {branch} → exit {}: {}",
|
||||
fetch.status,
|
||||
String::from_utf8_lossy(&fetch.stderr)
|
||||
redact_token(&String::from_utf8_lossy(&fetch.stderr))
|
||||
.chars()
|
||||
.take(400)
|
||||
.collect::<String>()
|
||||
@@ -166,11 +586,239 @@ async fn fetch_and_reset(path: &std::path::Path, branch: &str) -> Result<(), Str
|
||||
return Err(format!(
|
||||
"git reset --hard origin/{branch} → exit {}: {}",
|
||||
reset.status,
|
||||
String::from_utf8_lossy(&reset.stderr)
|
||||
redact_token(&String::from_utf8_lossy(&reset.stderr))
|
||||
.chars()
|
||||
.take(400)
|
||||
.collect::<String>()
|
||||
));
|
||||
}
|
||||
// HEAD just moved to the freshly fetched tip; that is this run's starting
|
||||
// point, so the recorded base moves with it.
|
||||
record_base_commit(path);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// The exclude must be idempotent — `ensure_checkout` re-runs on every
|
||||
/// phase, and appending the same block each time would grow the file
|
||||
/// without bound.
|
||||
#[test]
|
||||
fn scaffolding_exclusion_is_written_once() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
std::fs::create_dir_all(dir.path().join(".git/info")).unwrap();
|
||||
|
||||
ignore_agent_scaffolding(dir.path());
|
||||
let first = std::fs::read_to_string(dir.path().join(".git/info/exclude")).unwrap();
|
||||
assert!(
|
||||
first.contains("/SOUL.md"),
|
||||
"the agent's identity file is excluded"
|
||||
);
|
||||
assert!(first.contains("/MEMORY.md"));
|
||||
|
||||
ignore_agent_scaffolding(dir.path());
|
||||
let second = std::fs::read_to_string(dir.path().join(".git/info/exclude")).unwrap();
|
||||
assert_eq!(first, second, "re-running must not append a second block");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn credentials_are_stripped_from_a_remote_url() {
|
||||
assert_eq!(
|
||||
strip_credentials("https://oauth2:[email protected]/o/r.git"),
|
||||
"https://git.redclaw.dev/o/r.git"
|
||||
);
|
||||
// No credentials: unchanged.
|
||||
assert_eq!(
|
||||
strip_credentials("https://git.redclaw.dev/o/r.git"),
|
||||
"https://git.redclaw.dev/o/r.git"
|
||||
);
|
||||
// SSH form has no `://` authority to rewrite.
|
||||
assert_eq!(
|
||||
strip_credentials("[email protected]:o/r.git"),
|
||||
"[email protected]:o/r.git"
|
||||
);
|
||||
// An `@` inside the path is not a credential separator.
|
||||
assert_eq!(
|
||||
strip_credentials("https://host/scope/@org/pkg.git"),
|
||||
"https://host/scope/@org/pkg.git"
|
||||
);
|
||||
}
|
||||
|
||||
/// An existing exclude file belongs to the repository; keep it.
|
||||
#[test]
|
||||
fn an_existing_exclude_is_preserved() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
std::fs::create_dir_all(dir.path().join(".git/info")).unwrap();
|
||||
std::fs::write(dir.path().join(".git/info/exclude"), "/local-scratch\n").unwrap();
|
||||
|
||||
ignore_agent_scaffolding(dir.path());
|
||||
let body = std::fs::read_to_string(dir.path().join(".git/info/exclude")).unwrap();
|
||||
assert!(
|
||||
body.contains("/local-scratch"),
|
||||
"pre-existing rules survive"
|
||||
);
|
||||
assert!(body.contains("/AGENTS.md"));
|
||||
}
|
||||
|
||||
/// Seed a checkout that has an `origin`, like a real clone does. Without
|
||||
/// one `origin/<branch>` does not resolve and `has_local_work` takes its
|
||||
/// preserve-by-default path, which would make the pristine case untestable.
|
||||
fn seed(dir: &std::path::Path, remote: &std::path::Path) {
|
||||
std::process::Command::new("git")
|
||||
.args(["init", "--quiet", "--bare"])
|
||||
.arg(remote)
|
||||
.output()
|
||||
.unwrap();
|
||||
let g = |args: &[&str]| {
|
||||
std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(dir)
|
||||
.args(args)
|
||||
.output()
|
||||
.unwrap();
|
||||
};
|
||||
g(&["init", "--quiet"]);
|
||||
g(&["config", "user.email", "[email protected]"]);
|
||||
g(&["config", "user.name", "T"]);
|
||||
g(&["checkout", "-q", "-B", "main"]);
|
||||
std::fs::write(dir.join("README.md"), "# base\n").unwrap();
|
||||
g(&["add", "."]);
|
||||
g(&["commit", "--quiet", "-m", "base"]);
|
||||
g(&["remote", "add", "origin", &remote.display().to_string()]);
|
||||
g(&["push", "--quiet", "origin", "main"]);
|
||||
g(&["fetch", "--quiet", "origin", "main"]);
|
||||
record_base_commit(dir);
|
||||
}
|
||||
|
||||
/// A checkout mid-mission must not be mistaken for a cold one.
|
||||
///
|
||||
/// `ensure_checkout` runs per phase launch and resets on the reuse path.
|
||||
/// Mission `019fc444` lost phase 0's committed file that way. The fix then
|
||||
/// failed again on mission `019fc476` for a different reason, which the
|
||||
/// last case here pins down.
|
||||
#[test]
|
||||
fn local_work_is_recognized_before_a_checkout_is_reset() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let repo = &tmp.path().join("repo");
|
||||
std::fs::create_dir_all(repo).unwrap();
|
||||
seed(repo, &tmp.path().join("remote.git"));
|
||||
let repo = repo.as_path();
|
||||
|
||||
assert!(
|
||||
!has_local_work(repo, "main"),
|
||||
"a freshly cloned checkout has no work and may be refreshed"
|
||||
);
|
||||
|
||||
// An agent that wrote files and did not commit: dirty tree, HEAD put.
|
||||
std::fs::write(repo.join("ALPHA.md"), "ALPHA\n").unwrap();
|
||||
assert!(has_local_work(repo, "main"), "uncommitted agent output is work");
|
||||
|
||||
// An agent (or delivery) that committed: clean tree, HEAD moved. This
|
||||
// is the shape that was destroyed on 019fc444, because a hard reset
|
||||
// leaves untracked files alone but removes tracked ones.
|
||||
git_in(repo, &["add", "ALPHA.md"]);
|
||||
git_in(repo, &["commit", "--quiet", "-m", "phase 0"]);
|
||||
let status = std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(repo)
|
||||
.args(["status", "--porcelain"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(
|
||||
String::from_utf8_lossy(&status.stdout).trim().is_empty(),
|
||||
"the commit left a clean tree — the case a dirty-tree check misses"
|
||||
);
|
||||
assert!(
|
||||
has_local_work(repo, "main"),
|
||||
"committed phase output must not be reset away"
|
||||
);
|
||||
|
||||
// The regression from 019fc476. Delivery advances the capture base to
|
||||
// the commit it just made, so any check comparing HEAD against that
|
||||
// base reports "nothing happened" the instant a phase succeeds — and
|
||||
// the next phase resets the work away. Advancing it here is what makes
|
||||
// this a real reproduction rather than a restatement of the case above.
|
||||
let head = std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(repo)
|
||||
.args(["rev-parse", "HEAD"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let head = String::from_utf8_lossy(&head.stdout).trim().to_string();
|
||||
advance_base_commit(repo, &head);
|
||||
assert_eq!(
|
||||
base_commit(repo).as_deref(),
|
||||
Some(head.as_str()),
|
||||
"the base now equals HEAD, which is the trap"
|
||||
);
|
||||
assert!(
|
||||
has_local_work(repo, "main"),
|
||||
"a phase that committed successfully must still count as work \
|
||||
after the capture base advances to match its commit"
|
||||
);
|
||||
}
|
||||
|
||||
fn git_in(dir: &std::path::Path, args: &[&str]) {
|
||||
std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(dir)
|
||||
.args(args)
|
||||
.output()
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
/// A checkout in use must be recognised regardless of what the agent did.
|
||||
///
|
||||
/// This is the Seam-1 property. The tree-state heuristics were each correct
|
||||
/// in isolation and each blind to a different case: `019fc444` committed
|
||||
/// and left a clean tree, `019fc476` had its base advanced to match HEAD,
|
||||
/// `019fc450` survived only because a phase FAILED to commit. Whether the
|
||||
/// work survived was decided by the agent, not by us.
|
||||
///
|
||||
/// The marker is set when a phase launches, before the agent does anything,
|
||||
/// so every one of those states answers the same way.
|
||||
#[test]
|
||||
fn an_in_use_checkout_is_recognized_whatever_the_agent_did() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let repo = &tmp.path().join("repo");
|
||||
std::fs::create_dir_all(repo).unwrap();
|
||||
seed(repo, &tmp.path().join("remote.git"));
|
||||
let repo = repo.as_path();
|
||||
|
||||
assert!(!checkout_in_use(repo), "a fresh clone is not in use");
|
||||
|
||||
mark_phase_started(repo);
|
||||
assert!(checkout_in_use(repo), "a launched phase marks the checkout");
|
||||
|
||||
// The three production states, all of which must now answer the same.
|
||||
// (a) agent wrote nothing at all — the case every tree heuristic misses.
|
||||
assert!(checkout_in_use(repo), "clean tree at the base commit");
|
||||
|
||||
// (b) agent committed, leaving a clean tree at a moved HEAD.
|
||||
std::fs::write(repo.join("WORK.md"), "work\n").unwrap();
|
||||
git_in(repo, &["add", "WORK.md"]);
|
||||
git_in(repo, &["commit", "--quiet", "-m", "phase work"]);
|
||||
let head = std::process::Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(repo)
|
||||
.args(["rev-parse", "HEAD"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let head = String::from_utf8_lossy(&head.stdout).trim().to_string();
|
||||
assert!(checkout_in_use(repo));
|
||||
|
||||
// (c) capture advanced the base to match HEAD — the collision that
|
||||
// defeated the HEAD-versus-base check on 019fc476.
|
||||
advance_base_commit(repo, &head);
|
||||
assert!(
|
||||
checkout_in_use(repo),
|
||||
"an advanced base must not make an in-use checkout look pristine"
|
||||
);
|
||||
|
||||
// Marking twice is safe; phases launch repeatedly across a mission.
|
||||
mark_phase_started(repo);
|
||||
assert!(checkout_in_use(repo));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,345 @@
|
||||
//! Finding papers, shelving them, and cataloguing them.
|
||||
//!
|
||||
//! The library has three parts and it matters which is which:
|
||||
//!
|
||||
//! - **arXiv** is where papers are *found*.
|
||||
//! - **The blob store** is the *shelf* — the PDF itself lives there.
|
||||
//! - **The vault** is the *card catalogue* — a markdown note per paper, with
|
||||
//! the metadata and a pointer to the shelf.
|
||||
//!
|
||||
//! Plus [`crate::corpus`], which is the list of checkmarks: it is what stops
|
||||
//! the same paper being fetched twice across weekly runs. That list is the
|
||||
//! reason this can be a *continuous* job rather than one that redoes itself
|
||||
//! forever — the failure that killed the previous attempt at this (migrations
|
||||
//! 0030-0044, dropped in 0053).
|
||||
//!
|
||||
//! # The contract that ties it together
|
||||
//!
|
||||
//! Every note this module writes carries `source_id: arxiv:NNNN.NNNNN` in its
|
||||
//! frontmatter. `corpus::parse_note` reads exactly that key, so re-indexing
|
||||
//! the vault re-derives the checkmark list from the notes themselves. The
|
||||
//! catalogue is authoritative; the index is rebuildable from it. If the
|
||||
//! database were lost, a re-index of the vault would restore what we have.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// One paper as arXiv describes it.
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub struct Paper {
|
||||
/// Bare arXiv id, e.g. `2401.12345` — no version suffix.
|
||||
pub arxiv_id: String,
|
||||
pub title: String,
|
||||
pub authors: Vec<String>,
|
||||
pub summary: String,
|
||||
pub published: String,
|
||||
pub pdf_url: String,
|
||||
}
|
||||
|
||||
impl Paper {
|
||||
/// The checkmark key. Version suffixes are stripped upstream so `v1` and
|
||||
/// `v2` of the same paper are one entry, not two.
|
||||
pub fn source_id(&self) -> String {
|
||||
format!("arxiv:{}", self.arxiv_id)
|
||||
}
|
||||
|
||||
/// Where the PDF is shelved in the blob store.
|
||||
pub fn blob_key(&self) -> String {
|
||||
format!("papers/arxiv/{}.pdf", self.arxiv_id)
|
||||
}
|
||||
|
||||
/// Where the catalogue note goes in the vault.
|
||||
///
|
||||
/// Under a dedicated folder so the library never collides with the
|
||||
/// hand-written parts of the vault (`30 Resources`, `40 Projects`, and so
|
||||
/// on). A human should always be able to tell which notes a machine wrote.
|
||||
pub fn note_path(&self) -> String {
|
||||
format!("60 Papers/arxiv-{}.md", self.arxiv_id)
|
||||
}
|
||||
}
|
||||
|
||||
/// Strip an arXiv version suffix: `2401.12345v3` -> `2401.12345`.
|
||||
///
|
||||
/// Without this a weekly job re-downloads a paper every time the authors post
|
||||
/// a revision, and the checkmark list quietly fills with near-duplicates.
|
||||
pub fn normalize_arxiv_id(raw: &str) -> String {
|
||||
let id = raw.rsplit('/').next().unwrap_or(raw);
|
||||
match id.find('v') {
|
||||
// Only a trailing `vN` counts; the `v` in a word must not truncate.
|
||||
Some(i) if id[i + 1..].chars().all(|c| c.is_ascii_digit()) && i + 1 < id.len() => {
|
||||
id[..i].to_string()
|
||||
}
|
||||
_ => id.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse arXiv's Atom feed.
|
||||
///
|
||||
/// Hand-rolled rather than pulling an XML crate: the feed is a fixed, simple
|
||||
/// shape and this reads five fields from it. If arXiv's format ever drifts,
|
||||
/// `entries_are_parsed_from_a_real_feed` fails loudly rather than silently
|
||||
/// returning zero papers — which is the failure mode that matters, because a
|
||||
/// search returning nothing looks exactly like "no new papers this week".
|
||||
pub fn parse_atom(xml: &str) -> Vec<Paper> {
|
||||
let mut out = Vec::new();
|
||||
for chunk in xml.split("<entry>").skip(1) {
|
||||
let entry = chunk.split("</entry>").next().unwrap_or(chunk);
|
||||
let field = |tag: &str| -> Option<String> {
|
||||
let open = format!("<{tag}>");
|
||||
let close = format!("</{tag}>");
|
||||
let start = entry.find(&open)? + open.len();
|
||||
let end = entry[start..].find(&close)? + start;
|
||||
Some(unescape(entry[start..end].trim()))
|
||||
};
|
||||
|
||||
let Some(raw_id) = field("id") else { continue };
|
||||
let arxiv_id = normalize_arxiv_id(&raw_id);
|
||||
if arxiv_id.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let Some(title) = field("title") else { continue };
|
||||
|
||||
let authors = entry
|
||||
.split("<author>")
|
||||
.skip(1)
|
||||
.filter_map(|a| {
|
||||
let start = a.find("<name>")? + 6;
|
||||
let end = a[start..].find("</name>")? + start;
|
||||
Some(unescape(a[start..end].trim()))
|
||||
})
|
||||
.collect();
|
||||
|
||||
// The PDF link is an attribute, not an element.
|
||||
let pdf_url = entry
|
||||
.split("<link")
|
||||
.find(|l| l.contains("title=\"pdf\""))
|
||||
.and_then(|l| {
|
||||
let start = l.find("href=\"")? + 6;
|
||||
let end = l[start..].find('"')? + start;
|
||||
Some(l[start..end].to_string())
|
||||
})
|
||||
.unwrap_or_else(|| format!("https://arxiv.org/pdf/{arxiv_id}"));
|
||||
|
||||
out.push(Paper {
|
||||
title: title.split_whitespace().collect::<Vec<_>>().join(" "),
|
||||
summary: field("summary")
|
||||
.unwrap_or_default()
|
||||
.split_whitespace()
|
||||
.collect::<Vec<_>>()
|
||||
.join(" "),
|
||||
published: field("published").unwrap_or_default(),
|
||||
authors,
|
||||
pdf_url,
|
||||
arxiv_id,
|
||||
});
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn unescape(s: &str) -> String {
|
||||
s.replace("&", "&")
|
||||
.replace("<", "<")
|
||||
.replace(">", ">")
|
||||
.replace(""", "\"")
|
||||
.replace("'", "'")
|
||||
}
|
||||
|
||||
/// Search arXiv. `max_results` is capped to keep one run bounded.
|
||||
pub async fn search(query: &str, max_results: usize) -> Result<Vec<Paper>, String> {
|
||||
let max = max_results.clamp(1, 50);
|
||||
let url = format!(
|
||||
"https://export.arxiv.org/api/query?search_query={}&start=0&max_results={max}\
|
||||
&sortBy=submittedDate&sortOrder=descending",
|
||||
urlencoding(query)
|
||||
);
|
||||
let body = reqwest::Client::new()
|
||||
.get(&url)
|
||||
.header("User-Agent", "clawmates-papers/0.1 (research library)")
|
||||
.timeout(std::time::Duration::from_secs(60))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("arxiv query: {e}"))?
|
||||
.text()
|
||||
.await
|
||||
.map_err(|e| format!("arxiv body: {e}"))?;
|
||||
Ok(parse_atom(&body))
|
||||
}
|
||||
|
||||
/// Download the PDF. Returns the bytes; the caller decides where to shelve it.
|
||||
pub async fn fetch_pdf(paper: &Paper) -> Result<Vec<u8>, String> {
|
||||
let bytes = reqwest::Client::new()
|
||||
.get(&paper.pdf_url)
|
||||
.header("User-Agent", "clawmates-papers/0.1 (research library)")
|
||||
.timeout(std::time::Duration::from_secs(180))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("fetch pdf {}: {e}", paper.arxiv_id))?
|
||||
.bytes()
|
||||
.await
|
||||
.map_err(|e| format!("read pdf {}: {e}", paper.arxiv_id))?;
|
||||
|
||||
// A PDF starts with `%PDF`. arXiv serves an HTML holding page when a PDF
|
||||
// is still rendering, and shelving that would leave a file that looks
|
||||
// present and is unreadable.
|
||||
if !bytes.starts_with(b"%PDF") {
|
||||
return Err(format!(
|
||||
"{} did not return a PDF ({} bytes, starts {:?})",
|
||||
paper.pdf_url,
|
||||
bytes.len(),
|
||||
String::from_utf8_lossy(&bytes[..bytes.len().min(16)])
|
||||
));
|
||||
}
|
||||
Ok(bytes.to_vec())
|
||||
}
|
||||
|
||||
/// The catalogue note for a shelved paper.
|
||||
///
|
||||
/// `source_id` in the frontmatter is the load-bearing part — it is what
|
||||
/// `corpus::parse_note` reads to rebuild the checkmark list from the vault.
|
||||
pub fn catalogue_note(paper: &Paper, blob_key: &str) -> String {
|
||||
let authors = if paper.authors.is_empty() {
|
||||
"unknown".to_string()
|
||||
} else {
|
||||
paper.authors.join(", ")
|
||||
};
|
||||
format!(
|
||||
"---\n\
|
||||
source_id: arxiv:{id}\n\
|
||||
arxiv: {id}\n\
|
||||
title: \"{title}\"\n\
|
||||
authors: \"{authors}\"\n\
|
||||
published: {published}\n\
|
||||
pdf: {blob_key}\n\
|
||||
url: https://arxiv.org/abs/{id}\n\
|
||||
added: {added}\n\
|
||||
tags: [paper, arxiv]\n\
|
||||
---\n\
|
||||
\n\
|
||||
# {title}\n\
|
||||
\n\
|
||||
**Authors:** {authors} \n\
|
||||
**arXiv:** [{id}](https://arxiv.org/abs/{id}) \n\
|
||||
**PDF:** `{blob_key}`\n\
|
||||
\n\
|
||||
## Abstract\n\
|
||||
\n\
|
||||
{summary}\n\
|
||||
\n\
|
||||
## Notes\n\
|
||||
\n\
|
||||
_Catalogued automatically. Add your own notes below._\n",
|
||||
id = paper.arxiv_id,
|
||||
title = paper.title.replace('"', "'"),
|
||||
authors = authors,
|
||||
published = paper.published,
|
||||
blob_key = blob_key,
|
||||
added = paper.published,
|
||||
summary = paper.summary,
|
||||
)
|
||||
}
|
||||
|
||||
fn urlencoding(s: &str) -> String {
|
||||
s.bytes()
|
||||
.map(|b| match b {
|
||||
b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => {
|
||||
(b as char).to_string()
|
||||
}
|
||||
b' ' => "+".to_string(),
|
||||
_ => format!("%{b:02X}"),
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// A revision must not read as a new paper.
|
||||
#[test]
|
||||
fn version_suffixes_are_stripped() {
|
||||
assert_eq!(normalize_arxiv_id("http://arxiv.org/abs/2401.12345v3"), "2401.12345");
|
||||
assert_eq!(normalize_arxiv_id("2401.12345v1"), "2401.12345");
|
||||
assert_eq!(normalize_arxiv_id("2401.12345"), "2401.12345");
|
||||
// Old-style ids contain letters and a slash.
|
||||
assert_eq!(normalize_arxiv_id("http://arxiv.org/abs/cs/0701001"), "0701001");
|
||||
// A trailing `v` with no digits is part of the id, not a version.
|
||||
assert_eq!(normalize_arxiv_id("2401.1234v"), "2401.1234v");
|
||||
}
|
||||
|
||||
/// Parsed against the real shape of arXiv's Atom feed. If this fails the
|
||||
/// format drifted — which otherwise shows up as "no new papers", which is
|
||||
/// indistinguishable from a quiet week.
|
||||
#[test]
|
||||
fn entries_are_parsed_from_a_real_feed() {
|
||||
let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||
<entry>
|
||||
<id>http://arxiv.org/abs/2401.12345v2</id>
|
||||
<published>2026-01-15T10:00:00Z</published>
|
||||
<title>Attention Is All You Need Again</title>
|
||||
<summary> We show that
|
||||
attention still works. </summary>
|
||||
<author><name>Ada Lovelace</name></author>
|
||||
<author><name>Alan Turing</name></author>
|
||||
<link href="http://arxiv.org/abs/2401.12345v2" rel="alternate" type="text/html"/>
|
||||
<link title="pdf" href="http://arxiv.org/pdf/2401.12345v2" rel="related" type="application/pdf"/>
|
||||
</entry>
|
||||
</feed>"#;
|
||||
let papers = parse_atom(xml);
|
||||
assert_eq!(papers.len(), 1);
|
||||
let p = &papers[0];
|
||||
assert_eq!(p.arxiv_id, "2401.12345", "version stripped");
|
||||
assert_eq!(p.title, "Attention Is All You Need Again", "whitespace collapsed");
|
||||
assert_eq!(p.summary, "We show that attention still works.");
|
||||
assert_eq!(p.authors, vec!["Ada Lovelace", "Alan Turing"]);
|
||||
assert_eq!(p.pdf_url, "http://arxiv.org/pdf/2401.12345v2");
|
||||
assert_eq!(p.source_id(), "arxiv:2401.12345");
|
||||
assert_eq!(p.blob_key(), "papers/arxiv/2401.12345.pdf");
|
||||
assert_eq!(p.note_path(), "60 Papers/arxiv-2401.12345.md");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_empty_feed_yields_no_papers_rather_than_panicking() {
|
||||
assert!(parse_atom("<feed></feed>").is_empty());
|
||||
assert!(parse_atom("").is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn xml_entities_are_unescaped() {
|
||||
let xml = r#"<feed><entry><id>http://arxiv.org/abs/1v1</id>
|
||||
<title>Cats & Dogs <3</title><summary>a "quote"</summary>
|
||||
</entry></feed>"#;
|
||||
let p = &parse_atom(xml)[0];
|
||||
assert_eq!(p.title, "Cats & Dogs <3");
|
||||
assert_eq!(p.summary, "a \"quote\"");
|
||||
}
|
||||
|
||||
/// The note must carry the identity `corpus::parse_note` reads, or the
|
||||
/// catalogue cannot rebuild the checkmark list and the library forgets
|
||||
/// itself the moment the database is lost.
|
||||
#[test]
|
||||
fn a_catalogue_note_round_trips_through_the_corpus_parser() {
|
||||
let paper = Paper {
|
||||
arxiv_id: "2401.12345".into(),
|
||||
title: "A \"Quoted\" Title".into(),
|
||||
authors: vec!["Ada Lovelace".into()],
|
||||
summary: "Summary text.".into(),
|
||||
published: "2026-01-15T10:00:00Z".into(),
|
||||
pdf_url: "http://arxiv.org/pdf/2401.12345".into(),
|
||||
};
|
||||
let note = catalogue_note(&paper, &paper.blob_key());
|
||||
|
||||
let parsed = crate::corpus::parse_note(&paper.note_path(), ¬e);
|
||||
assert_eq!(
|
||||
parsed.declared_source_id.as_deref(),
|
||||
Some("arxiv:2401.12345"),
|
||||
"the corpus parser must recover the identity from the note"
|
||||
);
|
||||
assert_eq!(parsed.title.as_deref(), Some("A 'Quoted' Title"));
|
||||
assert!(note.contains("papers/arxiv/2401.12345.pdf"), "note points at the shelf");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn queries_are_url_encoded() {
|
||||
assert_eq!(urlencoding("all:agent topologies"), "all%3Aagent+topologies");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,262 @@
|
||||
//! Which phase-config keys the platform actually reads.
|
||||
//!
|
||||
//! `mission_phases.config` is free-form JSONB written by workflow recipes, the
|
||||
//! mission wizard and the API. Nothing connected a key to the code that reads
|
||||
//! it, so a key could be accepted, validated, stored, rendered — and consumed
|
||||
//! by nobody.
|
||||
//!
|
||||
//! `task` was exactly that. Every phase of every mission received identical
|
||||
//! instructions because the runner selected only the mission description; the
|
||||
//! per-phase task sat in Postgres unread. Mission `019fc42b` is what surfaced
|
||||
//! it: two coding phases with different `task` values produced the same two
|
||||
//! files. There was no error, because there is nothing to fail — an unread key
|
||||
//! is indistinguishable from a key whose value happens not to matter.
|
||||
//!
|
||||
//! This module is the missing link. Every key here names the code that reads
|
||||
//! it, `unknown_keys` reports anything else, and a test asserts the shipped
|
||||
//! recipes only write keys that exist. It cannot make a reader appear, but it
|
||||
//! makes an absent one visible.
|
||||
|
||||
/// A phase-config key and where it is consumed.
|
||||
pub struct KnownKey {
|
||||
pub key: &'static str,
|
||||
/// The code path that reads it. Kept as prose so this survives refactors
|
||||
/// that a symbol reference would not.
|
||||
pub read_by: &'static str,
|
||||
}
|
||||
|
||||
/// Keys with a reader in the current build.
|
||||
///
|
||||
/// Adding a key here without a reader defeats the purpose. The rule is: a key
|
||||
/// earns its entry when something consumes it, not when something writes it.
|
||||
pub const KNOWN_KEYS: &[KnownKey] = &[
|
||||
KnownKey {
|
||||
key: "done_when",
|
||||
read_by: "cm_db::repo::missions::create — promoted to the done_when column, \
|
||||
swept by phase_runner::evaluate_finished_phases",
|
||||
},
|
||||
KnownKey {
|
||||
key: "max_iterations",
|
||||
read_by: "cm_db::repo::missions::create — promoted to the max_iterations column",
|
||||
},
|
||||
KnownKey {
|
||||
key: "task",
|
||||
read_by: "phase_runner::start_pending_phases — injected by phase_task_text",
|
||||
},
|
||||
KnownKey {
|
||||
key: "commit_policy",
|
||||
read_by: "mission_delivery::Gate::parse — selects the delivery gate",
|
||||
},
|
||||
];
|
||||
|
||||
/// Keys a recipe may carry that are deliberately not consumed *yet*.
|
||||
///
|
||||
/// Distinguished from unknown keys so the report stays useful: these are known
|
||||
/// gaps with an owner, not typos. Every one is a feature described in a shipped
|
||||
/// workflow recipe whose implementation does not exist — which is worth seeing
|
||||
/// listed, because a recipe promising `loop = "until_done"` reads to an
|
||||
/// operator like something that loops.
|
||||
pub const DECLARED_BUT_UNREAD: &[KnownKey] = &[
|
||||
KnownKey {
|
||||
key: "loop",
|
||||
read_by: "NOT IMPLEMENTED — phase iteration uses max_iterations + done_when",
|
||||
},
|
||||
KnownKey {
|
||||
key: "produces",
|
||||
read_by: "NOT IMPLEMENTED — artifact rendering is not driven by this",
|
||||
},
|
||||
KnownKey {
|
||||
key: "input_from_phase",
|
||||
read_by: "NOT IMPLEMENTED — phases share a checkout, not declared inputs",
|
||||
},
|
||||
KnownKey {
|
||||
key: "mode",
|
||||
read_by: "NOT IMPLEMENTED — benchmark/refactor mode selection",
|
||||
},
|
||||
KnownKey {
|
||||
key: "harness",
|
||||
read_by: "NOT IMPLEMENTED — benchmark harness selection",
|
||||
},
|
||||
KnownKey {
|
||||
key: "tools",
|
||||
read_by: "NOT IMPLEMENTED — per-phase tool selection",
|
||||
},
|
||||
KnownKey {
|
||||
key: "benchmark",
|
||||
read_by: "NOT IMPLEMENTED — nested benchmark settings",
|
||||
},
|
||||
KnownKey {
|
||||
key: "mcp_bundles",
|
||||
read_by: "NOT IMPLEMENTED at phase level — bundles come from the TEAM \
|
||||
template (mission_orchestrator binds template.mcp_bundles) and \
|
||||
runtime_provision writes agents.<alias>.mcp_bundles. A recipe \
|
||||
setting this per phase changes nothing: security_hardening.toml \
|
||||
asks for gitea_forge + security_scan and its phase gets neither",
|
||||
},
|
||||
KnownKey {
|
||||
key: "test_command",
|
||||
read_by: "NOT IMPLEMENTED — mission_delivery::discover_test_command infers \
|
||||
from the repo and does not consult config",
|
||||
},
|
||||
];
|
||||
|
||||
fn is_listed(key: &str, list: &[KnownKey]) -> bool {
|
||||
list.iter().any(|k| k.key == key)
|
||||
}
|
||||
|
||||
/// Keys in this config that no code reads and that are not known gaps.
|
||||
///
|
||||
/// Almost always a typo or a setting invented for a feature that was never
|
||||
/// built. Returned rather than rejected: a mission whose config carries an
|
||||
/// unread key is not *wrong*, it is just doing less than its author believes,
|
||||
/// and failing the request would break recipes that already ship these.
|
||||
pub fn unknown_keys(config: &serde_json::Value) -> Vec<String> {
|
||||
let Some(obj) = config.as_object() else {
|
||||
return Vec::new();
|
||||
};
|
||||
obj.keys()
|
||||
.filter(|k| !is_listed(k, KNOWN_KEYS) && !is_listed(k, DECLARED_BUT_UNREAD))
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Keys that are recognised but that nothing consumes.
|
||||
pub fn inert_keys(config: &serde_json::Value) -> Vec<String> {
|
||||
let Some(obj) = config.as_object() else {
|
||||
return Vec::new();
|
||||
};
|
||||
obj.keys()
|
||||
.filter(|k| is_listed(k, DECLARED_BUT_UNREAD))
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Log what a phase's config asked for that will not happen.
|
||||
///
|
||||
/// Called once per phase at mission creation. Deliberately not an error: the
|
||||
/// point is that the author's intent and the platform's behaviour have
|
||||
/// diverged, and the author should be able to see that without being blocked.
|
||||
pub fn report(kind: &str, order_idx: i32, config: &serde_json::Value) {
|
||||
let unknown = unknown_keys(config);
|
||||
if !unknown.is_empty() {
|
||||
eprintln!(
|
||||
"phase_config: phase {order_idx} ({kind}) sets unrecognised key(s) {} — \
|
||||
nothing reads them; check for a typo",
|
||||
unknown.join(", ")
|
||||
);
|
||||
}
|
||||
let inert = inert_keys(config);
|
||||
if !inert.is_empty() {
|
||||
eprintln!(
|
||||
"phase_config: phase {order_idx} ({kind}) sets {} — recognised but NOT \
|
||||
IMPLEMENTED, so it will have no effect on this run",
|
||||
inert.join(", ")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn a_key_cannot_be_both_read_and_unread() {
|
||||
for k in KNOWN_KEYS {
|
||||
assert!(
|
||||
!is_listed(k.key, DECLARED_BUT_UNREAD),
|
||||
"{} is listed as both read and unread",
|
||||
k.key
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_known_key_names_its_reader() {
|
||||
for k in KNOWN_KEYS {
|
||||
assert!(
|
||||
!k.read_by.is_empty() && !k.read_by.starts_with("NOT IMPLEMENTED"),
|
||||
"{} claims to be read but names no reader",
|
||||
k.key
|
||||
);
|
||||
}
|
||||
for k in DECLARED_BUT_UNREAD {
|
||||
assert!(
|
||||
k.read_by.starts_with("NOT IMPLEMENTED"),
|
||||
"{} is listed as unread but names a reader — promote it to KNOWN_KEYS",
|
||||
k.key
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// The regression that motivated the module: `task` must stay claimed.
|
||||
#[test]
|
||||
fn the_per_phase_task_key_has_a_reader() {
|
||||
assert!(
|
||||
is_listed("task", KNOWN_KEYS),
|
||||
"task lost its reader again — every phase will get identical instructions"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_and_inert_keys_are_reported_separately() {
|
||||
let cfg = serde_json::json!({
|
||||
"done_when": "tests pass",
|
||||
"loop": "until_done",
|
||||
"typpo": true,
|
||||
});
|
||||
assert_eq!(unknown_keys(&cfg), vec!["typpo".to_string()]);
|
||||
assert_eq!(inert_keys(&cfg), vec!["loop".to_string()]);
|
||||
}
|
||||
|
||||
/// Every key the shipped workflow recipes write must be accounted for.
|
||||
///
|
||||
/// This is the CI-time half: a recipe that invents `comit_policy` should
|
||||
/// fail here rather than run a mission whose gate silently defaults.
|
||||
#[test]
|
||||
fn shipped_recipes_only_write_accounted_keys() {
|
||||
let dir = concat!(env!("CARGO_MANIFEST_DIR"), "/../../templates/workflows");
|
||||
let Ok(entries) = std::fs::read_dir(dir) else {
|
||||
return; // templates not present in this build context
|
||||
};
|
||||
// Keys that belong to the recipe/phase envelope rather than to the
|
||||
// phase config blob itself.
|
||||
const ENVELOPE: &[&str] = &[
|
||||
"key",
|
||||
"name",
|
||||
"title",
|
||||
"blurb",
|
||||
"kind",
|
||||
"order_idx",
|
||||
"requires_repo",
|
||||
"default_team_template",
|
||||
"default_topology",
|
||||
"phases",
|
||||
"description",
|
||||
];
|
||||
for entry in entries.flatten() {
|
||||
let path = entry.path();
|
||||
if path.extension().and_then(|e| e.to_str()) != Some("toml") {
|
||||
continue;
|
||||
}
|
||||
let body = std::fs::read_to_string(&path).unwrap();
|
||||
for line in body.lines() {
|
||||
let line = line.trim();
|
||||
if line.starts_with('#') || !line.contains('=') {
|
||||
continue;
|
||||
}
|
||||
let key = line.split('=').next().unwrap().trim();
|
||||
if key.is_empty() || key.contains(' ') || key.contains('[') {
|
||||
continue;
|
||||
}
|
||||
let accounted = ENVELOPE.contains(&key)
|
||||
|| is_listed(key, KNOWN_KEYS)
|
||||
|| is_listed(key, DECLARED_BUT_UNREAD);
|
||||
assert!(
|
||||
accounted,
|
||||
"{} writes `{key}`, which no reader claims and no gap declares",
|
||||
path.display()
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,10 +55,91 @@ async fn sweep_once(pool: &PgPool, runtime: &cm_runtime::Runtime) -> Result<(),
|
||||
// Between "all runs finished" and "phase done" sits the completion
|
||||
// evaluation, for phases that declare a condition.
|
||||
evaluate_finished_phases(pool, runtime).await?;
|
||||
// Capture before the mission closes and long before the sweeper reaps the
|
||||
// checkout. Idempotent, so a failure here is retried on the next tick
|
||||
// rather than losing the phase's work.
|
||||
capture_finished_coding_phases(pool).await?;
|
||||
close_finished_missions(pool).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// How many phases to capture per tick. Capture shells out to git against a
|
||||
/// working tree, so a backlog should be worked through steadily rather than
|
||||
/// all at once.
|
||||
const CAPTURE_BATCH: i64 = 5;
|
||||
|
||||
/// Write out the diff for any finished phase of a mission that has a repo.
|
||||
///
|
||||
/// Not just coding phases. `phase_task_text` tells a *research* phase to
|
||||
/// "save findings under /mission/repo/research/ using file_edit", so research
|
||||
/// output is real work sitting in the checkout, and the checkout is deleted
|
||||
/// thirty minutes after the mission ends. Filtering to coding kinds would have
|
||||
/// quietly thrown away every research brief a repo-bearing mission produced.
|
||||
///
|
||||
/// One consequence to know about: `git diff HEAD` is cumulative, so in a
|
||||
/// research→coding mission the coding phase's patch also contains the research
|
||||
/// phase's files. That resolves itself once each phase commits — the next
|
||||
/// phase then diffs against the previous phase's commit rather than the
|
||||
/// original HEAD.
|
||||
///
|
||||
/// Deliberately not hung off `close_finished_phases` or
|
||||
/// `evaluate_finished_phases`: a phase reaches `completed` through either
|
||||
/// path depending on whether it declared a `done_when`, and bolting capture
|
||||
/// onto one of them would silently skip the other. Driving it from the sweep
|
||||
/// with a `NOT EXISTS` guard covers both and is retryable by construction.
|
||||
async fn capture_finished_coding_phases(pool: &PgPool) -> Result<(), String> {
|
||||
let rows = sqlx::query(
|
||||
"SELECT mp.id, mp.mission_id
|
||||
FROM mission_phases mp
|
||||
JOIN missions m ON m.id = mp.mission_id
|
||||
WHERE mp.status = 'completed'
|
||||
AND m.repo_id IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM mission_artifacts a
|
||||
WHERE a.mission_id = mp.mission_id
|
||||
AND a.phase_id = mp.id
|
||||
AND a.kind = 'code_diff'
|
||||
)
|
||||
ORDER BY mp.completed_at DESC NULLS LAST
|
||||
LIMIT $1",
|
||||
)
|
||||
.bind(CAPTURE_BATCH)
|
||||
.fetch_all(pool)
|
||||
.await
|
||||
.map_err(|e| format!("select phases to capture: {e}"))?;
|
||||
|
||||
for row in rows {
|
||||
use sqlx::Row;
|
||||
let phase_id: Uuid = row.get("id");
|
||||
let mission_id: Uuid = row.get("mission_id");
|
||||
match crate::mission_delivery::capture_phase_diff(pool, mission_id, phase_id).await {
|
||||
Ok(Some(_)) => {}
|
||||
Ok(None) => {
|
||||
// The checkout is gone — reaped before capture reached this
|
||||
// phase. Record that, or the row stays eligible forever; and
|
||||
// because the batch is bounded, a handful of dead phases
|
||||
// occupy every slot permanently and no live mission is ever
|
||||
// captured again. That is exactly how this was found: five
|
||||
// reaped phases from earlier runs blocked the batch while a
|
||||
// freshly finished coding phase went untouched.
|
||||
if let Err(e) =
|
||||
crate::mission_delivery::record_uncapturable(pool, mission_id, phase_id).await
|
||||
{
|
||||
eprintln!("phase_runner: recording uncapturable phase {phase_id}: {e}");
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
// A real failure against a checkout that still exists; the
|
||||
// next tick retries it.
|
||||
eprintln!(
|
||||
"phase_runner: capturing diff for mission {mission_id} phase {phase_id}: {e}"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Enqueue topology_runs for every phase whose predecessors are done.
|
||||
async fn start_pending_phases(pool: &PgPool) -> Result<(), String> {
|
||||
// Eligible = pending phase, mission running, all lower-order phases
|
||||
@@ -66,6 +147,7 @@ async fn start_pending_phases(pool: &PgPool) -> Result<(), String> {
|
||||
// handles order 0 (no prior rows) + skipped phases naturally.
|
||||
let rows = sqlx::query(
|
||||
"SELECT mp.id, mp.mission_id, mp.kind, mp.order_idx, mp.iteration,
|
||||
mp.config->>'task' AS phase_task,
|
||||
m.workspace_id, m.title, m.description
|
||||
FROM mission_phases mp
|
||||
JOIN missions m ON m.id = mp.mission_id
|
||||
@@ -90,6 +172,7 @@ async fn start_pending_phases(pool: &PgPool) -> Result<(), String> {
|
||||
let workspace_id: Uuid = row.get("workspace_id");
|
||||
let title: String = row.get("title");
|
||||
let description: Option<String> = row.get("description");
|
||||
let phase_task: Option<String> = row.get("phase_task");
|
||||
let iteration: i32 = row.get("iteration");
|
||||
|
||||
if let Err(e) = launch_phase(
|
||||
@@ -101,6 +184,7 @@ async fn start_pending_phases(pool: &PgPool) -> Result<(), String> {
|
||||
workspace_id,
|
||||
title: &title,
|
||||
description: description.as_deref(),
|
||||
phase_task: phase_task.as_deref(),
|
||||
iteration,
|
||||
},
|
||||
)
|
||||
@@ -121,6 +205,14 @@ struct PhaseLaunch<'a> {
|
||||
workspace_id: Uuid,
|
||||
title: &'a str,
|
||||
description: Option<&'a str>,
|
||||
/// This phase's own instructions, from `mission_phases.config.task`.
|
||||
///
|
||||
/// Without it every phase of a mission receives byte-identical task text
|
||||
/// and differs only by the kind directive — so a two-phase mission has
|
||||
/// both phases do the same work. Mission `019fc42b` demonstrated it: two
|
||||
/// coding phases with distinct `task` values both produced the same two
|
||||
/// files, because neither phase ever saw its own instructions.
|
||||
phase_task: Option<&'a str>,
|
||||
/// Which pass this is, 0-based. Stamped onto the runs so the completion
|
||||
/// check can tell this pass's work from the previous one's.
|
||||
iteration: i32,
|
||||
@@ -134,6 +226,7 @@ async fn launch_phase(pool: &PgPool, p: PhaseLaunch<'_>) -> Result<(), String> {
|
||||
workspace_id,
|
||||
title,
|
||||
description,
|
||||
phase_task,
|
||||
iteration,
|
||||
} = p;
|
||||
// Which team purposes should execute this phase.
|
||||
@@ -178,10 +271,17 @@ async fn launch_phase(pool: &PgPool, p: PhaseLaunch<'_>) -> Result<(), String> {
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(Some(path)) => eprintln!(
|
||||
"phase_runner: repo checked out at {} for mission {mission_id} phase {phase_id}",
|
||||
path.display()
|
||||
),
|
||||
Ok(Some(path)) => {
|
||||
eprintln!(
|
||||
"phase_runner: repo checked out at {} for mission {mission_id} phase {phase_id}",
|
||||
path.display()
|
||||
);
|
||||
// From here the checkout belongs to a running phase. Recording it
|
||||
// explicitly is what stops the *next* phase's launch from
|
||||
// refreshing the tree out from under this one's output — a
|
||||
// decision that must not depend on what the agent leaves behind.
|
||||
crate::mission_workspace::mark_phase_started(&path);
|
||||
}
|
||||
Ok(None) => {}
|
||||
Err(e) => eprintln!(
|
||||
"phase_runner: repo checkout for mission {mission_id} phase {phase_id} failed (continuing): {e}"
|
||||
@@ -233,7 +333,7 @@ async fn launch_phase(pool: &PgPool, p: PhaseLaunch<'_>) -> Result<(), String> {
|
||||
let prior = crate::evaluator::latest(pool, phase_id)
|
||||
.await
|
||||
.unwrap_or(None);
|
||||
let task = phase_task_text(kind, title, description);
|
||||
let task = phase_task_text(kind, title, description, phase_task);
|
||||
let task = match prior {
|
||||
Some((iter, false, guidance)) => format!(
|
||||
"{task}\n\nPASS {} DID NOT SATISFY THE COMPLETION CONDITION. What is \
|
||||
@@ -308,7 +408,12 @@ async fn launch_phase(pool: &PgPool, p: PhaseLaunch<'_>) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn phase_task_text(kind: &str, title: &str, description: Option<&str>) -> String {
|
||||
fn phase_task_text(
|
||||
kind: &str,
|
||||
title: &str,
|
||||
description: Option<&str>,
|
||||
phase_task: Option<&str>,
|
||||
) -> String {
|
||||
let base = description.unwrap_or("").trim();
|
||||
// The prior template-derived system prompts trained agents to look
|
||||
// for `file_read`/`file_write` — tools that no longer exist under
|
||||
@@ -390,7 +495,20 @@ fn phase_task_text(kind: &str, title: &str, description: Option<&str>) -> String
|
||||
}
|
||||
_ => "Execute this mission phase according to the mission brief.",
|
||||
};
|
||||
format!("MISSION: {title}\n\n{tool_preamble}\n{marker_protocol}\n{directive}\n\nBRIEF:\n{base}")
|
||||
// The mission brief is shared by every phase; this block is not. It goes
|
||||
// last and says so explicitly, because the failure it fixes was agents
|
||||
// re-doing the whole mission in each phase rather than their slice of it.
|
||||
let scope = match phase_task.map(str::trim).filter(|t| !t.is_empty()) {
|
||||
Some(t) => format!(
|
||||
"\n\nTHIS PHASE'S TASK — do this and only this. The brief above is \
|
||||
the mission's full scope across all phases; the following is your \
|
||||
share of it:\n{t}"
|
||||
),
|
||||
None => String::new(),
|
||||
};
|
||||
format!(
|
||||
"MISSION: {title}\n\n{tool_preamble}\n{marker_protocol}\n{directive}\n\nBRIEF:\n{base}{scope}"
|
||||
)
|
||||
}
|
||||
|
||||
/// Close phases whose topology_runs are all terminal.
|
||||
@@ -646,6 +764,32 @@ mod tests {
|
||||
pairs.iter().map(|(k, v)| (k.to_string(), *v)).collect()
|
||||
}
|
||||
|
||||
/// A phase's own task must reach the agent, and two phases of one mission
|
||||
/// must not receive identical text.
|
||||
///
|
||||
/// This is the regression from mission `019fc42b`: `config.task` was
|
||||
/// accepted by the API, stored in the DB, and read by nothing. Both coding
|
||||
/// phases got byte-identical instructions and both produced the same two
|
||||
/// files. Asserting the texts *differ* is the part that matters — asserting
|
||||
/// only that the task appears would still pass if the brief carried it.
|
||||
#[test]
|
||||
fn phase_task_reaches_the_agent_and_distinguishes_phases() {
|
||||
let brief = Some("Add two marker files.");
|
||||
let alpha = phase_task_text("coding", "Demo", brief, Some("Create ALPHA.md"));
|
||||
let beta = phase_task_text("coding", "Demo", brief, Some("Create BETA.md"));
|
||||
|
||||
assert!(alpha.contains("Create ALPHA.md"), "phase task must be injected");
|
||||
assert!(beta.contains("Create BETA.md"));
|
||||
assert!(!alpha.contains("BETA.md"), "a phase must not see its sibling's task");
|
||||
assert_ne!(alpha, beta, "sibling phases received identical instructions");
|
||||
|
||||
// A phase with no task of its own is unchanged from before the fix.
|
||||
let bare = phase_task_text("coding", "Demo", brief, None);
|
||||
assert!(!bare.contains("THIS PHASE'S TASK"));
|
||||
// Empty and whitespace-only configs take the same path as absent.
|
||||
assert_eq!(bare, phase_task_text("coding", "Demo", brief, Some(" ")));
|
||||
}
|
||||
|
||||
/// The marker syntax we hand the agent must be the syntax we parse back.
|
||||
///
|
||||
/// These two sides used to live far apart — the rules were in team-template
|
||||
@@ -654,7 +798,7 @@ mod tests {
|
||||
/// Every example line in the prompt is fed through the real parser here.
|
||||
#[test]
|
||||
fn task_text_marker_examples_parse() {
|
||||
let text = phase_task_text("coding", "Demo", Some("brief"));
|
||||
let text = phase_task_text("coding", "Demo", Some("brief"), None);
|
||||
|
||||
let examples: Vec<&str> = text
|
||||
.lines()
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
//! The paper library: trigger a run, see what it holds.
|
||||
//!
|
||||
//! Thin on purpose. The work lives in [`crate::library`]; this exposes it so
|
||||
//! a run can be started by a person, a schedule, or the UI rather than only
|
||||
//! from an integration test.
|
||||
|
||||
use axum::extract::{Query, State};
|
||||
use axum::Json;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{json, Value};
|
||||
|
||||
use crate::{ApiError, AppState, Authed};
|
||||
|
||||
/// Default corpus + repo. Single-operator deployment, so these are constants
|
||||
/// rather than another table to keep in sync; a second library becomes a
|
||||
/// request field the day one exists.
|
||||
const DEFAULT_CORPUS: &str = "valhalla-vault";
|
||||
const DEFAULT_VAULT_URL: &str = "https://git.redclaw.dev/redclaw/valhalla-vault.git";
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct RunRequest {
|
||||
/// arXiv queries. Omitted → the topics this project is actually working on.
|
||||
#[serde(default)]
|
||||
pub topics: Option<Vec<String>>,
|
||||
/// Papers per topic. Clamped, because a broad first run against an empty
|
||||
/// library can otherwise pull hundreds of PDFs in one go.
|
||||
#[serde(default)]
|
||||
pub per_topic: Option<usize>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct RunResponse {
|
||||
pub candidates: usize,
|
||||
pub already_had: usize,
|
||||
pub shelved: Vec<String>,
|
||||
pub failed: Vec<Value>,
|
||||
pub notes: Vec<String>,
|
||||
pub branch: String,
|
||||
pub pushed: bool,
|
||||
pub error: Option<String>,
|
||||
/// A run that errored on nothing. Reported explicitly so a caller does not
|
||||
/// have to infer health from an empty `shelved` list — a quiet week and a
|
||||
/// broken run both shelve zero papers.
|
||||
pub healthy: bool,
|
||||
}
|
||||
|
||||
/// POST /api/library/runs — harvest now.
|
||||
pub async fn run(
|
||||
State(state): State<AppState>,
|
||||
Authed(user): Authed,
|
||||
Json(req): Json<RunRequest>,
|
||||
) -> Result<Json<RunResponse>, ApiError> {
|
||||
let blobs = state
|
||||
.blobs
|
||||
.clone()
|
||||
.ok_or_else(|| {
|
||||
eprintln!("library: blob storage is not configured; cannot shelve PDFs");
|
||||
ApiError::Internal
|
||||
})?;
|
||||
|
||||
let topics = req
|
||||
.topics
|
||||
.filter(|t| !t.is_empty())
|
||||
.unwrap_or_else(crate::library::default_topics);
|
||||
let per_topic = req.per_topic.unwrap_or(5).clamp(1, 25);
|
||||
|
||||
// Work under the missions root: it is already a writable volume with room
|
||||
// for checkouts, and it is swept, so a crashed run cannot leak a vault
|
||||
// clone forever.
|
||||
let work_root = std::env::temp_dir().join("clawmates-library");
|
||||
|
||||
let out = crate::library::run_to_vault(
|
||||
&state.pool,
|
||||
&blobs,
|
||||
user.workspace_id.as_uuid(),
|
||||
DEFAULT_CORPUS,
|
||||
DEFAULT_VAULT_URL,
|
||||
&work_root,
|
||||
&topics,
|
||||
per_topic,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
// The reason belongs in the log, not in the response: it can carry a
|
||||
// remote URL and git stderr.
|
||||
eprintln!("library: run failed: {e}");
|
||||
ApiError::Internal
|
||||
})?;
|
||||
|
||||
Ok(Json(RunResponse {
|
||||
candidates: out.harvest.candidates,
|
||||
already_had: out.harvest.already_had,
|
||||
shelved: out.harvest.shelved.clone(),
|
||||
failed: out
|
||||
.harvest
|
||||
.failed
|
||||
.iter()
|
||||
.map(|(id, why)| json!({ "source_id": id, "error": why }))
|
||||
.collect(),
|
||||
notes: out.harvest.notes_written.clone(),
|
||||
healthy: out.harvest.healthy(),
|
||||
branch: out.branch,
|
||||
pushed: out.pushed,
|
||||
error: out.error,
|
||||
}))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct ListQuery {
|
||||
#[serde(default)]
|
||||
pub kind: Option<String>,
|
||||
#[serde(default)]
|
||||
pub limit: Option<i64>,
|
||||
}
|
||||
|
||||
/// `(source_id, title, url, note path)` as stored.
|
||||
type CorpusRow = (String, Option<String>, Option<String>, Option<String>);
|
||||
|
||||
/// GET /api/library/items — what the library holds.
|
||||
pub async fn list(
|
||||
State(state): State<AppState>,
|
||||
Authed(user): Authed,
|
||||
Query(q): Query<ListQuery>,
|
||||
) -> Result<Json<Vec<Value>>, ApiError> {
|
||||
let limit = q.limit.unwrap_or(100).clamp(1, 500);
|
||||
let kind = q.kind.unwrap_or_else(|| "source".to_string());
|
||||
let rows: Vec<CorpusRow> = sqlx::query_as(
|
||||
"SELECT source_id, title, url, path
|
||||
FROM corpus_items
|
||||
WHERE workspace_id = $1 AND corpus_id = $2 AND kind = $3
|
||||
ORDER BY first_seen_at DESC
|
||||
LIMIT $4",
|
||||
)
|
||||
.bind(user.workspace_id.as_uuid())
|
||||
.bind(DEFAULT_CORPUS)
|
||||
.bind(kind)
|
||||
.bind(limit)
|
||||
.fetch_all(&state.pool)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
eprintln!("library: list corpus: {e}");
|
||||
ApiError::Internal
|
||||
})?;
|
||||
|
||||
Ok(Json(
|
||||
rows.into_iter()
|
||||
.map(|(source_id, title, url, path)| {
|
||||
json!({ "sourceId": source_id, "title": title, "url": url, "notePath": path })
|
||||
})
|
||||
.collect(),
|
||||
))
|
||||
}
|
||||
@@ -196,10 +196,16 @@ fn phases_for_create(
|
||||
})
|
||||
.map(|rp| rp.config.clone())
|
||||
.unwrap_or(Value::Null);
|
||||
let config = merge_config(base, p.config);
|
||||
// Say what this phase asked for that will not happen. A config key
|
||||
// nothing reads is silent by construction — `task` sat unread
|
||||
// through every mission until two phases with different tasks
|
||||
// produced identical output.
|
||||
crate::phase_config::report(&p.kind, p.order_idx, &config);
|
||||
NewMissionPhase {
|
||||
kind: p.kind,
|
||||
order_idx: p.order_idx,
|
||||
config: merge_config(base, p.config),
|
||||
config,
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
|
||||
@@ -13,6 +13,7 @@ pub mod gateway;
|
||||
pub mod health;
|
||||
pub mod identity;
|
||||
pub mod level_up;
|
||||
pub mod library;
|
||||
pub mod missions;
|
||||
pub mod nodes;
|
||||
pub mod oauth;
|
||||
|
||||
@@ -0,0 +1,190 @@
|
||||
//! Does the mission runtime actually carry the tools we depend on?
|
||||
//!
|
||||
//! Every capability in this codebase is written twice: once as code that
|
||||
//! invokes a binary, and once as a Dockerfile line that installs it. The two
|
||||
//! are only connected by someone having built and shipped the image, and
|
||||
//! nothing checked that they agreed.
|
||||
//!
|
||||
//! They did not. `deploy/clawmates-runtime/Dockerfile` gained a Rust
|
||||
//! toolchain, `gitleaks`, `trivy`, `semgrep` and `cargo-audit`; the image was
|
||||
//! never built, and gw-04 kept running the previous one for days. The
|
||||
//! consequences were all silent:
|
||||
//!
|
||||
//! - `verify_tests` could not launch `cargo test`, so every `on_green_tests`
|
||||
//! phase landed on `-wip` — indistinguishable from "no test suite here"
|
||||
//! - `security_scan` emitted `tool_error` rows and reported completion
|
||||
//! - the evaluator's allow-listed checks could not run the scanners
|
||||
//!
|
||||
//! No error, no log line, no failing test. The code was right and the machine
|
||||
//! was not. This module makes that specific disagreement observable: it asks
|
||||
//! the running container what it has and says so plainly at boot.
|
||||
//!
|
||||
//! It is a report, not a gate. A missing scanner should not stop the server
|
||||
//! from serving — it should stop us believing a scan that scanned nothing.
|
||||
|
||||
use crate::container_exec;
|
||||
use std::time::Duration;
|
||||
|
||||
const PROBE_TIMEOUT: Duration = Duration::from_secs(20);
|
||||
|
||||
/// A tool the platform invokes inside the runtime container, and what breaks
|
||||
/// without it. The consequence text is the point: a bare list of missing
|
||||
/// binaries does not tell an operator what is now quietly not happening.
|
||||
struct Dependency {
|
||||
argv: &'static [&'static str],
|
||||
needed_for: &'static str,
|
||||
}
|
||||
|
||||
const DEPENDENCIES: &[Dependency] = &[
|
||||
Dependency {
|
||||
argv: &["cargo", "--version"],
|
||||
needed_for: "the on_green_tests gate for Rust repos; without it every \
|
||||
phase is unverified and lands on -wip",
|
||||
},
|
||||
Dependency {
|
||||
argv: &["git", "--version"],
|
||||
needed_for: "agent-side git operations in the mission checkout",
|
||||
},
|
||||
Dependency {
|
||||
argv: &["gitleaks", "version"],
|
||||
needed_for: "secret scanning in security_scan phases and evaluator checks",
|
||||
},
|
||||
Dependency {
|
||||
argv: &["trivy", "--version"],
|
||||
needed_for: "vulnerability scanning in security_scan phases",
|
||||
},
|
||||
Dependency {
|
||||
argv: &["semgrep", "--version"],
|
||||
needed_for: "static analysis in security_scan phases",
|
||||
},
|
||||
Dependency {
|
||||
argv: &["cargo-audit", "--version"],
|
||||
needed_for: "dependency advisories in security_scan phases",
|
||||
},
|
||||
];
|
||||
|
||||
/// One tool's availability, as reported by the container itself.
|
||||
pub struct ToolStatus {
|
||||
pub program: String,
|
||||
pub present: bool,
|
||||
/// Version string when present, error when not.
|
||||
pub detail: String,
|
||||
pub needed_for: &'static str,
|
||||
}
|
||||
|
||||
/// Probe the runtime container for everything we invoke inside it.
|
||||
///
|
||||
/// Returns an empty vec if Docker itself is unreachable — that is a different
|
||||
/// and louder failure which the caller reports separately, and emitting six
|
||||
/// "missing" lines for it would be misleading.
|
||||
pub async fn probe(container: &str) -> Result<Vec<ToolStatus>, String> {
|
||||
let docker = container_exec::connect().map_err(|e| format!("docker unreachable: {e}"))?;
|
||||
let mut out = Vec::with_capacity(DEPENDENCIES.len());
|
||||
for dep in DEPENDENCIES {
|
||||
let argv: Vec<String> = dep.argv.iter().map(|s| s.to_string()).collect();
|
||||
let status =
|
||||
match container_exec::exec(&docker, container, None, &argv, PROBE_TIMEOUT).await {
|
||||
Ok(r) if r.success() => ToolStatus {
|
||||
program: dep.argv[0].to_string(),
|
||||
present: true,
|
||||
detail: r
|
||||
.combined()
|
||||
.lines()
|
||||
.next()
|
||||
.unwrap_or("")
|
||||
.trim()
|
||||
.chars()
|
||||
.take(80)
|
||||
.collect(),
|
||||
needed_for: dep.needed_for,
|
||||
},
|
||||
Ok(r) => ToolStatus {
|
||||
program: dep.argv[0].to_string(),
|
||||
present: false,
|
||||
detail: r.combined().trim().chars().take(160).collect(),
|
||||
needed_for: dep.needed_for,
|
||||
},
|
||||
Err(e) => ToolStatus {
|
||||
program: dep.argv[0].to_string(),
|
||||
present: false,
|
||||
detail: e.chars().take(160).collect(),
|
||||
needed_for: dep.needed_for,
|
||||
},
|
||||
};
|
||||
out.push(status);
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Probe at startup and write the result to stderr.
|
||||
///
|
||||
/// Spawned rather than awaited so a slow or absent Docker socket cannot delay
|
||||
/// the server coming up — the report is diagnostic, and the platform has to
|
||||
/// keep working without it.
|
||||
pub fn report_at_boot() {
|
||||
tokio::spawn(async {
|
||||
let container = std::env::var("CLAWMATES_RUNTIME_CONTAINER")
|
||||
.unwrap_or_else(|_| "clawmates-runtime".to_string());
|
||||
match probe(&container).await {
|
||||
Err(e) => eprintln!(
|
||||
"runtime_preflight: could not probe `{container}` ({e}) — mission \
|
||||
test gating and security scans may silently do nothing"
|
||||
),
|
||||
Ok(tools) => {
|
||||
let missing: Vec<&ToolStatus> = tools.iter().filter(|t| !t.present).collect();
|
||||
if missing.is_empty() {
|
||||
let names: Vec<&str> = tools.iter().map(|t| t.program.as_str()).collect();
|
||||
eprintln!(
|
||||
"runtime_preflight: `{container}` has all {} expected tools ({})",
|
||||
tools.len(),
|
||||
names.join(", ")
|
||||
);
|
||||
return;
|
||||
}
|
||||
eprintln!(
|
||||
"runtime_preflight: `{container}` is MISSING {} of {} tools the \
|
||||
platform invokes. The image on this host is behind \
|
||||
deploy/clawmates-runtime/Dockerfile — rebuild and redeploy it.",
|
||||
missing.len(),
|
||||
tools.len()
|
||||
);
|
||||
for t in missing {
|
||||
eprintln!(
|
||||
"runtime_preflight: {} — absent. Disables: {}. ({})",
|
||||
t.program, t.needed_for, t.detail
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// Every dependency must be probed with a flag that exits zero and prints
|
||||
/// a version. A typo here produces a permanent false "missing" that would
|
||||
/// train an operator to ignore the report — worse than no report at all.
|
||||
#[test]
|
||||
fn every_dependency_probe_is_a_version_query() {
|
||||
for dep in DEPENDENCIES {
|
||||
assert!(
|
||||
dep.argv.len() >= 2,
|
||||
"{} needs an argument that exits 0",
|
||||
dep.argv[0]
|
||||
);
|
||||
let flag = dep.argv[1];
|
||||
assert!(
|
||||
flag == "--version" || flag == "version",
|
||||
"{} probes with `{flag}`, which may not exit 0",
|
||||
dep.argv[0]
|
||||
);
|
||||
assert!(
|
||||
!dep.needed_for.is_empty(),
|
||||
"{} must say what breaks without it",
|
||||
dep.argv[0]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
//! Indexing the vault must be idempotent, or a continuous mission cannot tell
|
||||
//! new work from work it already did.
|
||||
//!
|
||||
//! These run against a real Postgres via cm-testkit. The vault fixture is
|
||||
//! shaped from the actual `valhalla-vault`: 416 notes, only 145 with
|
||||
//! frontmatter, none carrying arxiv/doi/url, plus repo-sync notes whose
|
||||
//! frontmatter churns on every sync.
|
||||
|
||||
use cm_api::corpus;
|
||||
use uuid::Uuid;
|
||||
|
||||
async fn workspace(pool: &sqlx::PgPool) -> Uuid {
|
||||
let ws = Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO workspaces (id, name, plan) VALUES ($1,'t','team')")
|
||||
.bind(ws)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
ws
|
||||
}
|
||||
|
||||
fn seed_vault(root: &std::path::Path) {
|
||||
std::fs::create_dir_all(root.join("50 APESS 2026/Lectures")).unwrap();
|
||||
std::fs::create_dir_all(root.join("Repos")).unwrap();
|
||||
std::fs::create_dir_all(root.join("Daily")).unwrap();
|
||||
// Course note: has frontmatter, but `source:` is a local path.
|
||||
std::fs::write(
|
||||
root.join("50 APESS 2026/Lectures/agentic.md"),
|
||||
"---\nsource: \"/Users/quantum/Downloads/Material/x.pdf\"\ntype: lecture\n---\n# Agentic Design\n\nbody\n",
|
||||
)
|
||||
.unwrap();
|
||||
// Repo-sync note: frontmatter churns, prose does not.
|
||||
std::fs::write(
|
||||
root.join("Repos/zeroclaw.md"),
|
||||
"---\nnode: tank\nupdated: 2026-08-01\nsize_kb: 12\n---\n# ZeroClaw\n\nmirror\n",
|
||||
)
|
||||
.unwrap();
|
||||
// Plain note: no frontmatter at all — the majority case.
|
||||
std::fs::write(root.join("Daily/2026-08-01.md"), "# Monday\n\nnotes\n").unwrap();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn indexing_an_unchanged_vault_is_a_no_op() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
seed_vault(tmp.path());
|
||||
|
||||
let first = corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(first.scanned, 3);
|
||||
assert_eq!(first.inserted, 3);
|
||||
assert_eq!(first.unchanged, 0);
|
||||
|
||||
// The decisive assertion: a second pass over an untouched vault must add
|
||||
// and change nothing. Without this, every run looks like new work.
|
||||
let second = corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(second.scanned, 3);
|
||||
assert_eq!(second.inserted, 0, "re-index must not insert");
|
||||
assert_eq!(second.updated, 0, "re-index must not update");
|
||||
assert_eq!(second.unchanged, 3);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_repo_sync_touching_only_frontmatter_is_not_an_edit() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
seed_vault(tmp.path());
|
||||
corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// Exactly what a repo sync does: bump `updated`/`size_kb`, prose untouched.
|
||||
std::fs::write(
|
||||
tmp.path().join("Repos/zeroclaw.md"),
|
||||
"---\nnode: tank\nupdated: 2026-08-03\nsize_kb: 14\n---\n# ZeroClaw\n\nmirror\n",
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
let stats = corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(stats.updated, 0, "frontmatter churn is not an edit");
|
||||
assert_eq!(stats.unchanged, 3);
|
||||
|
||||
// A real prose edit must still be seen.
|
||||
std::fs::write(
|
||||
tmp.path().join("Repos/zeroclaw.md"),
|
||||
"---\nnode: tank\nupdated: 2026-08-03\n---\n# ZeroClaw\n\nREWRITTEN\n",
|
||||
)
|
||||
.unwrap();
|
||||
let stats = corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(stats.updated, 1, "a genuine edit must be visible");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_hand_edited_note_survives_a_rebuild() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
seed_vault(tmp.path());
|
||||
corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// The vault is authoritative: a human renames a note by hand.
|
||||
std::fs::remove_file(tmp.path().join("Daily/2026-08-01.md")).unwrap();
|
||||
std::fs::write(tmp.path().join("Daily/renamed.md"), "# Monday\n\nnotes\n").unwrap();
|
||||
|
||||
let stats = corpus::index_vault(&pool, ws, "vault", tmp.path())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(stats.scanned, 3);
|
||||
assert_eq!(stats.inserted, 1, "the renamed note is indexed under its new path");
|
||||
// The stale row is left alone rather than deleted — the index is derived
|
||||
// and rebuildable, and losing coverage history is worse than a stale row.
|
||||
assert!(corpus::seen(&pool, ws, "vault", "note:Daily/renamed.md")
|
||||
.await
|
||||
.unwrap());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn unseen_filters_candidates_in_one_round_trip() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
|
||||
corpus::record(
|
||||
&pool, ws, "vault", "source", "arxiv:2401.11111",
|
||||
Some("Known"), None, None, "h", None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let candidates = vec![
|
||||
"arxiv:2401.11111".to_string(), // already read
|
||||
"arxiv:2401.22222".to_string(),
|
||||
"doi:10.1000/new".to_string(),
|
||||
];
|
||||
let fresh = corpus::unseen(&pool, ws, "vault", &candidates).await.unwrap();
|
||||
assert_eq!(fresh, vec!["arxiv:2401.22222", "doi:10.1000/new"]);
|
||||
|
||||
assert!(corpus::seen(&pool, ws, "vault", "arxiv:2401.11111").await.unwrap());
|
||||
assert!(!corpus::seen(&pool, ws, "vault", "arxiv:2401.22222").await.unwrap());
|
||||
// A different corpus must not inherit another's seen-set.
|
||||
assert!(!corpus::seen(&pool, ws, "other", "arxiv:2401.11111").await.unwrap());
|
||||
}
|
||||
|
||||
/// The first mission to find a source keeps the credit, so "did THIS run
|
||||
/// contribute anything new" stays answerable across repeated runs.
|
||||
#[tokio::test]
|
||||
async fn re_recording_a_source_does_not_reassign_it() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
|
||||
let inserted = corpus::record(
|
||||
&pool, ws, "vault", "source", "arxiv:2401.33333",
|
||||
Some("Paper"), None, None, "h1", None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(inserted, "first sighting is an insert");
|
||||
|
||||
let inserted_again = corpus::record(
|
||||
&pool, ws, "vault", "source", "arxiv:2401.33333",
|
||||
Some("Paper"), None, None, "h2", None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(!inserted_again, "a second sighting is not new work");
|
||||
}
|
||||
/// Idempotence against the real vault rather than a fixture.
|
||||
///
|
||||
/// Ignored by default because it needs a checkout: run with
|
||||
/// `VAULT=/path/to/valhalla-vault cargo test -p cm-api --test corpus_vault \
|
||||
/// index_the_real_vault -- --ignored --nocapture`.
|
||||
///
|
||||
/// Measured 2026-08-03 on the live vault:
|
||||
/// PASS1 { scanned: 416, inserted: 416, updated: 0, unchanged: 0 }
|
||||
/// PASS2 { scanned: 416, inserted: 0, updated: 0, unchanged: 416 }
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn index_the_real_vault() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = uuid::Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO workspaces (id, name, plan) VALUES ($1,'t','team')")
|
||||
.bind(ws).execute(&pool).await.unwrap();
|
||||
let root = std::path::Path::new(&std::env::var("VAULT").unwrap()).to_path_buf();
|
||||
let a = cm_api::corpus::index_vault(&pool, ws, "valhalla-vault", &root).await.unwrap();
|
||||
println!("PASS1 {a:?}");
|
||||
let b = cm_api::corpus::index_vault(&pool, ws, "valhalla-vault", &root).await.unwrap();
|
||||
println!("PASS2 {b:?}");
|
||||
assert_eq!(b.inserted, 0);
|
||||
assert_eq!(b.updated, 0);
|
||||
assert_eq!(b.unchanged, a.scanned);
|
||||
}
|
||||
|
||||
/// Live arXiv check. Ignored by default (needs network); run with
|
||||
/// `cargo test -p cm-api --test corpus_vault live_arxiv -- --ignored --nocapture`.
|
||||
///
|
||||
/// Guards the one failure that hides: if arXiv's feed format drifts, parsing
|
||||
/// returns zero papers, which looks exactly like "no new papers this week".
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn live_arxiv_search_and_fetch() {
|
||||
let papers = cm_api::papers::search("all:agentic topologies", 3)
|
||||
.await
|
||||
.expect("arxiv search");
|
||||
println!("found {} papers", papers.len());
|
||||
assert!(!papers.is_empty(), "arXiv returned nothing — format drift?");
|
||||
|
||||
for p in &papers {
|
||||
println!(" {} | {}", p.source_id(), &p.title[..p.title.len().min(60)]);
|
||||
assert!(!p.arxiv_id.is_empty());
|
||||
assert!(!p.title.is_empty());
|
||||
assert!(!p.arxiv_id.contains('v'), "version must be stripped: {}", p.arxiv_id);
|
||||
}
|
||||
|
||||
let pdf = cm_api::papers::fetch_pdf(&papers[0]).await.expect("fetch pdf");
|
||||
println!("pdf bytes: {}", pdf.len());
|
||||
assert!(pdf.starts_with(b"%PDF"));
|
||||
assert!(pdf.len() > 10_000, "suspiciously small pdf: {}", pdf.len());
|
||||
}
|
||||
@@ -0,0 +1,202 @@
|
||||
//! A second run must not re-download what the first run already shelved.
|
||||
|
||||
use cm_api::{corpus, harvest, papers::Paper};
|
||||
use std::sync::Arc;
|
||||
use uuid::Uuid;
|
||||
|
||||
async fn workspace(pool: &sqlx::PgPool) -> Uuid {
|
||||
let ws = Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO workspaces (id, name, plan) VALUES ($1,'t','team')")
|
||||
.bind(ws)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
ws
|
||||
}
|
||||
|
||||
fn paper(id: &str) -> Paper {
|
||||
Paper {
|
||||
arxiv_id: id.into(),
|
||||
title: format!("Paper {id}"),
|
||||
authors: vec!["Ada Lovelace".into()],
|
||||
summary: "A summary.".into(),
|
||||
published: "2026-01-15T10:00:00Z".into(),
|
||||
// Deliberately unreachable: if the skip works, this is never fetched.
|
||||
pdf_url: "http://127.0.0.1:1/never.pdf".into(),
|
||||
}
|
||||
}
|
||||
|
||||
/// The load-bearing behaviour. Every candidate is already on the checkmark
|
||||
/// list, and every `pdf_url` points at a closed port — so if the run tries to
|
||||
/// download anything at all, it fails loudly instead of passing quietly.
|
||||
#[tokio::test]
|
||||
async fn papers_we_already_hold_are_never_downloaded_again() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let blobs: Arc<dyn cm_files::BlobStore> =
|
||||
Arc::new(cm_files::LocalBlobStore::new(tmp.path().join("blobs")));
|
||||
let vault = tmp.path().join("vault");
|
||||
|
||||
let candidates = vec![paper("2401.11111"), paper("2401.22222")];
|
||||
for p in &candidates {
|
||||
corpus::record(
|
||||
&pool, ws, "lib", "source", &p.source_id(),
|
||||
Some(&p.title), None, None, "h", None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
let lib = harvest::Library {
|
||||
pool: &pool, blobs: &blobs, workspace_id: ws,
|
||||
corpus_id: "lib", vault_root: &vault,
|
||||
};
|
||||
let h = harvest::shelve(&lib, &candidates, None).await.unwrap();
|
||||
|
||||
assert_eq!(h.candidates, 2);
|
||||
assert_eq!(h.already_had, 2, "both were already held");
|
||||
assert!(h.shelved.is_empty());
|
||||
assert!(
|
||||
h.failed.is_empty(),
|
||||
"nothing should have been fetched at all, but got: {:?}",
|
||||
h.failed
|
||||
);
|
||||
assert!(h.healthy(), "a fully-known batch is a healthy quiet week");
|
||||
assert!(!h.added_anything(), "and it added nothing");
|
||||
assert!(!vault.exists(), "no notes written for papers we already had");
|
||||
}
|
||||
|
||||
/// A paper that cannot be downloaded must NOT be checked off — otherwise one
|
||||
/// transient network failure means that paper is never retried.
|
||||
#[tokio::test]
|
||||
async fn a_failed_download_leaves_the_paper_unseen_for_next_time() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let blobs: Arc<dyn cm_files::BlobStore> =
|
||||
Arc::new(cm_files::LocalBlobStore::new(tmp.path().join("blobs")));
|
||||
let vault = tmp.path().join("vault");
|
||||
|
||||
let candidates = vec![paper("2401.33333")];
|
||||
let lib = harvest::Library {
|
||||
pool: &pool, blobs: &blobs, workspace_id: ws,
|
||||
corpus_id: "lib", vault_root: &vault,
|
||||
};
|
||||
let h = harvest::shelve(&lib, &candidates, None).await.unwrap();
|
||||
|
||||
assert_eq!(h.already_had, 0);
|
||||
assert!(h.shelved.is_empty());
|
||||
assert_eq!(h.failed.len(), 1, "the unreachable fetch must be reported");
|
||||
assert!(!h.healthy(), "a failed fetch is not a quiet week");
|
||||
|
||||
assert!(
|
||||
!corpus::seen(&pool, ws, "lib", "arxiv:2401.33333")
|
||||
.await
|
||||
.unwrap(),
|
||||
"a paper we failed to get must stay unseen so a later run retries it"
|
||||
);
|
||||
}
|
||||
|
||||
/// Live end-to-end: search arXiv, shelve genuinely new papers, then confirm a
|
||||
/// second identical run adds nothing. Ignored by default (network + Postgres):
|
||||
/// `cargo test -p cm-api --test harvest_run live_ -- --ignored --nocapture`
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn live_end_to_end_run_then_rerun() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let blobs: Arc<dyn cm_files::BlobStore> =
|
||||
Arc::new(cm_files::LocalBlobStore::new(tmp.path().join("blobs")));
|
||||
let vault = tmp.path().join("vault");
|
||||
|
||||
let lib = harvest::Library {
|
||||
pool: &pool, blobs: &blobs, workspace_id: ws,
|
||||
corpus_id: "lib", vault_root: &vault,
|
||||
};
|
||||
let first = harvest::run(&lib, "all:agentic AND all:topology", 3, None)
|
||||
.await
|
||||
.unwrap();
|
||||
println!("RUN1 {}", first.summary());
|
||||
for n in &first.notes_written {
|
||||
println!(" note: {n}");
|
||||
}
|
||||
assert!(first.healthy(), "failures: {:?}", first.failed);
|
||||
assert!(first.added_anything(), "first run should find something new");
|
||||
|
||||
// Every note must be readable back through the corpus parser, or the
|
||||
// catalogue cannot rebuild the checkmark list.
|
||||
for rel in &first.notes_written {
|
||||
let text = std::fs::read_to_string(vault.join(rel)).unwrap();
|
||||
let parsed = corpus::parse_note(rel, &text);
|
||||
assert!(
|
||||
parsed
|
||||
.declared_source_id
|
||||
.as_deref()
|
||||
.is_some_and(|s| s.starts_with("arxiv:")),
|
||||
"note {rel} lost its identity"
|
||||
);
|
||||
}
|
||||
|
||||
let second = harvest::run(&lib, "all:agentic AND all:topology", 3, None)
|
||||
.await
|
||||
.unwrap();
|
||||
println!("RUN2 {}", second.summary());
|
||||
assert!(second.healthy());
|
||||
assert!(
|
||||
!second.added_anything(),
|
||||
"a rerun must add nothing — got {:?}",
|
||||
second.shelved
|
||||
);
|
||||
assert_eq!(second.already_had, second.candidates);
|
||||
}
|
||||
|
||||
/// THE REAL RUN. Clones the live vault, harvests our current topics, pushes a
|
||||
/// branch. Ignored by default — needs network, Postgres and GITEA_TOKEN:
|
||||
/// `GITEA_TOKEN=… VAULT_URL=… cargo test -p cm-api --test harvest_run \
|
||||
/// live_library_run -- --ignored --nocapture`
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn live_library_run() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let ws = workspace(&pool).await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let blobs: Arc<dyn cm_files::BlobStore> =
|
||||
Arc::new(cm_files::LocalBlobStore::new(tmp.path().join("shelf")));
|
||||
let url = std::env::var("VAULT_URL").unwrap();
|
||||
|
||||
let topics = cm_api::library::default_topics();
|
||||
for t in &topics {
|
||||
println!("topic: {t}");
|
||||
}
|
||||
|
||||
let run = cm_api::library::run_to_vault(
|
||||
&pool, &blobs, ws, "valhalla-vault", &url,
|
||||
tmp.path(), &topics, 2, None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
println!("\nRESULT {}", run.harvest.summary());
|
||||
println!("branch: {} pushed: {}", run.branch, run.pushed);
|
||||
if let Some(e) = &run.error {
|
||||
println!("error: {e}");
|
||||
}
|
||||
for n in &run.harvest.notes_written {
|
||||
println!(" note: {n}");
|
||||
}
|
||||
for (sid, why) in &run.harvest.failed {
|
||||
println!(" FAILED {sid}: {why}");
|
||||
}
|
||||
|
||||
// Every shelved paper must have its PDF really on the shelf.
|
||||
for sid in &run.harvest.shelved {
|
||||
let id = sid.trim_start_matches("arxiv:");
|
||||
let key = format!("papers/arxiv/{id}.pdf");
|
||||
let bytes = blobs.get(&key).await.expect("pdf on the shelf");
|
||||
assert!(bytes.starts_with(b"%PDF"), "{key} is not a PDF");
|
||||
println!(" shelf: {key} ({} bytes)", bytes.len());
|
||||
}
|
||||
assert!(run.harvest.healthy(), "failures: {:?}", run.harvest.failed);
|
||||
}
|
||||
@@ -0,0 +1,878 @@
|
||||
//! Diff capture, against a real git repository.
|
||||
//!
|
||||
//! Deliberately not mocked. Every bug this area has produced came from git
|
||||
//! behaving differently than assumed — a shallow clone refusing a push, an
|
||||
//! ownership check refusing the repo, untracked files invisible to `git diff`.
|
||||
//! A fake `git` would agree with whatever the code believed and prove nothing.
|
||||
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
|
||||
use cm_api::mission_delivery;
|
||||
use uuid::Uuid;
|
||||
|
||||
/// Capture against an explicit root, so parallel tests cannot race each other
|
||||
/// through the process-global `CLAWMATES_MISSIONS_ROOT`.
|
||||
async fn capture(
|
||||
pool: &sqlx::PgPool,
|
||||
root: &Path,
|
||||
mission: Uuid,
|
||||
phase: Uuid,
|
||||
) -> Result<Option<mission_delivery::Capture>, String> {
|
||||
mission_delivery::capture_phase_diff_at(
|
||||
pool,
|
||||
mission,
|
||||
phase,
|
||||
&root.join(mission.to_string()).join("repo"),
|
||||
&root.join("_outputs").join(mission.to_string()),
|
||||
0,
|
||||
mission_delivery::Gate::Always,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
fn git(repo: &Path, args: &[&str]) {
|
||||
let out = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(repo)
|
||||
.args(args)
|
||||
.output()
|
||||
.expect("run git");
|
||||
assert!(
|
||||
out.status.success(),
|
||||
"git {args:?} failed: {}",
|
||||
String::from_utf8_lossy(&out.stderr)
|
||||
);
|
||||
}
|
||||
|
||||
/// A repo with one commit, at `<root>/<mission>/repo` so `checkout_path`
|
||||
/// finds it.
|
||||
/// Record the clone point the way `mission_workspace` does after a clone.
|
||||
fn record_base(repo: &Path) {
|
||||
let out = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(repo)
|
||||
.args(["rev-parse", "HEAD"])
|
||||
.output()
|
||||
.unwrap();
|
||||
std::fs::write(
|
||||
repo.join(".git/clawmates-base"),
|
||||
String::from_utf8_lossy(&out.stdout).trim(),
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
fn seed_repo(root: &Path, mission: Uuid) -> std::path::PathBuf {
|
||||
let repo = root.join(mission.to_string()).join("repo");
|
||||
std::fs::create_dir_all(&repo).unwrap();
|
||||
git(&repo, &["init", "--quiet"]);
|
||||
git(&repo, &["config", "user.email", "[email protected]"]);
|
||||
git(&repo, &["config", "user.name", "Test"]);
|
||||
std::fs::write(repo.join("README.md"), "# base\n").unwrap();
|
||||
git(&repo, &["add", "."]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "base"]);
|
||||
// The real clone path applies this; seeding a repo by hand and skipping it
|
||||
// is what let the uid-split failure reach production untested.
|
||||
cm_api::mission_workspace::share_repository_across_uids(&repo);
|
||||
record_base(&repo);
|
||||
repo
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn captures_modified_and_untracked_files() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (ws, phase) = seed_mission_phase(&pool, mission).await;
|
||||
let _ = ws;
|
||||
|
||||
// A modified file and a brand-new one. The new file is the case that
|
||||
// matters: without `--intent-to-add` it would not appear in `git diff`,
|
||||
// and a phase that only creates files is the likeliest shape of all.
|
||||
std::fs::write(repo.join("README.md"), "# base\nchanged\n").unwrap();
|
||||
std::fs::write(repo.join("new_module.rs"), "fn added() {}\n").unwrap();
|
||||
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.expect("mission has a checkout");
|
||||
|
||||
assert!(!cap.empty, "the phase changed files");
|
||||
assert_eq!(cap.files_changed, 2, "one modified, one created");
|
||||
assert!(cap.insertions >= 2);
|
||||
|
||||
let patch = std::fs::read_to_string(&cap.patch_path).unwrap();
|
||||
assert!(
|
||||
patch.contains("new_module.rs"),
|
||||
"untracked file is captured"
|
||||
);
|
||||
assert!(patch.contains("fn added()"), "its content is captured");
|
||||
assert!(patch.contains("changed"), "the modification is captured");
|
||||
|
||||
// Capture is followed by a commit, so the tree the agents left is now on a
|
||||
// branch of its own. The patch was written first and is what guarantees
|
||||
// the work survives; the branch is the convenience on top.
|
||||
let branch = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["rev-parse", "--abbrev-ref", "HEAD"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let branch = String::from_utf8_lossy(&branch.stdout).trim().to_string();
|
||||
assert!(
|
||||
branch.starts_with("clawmates/mission-"),
|
||||
"work lands on a namespaced mission branch, never the default one: {branch}"
|
||||
);
|
||||
|
||||
let status = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["status", "--porcelain"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(
|
||||
String::from_utf8_lossy(&status.stdout).trim().is_empty(),
|
||||
"everything the phase produced is committed, nothing left dangling"
|
||||
);
|
||||
|
||||
let show = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["show", "--stat", "--oneline", "HEAD"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let show = String::from_utf8_lossy(&show.stdout);
|
||||
assert!(
|
||||
show.contains("new_module.rs"),
|
||||
"the created file is in the commit: {show}"
|
||||
);
|
||||
|
||||
assert!(
|
||||
cap.committed.is_some(),
|
||||
"the capture records where the work landed"
|
||||
);
|
||||
|
||||
let row: (String, serde_json::Value) = sqlx::query_as(
|
||||
"SELECT kind, metadata FROM mission_artifacts WHERE mission_id = $1 AND phase_id = $2",
|
||||
)
|
||||
.bind(mission)
|
||||
.bind(phase)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(row.0, "code_diff");
|
||||
assert_eq!(row.1["files_changed"], 2);
|
||||
assert_eq!(row.1["empty"], false);
|
||||
assert!(row.1["base_sha"].as_str().unwrap().len() >= 7);
|
||||
}
|
||||
|
||||
/// "This coding phase wrote no code" is a result, and currently an invisible
|
||||
/// one. It must still produce an artifact.
|
||||
#[tokio::test]
|
||||
async fn an_empty_phase_still_produces_an_artifact() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
assert!(cap.empty);
|
||||
assert_eq!(cap.files_changed, 0);
|
||||
|
||||
let (kind, meta): (String, serde_json::Value) =
|
||||
sqlx::query_as("SELECT kind, metadata FROM mission_artifacts WHERE mission_id = $1")
|
||||
.bind(mission)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(kind, "code_diff");
|
||||
assert_eq!(meta["empty"], true, "the emptiness is recorded, not hidden");
|
||||
}
|
||||
|
||||
/// Build output must never reach the patch. A phase that ran `cargo build`
|
||||
/// leaves a `target/` larger than the repository, and committing it would be
|
||||
/// worse than losing the diff.
|
||||
#[tokio::test]
|
||||
async fn build_output_is_not_captured() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
std::fs::create_dir_all(repo.join("target/debug")).unwrap();
|
||||
std::fs::write(repo.join("target/debug/huge.bin"), vec![b'x'; 200_000]).unwrap();
|
||||
std::fs::create_dir_all(repo.join("node_modules/left-pad")).unwrap();
|
||||
std::fs::write(
|
||||
repo.join("node_modules/left-pad/index.js"),
|
||||
"module.exports=0",
|
||||
)
|
||||
.unwrap();
|
||||
std::fs::write(repo.join("real_change.rs"), "fn kept() {}\n").unwrap();
|
||||
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
let patch = std::fs::read_to_string(&cap.patch_path).unwrap();
|
||||
assert!(patch.contains("real_change.rs"), "genuine work is captured");
|
||||
assert!(!patch.contains("huge.bin"), "target/ is excluded");
|
||||
assert!(!patch.contains("left-pad"), "node_modules is excluded");
|
||||
assert_eq!(cap.files_changed, 1, "only the real change counts");
|
||||
}
|
||||
|
||||
/// A research mission has no checkout. That is not an error.
|
||||
#[tokio::test]
|
||||
async fn a_mission_without_a_checkout_captures_nothing() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
assert!(capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.is_none());
|
||||
}
|
||||
|
||||
async fn seed_mission_phase(pool: &sqlx::PgPool, mission: Uuid) -> (Uuid, Uuid) {
|
||||
let ws = Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO workspaces (id, name, plan) VALUES ($1,'t','team')")
|
||||
.bind(ws)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
sqlx::query(
|
||||
"INSERT INTO missions (id, workspace_id, title, template_kind, schedule, status, config)
|
||||
VALUES ($1,$2,'t','research_and_code','{}'::jsonb,'running','{}'::jsonb)",
|
||||
)
|
||||
.bind(mission)
|
||||
.bind(ws)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let phase = Uuid::now_v7();
|
||||
sqlx::query(
|
||||
"INSERT INTO mission_phases (id, mission_id, kind, order_idx, status, config)
|
||||
VALUES ($1,$2,'coding',0,'completed','{}'::jsonb)",
|
||||
)
|
||||
.bind(phase)
|
||||
.bind(mission)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
(ws, phase)
|
||||
}
|
||||
|
||||
/// Add a second phase to a mission `seed_mission_phase` already created.
|
||||
async fn seed_extra_phase(pool: &sqlx::PgPool, mission: Uuid, order_idx: i32) -> Uuid {
|
||||
let phase = Uuid::now_v7();
|
||||
sqlx::query(
|
||||
"INSERT INTO mission_phases (id, mission_id, kind, order_idx, status, config)
|
||||
VALUES ($1,$2,'coding',$3,'completed','{}'::jsonb)",
|
||||
)
|
||||
.bind(phase)
|
||||
.bind(mission)
|
||||
.bind(order_idx)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
phase
|
||||
}
|
||||
|
||||
/// The production failure this pairs with. Mission 019fc372's agent created
|
||||
/// the file it was asked for and *committed* it — `rust_sdlc` has a committer
|
||||
/// role, so that is the intended path — leaving a clean working tree. Capture
|
||||
/// diffed against HEAD, found nothing, and recorded `empty: true` next to a
|
||||
/// commit that plainly contained the work.
|
||||
#[tokio::test]
|
||||
async fn work_the_agent_committed_is_captured() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
std::fs::write(repo.join("DELIVERY_PROBE.md"), "CAPTURED-BY-CLAWMATES\n").unwrap();
|
||||
git(&repo, &["add", "DELIVERY_PROBE.md"]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "Add DELIVERY_PROBE.md"]);
|
||||
|
||||
// The tree is clean — `git status --porcelain` is empty here, which is
|
||||
// precisely why the HEAD-relative version saw nothing.
|
||||
let status = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["status", "--porcelain"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(
|
||||
String::from_utf8_lossy(&status.stdout).trim().is_empty(),
|
||||
"the agent committed, so the tree is clean"
|
||||
);
|
||||
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
assert!(
|
||||
!cap.empty,
|
||||
"committed work must be captured, not reported as empty"
|
||||
);
|
||||
assert_eq!(cap.files_changed, 1);
|
||||
|
||||
let patch = std::fs::read_to_string(&cap.patch_path).unwrap();
|
||||
assert!(
|
||||
patch.contains("CAPTURED-BY-CLAWMATES"),
|
||||
"the committed content is in the patch"
|
||||
);
|
||||
}
|
||||
|
||||
/// Committed *and* uncommitted work in the same phase — a coder that committed
|
||||
/// one change and left another in progress.
|
||||
#[tokio::test]
|
||||
async fn committed_and_uncommitted_changes_are_both_captured() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
std::fs::write(repo.join("committed.rs"), "fn done() {}\n").unwrap();
|
||||
git(&repo, &["add", "committed.rs"]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "first"]);
|
||||
std::fs::write(repo.join("in_progress.rs"), "fn wip() {}\n").unwrap();
|
||||
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
let patch = std::fs::read_to_string(&cap.patch_path).unwrap();
|
||||
assert!(patch.contains("fn done()"), "committed work");
|
||||
assert!(patch.contains("fn wip()"), "uncommitted work");
|
||||
assert_eq!(cap.files_changed, 2);
|
||||
}
|
||||
|
||||
/// Build output must stay out of the commit as well as the patch. Putting a
|
||||
/// `target/` directory into someone's history is worse than losing the diff.
|
||||
#[tokio::test]
|
||||
async fn excluded_paths_are_not_committed() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
std::fs::create_dir_all(repo.join("target/debug")).unwrap();
|
||||
std::fs::write(repo.join("target/debug/blob.bin"), vec![b'x'; 50_000]).unwrap();
|
||||
std::fs::write(
|
||||
repo.join(".gitconfig_temp"),
|
||||
"[safe]\n\tdirectory = /mission/repo\n",
|
||||
)
|
||||
.unwrap();
|
||||
std::fs::write(repo.join("real.rs"), "fn kept() {}\n").unwrap();
|
||||
|
||||
capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
let tracked = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["ls-files"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let tracked = String::from_utf8_lossy(&tracked.stdout);
|
||||
assert!(tracked.contains("real.rs"), "genuine work is committed");
|
||||
assert!(
|
||||
!tracked.contains("blob.bin"),
|
||||
"build output is not committed"
|
||||
);
|
||||
assert!(
|
||||
!tracked.contains(".gitconfig_temp"),
|
||||
"an agent's workaround file is not committed into the user's history"
|
||||
);
|
||||
}
|
||||
|
||||
/// Sibling phases of one mission must not share a branch.
|
||||
///
|
||||
/// They did. Both ids are UUIDv7, which leads with a timestamp, so two phases
|
||||
/// created in the same millisecond had identical leading hex and the name
|
||||
/// collapsed to one branch per mission — each phase quietly moving the ref the
|
||||
/// previous one had set. Production showed
|
||||
/// `clawmates/mission-019fc40e-019fc40e` for both phases of a mission.
|
||||
#[test]
|
||||
fn sibling_phases_get_distinct_branches() {
|
||||
let mission = Uuid::now_v7();
|
||||
// Minted back to back, so they share a timestamp prefix exactly as they do
|
||||
// when a mission inserts its phases in one transaction.
|
||||
let research = Uuid::now_v7();
|
||||
let coding = Uuid::now_v7();
|
||||
assert_eq!(
|
||||
research.simple().to_string()[..8],
|
||||
coding.simple().to_string()[..8],
|
||||
"precondition: v7 ids minted together share their leading hex"
|
||||
);
|
||||
|
||||
let a = mission_delivery::branch_name(mission, research, 0);
|
||||
let b = mission_delivery::branch_name(mission, coding, 0);
|
||||
assert_ne!(a, b, "each phase needs its own ref: {a} vs {b}");
|
||||
assert!(a.starts_with("clawmates/mission-"));
|
||||
}
|
||||
|
||||
/// A re-run must not collide with the pass before it.
|
||||
#[test]
|
||||
fn a_rerun_lands_on_its_own_branch() {
|
||||
let m = Uuid::now_v7();
|
||||
let p = Uuid::now_v7();
|
||||
let first = mission_delivery::branch_name(m, p, 0);
|
||||
let second = mission_delivery::branch_name(m, p, 1);
|
||||
assert_ne!(first, second);
|
||||
assert!(first.starts_with("clawmates/mission-"));
|
||||
assert!(
|
||||
second.ends_with("-i2"),
|
||||
"pass 2 is named for the pass, not the index: {second}"
|
||||
);
|
||||
}
|
||||
|
||||
/// Push against a real bare repository.
|
||||
///
|
||||
/// A mock remote would accept whatever we sent and prove nothing; the failures
|
||||
/// worth catching here — a rejected ref, a branch that never arrives, work
|
||||
/// pushed to the wrong name — are all things only a real git remote reports.
|
||||
#[tokio::test]
|
||||
async fn a_gated_push_reaches_the_remote() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let remote = tmp.path().join("remote.git");
|
||||
std::fs::create_dir_all(&remote).unwrap();
|
||||
Command::new("git")
|
||||
.args(["init", "--bare", "--quiet"])
|
||||
.arg(&remote)
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
std::fs::write(repo.join("work.rs"), "fn shipped() {}\n").unwrap();
|
||||
git(&repo, &["add", "."]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "work"]);
|
||||
git(
|
||||
&repo,
|
||||
&["checkout", "-B", "clawmates/mission-test-aaaaaaaa"],
|
||||
);
|
||||
|
||||
let out = mission_delivery::publish_phase_branch(
|
||||
&repo,
|
||||
remote.to_str().unwrap(),
|
||||
"clawmates/mission-test-aaaaaaaa",
|
||||
mission_delivery::Gate::Always,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(out.pushed, "push failed: {:?}", out.error);
|
||||
assert_eq!(out.branch, "clawmates/mission-test-aaaaaaaa");
|
||||
|
||||
// The remote genuinely has it, with the content.
|
||||
let refs = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&remote)
|
||||
.args(["for-each-ref", "--format=%(refname:short)"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let refs = String::from_utf8_lossy(&refs.stdout);
|
||||
assert!(
|
||||
refs.contains("clawmates/mission-test-aaaaaaaa"),
|
||||
"refs: {refs}"
|
||||
);
|
||||
|
||||
let show = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&remote)
|
||||
.args(["show", "clawmates/mission-test-aaaaaaaa:work.rs"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(String::from_utf8_lossy(&show.stdout).contains("fn shipped()"));
|
||||
}
|
||||
|
||||
/// A red suite must not block delivery — it must redirect it. The work still
|
||||
/// reaches the forge, on a branch whose name says it is unproven.
|
||||
#[tokio::test]
|
||||
async fn a_failed_gate_publishes_to_a_wip_branch() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let remote = tmp.path().join("remote.git");
|
||||
std::fs::create_dir_all(&remote).unwrap();
|
||||
Command::new("git")
|
||||
.args(["init", "--bare", "--quiet"])
|
||||
.arg(&remote)
|
||||
.output()
|
||||
.unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
std::fs::write(repo.join("half_done.rs"), "fn broken() {}\n").unwrap();
|
||||
git(&repo, &["add", "."]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "wip"]);
|
||||
git(
|
||||
&repo,
|
||||
&["checkout", "-B", "clawmates/mission-test-bbbbbbbb"],
|
||||
);
|
||||
|
||||
let out = mission_delivery::publish_phase_branch(
|
||||
&repo,
|
||||
remote.to_str().unwrap(),
|
||||
"clawmates/mission-test-bbbbbbbb",
|
||||
mission_delivery::Gate::OnGreenTests,
|
||||
Some(false),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert!(out.pushed, "a failed gate still publishes: {:?}", out.error);
|
||||
assert!(
|
||||
out.branch.ends_with("-wip"),
|
||||
"verdict is in the name: {}",
|
||||
out.branch
|
||||
);
|
||||
|
||||
let refs = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&remote)
|
||||
.args(["for-each-ref", "--format=%(refname:short)"])
|
||||
.output()
|
||||
.unwrap();
|
||||
let refs = String::from_utf8_lossy(&refs.stdout);
|
||||
assert!(
|
||||
refs.contains("-wip"),
|
||||
"the work reached the forge anyway: {refs}"
|
||||
);
|
||||
assert!(
|
||||
!refs.contains("clawmates/mission-test-bbbbbbbb\n"),
|
||||
"and did not claim the clean branch name"
|
||||
);
|
||||
}
|
||||
|
||||
/// An unreachable remote is a degraded success, not a failure: the patch and
|
||||
/// the local branch both still exist.
|
||||
#[tokio::test]
|
||||
async fn an_unreachable_remote_does_not_lose_the_work() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
std::fs::write(repo.join("work.rs"), "fn kept() {}\n").unwrap();
|
||||
git(&repo, &["add", "."]);
|
||||
git(&repo, &["commit", "--quiet", "-m", "work"]);
|
||||
git(
|
||||
&repo,
|
||||
&["checkout", "-B", "clawmates/mission-test-cccccccc"],
|
||||
);
|
||||
|
||||
let out = mission_delivery::publish_phase_branch(
|
||||
&repo,
|
||||
&tmp.path().join("does-not-exist.git").display().to_string(),
|
||||
"clawmates/mission-test-cccccccc",
|
||||
mission_delivery::Gate::Always,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert!(!out.pushed);
|
||||
assert!(
|
||||
out.error.is_some(),
|
||||
"the reason is recorded for the operator"
|
||||
);
|
||||
|
||||
// The commit is still there locally — nothing was rolled back.
|
||||
let show = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["show", "HEAD:work.rs"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert!(String::from_utf8_lossy(&show.stdout).contains("fn kept()"));
|
||||
}
|
||||
|
||||
/// A later phase must report its own work, not its predecessor's.
|
||||
///
|
||||
/// The capture base is recorded once at clone time. Left there, phase 2 diffs
|
||||
/// against the original clone point and claims phase 1's commits as its own —
|
||||
/// which is exactly what mission `019fc42b` produced: two coding phases, two
|
||||
/// artifacts, and the second one reporting the union of both.
|
||||
#[tokio::test]
|
||||
async fn a_later_phase_reports_only_its_own_work() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase_one) = seed_mission_phase(&pool, mission).await;
|
||||
let phase_two = seed_extra_phase(&pool, mission, 1).await;
|
||||
|
||||
std::fs::write(repo.join("ALPHA.md"), "ALPHA-DELIVERED\n").unwrap();
|
||||
let first = capture(&pool, tmp.path(), mission, phase_one)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
assert_eq!(first.files_changed, 1, "phase one wrote one file");
|
||||
|
||||
std::fs::write(repo.join("BETA.md"), "BETA-DELIVERED\n").unwrap();
|
||||
let second = capture(&pool, tmp.path(), mission, phase_two)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(
|
||||
second.files_changed, 1,
|
||||
"phase two must report only BETA.md, not ALPHA.md as well"
|
||||
);
|
||||
let patch = std::fs::read_to_string(&second.patch_path).unwrap();
|
||||
assert!(patch.contains("BETA-DELIVERED"), "phase two's own work");
|
||||
assert!(
|
||||
!patch.contains("ALPHA-DELIVERED"),
|
||||
"phase one's work must not reappear in phase two's patch"
|
||||
);
|
||||
|
||||
// The branch, unlike the patch, stays cumulative: it is built from HEAD,
|
||||
// so it still carries phase one's commit underneath phase two's.
|
||||
let branch = second.committed.expect("phase two committed").branch;
|
||||
let files = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["ls-tree", "--name-only", "-r", &branch])
|
||||
.output()
|
||||
.unwrap();
|
||||
let listed = String::from_utf8_lossy(&files.stdout);
|
||||
assert!(listed.contains("ALPHA.md"), "branch is cumulative: {listed}");
|
||||
assert!(listed.contains("BETA.md"), "branch is cumulative: {listed}");
|
||||
}
|
||||
|
||||
/// A checkout must stay writable after another user has written to it.
|
||||
///
|
||||
/// The production failure (mission `019fc437`) is a uid split: cm-api runs as
|
||||
/// 65532, the mission runtime container runs as root, and they share one
|
||||
/// checkout. Git's `.git/objects/xx/` fan-out directories inherit the
|
||||
/// ownership of whoever creates them, so the agent committing first locked the
|
||||
/// server out — `git add` returned "insufficient permission for adding an
|
||||
/// object to repository database".
|
||||
///
|
||||
/// A test process cannot become two users, so this asserts the mechanism that
|
||||
/// makes the two-user case work: the clone sets `core.sharedRepository`, and
|
||||
/// objects git writes afterwards are group- and world-writable. Without that
|
||||
/// mode bit the second user is refused regardless of which one arrived first.
|
||||
#[tokio::test]
|
||||
async fn a_checkout_is_writable_by_both_uids_that_share_it() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
let shared = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["config", "core.sharedRepository"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
String::from_utf8_lossy(&shared.stdout).trim(),
|
||||
"0777",
|
||||
"the checkout must be marked shared, or a second uid cannot write objects"
|
||||
);
|
||||
|
||||
// Only directories created *after* the setting can carry its mode, and
|
||||
// only those matter: the clone writes its own objects before any config
|
||||
// exists, but the party that would be blocked by them is the container,
|
||||
// which runs as root and ignores permission bits. The failing direction is
|
||||
// the other one — directories the agent creates later, which the server
|
||||
// must still be able to write into. Snapshot first, then diff.
|
||||
let objects = repo.join(".git/objects");
|
||||
let fanout = |dir: &std::path::Path| -> std::collections::HashSet<String> {
|
||||
std::fs::read_dir(dir)
|
||||
.map(|rd| {
|
||||
rd.filter_map(|e| e.ok())
|
||||
.map(|e| e.file_name().to_string_lossy().into_owned())
|
||||
.filter(|n| n.len() == 2 && n.chars().all(|c| c.is_ascii_hexdigit()))
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default()
|
||||
};
|
||||
let before = fanout(&objects);
|
||||
|
||||
std::fs::write(repo.join("SHARED.md"), "SHARED\n").unwrap();
|
||||
capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
let mut checked = 0;
|
||||
for name in fanout(&objects).difference(&before) {
|
||||
let mode = std::fs::metadata(objects.join(name))
|
||||
.unwrap()
|
||||
.permissions()
|
||||
.mode()
|
||||
& 0o777;
|
||||
assert_eq!(
|
||||
mode & 0o022,
|
||||
0o022,
|
||||
"{name} is {mode:o}; the other uid sharing this checkout could not \
|
||||
write objects into it"
|
||||
);
|
||||
checked += 1;
|
||||
}
|
||||
assert!(checked > 0, "no object directories were created to check");
|
||||
}
|
||||
|
||||
/// Delivery must commit without depending on the checkout's git identity.
|
||||
///
|
||||
/// The server container has no identity of its own (`git config --global
|
||||
/// user.email` exits 1), so `git commit` fails with "Author identity unknown"
|
||||
/// unless one is supplied. Mission `019fc450` lost its first phase that way,
|
||||
/// while earlier missions committed fine — because their agents had happened
|
||||
/// to run `git config user.email` in the checkout first.
|
||||
///
|
||||
/// A test process cannot unset the developer's global git config without
|
||||
/// racing every other test, so this asserts the stronger, deterministic
|
||||
/// property: the pipeline's identity is used even when the checkout already
|
||||
/// has a different one. An identity that overrides existing config is
|
||||
/// necessarily also present when config is absent.
|
||||
#[tokio::test]
|
||||
async fn delivery_commits_under_its_own_identity() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
|
||||
// seed_repo configures "Test <[email protected]>" locally; the base
|
||||
// commit therefore carries it, and the delivery commit must not.
|
||||
std::fs::write(repo.join("IDENTITY_PROBE.md"), "PROBE\n").unwrap();
|
||||
let cap = capture(&pool, tmp.path(), mission, phase)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
let commit = cap.committed.expect("delivery committed");
|
||||
|
||||
let author = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["log", "-1", "--format=%an <%ae>", &commit.sha])
|
||||
.output()
|
||||
.unwrap();
|
||||
let author = String::from_utf8_lossy(&author.stdout).trim().to_string();
|
||||
assert_eq!(
|
||||
author, "Omar Sobh <[email protected]>",
|
||||
"delivery must supply a configured identity, not inherit whatever \
|
||||
the checkout happens to have configured"
|
||||
);
|
||||
|
||||
let base_author = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["log", "-1", "--format=%an", "HEAD~1"])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
String::from_utf8_lossy(&base_author.stdout).trim(),
|
||||
"Test",
|
||||
"the pre-existing local identity is still configured, so the \
|
||||
assertion above proves an override rather than an absence"
|
||||
);
|
||||
}
|
||||
|
||||
/// The commit subject must read as English on both the first pass and a rerun.
|
||||
///
|
||||
/// Mission `019fc4e0` pushed commits titled "clawmates: phase phase work" — the
|
||||
/// iteration marker was interpolated into a slot that already said "phase".
|
||||
/// Cosmetic, but it lands in the operator's git history under their own name.
|
||||
#[tokio::test]
|
||||
async fn commit_subjects_read_correctly_on_first_pass_and_rerun() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
|
||||
for (iteration, expected) in [(0, "clawmates: phase work"), (1, "clawmates: phase work (pass 2)")] {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
let (_, phase) = seed_mission_phase(&pool, mission).await;
|
||||
std::fs::write(repo.join("SUBJECT_PROBE.md"), "PROBE\n").unwrap();
|
||||
|
||||
let commit = cm_api::mission_delivery::commit_phase_work(&repo, mission, phase, iteration)
|
||||
.await
|
||||
.unwrap()
|
||||
.expect("committed");
|
||||
|
||||
let subject = Command::new("git")
|
||||
.arg("-C")
|
||||
.arg(&repo)
|
||||
.args(["log", "-1", "--format=%s", &commit.sha])
|
||||
.output()
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
String::from_utf8_lossy(&subject.stdout).trim(),
|
||||
expected,
|
||||
"iteration {iteration} produced a malformed subject"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// "No test suite" and "could not run the test suite" must not look alike.
|
||||
///
|
||||
/// verify_tests returned Option<bool>, so both produced `None`. That is how a
|
||||
/// runtime image shipped without `cargo` stayed invisible: every on_green_tests
|
||||
/// phase landed on -wip, which reads exactly like a repository that has no
|
||||
/// tests — the conclusion I drew at the time and reported.
|
||||
///
|
||||
/// Both still gate identically, and that part is deliberate: unproven is not a
|
||||
/// pass, whatever the reason. What changes is that the artifact now says which
|
||||
/// of the two happened, so an infrastructure fault is legible as one.
|
||||
#[tokio::test]
|
||||
async fn an_unrunnable_suite_is_distinguishable_from_no_suite() {
|
||||
use cm_api::mission_delivery::{verify_tests, TestOutcome};
|
||||
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mission = Uuid::now_v7();
|
||||
let repo = seed_repo(tmp.path(), mission);
|
||||
|
||||
// No Cargo.toml / package.json / pytest markers: nothing to run.
|
||||
let none = verify_tests(&repo, "clawmates-runtime-does-not-exist").await;
|
||||
assert_eq!(none, TestOutcome::NoSuite);
|
||||
assert_eq!(none.status(), "no_suite");
|
||||
assert_eq!(none.verified(), None, "no suite must not clear the gate");
|
||||
|
||||
// A suite exists, but the container named here does not, so it cannot run.
|
||||
std::fs::write(
|
||||
repo.join("Cargo.toml"),
|
||||
"[package]\nname = \"p\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
|
||||
)
|
||||
.unwrap();
|
||||
let unrunnable = verify_tests(&repo, "clawmates-runtime-does-not-exist").await;
|
||||
assert_eq!(unrunnable.status(), "could_not_run");
|
||||
assert_eq!(
|
||||
unrunnable.verified(),
|
||||
None,
|
||||
"an unrunnable suite must not clear the gate either"
|
||||
);
|
||||
assert!(
|
||||
unrunnable.detail().is_some_and(|d| !d.is_empty()),
|
||||
"an infrastructure fault must carry its reason into the artifact"
|
||||
);
|
||||
assert_ne!(
|
||||
unrunnable.status(),
|
||||
none.status(),
|
||||
"the two must be distinguishable — this is the whole point"
|
||||
);
|
||||
}
|
||||
@@ -556,6 +556,11 @@ pub struct RegisterArtifact<'a> {
|
||||
pub title: Option<&'a str>,
|
||||
pub generated_by_run: Option<Uuid>,
|
||||
pub render_pdf: bool,
|
||||
/// Free-form facts about the artifact (diffstat, branch, gate verdict).
|
||||
/// The column has existed since 0047 and was never written — an artifact
|
||||
/// with no metadata is a path and a kind, which is not enough for a UI to
|
||||
/// say anything useful about it.
|
||||
pub metadata: Option<serde_json::Value>,
|
||||
}
|
||||
|
||||
/// Register an artifact discovered on disk (or produced inline).
|
||||
@@ -566,14 +571,15 @@ pub async fn register_artifact(pool: &PgPool, a: RegisterArtifact<'_>) -> Result
|
||||
let row = sqlx::query(
|
||||
"INSERT INTO mission_artifacts
|
||||
(id, mission_id, phase_id, path, kind, mime, title,
|
||||
generated_by_run, render_pdf_status)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)
|
||||
generated_by_run, render_pdf_status, metadata)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,COALESCE($10, '{}'::jsonb))
|
||||
ON CONFLICT (mission_id, path) DO UPDATE
|
||||
SET kind = EXCLUDED.kind,
|
||||
mime = COALESCE(EXCLUDED.mime, mission_artifacts.mime),
|
||||
title = COALESCE(EXCLUDED.title, mission_artifacts.title),
|
||||
generated_by_run = COALESCE(EXCLUDED.generated_by_run,
|
||||
mission_artifacts.generated_by_run),
|
||||
metadata = COALESCE(EXCLUDED.metadata, mission_artifacts.metadata),
|
||||
updated_at = now()
|
||||
RETURNING id",
|
||||
)
|
||||
@@ -586,6 +592,7 @@ pub async fn register_artifact(pool: &PgPool, a: RegisterArtifact<'_>) -> Result
|
||||
.bind(a.title)
|
||||
.bind(a.generated_by_run)
|
||||
.bind(render_status)
|
||||
.bind(a.metadata.as_ref())
|
||||
.fetch_one(pool)
|
||||
.await?;
|
||||
Ok(row.get("id"))
|
||||
|
||||
@@ -104,3 +104,80 @@ pub async fn set_next_run(
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// What claiming an occurrence found.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum FireClaim {
|
||||
/// Nobody has taken this occurrence. Fire it.
|
||||
Fresh,
|
||||
/// A previous attempt took it and never recorded an outcome — a crash
|
||||
/// between claim and dispatch. Safe to fire again: no completion was ever
|
||||
/// written, so nothing downstream saw a result.
|
||||
Retry,
|
||||
/// Already dispatched (or already failed). Do not fire; just advance the
|
||||
/// clock. This is the branch that makes a scheduled mission cost one
|
||||
/// container instead of one per restart.
|
||||
Settled,
|
||||
}
|
||||
|
||||
/// Take ownership of one occurrence before dispatching it.
|
||||
///
|
||||
/// `scheduled_at` is the occurrence's own timestamp — the `next_run_at` that
|
||||
/// came due — not the wall clock at claim time. That is what makes the claim
|
||||
/// idempotent across restarts: the same occurrence always maps to the same
|
||||
/// row.
|
||||
pub async fn claim_fire(
|
||||
pool: &PgPool,
|
||||
routine_id: Uuid,
|
||||
scheduled_at: OffsetDateTime,
|
||||
) -> Result<FireClaim, DbError> {
|
||||
use sqlx::Row;
|
||||
// Insert-or-look-at-what's-there in one statement, so two schedulers
|
||||
// racing the same occurrence cannot both see "fresh".
|
||||
let row = sqlx::query(
|
||||
"INSERT INTO routine_fires (routine_id, scheduled_at)
|
||||
VALUES ($1, $2)
|
||||
ON CONFLICT (routine_id, scheduled_at) DO UPDATE
|
||||
SET routine_id = routine_fires.routine_id
|
||||
RETURNING status, (xmax = 0) AS inserted",
|
||||
)
|
||||
.bind(routine_id)
|
||||
.bind(scheduled_at)
|
||||
.fetch_one(pool)
|
||||
.await?;
|
||||
|
||||
// `xmax = 0` distinguishes a genuine insert from a no-op update — the
|
||||
// usual Postgres trick, and the reason for the otherwise pointless
|
||||
// self-assignment in DO UPDATE (a bare DO NOTHING returns no row at all).
|
||||
let inserted: bool = row.try_get("inserted").unwrap_or(false);
|
||||
if inserted {
|
||||
return Ok(FireClaim::Fresh);
|
||||
}
|
||||
let status: String = row.try_get("status").unwrap_or_default();
|
||||
Ok(match status.as_str() {
|
||||
"claimed" => FireClaim::Retry,
|
||||
_ => FireClaim::Settled,
|
||||
})
|
||||
}
|
||||
|
||||
/// Record how a dispatched occurrence ended. Called after the work is handed
|
||||
/// off, so a crash before this leaves the row `claimed` and retryable.
|
||||
pub async fn complete_fire(
|
||||
pool: &PgPool,
|
||||
routine_id: Uuid,
|
||||
scheduled_at: OffsetDateTime,
|
||||
error: Option<&str>,
|
||||
) -> Result<(), DbError> {
|
||||
sqlx::query(
|
||||
"UPDATE routine_fires
|
||||
SET status = $3, completed_at = now(), error = $4
|
||||
WHERE routine_id = $1 AND scheduled_at = $2",
|
||||
)
|
||||
.bind(routine_id)
|
||||
.bind(scheduled_at)
|
||||
.bind(if error.is_some() { "failed" } else { "fired" })
|
||||
.bind(error)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -8,6 +8,14 @@ use cm_runtime::Runtime;
|
||||
use sqlx::PgPool;
|
||||
use time::OffsetDateTime;
|
||||
|
||||
/// Most occurrences one tick will dispatch.
|
||||
///
|
||||
/// A backlog — a clock jump, a long outage, or a cron expression that
|
||||
/// accidentally resolves to "every minute" — would otherwise fan out every
|
||||
/// missed occurrence at once. For a topology routine that is one container
|
||||
/// each. The remainder stays due and is picked up by the following tick.
|
||||
const MAX_FIRES_PER_TICK: usize = 25;
|
||||
|
||||
pub use cm_runtime::scheduling::next_occurrence;
|
||||
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
@@ -30,12 +38,58 @@ impl Scheduler {
|
||||
|
||||
/// Fires every due routine once and reschedules it. Returns how many
|
||||
/// fired. Time is a parameter so tests control the clock.
|
||||
///
|
||||
/// Each occurrence is claimed in `routine_fires` before it is dispatched,
|
||||
/// and settled after. That ordering is what makes a firing survive a
|
||||
/// restart: the clock still advances first (a failing action must not
|
||||
/// stall the schedule), but the claim row remembers that the occurrence
|
||||
/// was owed, so a crash between reschedule and dispatch is retried instead
|
||||
/// of silently skipped — and an occurrence already dispatched is never
|
||||
/// dispatched twice.
|
||||
pub async fn tick(&self, now: OffsetDateTime) -> Result<usize, ScheduleError> {
|
||||
let due = routines::claim_due(&self.pool, now).await?;
|
||||
for routine in &due {
|
||||
// Reschedule first: a firing failure must not stall the clock. A
|
||||
// one-shot routine (Scheduled mode, a specific date/time) fires once
|
||||
// and never reschedules.
|
||||
// Cap the fan-out. A backlog (clock jump, long outage, a cron that
|
||||
// resolves to "every minute" by accident) would otherwise dispatch
|
||||
// every missed occurrence in one tick — for topology routines that is
|
||||
// one container each.
|
||||
let mut fired = 0usize;
|
||||
for routine in due.iter().take(MAX_FIRES_PER_TICK) {
|
||||
// The occurrence's own timestamp identifies the slot. `claim_due`
|
||||
// does not clear `next_run_at`, so this is still the value that
|
||||
// came due.
|
||||
let slot = routine.next_run_at.unwrap_or(now);
|
||||
match routines::claim_fire(&self.pool, routine.id, slot).await {
|
||||
Ok(routines::FireClaim::Fresh) | Ok(routines::FireClaim::Retry) => {}
|
||||
Ok(routines::FireClaim::Settled) => {
|
||||
// Already dispatched by a previous tick or replica. Let the
|
||||
// clock advance below, but do not run the work again.
|
||||
let one_shot = routine
|
||||
.action
|
||||
.get("one_shot")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
let next = if one_shot {
|
||||
None
|
||||
} else {
|
||||
next_occurrence(&routine.schedule_cron, now).ok()
|
||||
};
|
||||
let _ = routines::set_next_run(&self.pool, routine.id, next).await;
|
||||
continue;
|
||||
}
|
||||
Err(e) => {
|
||||
// Could not take the slot. Leaving `next_run_at` untouched
|
||||
// means the occurrence is still due and the next tick tries
|
||||
// again — the safe direction.
|
||||
eprintln!("scheduler: claiming fire for routine {}: {e}", routine.id);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
fired += 1;
|
||||
|
||||
// Reschedule before dispatching: a firing failure must not stall
|
||||
// the clock. The claim above is what keeps this from losing the
|
||||
// occurrence outright. A one-shot routine (Scheduled mode, a
|
||||
// specific date/time) fires once and never reschedules.
|
||||
let one_shot = routine
|
||||
.action
|
||||
.get("one_shot")
|
||||
@@ -49,8 +103,28 @@ impl Scheduler {
|
||||
routines::set_next_run(&self.pool, routine.id, next).await?;
|
||||
|
||||
let agent_id = cm_domain::AgentId::from(routine.agent_id);
|
||||
let Ok(agent) = agents::get(&self.pool, agent_id).await else {
|
||||
continue; // deleted agent: routine is orphaned
|
||||
let agent = match agents::get(&self.pool, agent_id).await {
|
||||
Ok(a) => a,
|
||||
Err(e) => {
|
||||
// Orphaned routine (deleted agent, or a row we cannot
|
||||
// read). Settle the slot rather than leaving it `claimed`:
|
||||
// an unsettled claim looks like a crash mid-fire, so every
|
||||
// tick would re-claim the same routine forever and the
|
||||
// table would grow one stuck row per occurrence.
|
||||
eprintln!(
|
||||
"scheduler: routine {} references agent {agent_id} which could not be \
|
||||
read ({e}) — settling the occurrence as failed",
|
||||
routine.id
|
||||
);
|
||||
let _ = routines::complete_fire(
|
||||
&self.pool,
|
||||
routine.id,
|
||||
slot,
|
||||
Some(&format!("agent {agent_id} unreadable: {e}")),
|
||||
)
|
||||
.await;
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
// Topology routine: fire the whole team's stored topology as one
|
||||
@@ -87,11 +161,27 @@ impl Scheduler {
|
||||
};
|
||||
let _ = routine_runs::finish(&self.pool, rid, status, err.as_deref()).await;
|
||||
}
|
||||
let topo_err = res.as_ref().err().cloned();
|
||||
let _ = routines::complete_fire(&self.pool, routine.id, slot, topo_err.as_deref())
|
||||
.await;
|
||||
continue;
|
||||
}
|
||||
|
||||
let message = routine.action["message"].as_str().unwrap_or_default();
|
||||
if message.is_empty() {
|
||||
// Neither a topology nor a message action: there is nothing to
|
||||
// dispatch. Settle it so the slot is not mistaken for a crash.
|
||||
eprintln!(
|
||||
"scheduler: routine {} has no `topology` or `message` action — nothing to fire",
|
||||
routine.id
|
||||
);
|
||||
let _ = routines::complete_fire(
|
||||
&self.pool,
|
||||
routine.id,
|
||||
slot,
|
||||
Some("routine action has neither `topology` nor `message`"),
|
||||
)
|
||||
.await;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -108,15 +198,26 @@ impl Scheduler {
|
||||
// Journal the firing for the dashboard routines panel.
|
||||
let run_id = routine_runs::start(&self.pool, routine.id).await.ok();
|
||||
let res = self.runtime.send_message(session.id, message).await;
|
||||
let send_err = res.as_ref().err().map(|e| format!("{e}"));
|
||||
if let Some(rid) = run_id {
|
||||
let (status, err) = match &res {
|
||||
Ok(_) => ("ok", None),
|
||||
Err(e) => ("error", Some(format!("{e}"))),
|
||||
Err(_) => ("error", send_err.clone()),
|
||||
};
|
||||
let _ = routine_runs::finish(&self.pool, rid, status, err.as_deref()).await;
|
||||
}
|
||||
let _ =
|
||||
routines::complete_fire(&self.pool, routine.id, slot, send_err.as_deref()).await;
|
||||
}
|
||||
Ok(due.len())
|
||||
if due.len() > MAX_FIRES_PER_TICK {
|
||||
eprintln!(
|
||||
"scheduler: {} routines were due; fired {MAX_FIRES_PER_TICK} this tick, \
|
||||
{} deferred to the next one",
|
||||
due.len(),
|
||||
due.len() - MAX_FIRES_PER_TICK,
|
||||
);
|
||||
}
|
||||
Ok(fired)
|
||||
}
|
||||
|
||||
/// The production loop: ticks on an interval with the real clock.
|
||||
@@ -125,7 +226,12 @@ impl Scheduler {
|
||||
let mut tick = tokio::time::interval(interval);
|
||||
loop {
|
||||
tick.tick().await;
|
||||
let _ = self.tick(OffsetDateTime::now_utc()).await;
|
||||
// A persistently failing tick used to be invisible: the result
|
||||
// was discarded, so a scheduler that stopped firing looked
|
||||
// exactly like one with nothing to do.
|
||||
if let Err(e) = self.tick(OffsetDateTime::now_utc()).await {
|
||||
eprintln!("scheduler: tick failed: {e}");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -196,3 +196,113 @@ async fn paused_routines_do_not_fire() {
|
||||
|
||||
assert_eq!(scheduler.tick(now).await.unwrap(), 0);
|
||||
}
|
||||
|
||||
/// The crash window this exists to close.
|
||||
///
|
||||
/// The scheduler advances `next_run_at` before dispatching, so a process that
|
||||
/// dies between the two used to drop the occurrence with nothing anywhere
|
||||
/// recording that it was owed. The claim row is what makes that recoverable:
|
||||
/// a slot left `claimed` is a crash mid-fire, and the next tick retries it.
|
||||
#[tokio::test]
|
||||
async fn an_occurrence_claimed_but_never_settled_is_retried() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let agent = seeded(&pool).await;
|
||||
let now = time::OffsetDateTime::now_utc();
|
||||
let slot = now - time::Duration::minutes(1);
|
||||
|
||||
let routine = cm_db::repo::routines::create(
|
||||
&pool,
|
||||
agent.id,
|
||||
"Nightly sweep",
|
||||
"* * * * *",
|
||||
json!({"message": "sweep"}),
|
||||
slot,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
use cm_db::repo::routines::FireClaim;
|
||||
|
||||
// First claim: nobody has this occurrence.
|
||||
assert_eq!(
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, slot)
|
||||
.await
|
||||
.unwrap(),
|
||||
FireClaim::Fresh
|
||||
);
|
||||
|
||||
// Simulate a crash: claimed, never settled. The next attempt must be told
|
||||
// it is safe to retry — no completion was ever recorded, so nothing
|
||||
// downstream saw a result.
|
||||
assert_eq!(
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, slot)
|
||||
.await
|
||||
.unwrap(),
|
||||
FireClaim::Retry
|
||||
);
|
||||
|
||||
// Once settled, the same occurrence must never fire again — this is the
|
||||
// branch that keeps a scheduled mission to one container across restarts.
|
||||
cm_db::repo::routines::complete_fire(&pool, routine.id, slot, None)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, slot)
|
||||
.await
|
||||
.unwrap(),
|
||||
FireClaim::Settled
|
||||
);
|
||||
|
||||
// A *different* occurrence of the same routine is independent.
|
||||
let later = slot + time::Duration::minutes(1);
|
||||
assert_eq!(
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, later)
|
||||
.await
|
||||
.unwrap(),
|
||||
FireClaim::Fresh
|
||||
);
|
||||
}
|
||||
|
||||
/// A failed dispatch settles the slot rather than leaving it retryable.
|
||||
/// Retrying a persistently failing action every tick is how a broken routine
|
||||
/// becomes a denial-of-service against the thing it talks to.
|
||||
#[tokio::test]
|
||||
async fn a_failed_dispatch_is_terminal_for_that_occurrence() {
|
||||
let pool = cm_testkit::test_pool().await;
|
||||
let agent = seeded(&pool).await;
|
||||
let slot = time::OffsetDateTime::now_utc() - time::Duration::minutes(1);
|
||||
let routine = cm_db::repo::routines::create(
|
||||
&pool,
|
||||
agent.id,
|
||||
"Flaky",
|
||||
"* * * * *",
|
||||
json!({"message": "x"}),
|
||||
slot,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
use cm_db::repo::routines::FireClaim;
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, slot)
|
||||
.await
|
||||
.unwrap();
|
||||
cm_db::repo::routines::complete_fire(&pool, routine.id, slot, Some("gateway timed out"))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(
|
||||
cm_db::repo::routines::claim_fire(&pool, routine.id, slot)
|
||||
.await
|
||||
.unwrap(),
|
||||
FireClaim::Settled,
|
||||
"a failed occurrence must not be retried forever"
|
||||
);
|
||||
|
||||
let err: Option<String> =
|
||||
sqlx::query_scalar("SELECT error FROM routine_fires WHERE routine_id = $1")
|
||||
.bind(routine.id)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(err.as_deref(), Some("gateway timed out"));
|
||||
}
|
||||
|
||||
@@ -56,6 +56,62 @@ RUN set -eux; \
|
||||
/usr/local/bin/tea --version | head -1; \
|
||||
/usr/local/bin/gitea-mcp --version 2>&1 | head -1 || true
|
||||
|
||||
# ── Mission toolchain ────────────────────────────────────────────────
|
||||
# Agents and the phase evaluator both run project checks inside this image:
|
||||
# `templates/teams/rust_sdlc.toml` tells the coder to run `cargo test`, the
|
||||
# `done_when` evaluator runs the project's own suite to verify a claim rather
|
||||
# than believe it, and `security_scan.rs` shells out to four scanners.
|
||||
#
|
||||
# None of it was here. A Rust mission's `cargo build` failed, and every
|
||||
# security scan produced four `<tool>:tool_error` task rows instead of
|
||||
# findings — a scan that scanned nothing and reported cleanly.
|
||||
#
|
||||
# Measured cost on top of the 864 MB base: scanners +350 MB, Rust +1.23 GB,
|
||||
# semgrep +680 MB. This image is NOT in `AGENT_IMAGES`, so it never ships to
|
||||
# fleet nodes — only gw-04 holds it, against 112 GB free. The real cost is a
|
||||
# slower `docker save | load` on each runtime rebuild, which is worth paying
|
||||
# for missions that can actually compile and test what they write.
|
||||
#
|
||||
# Ordered cheapest-and-most-stable first so a version bump lower down doesn't
|
||||
# invalidate the expensive layers above it.
|
||||
ARG GITLEAKS_VERSION=8.30.1
|
||||
ARG TRIVY_VERSION=0.72.0
|
||||
RUN set -eux; \
|
||||
arch="$(dpkg --print-architecture)"; \
|
||||
case "$arch" in \
|
||||
amd64) gl_arch=x64; tv_arch=64bit ;; \
|
||||
arm64) gl_arch=arm64; tv_arch=ARM64 ;; \
|
||||
*) echo "unsupported arch: $arch"; exit 1 ;; \
|
||||
esac; \
|
||||
curl -fsSL "https://github.com/gitleaks/gitleaks/releases/download/v${GITLEAKS_VERSION}/gitleaks_${GITLEAKS_VERSION}_linux_${gl_arch}.tar.gz" \
|
||||
| tar -xz -C /usr/local/bin gitleaks; \
|
||||
curl -fsSL "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-${tv_arch}.tar.gz" \
|
||||
| tar -xz -C /usr/local/bin trivy; \
|
||||
gitleaks version; trivy --version | head -1
|
||||
|
||||
# semgrep in its own venv so its pinned dependency tree can never collide with
|
||||
# anything else installed here.
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
python3 python3-pip python3-venv \
|
||||
&& python3 -m venv /opt/semgrep \
|
||||
&& /opt/semgrep/bin/pip install --no-cache-dir semgrep \
|
||||
&& ln -s /opt/semgrep/bin/semgrep /usr/local/bin/semgrep \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& semgrep --version
|
||||
|
||||
# Rust last: the largest layer and the one most likely to be bumped, so it
|
||||
# sits where a rebuild costs the least cache.
|
||||
ENV RUSTUP_HOME=/usr/local/rustup \
|
||||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:$PATH
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
gcc libc6-dev pkg-config libssl-dev make \
|
||||
&& curl -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable \
|
||||
&& cargo install cargo-audit --locked --no-default-features \
|
||||
&& rm -rf /var/lib/apt/lists/* "$CARGO_HOME/registry" "$CARGO_HOME/git" \
|
||||
&& chmod -R a+rX "$RUSTUP_HOME" "$CARGO_HOME" \
|
||||
&& rustc --version && cargo audit --version
|
||||
|
||||
COPY --from=build /usr/local/bin/zeroclaw /usr/local/bin/zeroclaw
|
||||
ENV HOME=/zeroclaw-data \
|
||||
ZEROCLAW_WORKSPACE=/zeroclaw-data/workspace \
|
||||
|
||||
@@ -138,7 +138,14 @@ excluded_tools = ["shell", "file_read", "file_write", "http_request", "browser",
|
||||
# burn tokens dumping code inline, this list drifted back to pre-0.8 names.
|
||||
[risk_profiles.coding_readwrite]
|
||||
level = "full"
|
||||
allowed_tools = ["file_read", "file_edit", "content_search", "glob_search", "git_operations", "shell"]
|
||||
# `file_write` creates and overwrites; `file_edit` only replaces an exact
|
||||
# existing string and rejects an empty `old_string`, so without file_write an
|
||||
# agent literally cannot create a new file. Observed on mission 019fc372: the
|
||||
# agent burned its turn reasoning about how to make file_edit create a file
|
||||
# ("the tool rejected empty old_string... the shell is restricted") before
|
||||
# working around it through `shell`. The comment below has claimed file_write
|
||||
# was here since the profile was written; the list never had it.
|
||||
allowed_tools = ["file_read", "file_write", "file_edit", "content_search", "glob_search", "git_operations", "shell"]
|
||||
excluded_tools = ["http_request", "browser", "composio"]
|
||||
|
||||
# Read-only research profile (scout/researcher/reviewer/planner roles).
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
-- One row per (routine, scheduled occurrence), so a firing is idempotent.
|
||||
--
|
||||
-- The scheduler advanced `next_run_at` *before* dispatching the work
|
||||
-- (`cm-scheduler/src/lib.rs`, "Reschedule first: a firing failure must not
|
||||
-- stall the clock"). That trade is defensible on its own terms, but it has no
|
||||
-- record of the attempt: a crash between the reschedule and the dispatch drops
|
||||
-- the occurrence with nothing anywhere to say it was owed. For a message
|
||||
-- routine that costs a lost reply. For a scheduled *mission* it costs a
|
||||
-- container, a repo checkout, and real money — which is why this lands before
|
||||
-- mission scheduling does.
|
||||
--
|
||||
-- `scheduled_at` is the occurrence's own timestamp, not the claim time, so the
|
||||
-- primary key is what makes a retry idempotent: re-claiming the same slot
|
||||
-- finds the existing row instead of firing twice.
|
||||
CREATE TABLE routine_fires (
|
||||
routine_id UUID NOT NULL REFERENCES routines (id) ON DELETE CASCADE,
|
||||
-- The occurrence this row accounts for (the `next_run_at` that came due).
|
||||
scheduled_at TIMESTAMPTZ NOT NULL,
|
||||
claimed_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
completed_at TIMESTAMPTZ,
|
||||
-- `claimed` — taken, dispatch not yet known to have finished. A row stuck
|
||||
-- here is a crash mid-fire and is safe to retry.
|
||||
-- `fired` — dispatch completed; never fire this slot again.
|
||||
-- `failed` — dispatch returned an error. Terminal: the clock has already
|
||||
-- moved on, and silently retrying a failing action every tick
|
||||
-- is how a broken routine becomes a denial-of-service.
|
||||
status TEXT NOT NULL DEFAULT 'claimed'
|
||||
CHECK (status IN ('claimed', 'fired', 'failed')),
|
||||
error TEXT,
|
||||
PRIMARY KEY (routine_id, scheduled_at)
|
||||
);
|
||||
|
||||
-- The reaper's query: rows still `claimed` past a grace period are crashes.
|
||||
CREATE INDEX routine_fires_stuck_idx
|
||||
ON routine_fires (status, claimed_at)
|
||||
WHERE status = 'claimed';
|
||||
@@ -0,0 +1,69 @@
|
||||
-- The seen-set for continuous missions.
|
||||
--
|
||||
-- Every "continuous X" mission has the same failure mode: it runs again and
|
||||
-- redoes work it already did. Research resurfaces papers it already read; a
|
||||
-- security scan re-reports findings already triaged. Orchestration does not
|
||||
-- fix that — a record of what has already been covered does.
|
||||
--
|
||||
-- This repository already tried continuous research once. Migrations 0030-0044
|
||||
-- built `research_topics`, `research_outcomes` and `loops`; 0053 dropped them
|
||||
-- all. `research_topics` carried a status lifecycle but no seen-set, so it
|
||||
-- could run forever and never know what it had covered. That is the gap this
|
||||
-- table exists to close, and it is the reason it lands before any scheduling.
|
||||
--
|
||||
-- Authoritative here rather than in the runtime's memory: ZeroClaw memory is
|
||||
-- scoped per agent, and mission agents are ephemeral `claw_<uuid>` aliases
|
||||
-- minted per mission (measured: ~100 of them already). A seen-set that
|
||||
-- disappears with the agent that wrote it is not a seen-set.
|
||||
CREATE TABLE corpus_items (
|
||||
id UUID PRIMARY KEY,
|
||||
workspace_id UUID NOT NULL REFERENCES workspaces (id) ON DELETE CASCADE,
|
||||
-- Which corpus this belongs to, e.g. 'valhalla-vault'. A workspace can
|
||||
-- track several (a vault, a findings ledger, a paper collection).
|
||||
corpus_id TEXT NOT NULL,
|
||||
|
||||
-- 'note' = something already in the corpus (a vault file). Establishes
|
||||
-- coverage: what has this vault already got?
|
||||
-- 'source' = an external thing a mission consumed (a paper, an advisory).
|
||||
-- This is the dedupe key that stops re-reading.
|
||||
--
|
||||
-- Both are needed and they answer different questions. Measured against
|
||||
-- the real vault: 416 notes, and ZERO carry an arxiv/doi/url key — so an
|
||||
-- ingester keyed only on external identity would index nothing at all.
|
||||
kind TEXT NOT NULL CHECK (kind IN ('note', 'source')),
|
||||
|
||||
-- Stable identity within the corpus. For notes, 'note:<vault-relative
|
||||
-- path>'; for sources, a natural id like 'arxiv:2401.12345', 'doi:10...'
|
||||
-- or 'url:<sha256>'. Uniqueness is on this, which is what makes
|
||||
-- re-ingestion idempotent.
|
||||
source_id TEXT NOT NULL,
|
||||
|
||||
title TEXT,
|
||||
-- Vault-relative path for notes; NULL for external sources.
|
||||
path TEXT,
|
||||
url TEXT,
|
||||
|
||||
-- SHA-256 of the content at last sight. Lets a re-index distinguish
|
||||
-- "unchanged" from "edited" without diffing, so an unchanged vault is a
|
||||
-- genuine no-op rather than 416 pointless updates.
|
||||
content_hash TEXT NOT NULL,
|
||||
|
||||
first_seen_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
last_seen_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
-- Which mission first recorded this. NULL for the initial vault index,
|
||||
-- which is derived from files nobody's mission wrote.
|
||||
mission_id UUID REFERENCES missions (id) ON DELETE SET NULL,
|
||||
|
||||
UNIQUE (workspace_id, corpus_id, source_id)
|
||||
);
|
||||
|
||||
-- The hot query is "have I seen this?", which the UNIQUE index already covers.
|
||||
-- This one serves "what does this corpus contain?" for briefing assembly.
|
||||
CREATE INDEX corpus_items_corpus_idx
|
||||
ON corpus_items (workspace_id, corpus_id, kind, last_seen_at DESC);
|
||||
|
||||
-- "What did this mission add?" — the verification predicate for a continuous
|
||||
-- run is that it contributed at least one NEW source.
|
||||
CREATE INDEX corpus_items_mission_idx
|
||||
ON corpus_items (mission_id)
|
||||
WHERE mission_id IS NOT NULL;
|
||||
+38
-6
@@ -32,19 +32,51 @@ TAG=${TAG:-latest}
|
||||
SHA=$(git rev-parse --short HEAD 2>/dev/null || echo manual)
|
||||
AGENT_IMAGES=(agent-base agent-browser agent-terminal)
|
||||
|
||||
load() { ssh "$BUILD_HOST" "docker save $1" | ssh "$2" "docker load"; }
|
||||
# Stream an image between two remote hosts. The tar crosses two SSH
|
||||
# connections spliced through this workstation, so a stall on either side
|
||||
# truncates it — that surfaces as `unexpected EOF` from `docker load`, which
|
||||
# is a genuine failure and was previously indistinguishable from success
|
||||
# because nothing checked afterwards. Compress (these images are mostly
|
||||
# filesystem, and less bytes is less exposure to a stall) and set pipefail so
|
||||
# a failed `save` cannot be masked by a `load` that exits 0 on a short stream.
|
||||
load() {
|
||||
( set -o pipefail
|
||||
ssh "$BUILD_HOST" "docker save $1 | gzip -1" | ssh "$2" "gunzip | docker load" )
|
||||
}
|
||||
|
||||
# Load only if the target lacks the exact image (skips re-transferring unchanged
|
||||
# multi-hundred-MB agent images to every node on each code deploy).
|
||||
#
|
||||
# Verifies by image ID afterwards rather than trusting the exit status: a
|
||||
# truncated stream can still leave a partially-populated image, and shipping a
|
||||
# corrupt agent image to every fleet node is worse than failing the deploy.
|
||||
# One retry, because the observed failure is a transient stream stall.
|
||||
#
|
||||
# Identity is the image's `Created` stamp, NOT its `Id`. A BuildKit image on
|
||||
# the build host carries attestation manifests that `docker save | docker load`
|
||||
# does not reproduce, so the same build legitimately arrives with a different
|
||||
# Id and a different reported Size — comparing Ids fails every transfer of a
|
||||
# correctly-shipped image. `Created` comes from the config blob, survives the
|
||||
# round trip, and is what actually answers "is the new build here".
|
||||
load_if_changed() {
|
||||
local lid rid
|
||||
lid=$(ssh "$BUILD_HOST" "docker image inspect -f '{{.Id}}' $1 2>/dev/null" || true)
|
||||
rid=$(ssh "$2" "docker image inspect -f '{{.Id}}' $1 2>/dev/null" || true)
|
||||
if [ -n "$lid" ] && [ "$lid" = "$rid" ]; then
|
||||
local lts rts attempt
|
||||
lts=$(ssh "$BUILD_HOST" "docker image inspect -f '{{.Created}}' $1 2>/dev/null" || true)
|
||||
rts=$(ssh "$2" "docker image inspect -f '{{.Created}}' $1 2>/dev/null" || true)
|
||||
if [ -n "$lts" ] && [ "$lts" = "$rts" ]; then
|
||||
echo " (unchanged — skip)"
|
||||
return 0
|
||||
fi
|
||||
load "$1" "$2"
|
||||
for attempt in 1 2; do
|
||||
load "$1" "$2" || echo " (transfer attempt $attempt failed)"
|
||||
rts=$(ssh "$2" "docker image inspect -f '{{.Created}}' $1 2>/dev/null" || true)
|
||||
if [ -n "$lts" ] && [ "$lts" = "$rts" ]; then
|
||||
[ "$attempt" -gt 1 ] && echo " (recovered on attempt $attempt)"
|
||||
return 0
|
||||
fi
|
||||
echo " (build stamp mismatch after attempt $attempt — retrying)" >&2
|
||||
done
|
||||
echo " ✗ $1 did not land on $2 (wanted $lts, got ${rts:-nothing})" >&2
|
||||
return 1
|
||||
}
|
||||
|
||||
echo "→ sync to $BUILD_HOST"
|
||||
|
||||
Reference in New Issue
Block a user