Fix: pin home-rooted check to one layout so leftover user dirs cannot stale a project install

Inferred scope walked both Pi paths. A current ~/.pi/skills copy next to a leftover ~/.pi/agent/skills without impeccable still hashed as outdated. Project scope on that fallback hashes only the project layout.

Written with AI assistance (Cursor Grok 4.6).

Co-authored-by: Cursor <cursoragent@cursor.com>

crates/live/src/live_accept.rs

@@ -1093,26 +1093,12 @@ fn extract_inner_by_attr(text: &str, attr: &str) -> Option<String> {
     None
 }
 
-/// Drop leading and trailing blank lines while keeping a single empty line
-/// when the inner text is only whitespace.
-fn trim_surrounding_blank_lines(lines: Vec<String>) -> Vec<String> {
-    let mut start = 0usize;
-    let mut end = lines.len();
-    while end - start > 1 && trim(&lines[start]).is_empty() {
-        start += 1;
-    }
-    while end - start > 1 && trim(&lines[end - 1]).is_empty() {
-        end -= 1;
-    }
-    lines[start..end].to_vec()
-}
-
 /// JS: extractOriginal(lines, block)
 fn extract_original(lines: &[String], block: &MarkerBlock) -> Vec<String> {
     let text = strip_style_and_join(lines, block);
     match extract_inner_by_attr(&text, "data-impeccable-variant=\"original\"") {
         None => Vec::new(),
-        Some(inner) => trim_surrounding_blank_lines(inner.split('\n').map(String::from).collect()),
+        Some(inner) => inner.split('\n').map(String::from).collect(),
     }
 }
 
@@ -1127,7 +1113,13 @@ fn extract_variant(
         &text,
         &format!("data-impeccable-variant=\"{}\"", variant_num),
     )?;
