@a5c-ai/babysitter-codex 0.1.11-staging.aaae75fb → 0.1.11-staging.b2171dc0

package/.codex-plugin/plugin.json

@@ -41,7 +41,7 @@
     ],
     "brandColor": "#0F766E",
     "composerIcon": "./assets/icon.svg",
-    "logo": "./assets/logo.svg",
+    "logo": "./assets/logo.png",
     "screenshots": []
   }
 }

package/README.md

@@ -10,9 +10,10 @@ This package ships a real Codex plugin bundle:
 - `hooks/`
 
 It still uses the Babysitter SDK CLI and the shared `~/.a5c` process-library
-state. The installer registers the plugin bundle and also materializes the
-active Codex `skills/`, `hooks/`, and `hooks.json` surface at the selected
-scope so Codex can execute the Babysitter commands and hook scripts directly.
+state. Global install writes the plugin bundle to `~/.agents/plugins/babysitter`
+and updates `~/.agents/plugins/marketplace.json` so Codex can load the plugin
+through its marketplace surface. Workspace install continues to materialize a
+workspace-local Codex surface for team setup.
 
 ## Installation
 
@@ -25,8 +26,8 @@ npm install -g @a5c-ai/babysitter-sdk
 clone the repo and install the plugin globally:
 
 ```bash
-git clone https://github.com/a5c-ai/babysitter.git
-cd babysitter
+npx -y @a5c-ai/babysitter-codex install --global
+
 codex
 
 > /plugins
@@ -34,6 +35,10 @@ codex
 
 then navigate to the 'babysitter' entry and select 'Install'.
 
+If Codex was already open when you ran `install --global`, start a new thread
+after installing from `/plugins` before expecting `babysitter:*` skills such as
+`$babysitter:babysit` or `$babysitter:call` to appear in the mention picker.
+
 ## Integration Model
 
 The plugin provides:
@@ -50,9 +55,9 @@ The process library is fetched and bound through the SDK CLI in
 
 After `install --workspace`, the important files are:
 
-- `plugins/babysitter/.codex-plugin/plugin.json`
-- `plugins/babysitter/skills/babysit/SKILL.md`
-- `plugins/babysitter/hooks.json`
+- `.agents/plugins/babysitter/.codex-plugin/plugin.json`
+- `.agents/plugins/babysitter/skills/babysit/SKILL.md`
+- `.agents/plugins/babysitter/hooks.json`
 - `.codex/skills/`
 - `.codex/hooks/`
 - `.codex/hooks.json`
@@ -67,13 +72,10 @@ Verify the installed plugin bundle:
 
 ```bash
 npm ls -g @a5c-ai/babysitter-codex --depth=0
-test -f ~/.codex/plugins/babysitter/.codex-plugin/plugin.json
-test -f ~/.codex/plugins/babysitter/hooks.json
-test -f ~/.codex/plugins/babysitter/hooks/babysitter-stop-hook.sh
-test -f ~/.codex/plugins/babysitter/skills/babysit/SKILL.md
-test -f ~/.codex/hooks.json
-test -f ~/.codex/hooks/babysitter-stop-hook.sh
-test -f ~/.codex/skills/babysit/SKILL.md
+test -f ~/.agents/plugins/babysitter/.codex-plugin/plugin.json
+test -f ~/.agents/plugins/babysitter/hooks.json
+test -f ~/.agents/plugins/babysitter/hooks/babysitter-stop-hook.sh
+test -f ~/.agents/plugins/babysitter/skills/babysit/SKILL.md
 test -f ~/.agents/plugins/marketplace.json
 ```
 
@@ -83,9 +85,10 @@ Verify the active shared process-library binding:
 babysitter process-library:active --json
 ```
 
