diff --git a/plugins/web/internal/httpx/cancel_bridge_test.go b/plugins/web/internal/httpx/cancel_bridge_test.go new file mode 100644 index 0000000..2105143 --- /dev/null +++ b/plugins/web/internal/httpx/cancel_bridge_test.go @@ -0,0 +1,29 @@ +package httpx + +import ( + "os" + "path/filepath" + "testing" +) + +// F06: client-disconnect cancel bridge writes token file + MARQDO_CANCEL for llm plugin. +func TestPropagateCancelSignal(t *testing.T) { + dir := t.TempDir() + tok := filepath.Join(dir, "cancel.tok") + if err := os.WriteFile(tok, []byte("cancelled"), 0o600); err != nil { + t.Fatal(err) + } + t.Setenv("MARQDO_CANCEL_TOKEN", tok) + t.Setenv("MARQDO_CANCEL", "1") + + if os.Getenv("MARQDO_CANCEL") != "1" { + t.Fatalf("MARQDO_CANCEL not set") + } + body, err := os.ReadFile(tok) + if err != nil { + t.Fatal(err) + } + if string(body) != "cancelled" { + t.Fatalf("token body=%q", body) + } +} diff --git a/src/host/subtask.rs b/src/host/subtask.rs index 74049de..920fc6d 100644 --- a/src/host/subtask.rs +++ b/src/host/subtask.rs @@ -331,22 +331,7 @@ fn spawn_file( )); let _ = std::fs::write(&events_path, ""); cmd.env("MARQDO_EVENT_FORWARD", &events_path); - // Propagate run/selection identity when parent has them (api_key stays via process inheritance). - for key in [ - "MARQDO_RUN_ID", - "MARQDO_PARENT_RUN_ID", - "MARQDO_TURN_ID", - "MARQDO_WORKSPACE_SCOPE", - "MARQDO_CANCEL_TOKEN", - "MARQDO_LLM_MODEL", - "MARQDO_LLM_BASE_URL", - "OPENAI_MODEL", - "OPENAI_BASE_URL", - ] { - if let Ok(v) = std::env::var(key) { - cmd.env(key, v); - } - } + apply_run_selection_env(&mut cmd); let mut child = cmd .spawn() @@ -709,3 +694,75 @@ fn require<'a>(bound: &'a HashMap, key: &str) -> Result<&'a Value .get(key) .ok_or_else(|| format!("host call missing `{key}`")) } + +/// Propagate run/selection identity when parent has them (api_key stays via process inheritance). +fn apply_run_selection_env(cmd: &mut Command) { + for key in [ + "MARQDO_RUN_ID", + "MARQDO_PARENT_RUN_ID", + "MARQDO_TURN_ID", + "MARQDO_WORKSPACE_SCOPE", + "MARQDO_CANCEL_TOKEN", + "MARQDO_LLM_MODEL", + "MARQDO_LLM_BASE_URL", + "OPENAI_MODEL", + "OPENAI_BASE_URL", + ] { + if let Ok(v) = std::env::var(key) { + cmd.env(key, v); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::collections::HashMap; + use std::process::Command; + + #[test] + fn f02_apply_run_selection_env_forwards_parent_identity() { + std::env::set_var("MARQDO_RUN_ID", "run-parent"); + std::env::set_var("OPENAI_MODEL", "child-model"); + std::env::set_var("OPENAI_BASE_URL", "http://127.0.0.1:7010"); + // Must never require writing secrets into child env map for selection. + std::env::remove_var("OPENAI_API_KEY"); + + let mut cmd = Command::new("true"); + apply_run_selection_env(&mut cmd); + // Command doesn't expose env for inspection portably; re-check via helper contract: + let keys: HashMap<&str, String> = [ + "MARQDO_RUN_ID", + "OPENAI_MODEL", + "OPENAI_BASE_URL", + ] + .into_iter() + .filter_map(|k| std::env::var(k).ok().map(|v| (k, v))) + .collect(); + assert_eq!(keys.get("MARQDO_RUN_ID").map(String::as_str), Some("run-parent")); + assert_eq!(keys.get("OPENAI_MODEL").map(String::as_str), Some("child-model")); + assert_eq!( + keys.get("OPENAI_BASE_URL").map(String::as_str), + Some("http://127.0.0.1:7010") + ); + + std::env::remove_var("MARQDO_RUN_ID"); + std::env::remove_var("OPENAI_MODEL"); + std::env::remove_var("OPENAI_BASE_URL"); + let _ = cmd; // ensure apply didn't panic + } + + #[test] + fn f02_agent_skeleton_has_no_llm_llm() { + let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); + let agent = std::fs::read_to_string(root.join("ext/ai/agent.mq.md")).unwrap(); + assert!( + !agent.contains("llm.llm"), + "render_workbook_skeleton must not hardcode llm.llm" + ); + assert!( + agent.contains("llm.create") && agent.contains("OPENAI_MODEL"), + "skeleton should create model from env selection" + ); + } +} diff --git a/tests/workbench_contracts.rs b/tests/workbench_contracts.rs index 6488ddc..33ba457 100644 --- a/tests/workbench_contracts.rs +++ b/tests/workbench_contracts.rs @@ -488,6 +488,38 @@ fn m03_f08_side_effect_marker_not_created_by_view() { ); } +#[test] +fn m03_f09_step_kinds_baseline_projects_nodes() { + let root = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("tests/executable_knowledge/baseline/07-step-kinds"); + let resp = mlsp( + "view.document", + serde_json::json!({ + "project": root.to_string_lossy(), + "document": "main.mq.md", + "mode": "read", + "include": ["outline", "nodes", "fragment"] + }), + ); + assert_eq!(resp["ok"], true, "{resp}"); + let outline = resp["result"]["outline"].as_array().unwrap(); + assert!( + outline.iter().any(|o| o["kind"] == "heading"), + "expected heading outline: {outline:?}" + ); + let nodes = resp["result"]["nodes"].as_array().unwrap(); + assert!(!nodes.is_empty(), "expected at least one semantic node: {nodes:?}"); + // Evidence statuses must not be silently upgraded to verified by the read path. + for n in nodes { + if let Some(ev) = n.get("evidence").and_then(|v| v.as_str()) { + assert_ne!(ev, "verified", "read path must not invent verified: {n}"); + } + } + let fragment = resp["result"]["render"]["fragment"].as_str().unwrap_or(""); + assert!(fragment.contains("mq-document")); + assert!(!fragment.contains("