-    let result = trim_surrounding_blank_lines(inner.split('\n').map(String::from).collect());
+    let mut result: Vec<String> = inner.split('\n').map(String::from).collect();
+    while result.len() > 1 && trim(&result[0]).is_empty() {
+        result.remove(0);
+    }
+    while result.len() > 1 && trim(result.last().unwrap()).is_empty() {
+        result.pop();
+    }
     if result.is_empty() {
         None
     } else {
@@ -1257,55 +1249,6 @@ fn find_session_file(id: &str, cwd: &str) -> Option<(String, String, Vec<String>
     Some((file, content, lines))
 }
 
-#[cfg(test)]
-mod discard_tests {
-    use super::*;
-
-    #[test]
-    fn discard_restores_the_original_without_blank_lines_around_it() {
-        let nanos = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .map(|d| d.as_nanos())
-            .unwrap_or(0);
-        let dir = std::env::temp_dir().join(format!(
-            "impeccable-discard-{}-{nanos}",
-            std::process::id()
-        ));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let file = dir.join("Login.tsx");
-        let src = [
-            "      </div>",
-            "      <div data-impeccable-variants=\"ab12cd34\" data-impeccable-variant-count=\"3\" style={{ display: \"contents\" }}>",
-            "        {/* impeccable-variants-start ab12cd34 */}",
-            "        <style data-impeccable-css=\"ab12cd34\">{`",
-            "          @scope ([data-impeccable-variant=\"1\"]) { :scope > .x { color: red; } }",
-            "        `}</style>",
-            "        {/* Original */}",
-            "        <div data-impeccable-variant=\"original\">",
-            "          <Bar title=\"Log in\" />",
-            "        </div>",
-            "        {/* Variants: insert below this line */}",
-            "        <div data-impeccable-variant=\"1\">",
-            "          <Bar title=\"Log in\" />",
-            "        </div>",
-            "        {/* impeccable-variants-end ab12cd34 */}",
-            "      </div>",
-            "    </AuthPage>",
-        ];
-        let lines: Vec<String> = src.iter().map(|s| s.to_string()).collect();
-        let path = file.to_string_lossy().into_owned();
-        std::fs::write(&file, lines.join("\n")).unwrap();
-        handle_discard_unlocked("ab12cd34", &lines, &path).unwrap();
-        let out = std::fs::read_to_string(&file).unwrap();
-        let _ = std::fs::remove_dir_all(&dir);
-        assert_eq!(
-            out,
-            "      </div>\n      <Bar title=\"Log in\" />\n    </AuthPage>"
-        );
-    }
-}
-
 #[cfg(test)]
 mod bake_tests {
     use super::*;

crates/skills/src/commands.rs

@@ -140,25 +140,35 @@ fn locale_compare(a: &str, b: &str) -> std::cmp::Ordering {
 fn check(io: &mut Io) -> R<()> {
     let (sys, _) = ctx(io);
     let root = sys.find_project_root();
-    if sys.is_already_installed(&root, None).is_none() {
+    // A home-rooted tree is either the user-level install or a project
+    // install under ~. Pick one scope so leftover dirs on the other layout
+    // cannot make a current copy look stale (#824). Inferred scope walks
+    // both, which is what produced the false "Updates available".
+    let scope = if sys.is_home_dir(&root) {
+        if sys.is_already_installed(&root, Some(Scope::User)).is_some() {
+            Some(Scope::User)
+        } else {
+            Some(Scope::Project)
+        }
+    } else {
+        None
+    };
+    if sys.is_already_installed(&root, scope).is_none() {
         out(io, "Impeccable is not installed in this project.");
         out(io, "Run `npx impeccable install` to install.");
         return Err(Flow::Exit(0));
     }
-    let providers = sys.find_installed_providers(&root, None);
+    let providers = sys.find_impeccable_providers(&root, scope);
     out(io, "Checking for updates...\n");
     let result = (|| -> Result<bool, String> {
         let bundle_dir = bundle::download_and_extract_bundle(&sys)?;
-        // JS: agentScope 'user' for a home-rooted checkout (d2a9efb9), so
-        // check() judges agent freshness against the user agent dirs.
-        let agent_scope = if sys.is_home_dir(&root) { Some(Scope::User) } else { None };
-        let up_to_date = bundle::is_up_to_date(&sys, &root, &providers, &bundle_dir, None, agent_scope)?;
+        let up_to_date = bundle::is_up_to_date(&sys, &root, &providers, &bundle_dir, scope, scope)?;
         util::rm_rf(&bundle_dir);
         Ok(up_to_date)
     })();
     match result {
         Ok(true) => {
-            let v = sys.get_skills_version(&root, None);
+            let v = sys.get_skills_version(&root, scope);
             out(io, &format!("Skills are up to date{}.", version_suffix(&v)));
         }
         Ok(false) => {

crates/skills/tests/drift_ports_tests.rs

@@ -460,6 +460,133 @@ fn check_accepts_current_copilot_user_agents_in_home_rooted_checkout() {
     std::fs::remove_dir_all(&root).ok();
 }
 
+// ─── check vs update scope parity (#824) ─────────────────────────────────────
+
+#[test]
+fn check_ignores_unrelated_harness_skill_in_home_rooted_tree() {
+    let root = temp_root("check-824-extra-harness");
+    let home = format!("{root}/home");
+    let tmpdir = format!("{root}/tmp");
+    for d in [&home, &tmpdir] {
+        std::fs::create_dir_all(d).unwrap();
+    }
+    std::fs::create_dir_all(format!("{home}/.git")).unwrap();
+    let bundle_root = create_fake_universal_bundle(&home, &[".claude", ".cursor"]);
+    let env = base_env(&home, &tmpdir, &bundle_root);
+
+    let r = run_cli(
+        &["install", "-y", "--scope=global", "--no-hooks", "--providers=claude"],
+        &home,
+        &env,
+    );
+    assert_eq!(r.code, 0, "{}\n{}", r.stdout, r.stderr);
+    write(
+        &format!("{home}/.cursor/skills/other/SKILL.md"),
+        "---\nname: other\n---\nUnrelated skill.\n",
+    );
+
+    let r = run_cli(&["check"], &home, &env);
+    assert!(r.stdout.contains("Skills are up to date"), "{}\n{}", r.stdout, r.stderr);
+    assert!(!r.stdout.contains("Updates available"), "{}", r.stdout);
+
+    let r = run_cli(&["update", "--global", "-y", "--no-hooks"], &home, &env);
+    assert!(r.stdout.contains("Skills are up to date"), "{}\n{}", r.stdout, r.stderr);
+    std::fs::remove_dir_all(&root).ok();
+}
+
+#[test]
+fn check_ignores_leftover_pi_project_layout_in_home_rooted_tree() {
+    let root = temp_root("check-824-pi-leftover");
+    let home = format!("{root}/home");
+    let tmpdir = format!("{root}/tmp");
+    for d in [&home, &tmpdir] {
+        std::fs::create_dir_all(d).unwrap();
+    }
+    std::fs::create_dir_all(format!("{home}/.git")).unwrap();
+    let bundle_root = create_fake_universal_bundle(&home, &[".pi"]);
+    let env = base_env(&home, &tmpdir, &bundle_root);
+
+    let r = run_cli(
+        &["install", "-y", "--scope=global", "--no-hooks", "--providers=pi"],
+        &home,
+        &env,
+    );
+    assert_eq!(r.code, 0, "{}\n{}", r.stdout, r.stderr);
+    assert!(std::path::Path::new(&format!("{home}/.pi/agent/skills/impeccable/SKILL.md")).exists());
+    write(
+        &format!("{home}/.pi/skills/other/SKILL.md"),
+        "---\nname: other\n---\nLeftover project-layout skill.\n",
+    );
+
+    let r = run_cli(&["check"], &home, &env);
+    assert!(r.stdout.contains("Skills are up to date"), "{}\n{}", r.stdout, r.stderr);
+    assert!(!r.stdout.contains("Updates available"), "{}", r.stdout);
+
+    let r = run_cli(&["update", "--global", "-y", "--no-hooks"], &home, &env);
+    assert!(r.stdout.contains("Skills are up to date"), "{}\n{}", r.stdout, r.stderr);
+    std::fs::remove_dir_all(&root).ok();
+}
+
+#[test]
+fn check_sees_home_rooted_project_scope_pi_install() {
+    let root = temp_root("check-824-pi-project");
+    let home = format!("{root}/home");
+    let tmpdir = format!("{root}/tmp");
+    for d in [&home, &tmpdir] {
+        std::fs::create_dir_all(d).unwrap();
+    }
+    std::fs::create_dir_all(format!("{home}/.git")).unwrap();
+    let bundle_root = create_fake_universal_bundle(&home, &[".pi"]);
+    let env = base_env(&home, &tmpdir, &bundle_root);
+
+    let r = run_cli(
+        &["install", "-y", "--scope=project", "--no-hooks", "--providers=pi"],
+        &home,
+        &env,
+    );
+    assert_eq!(r.code, 0, "{}\n{}", r.stdout, r.stderr);
+    assert!(std::path::Path::new(&format!("{home}/.pi/skills/impeccable/SKILL.md")).exists());
+    assert!(!std::path::Path::new(&format!("{home}/.pi/agent/skills/impeccable/SKILL.md")).exists());
+    write(
+        &format!("{home}/.pi/agent/skills/other/SKILL.md"),
+        "---\nname: other\n---\nLeftover user-layout skill.\n",
+    );
+
+    let r = run_cli(&["check"], &home, &env);
+    assert!(!r.stdout.contains("not installed"), "{}\n{}", r.stdout, r.stderr);
+    assert!(r.stdout.contains("Skills are up to date"), "{}\n{}", r.stdout, r.stderr);
+    assert!(!r.stdout.contains("Updates available"), "{}", r.stdout);
+    std::fs::remove_dir_all(&root).ok();
+}
+
+#[test]
+fn check_reports_stale_impeccable_in_home_rooted_tree() {
+    let root = temp_root("check-824-stale");
+    let home = format!("{root}/home");
+    let tmpdir = format!("{root}/tmp");
+    for d in [&home, &tmpdir] {
+        std::fs::create_dir_all(d).unwrap();
+    }
+    std::fs::create_dir_all(format!("{home}/.git")).unwrap();
+    let bundle_root = create_fake_universal_bundle(&home, &[".claude"]);
+    let env = base_env(&home, &tmpdir, &bundle_root);
+
+    let r = run_cli(
+        &["install", "-y", "--scope=global", "--no-hooks", "--providers=claude"],
+        &home,
+        &env,
+    );
+    assert_eq!(r.code, 0, "{}\n{}", r.stdout, r.stderr);
+    write(
+        &format!("{home}/.claude/skills/impeccable/SKILL.md"),
+        "---\nname: impeccable\nversion: 0.0.0-stale\n---\n\nStale copy.\n",
+    );
+
+    let r = run_cli(&["check"], &home, &env);
+    assert!(r.stdout.contains("Updates available"), "{}\n{}", r.stdout, r.stderr);
+    std::fs::remove_dir_all(&root).ok();
+}
+
 // ─── inferred agent update scope (d2a9efb9) ──────────────────────────────────
 
 #[test]

tests/oracle/golden/live-accept-html-discard-then-accept.json

@@ -16,6 +16,6 @@
   "files": {
     ".impeccable/live/accept-receipts/ab12cd34.json": "{\n  \"id\": \"ab12cd34\",\n  \"operation\": \"discard\",\n  \"variantId\": null,\n  \"result\": {\n    \"handled\": true,\n    \"file\": \"index.html\",\n    \"carbonize\": false\n  },\n  \"completedAt\": \"<ISO>\"\n}\n",
     ".impeccable/live/config.json": "{\n  \"files\": [\"index.html\", \"public/**/*.html\"],\n  \"insertBefore\": \"</body>\",\n  \"commentSyntax\": \"html\"\n}\n",
-    "index.html": "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"UTF-8\" />\n    <title>Oracle Live HTML Fixture</title>\n    <style>\n      .hero-title { font-size: 2rem; }\n      .hero-hook { color: #555; }\n    </style>\n  </head>\n  <body>\n    <main class=\"page\">\n      <h1 id=\"hero\" class=\"hero-title\">Oracle Fixture</h1>\n      <p class=\"hero-hook\">Minimal static page for oracle live-mode goldens.</p>\n      <section id=\"features\" class=\"feature-grid\">\n        <article class=\"feature-card\">One</article>\n        <article class=\"feature-card\">Two</article>\n      </section>\n      <aside class=\"side-note\">\n        <h2 class=\"note-title\">Aside</h2>\n        <p>Nested content.</p>\n      </aside>\n    </main>\n  </body>\n</html>\n"
+    "index.html": "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"UTF-8\" />\n    <title>Oracle Live HTML Fixture</title>\n    <style>\n      .hero-title { font-size: 2rem; }\n      .hero-hook { color: #555; }\n    </style>\n  </head>\n  <body>\n    <main class=\"page\">\n\n      <h1 id=\"hero\" class=\"hero-title\">Oracle Fixture</h1>\n\n      <p class=\"hero-hook\">Minimal static page for oracle live-mode goldens.</p>\n      <section id=\"features\" class=\"feature-grid\">\n        <article class=\"feature-card\">One</article>\n        <article class=\"feature-card\">Two</article>\n      </section>\n      <aside class=\"side-note\">\n        <h2 class=\"note-title\">Aside</h2>\n        <p>Nested content.</p>\n      </aside>\n    </main>\n  </body>\n</html>\n"
   }
 }

tests/oracle/golden/live-accept-html-discard.json

@@ -6,6 +6,6 @@
   "files": {
     ".impeccable/live/accept-receipts/ab12cd34.json": "{\n  \"id\": \"ab12cd34\",\n  \"operation\": \"discard\",\n  \"variantId\": null,\n  \"result\": {\n    \"handled\": true,\n    \"file\": \"index.html\",\n    \"carbonize\": false\n  },\n  \"completedAt\": \"<ISO>\"\n}\n",
     ".impeccable/live/config.json": "{\n  \"files\": [\"index.html\", \"public/**/*.html\"],\n  \"insertBefore\": \"</body>\",\n  \"commentSyntax\": \"html\"\n}\n",
-    "index.html": "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"UTF-8\" />\n    <title>Oracle Live HTML Fixture</title>\n    <style>\n      .hero-title { font-size: 2rem; }\n      .hero-hook { color: #555; }\n    </style>\n  </head>\n  <body>\n    <main class=\"page\">\n      <h1 id=\"hero\" class=\"hero-title\">Oracle Fixture</h1>\n      <p class=\"hero-hook\">Minimal static page for oracle live-mode goldens.</p>\n      <section id=\"features\" class=\"feature-grid\">\n        <article class=\"feature-card\">One</article>\n        <article class=\"feature-card\">Two</article>\n      </section>\n      <aside class=\"side-note\">\n        <h2 class=\"note-title\">Aside</h2>\n        <p>Nested content.</p>\n      </aside>\n    </main>\n  </body>\n</html>\n"
+    "index.html": "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"UTF-8\" />\n    <title>Oracle Live HTML Fixture</title>\n    <style>\n      .hero-title { font-size: 2rem; }\n      .hero-hook { color: #555; }\n    </style>\n  </head>\n  <body>\n    <main class=\"page\">\n\n      <h1 id=\"hero\" class=\"hero-title\">Oracle Fixture</h1>\n\n      <p class=\"hero-hook\">Minimal static page for oracle live-mode goldens.</p>\n      <section id=\"features\" class=\"feature-grid\">\n        <article class=\"feature-card\">One</article>\n        <article class=\"feature-card\">Two</article>\n      </section>\n      <aside class=\"side-note\">\n        <h2 class=\"note-title\">Aside</h2>\n        <p>Nested content.</p>\n      </aside>\n    </main>\n  </body>\n</html>\n"
   }
 }

tests/oracle/golden/live-accept-jsx-discard.json

@@ -6,7 +6,7 @@
   "files": {
     ".impeccable/live/accept-receipts/ab12cd34.json": "{\n  \"id\": \"ab12cd34\",\n  \"operation\": \"discard\",\n  \"variantId\": null,\n  \"result\": {\n    \"handled\": true,\n    \"file\": \"src/App.jsx\",\n    \"carbonize\": false\n  },\n  \"completedAt\": \"<ISO>\"\n}\n",
     ".impeccable/live/config.json": "{\n  \"files\": [\"index.html\"],\n  \"insertBefore\": \"</body>\",\n  \"commentSyntax\": \"html\"\n}\n",
-    "src/App.jsx": "export default function App() {\n  return (\n    <main className=\"page\">\n      <h1 className=\"hero-title\">Vite Fixture</h1>\n      <p className=\"hero-hook\">Minimal React tree for oracle live-mode goldens.</p>\n      <section id=\"features\" className=\"feature-grid\">\n        <article className=\"feature-card\">One</article>\n        <article className=\"feature-card\">Two</article>\n      </section>\n      <ul className=\"item-list\">\n        {items.map((item) => (\n          <li key={item.id} className=\"item-row\">{item.title}</li>\n        ))}\n      </ul>\n    </main>\n  );\n}\n\nconst items = [\n  { id: 1, title: 'First' },\n  { id: 2, title: 'Second' },\n];\n",
+    "src/App.jsx": "export default function App() {\n  return (\n    <main className=\"page\">\n\n      <h1 className=\"hero-title\">Vite Fixture</h1>\n\n      <p className=\"hero-hook\">Minimal React tree for oracle live-mode goldens.</p>\n      <section id=\"features\" className=\"feature-grid\">\n        <article className=\"feature-card\">One</article>\n        <article className=\"feature-card\">Two</article>\n      </section>\n      <ul className=\"item-list\">\n        {items.map((item) => (\n          <li key={item.id} className=\"item-row\">{item.title}</li>\n        ))}\n      </ul>\n    </main>\n  );\n}\n\nconst items = [\n  { id: 1, title: 'First' },\n  { id: 2, title: 'Second' },\n];\n",
     "src/main.jsx": "import { createRoot } from 'react-dom/client';\nimport App from './App.jsx';\n\ncreateRoot(document.getElementById('root')).render(<App />);\n",
     "src/Panel.tsx": "type PanelProps = { title: string; children?: React.ReactNode };\n\nexport function Panel({ title, children }: PanelProps) {\n  return (\n    <section className=\"panel\">\n      <header className=\"panel-header\">\n        <h2 className=\"panel-title\">{title}</h2>\n      </header>\n      <div className=\"panel-body\">{children}</div>\n    </section>\n  );\n}\n"
   }

tests/oracle/golden/live-accept-svelte-fallback-source-wrapper.json

@@ -17,6 +17,6 @@
     ".impeccable/live/accept-receipts/ab12cd34.json": "{\n  \"id\": \"ab12cd34\",\n  \"operation\": \"discard\",\n  \"variantId\": null,\n  \"result\": {\n    \"handled\": true,\n    \"file\": \"src/routes/+page.svelte\",\n    \"carbonize\": false\n  },\n  \"completedAt\": \"<ISO>\"\n}\n",
     ".impeccable/live/config.json": "{\n  \"files\": [\"src/app.html\"],\n  \"insertBefore\": \"</body>\",\n  \"commentSyntax\": \"html\"\n}\n",
     "src/app.html": "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <meta charset=\"utf-8\" />\n    <title>SvelteKit Fixture</title>\n    %sveltekit.head%\n  </head>\n  <body data-sveltekit-preload-data=\"hover\">\n    <div style=\"display: contents\">%sveltekit.body%</div>\n  </body>\n</html>\n",
-    "src/routes/+page.svelte": "<script>\n  let title = 'SvelteKit Fixture';\n  let expenses = [\n    { id: 1, label: 'Coffee', amount: 3 },\n    { id: 2, label: 'Lunch', amount: 12 },\n  ];\n</script>\n\n<main class=\"page\">\n  <h1 class=\"hero-title\">{title}</h1>\n  <p class=\"hero-hook\">Minimal SvelteKit route for oracle live-mode goldens.</p>\n  <ul class=\"expense-list\">\n    {#each expenses as expense (expense.id)}\n      <li class=\"expense-row\">{expense.label}: {expense.amount}</li>\n    {/each}\n  </ul>\n  <section id=\"features\" class=\"feature-grid\">\n    <article class=\"feature-card\">One</article>\n    <article class=\"feature-card\">Two</article>\n  </section>\n</main>\n\n<style>\n  .hero-title { font-size: 2rem; }\n  .expense-list { list-style: none; padding: 0; }\n  .expense-row { padding: 4px 0; }\n</style>\n"
+    "src/routes/+page.svelte": "<script>\n  let title = 'SvelteKit Fixture';\n  let expenses = [\n    { id: 1, label: 'Coffee', amount: 3 },\n    { id: 2, label: 'Lunch', amount: 12 },\n  ];\n</script>\n\n<main class=\"page\">\n\n  <h1 class=\"hero-title\">{title}</h1>\n\n  <p class=\"hero-hook\">Minimal SvelteKit route for oracle live-mode goldens.</p>\n  <ul class=\"expense-list\">\n    {#each expenses as expense (expense.id)}\n      <li class=\"expense-row\">{expense.label}: {expense.amount}</li>\n    {/each}\n  </ul>\n  <section id=\"features\" class=\"feature-grid\">\n    <article class=\"feature-card\">One</article>\n    <article class=\"feature-card\">Two</article>\n  </section>\n</main>\n\n<style>\n  .hero-title { font-size: 2rem; }\n  .expense-list { list-style: none; padding: 0; }\n  .expense-row { padding: 4px 0; }\n</style>\n"
   }
 }