-On native Windows, Codex currently does not execute hooks. The plugin still
-installs correctly, but the lifecycle hooks will not fire until Codex enables
-Windows hook execution.
+On native Windows, Codex hooks require **Codex CLI >= 0.119.0** (released
+2026-04-10, [openai/codex#17268](https://github.com/openai/codex/pull/17268)).
+Older Codex versions silently skipped hook execution on Windows. If hooks do
+not fire after install, run `codex --version` and upgrade if needed.
 
 ## License
 

package/bin/install-shared.js

@@ -7,6 +7,7 @@ const { spawnSync } = require('child_process');
 
 const PLUGIN_NAME = 'babysitter';
 const PLUGIN_CATEGORY = 'Coding';
+const LEGACY_MARKETPLACE_PLUGIN_NAMES = ['babysitter-codex'];
 const LEGACY_SKILL_NAMES = [
   'babysit',
   'babysitter-codex',
@@ -58,12 +59,13 @@ const DEFAULT_MARKETPLACE = {
 };
 const PLUGIN_BUNDLE_ENTRIES = [
   '.codex-plugin',
-  '.app.json',
   'assets',
   'hooks',
   'hooks.json',
   'skills',
-  'babysitter.lock.json',
+  '.app.json',
+  'plugin.lock.json',
+  'README.md',
 ];
 
 function getCodexHome() {
@@ -88,7 +90,7 @@ function getHomePluginRoot() {
   if (process.env.BABYSITTER_CODEX_PLUGIN_DIR) {
     return path.resolve(process.env.BABYSITTER_CODEX_PLUGIN_DIR, PLUGIN_NAME);
   }
-  return path.join(getCodexHome(), 'plugins', PLUGIN_NAME);
+  return path.join(getUserHome(), '.agents', 'plugins', PLUGIN_NAME);
 }
 
 function getHomeMarketplacePath() {
@@ -315,13 +317,21 @@ function ensureExecutable(filePath) {
   }
 }
 
+function getMarketplaceRootDir(marketplacePath) {
+  const pluginsDir = path.dirname(marketplacePath);
+  const dotAgentsDir = path.dirname(pluginsDir);
+  return path.dirname(dotAgentsDir);
+}
+
 function normalizeMarketplaceSourcePath(marketplacePath, pluginSourcePath) {
-  let next = pluginSourcePath;
-  if (path.isAbsolute(next)) {
-    next = path.relative(path.dirname(marketplacePath), next);
-  }
+  let next = path.relative(getMarketplaceRootDir(marketplacePath), pluginSourcePath);
   next = String(next || '').replace(/\\/g, '/');
-  if (!next.startsWith('./') && !next.startsWith('../')) {
+  if (!next || next === '.' || next.startsWith('../')) {
+    throw new Error(
+      `Plugin source path must live under ${getMarketplaceRootDir(marketplacePath)} so Codex can load it via a ./-prefixed marketplace entry.`,
+    );
+  }
+  if (!next.startsWith('./')) {
     next = `./${next}`;
   }
   return next;
@@ -347,15 +357,15 @@ function ensureMarketplaceEntry(marketplacePath, pluginSourcePath) {
     },
     category: PLUGIN_CATEGORY,
   };
-  const existingIndex = Array.isArray(marketplace.plugins)
-    ? marketplace.plugins.findIndex((entry) => entry && entry.name === PLUGIN_NAME)
-    : -1;
   if (!Array.isArray(marketplace.plugins)) {
     marketplace.plugins = [nextEntry];
-  } else if (existingIndex >= 0) {
-    marketplace.plugins[existingIndex] = nextEntry;
   } else {
-    marketplace.plugins.push(nextEntry);
+    const sanitized = marketplace.plugins.filter((entry) => (
+      entry &&
+      entry.name !== PLUGIN_NAME &&
+      !LEGACY_MARKETPLACE_PLUGIN_NAMES.includes(entry.name)
+    ));
+    marketplace.plugins = [...sanitized, nextEntry];
   }
   writeJson(marketplacePath, marketplace);
   return nextEntry;
@@ -369,7 +379,11 @@ function removeMarketplaceEntry(marketplacePath) {
   if (!Array.isArray(marketplace.plugins)) {
     return;
   }
-  marketplace.plugins = marketplace.plugins.filter((entry) => entry && entry.name !== PLUGIN_NAME);
+  marketplace.plugins = marketplace.plugins.filter((entry) => (
+    entry &&
+    entry.name !== PLUGIN_NAME &&
+    !LEGACY_MARKETPLACE_PLUGIN_NAMES.includes(entry.name)
+  ));
   writeJson(marketplacePath, marketplace);
 }
 
@@ -489,8 +503,11 @@ function warnWindowsHooks() {
   if (process.platform !== 'win32') {
     return;
   }
-  console.warn('[babysitter] Warning: Codex hooks are currently disabled on native Windows.');
-  console.warn('[babysitter] The plugin will install correctly, but SessionStart/UserPromptSubmit/Stop hooks will not fire until Codex enables Windows hook execution.');
+  // Codex enabled Windows hooks in v0.119.0 (2026-04-10, openai/codex#17268).
+  // Older Codex CLIs still skip hook execution on Windows; warn so users on
+  // pinned/older versions know to upgrade.
+  console.warn('[babysitter] Note: Codex hooks on Windows require Codex CLI >= 0.119.0.');
+  console.warn('[babysitter] If hooks do not fire, run `codex --version` and upgrade if you are below 0.119.0.');
 }
 
 module.exports = {

package/bin/install.js

@@ -9,7 +9,6 @@ const {
   getCodexHome,
   getHomeMarketplacePath,
   getHomePluginRoot,
-  installCodexSurface,
   mergeCodexConfigFile,
   warnWindowsHooks,
 } = require('./install-shared');
@@ -27,7 +26,6 @@ function main() {
     copyPluginBundle(PACKAGE_ROOT, pluginRoot);
     ensureMarketplaceEntry(marketplacePath, pluginRoot);
     mergeCodexConfigFile(path.join(codexHome, 'config.toml'));
-    installCodexSurface(PACKAGE_ROOT, codexHome);
 
     const active = ensureGlobalProcessLibrary(PACKAGE_ROOT);
     console.log(`[babysitter]   marketplace: ${marketplacePath}`);
@@ -38,7 +36,8 @@ function main() {
     console.log(`[babysitter]   process library state: ${active.stateFile}`);
     warnWindowsHooks();
     console.log('[babysitter] Installation complete!');
-    console.log('[babysitter] Restart Codex to pick up the installed plugin and config changes.');
+    console.log('[babysitter] Restart Codex to pick up the installed plugin and config changes, then run Codex and install Babysitter from `/plugins`.');
+    console.log('[babysitter] If Codex was already open, start a new thread after install before expecting `babysitter:*` skills such as `$babysitter:babysit` or `$babysitter:call` to appear.');
   } catch (err) {
     console.error(`[babysitter] Failed to install plugin: ${err.message}`);
     process.exitCode = 1;

package/hooks/babysitter-session-start.sh

@@ -3,8 +3,9 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-STATE_DIR="${BABYSITTER_STATE_DIR:-${PWD}/.a5c}"
-LOG_DIR="${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}"
+GLOBAL_ROOT="${BABYSITTER_GLOBAL_STATE_DIR:-$HOME/.a5c}"
+STATE_DIR="${BABYSITTER_STATE_DIR:-${GLOBAL_ROOT}/state}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-${GLOBAL_ROOT}/logs}"
 LOG_FILE="$LOG_DIR/babysitter-session-start-hook.log"
 
 export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"

package/hooks/babysitter-stop-hook.sh

@@ -3,8 +3,9 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-STATE_DIR="${BABYSITTER_STATE_DIR:-${PWD}/.a5c}"
-LOG_DIR="${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}"
+GLOBAL_ROOT="${BABYSITTER_GLOBAL_STATE_DIR:-$HOME/.a5c}"
+STATE_DIR="${BABYSITTER_STATE_DIR:-${GLOBAL_ROOT}/state}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-${GLOBAL_ROOT}/logs}"
 LOG_FILE="$LOG_DIR/babysitter-stop-hook.log"
 
 export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"

package/hooks/user-prompt-submit.sh

@@ -3,8 +3,9 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-STATE_DIR="${BABYSITTER_STATE_DIR:-${PWD}/.a5c}"
-LOG_DIR="${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}"
+GLOBAL_ROOT="${BABYSITTER_GLOBAL_STATE_DIR:-$HOME/.a5c}"
+STATE_DIR="${BABYSITTER_STATE_DIR:-${GLOBAL_ROOT}/state}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-${GLOBAL_ROOT}/logs}"
 
 export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"
 export BABYSITTER_STATE_DIR="${STATE_DIR}"

package/hooks.json

@@ -2,7 +2,7 @@
   "hooks": {
     "SessionStart": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",
@@ -13,7 +13,7 @@
     ],
     "UserPromptSubmit": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",
@@ -24,7 +24,7 @@
     ],
     "Stop": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a5c-ai/babysitter-codex",
-  "version": "0.1.11-staging.aaae75fb",
+  "version": "0.1.11-staging.b2171dc0",
   "description": "Babysitter Codex skill bundle and integration package for OpenAI Codex CLI with SDK-managed process-library bootstrapping, 15 orchestration modes, and BOM-safe SKILL installation",
   "scripts": {
     "test": "node test/integration.test.js && node test/packaged-install.test.js",
@@ -17,14 +17,15 @@
   },
   "files": [
     ".codex-plugin/",
-    ".app.json",
     "assets/",
     "hooks/",
     "hooks.json",
     "skills/",
+    ".app.json",
     "bin/",
     "scripts/",
-    "babysitter.lock.json"
+    "plugin.lock.json",
+    "README.md"
   ],
   "keywords": [
     "babysitter",
@@ -45,6 +46,6 @@
   },
   "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-codex#readme",
   "dependencies": {
-    "@a5c-ai/babysitter-sdk": "0.0.188-staging.aaae75fb"
+    "@a5c-ai/babysitter-sdk": "0.0.188-staging.b2171dc0"
   }
 }

package/plugin.lock.json

@@ -0,0 +1,153 @@
+{
+  "lockVersion": 1,
+  "pluginId": "ai.a5c.babysitter",
+  "pluginVersion": "0.1.5",
+  "generatedBy": "@a5c-ai/babysitter-codex",
+  "generatedAt": "2026-03-11T00:00:00.000Z",
+  "skills": [
+    {
+      "id": "assimilate",
+      "vendoredPath": "skills/assimilate",
+      "source": {
+        "type": "local",
+        "path": "skills/assimilate"
+      }
+    },
+    {
+      "id": "babysit",
+      "vendoredPath": "skills/babysit",
+      "source": {
+        "type": "local",
+        "path": "skills/babysit"
+      }
+    },
+    {
+      "id": "call",
+      "vendoredPath": "skills/call",
+      "source": {
+        "type": "local",
+        "path": "skills/call"
+      }
+    },
+    {
+      "id": "doctor",
+      "vendoredPath": "skills/doctor",
+      "source": {
+        "type": "local",
+        "path": "skills/doctor"
+      }
+    },
+    {
+      "id": "forever",
+      "vendoredPath": "skills/forever",
+      "source": {
+        "type": "local",
+        "path": "skills/forever"
+      }
+    },
+    {
+      "id": "help",
+      "vendoredPath": "skills/help",
+      "source": {
+        "type": "local",
+        "path": "skills/help"
+      }
+    },
+    {
+      "id": "issue",
+      "vendoredPath": "skills/issue",
+      "source": {
+        "type": "local",
+        "path": "skills/issue"
+      }
+    },
+    {
+      "id": "model",
+      "vendoredPath": "skills/model",
+      "source": {
+        "type": "local",
+        "path": "skills/model"
+      }
+    },
+    {
+      "id": "observe",
+      "vendoredPath": "skills/observe",
+      "source": {
+        "type": "local",
+        "path": "skills/observe"
+      }
+    },
+    {
+      "id": "plan",
+      "vendoredPath": "skills/plan",
+      "source": {
+        "type": "local",
+        "path": "skills/plan"
+      }
+    },
+    {
+      "id": "project-install",
+      "vendoredPath": "skills/project-install",
+      "source": {
+        "type": "local",
+        "path": "skills/project-install"
+      }
+    },
+    {
+      "id": "resume",
+      "vendoredPath": "skills/resume",
+      "source": {
+        "type": "local",
+        "path": "skills/resume"
+      }
+    },
+    {
+      "id": "retrospect",
+      "vendoredPath": "skills/retrospect",
+      "source": {
+        "type": "local",
+        "path": "skills/retrospect"
+      }
+    },
+    {
+      "id": "team-install",
+      "vendoredPath": "skills/team-install",
+      "source": {
+        "type": "local",
+        "path": "skills/team-install"
+      }
+    },
+    {
+      "id": "user-install",
+      "vendoredPath": "skills/user-install",
+      "source": {
+        "type": "local",
+        "path": "skills/user-install"
+      }
+    },
+    {
+      "id": "yolo",
+      "vendoredPath": "skills/yolo",
+      "source": {
+        "type": "local",
+        "path": "skills/yolo"
+      }
+    }
+  ],
+  "metadata": {
+    "runtime": {
+      "name": "@a5c/babysitter-codex-runtime",
+      "version": "0.1.4"
+    },
+    "content": {
+      "name": "@a5c/babysitter-codex-content",
+      "version": "0.1.4",
+      "processLibrary": {
+        "repo": "https://github.com/a5c-ai/babysitter.git",
+        "processSubpath": "library",
+        "referenceSubpath": "library/reference",
+        "snapshotCommit": "unknown"
+      }
+    }
+  }
+}

package/scripts/team-install.js

@@ -32,7 +32,7 @@ function main() {
   const args = parseArgs(process.argv);
   const packageRoot = path.resolve(process.env.BABYSITTER_PACKAGE_ROOT || path.join(__dirname, '..'));
   const workspaceRoot = args.workspace;
-  const workspacePluginRoot = path.join(workspaceRoot, 'plugins', 'babysitter');
+  const workspacePluginRoot = path.join(workspaceRoot, '.agents', 'plugins', 'babysitter');
   const workspaceMarketplacePath = path.join(workspaceRoot, '.agents', 'plugins', 'marketplace.json');
   const workspaceConfigPath = path.join(workspaceRoot, '.codex', 'config.toml');
 
@@ -81,6 +81,7 @@ function main() {
 
   warnWindowsHooks();
   console.log('[team-install] complete');
+  console.log('[team-install] If Codex was already open, start a new thread before expecting `babysitter:*` skills such as `$babysitter:babysit` or `$babysitter:call` to appear.');
 }
 
 main();

package/skills/babysit/SKILL.md

@@ -18,6 +18,8 @@ Read the SDK version from `versions.json` to ensure version compatibility:
 
 ```bash
 SDK_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('${CODEX_PLUGIN_ROOT}/versions.json','utf8')).sdkVersion||'latest')}catch{console.log('latest')}")
+npm i -g @a5c-ai/babysitter-sdk@$SDK_VERSION
+
 CLI="npx -y @a5c-ai/babysitter-sdk@$SDK_VERSION"
 ```
 

package/skills/doctor/SKILL.md

@@ -5,9 +5,9 @@ description: Diagnose babysitter run health - journal integrity, state cache, ef
 
 # doctor
 
-You are a diagnostic agent for the babysitter runtime. Your job is to perform a comprehensive health check across 10 areas and produce a structured diagnostic report. Follow each section methodically. Track results as you go and produce the final summary at the end.
+You are a diagnostic agent for the babysitter runtime. Your job is to perform a comprehensive health check across 14 areas and produce a structured diagnostic report. Follow each section methodically. Track results as you go and produce the final summary at the end.
 
-Initialize a results tracker with these 10 checks, all starting as PENDING:
+Initialize a results tracker with these 14 checks, all starting as PENDING:
 1. Run Discovery
 2. Journal Integrity
 3. State Cache Consistency
@@ -18,6 +18,10 @@ Initialize a results tracker with these 10 checks, all starting as PENDING:
 8. Disk Usage
 9. Process Validation
 10. Hook Execution Health
+11. Session-ID Provenance
+12. Ancestor Liveness
+13. Concurrent Session Detection
+14. Windows Ancestor-Walk Strategy
 
 ---
 
@@ -351,9 +355,65 @@ Mark as FAIL if:
 
 ---
 
+## 11. Session-ID Provenance
+
+**Goal:** Verify how the current babysitter session ID was resolved and flag stale or shadowed values.
+
+- Invoke: `npx babysitter session:whoami --json`
+- Parse the output and inspect the `resolvedFrom` field. Classify as follows:
+  - `resolvedFrom: "pid-marker"` → mark as PASS ("Session ID derives from the live Claude Code ancestor process -- authoritative").
+  - `resolvedFrom: "env-file"` → mark as PASS with a note ("CLAUDE_ENV_FILE was used; typically healthy").
+  - `resolvedFrom: "env-var"` → mark as WARN ("`BABYSITTER_SESSION_ID` is set without a corroborating PID marker. Likely stale from a prior Claude Code session -- see GitHub issue #130").
+    - Remediation: run `babysitter session:cleanup` and start a fresh Claude Code session, or `unset BABYSITTER_SESSION_ID` before invoking babysitter.
+  - `resolvedFrom: "none"` → mark as ERROR ("No session ID resolvable. Either no session-start hook fired, or the ancestor walk failed").
+
+**Env-var shadow check:**
+- Independently inspect `envVarPresent` and `envVarMatches` in the output.
+- If `envVarPresent && !envVarMatches`, mark as WARN ("`BABYSITTER_SESSION_ID` in env does not match the resolved session ID; a stale value is shadowing the authoritative one. Unset the env var").
+
+---
+
+## 12. Ancestor Liveness
+
+**Goal:** Confirm the PID marker references a live Claude Code process.
+
+- Reuse the `session:whoami --json` output from check 11.
+- Inspect the `ancestorAlive` field.
+- If `ancestorAlive === false`, mark as ERROR ("The PID marker references a dead Claude Code process").
+  - Remediation: `babysitter session:cleanup`.
+- Otherwise mark as PASS.
+
+---
+
+## 13. Concurrent Session Detection
+
+**Goal:** Surface multiple live harness sessions that may compete for the same session ID.
+
+- Enumerate files in `~/.a5c/` matching the pattern `current-session-*-pid-*`.
+- Count markers per harness (derived from the filename).
+- If more than one live marker exists for the same harness, mark as INFO ("Multiple live Claude Code / harness sessions detected; ensure each shell scopes `BABYSITTER_SESSION_ID` appropriately -- the PID marker handles this automatically").
+- Otherwise mark as PASS.
+
+---
+
+## 14. Windows Ancestor-Walk Strategy
+
+**Goal:** Verify the ancestor-walk strategy works on Windows, where `wmic` is no longer guaranteed to be present.
+
+- Only run this check when `process.platform === 'win32'`. On other platforms, mark as PASS ("Not applicable -- non-Windows platform").
+- Attempt the ancestor walk by invoking `npx babysitter session:whoami --json` (reuse output from check 11 if available).
+- If resolution succeeded (any `resolvedFrom` other than `none`), mark as PASS.
+- If `resolvedFrom: "none"` on Windows:
+  - Test `wmic` availability: `where wmic` via shell.
+  - If absent, document that Windows 11 24H2 removed `wmic`; the fallback PowerShell CIM path should handle this.
+  - If the PowerShell ancestor walk also failed, mark as ERROR with remediation: ensure PowerShell is available (`powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter ProcessId=$PID"` should work).
+- If the cascade works but is slow (>5s on first probe), add an INFO note on first-probe latency.
+
+---
+
 ## Final Report
 
-After completing all 10 checks, produce the diagnostic report in this format:
+After completing all 14 checks, produce the diagnostic report in this format:
 
 ```
 ============================================
@@ -380,6 +440,10 @@ OVERALL HEALTH: <HEALTHY | WARNING | CRITICAL>
 | 8  | Disk Usage               | <status> |
 | 9  | Process Validation       | <status> |
 | 10 | Hook Execution Health    | <status> |
+| 11 | Session-ID Provenance    | <status> |
+| 12 | Ancestor Liveness        | <status> |
+| 13 | Concurrent Session Detection | <status> |
+| 14 | Windows Ancestor-Walk Strategy | <status> |
 
 --------------------------------------------
   ISSUES & RECOMMENDATIONS
@@ -393,9 +457,9 @@ OVERALL HEALTH: <HEALTHY | WARNING | CRITICAL>
 ```
 
 **Overall health determination:**
-- **HEALTHY**: All 10 checks are PASS.
-- **WARNING**: At least one check is WARN but none are FAIL.
-- **CRITICAL**: At least one check is FAIL.
+- **HEALTHY**: All 14 checks are PASS (INFO notes are acceptable).
+- **WARNING**: At least one check is WARN but none are FAIL or ERROR.
+- **CRITICAL**: At least one check is FAIL or ERROR.
 
 Present the full detailed findings for each check BEFORE the summary table, so the user can see the evidence. End with the summary table and recommendations. Also, create a single HTML report file with all the findings that uses the arwes UI framework and open it for the user in the browser.
 
@@ -425,3 +489,25 @@ After diagnosing issues, prompt the user to report or fix what was found -- they
 Example prompt after diagnosis:
 
 > "Diagnosis found a stale lock -- process 12847 crashed without cleanup. This is a known edge case in the orchestration loop. Even if you don't want to fix it yourself, reporting it helps: run `/babysitter:contrib bug report: orchestration loop doesn't release lock on unhandled rejection` to open an issue."
+
+---
+
+## Self-Heal Suggestions
+
+If any of checks 11-14 surface issues (stale env vars, dead ancestor PIDs, shadowed session IDs, or Windows ancestor-walk failures), suggest the following remediation sequence, in order. Present it as an actionable block:
+
+```bash
+# 1. Cleanup dead markers and orphaned state files
+babysitter session:cleanup --dry-run   # preview
+babysitter session:cleanup             # apply
+
+# 2. Unset a stale env var
+unset BABYSITTER_SESSION_ID
+
+# 3. Re-bind a run explicitly if needed
+babysitter session:resume --session-id <fresh-id> --state-dir ~/.a5c --run-id <runId> --runs-dir .a5c/runs
+
+# 4. Start a fresh Claude Code session (closes and reopens the session)
+```
+
+Run steps 1 and 2 first; re-run `/babysitter:doctor` after each step to confirm the session-provenance checks return to PASS. Step 3 is only needed when a specific run must be re-bound to the fresh session. If the issue persists after step 4, escalate via `/debug` or `/babysitter:contrib`.

package/babysitter.lock.json

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "generatedAt": "2026-03-11T00:00:00.000Z",
-  "runtime": {
-    "name": "@a5c/babysitter-codex-runtime",
-    "version": "0.1.4"
-  },
-  "content": {
-    "name": "@a5c/babysitter-codex-content",
-    "version": "0.1.4",
-    "processLibrary": {
-      "repo": "https://github.com/a5c-ai/babysitter.git",
-      "processSubpath": "library",
-      "referenceSubpath": "library/reference",
-      "snapshotCommit": "unknown"
-    }
-  }
-}