@@ -1,4 +1,4 @@
-# Native OpenTUI artifacts that match opentui-rust's bindings, in the shared directory that
-# native-hardening's abi-artifacts.py keeps at opentui-rust's pin. A value set in the shell wins.
+# Native OpenTUI artifacts whose opentui.h matches the bindings at the client's OpenTUI `rev`, in the shared
+# directory that native-hardening's abi-artifacts.py fills from that `rev`. A value set in the shell wins.
 [env]
 OPENTUI_LIB_DIR = { value = "/home/simon/.cache/opentui-native/x86_64-linux", force = false }
@@ -29,8 +29,9 @@ opencode-tui = { path = "crates/tui" }
 opencode-ui = { path = "crates/ui" }
 opencode-util = { path = "crates/util" }
 
-# The local opentui-rust checkout on main; see README.md for the native library.
-opentui = { path = "/home/simon/src/opentui-rust/crates/opentui", features = ["static", "tokio", "tree-sitter"] }
+# OpenTUI's Rust crates (`packages/rust` of anomalyco/opentui), pinned by commit. The checkout has no native library;
+# see README.md.
+opentui = { git = "https://github.com/anomalyco/opentui", rev = "ee25e46b1d1615950275688147464fe70a924069", features = ["static", "tokio", "tree-sitter"] }
 
 # Expected third-party crates, declared once so steps rarely edit manifests. A crate takes one with
 # `name.workspace = true` and adds features with `features = [...]`.
 
@@ -18,9 +18,6 @@ const SECTIONS: [&str; 2] = ["[tests]", "[optional]"];
 
 /// OpenTUI's packages, first-party when they come from where the workspace takes OpenTUI.
 const OPENTUI: [&str; 2] = ["opentui", "opentui-sys"];
-/// `None`: the opentui-rust checkout the workspace's `opentui` path dependency is in. When the client pins OpenTUI by
-/// git `rev` (O-63), this becomes `Some("git+https://github.com/anomalyco/opentui")`.
-const OPENTUI_GIT: Option<&str> = None;
 
 type Graph = BTreeMap<String, BTreeSet<&'static str>>;
 
@@ -145,20 +142,21 @@ fn graph(manifest: &Path, metadata: &Value, selection: &[&str]) -> Graph {
     graph
 }
 
-/// The package ID prefix of OpenTUI's packages: the git repository, or the root of the checkout the workspace's
-/// `opentui` path dependency is in (its `crates/opentui`, two levels down).
+/// The package ID prefix of OpenTUI's packages, from the workspace's `opentui` dependency: its git source and `rev`,
+/// or, for a path, the directory above its `crates/opentui` (an OpenTUI worktree's `packages/rust`).
 fn opentui_source(metadata: &Value) -> String {
-    if let Some(url) = OPENTUI_GIT {
-        return format!("{url}?");
-    }
-    let path = metadata["packages"]
+    let dep = metadata["packages"]
         .as_array()
         .unwrap()
         .iter()
         .flat_map(|p| p["dependencies"].as_array().unwrap())
-        .find_map(|dep| (dep["name"] == "opentui").then(|| dep["path"].as_str()).flatten())
-        .expect("a workspace member takes opentui by path");
-    let root = Path::new(path).parent().and_then(Path::parent).expect("opentui is at <checkout>/crates/opentui");
+        .find(|dep| dep["name"] == "opentui")
+        .expect("a workspace member takes opentui");
+    if let Some(source) = dep["source"].as_str() {
+        return format!("{source}#");
+    }
+    let path = dep["path"].as_str().expect("opentui comes from git or a path");
+    let root = Path::new(path).parent().and_then(Path::parent).expect("opentui is at <root>/crates/opentui");
     format!("path+file://{}/", root.display())
 }