@a5c-ai/babysitter-cursor 0.1.4 → 0.1.5-staging.06f78f92

package/README.md

@@ -34,20 +34,10 @@ Install through Cursor's marketplace UI using the repo-root
 2. Open the marketplace entry named **a5c-ai**
 3. Install the plugin named **babysitter**
 
-### Via Babysitter plugin manager
-
-This path installs the Babysitter plugin package named
-`babysitter-cursor` from the SDK marketplace, not the Cursor UI plugin
-entry:
-
-```bash
-babysitter plugin:install babysitter-cursor --marketplace-name a5c-ai --global
-```
-
-### Workspace installation
+### Via Babysitter harness install
 
 ```bash
-babysitter plugin:install babysitter-cursor --marketplace-name a5c-ai --project
+babysitter harness:install-plugin cursor
 ```
 
 If the workspace does not already have an active process-library binding, the
@@ -91,10 +81,10 @@ ln -s "$(pwd)/plugins/babysitter-cursor" ~/.cursor/plugins/local/babysitter-curs
 babysitter-cursor uninstall
 ```
 
-Or via the plugin manager:
+Or via npm:
 
 ```bash
-babysitter plugin:uninstall babysitter-cursor --global
+npm uninstall -g @a5c-ai/babysitter-cursor
 ```
 
 ## Plugin Structure (Directory Layout)
@@ -294,7 +284,7 @@ behavior within sessions.
 | `CURSOR_API_KEY` | -- | API key for headless CLI mode (required) |
 | `CURSOR_PLUGIN_ROOT` | Plugin directory | Plugin root directory |
 | `BABYSITTER_STATE_DIR` | `<cwd>/.a5c` | State directory for session data |
-| `BABYSITTER_LOG_DIR` | `<plugin>/.a5c/logs` | Log output directory |
+| `BABYSITTER_LOG_DIR` | `~/.a5c/logs` | Log output directory override; default is the user-global Babysitter log root |
 
 ### SDK Version Pinning
 
@@ -362,9 +352,7 @@ The repo-root Cursor marketplace manifest lives at `/.cursor-plugin/marketplace.
 ### User Commands
 
 ```bash
-babysitter plugin:add-marketplace --marketplace-url https://github.com/a5c-ai/babysitter --marketplace-path plugins/a5c/marketplace/marketplace.json --global
-babysitter plugin:list-plugins --marketplace-name a5c-ai --global
-babysitter plugin:install babysitter-cursor --marketplace-name a5c-ai --global
+babysitter harness:install-plugin cursor
 ```
 
 ## Troubleshooting
@@ -378,7 +366,7 @@ session health:
 $doctor
 ```
 
-Also check log output in `<plugin-root>/.a5c/logs/`:
+Also check log output in `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/`:
 
 - `babysitter-session-start-hook.log`
 - `babysitter-stop-hook.log`

package/commands/doctor.md

@@ -4,9 +4,9 @@ argument-hint: "[run-id] Optional run ID to diagnose. If omitted, uses the most
 allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
 ---
 
-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
@@ -17,6 +17,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
 
 ---
 
@@ -177,13 +181,13 @@ Mark as PASS if no issues. Mark as WARN if runaway loops or stale sessions detec
 **Goal:** Analyze babysitter log files for errors, warnings, and stop hook decisions.
 
 Read the last 50 lines of each of these log files (if they exist):
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/hooks.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook-stderr.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-session-start-hook.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-session-start-hook-stderr.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter.log`
-- `$HOME/.a5c/logs/` and relevant logs and run/session specific logs there
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/hooks.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook-stderr.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-session-start-hook.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-session-start-hook-stderr.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/` and relevant run/session specific logs there
 
 
 For each log file:
@@ -285,7 +289,7 @@ The hooks delegate to the `babysitter` CLI. Check if it is available:
 Check whether the stop hook has actually been invoked during this run's lifetime:
 
 **From log files:**
-- Read `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook.log` (if it exists).
+- Read `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook.log` (if it exists).
 - Count the number of "Hook script invoked" lines. This is the total invocation count.
 - Count the number of "CLI exit code=" lines and extract exit codes.
 - If the log file does not exist or has zero invocations, the stop hook has NOT been running.
@@ -297,7 +301,7 @@ Check whether the stop hook has actually been invoked during this run's lifetime
 - If no STOP_HOOK_INVOKED events exist in the journal, note that the stop hook has not recorded any decisions for this run.
 
 **From stderr:**
-- Read `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook-stderr.log`.
+- Read `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook-stderr.log`.
 - If it contains error output, display it and diagnose:
   - "command not found" or exit code 127 → CLI not installed (see 10c)
   - "MODULE_NOT_FOUND" or "Cannot find module" → SDK package corrupted or not built
@@ -350,9 +354,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:
 
 ```
 ============================================
@@ -379,6 +439,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
@@ -392,9 +456,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.
 
@@ -424,3 +488,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/hooks/session-start.ps1

@@ -18,7 +18,7 @@ $MarkerFile = Join-Path $PluginRoot ".babysitter-install-attempted"
 $env:CURSOR_PLUGIN_ROOT = $PluginRoot
 $env:BABYSITTER_STATE_DIR = $StateDir
 
-$LogDir = if ($env:BABYSITTER_LOG_DIR) { $env:BABYSITTER_LOG_DIR } else { Join-Path $PluginRoot ".a5c\logs" }
+$LogDir = if ($env:BABYSITTER_LOG_DIR) { $env:BABYSITTER_LOG_DIR } else { Join-Path $HOME ".a5c\logs" }
 $LogFile = Join-Path $LogDir "babysitter-session-start-hook.log"
 New-Item -ItemType Directory -Path $LogDir -Force -ErrorAction SilentlyContinue | Out-Null
 

package/hooks/session-start.sh

@@ -15,7 +15,7 @@ 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:-$PLUGIN_ROOT/.a5c/logs}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}"
 LOG_FILE="$LOG_DIR/babysitter-session-start-hook.log"
 
 export CURSOR_PLUGIN_ROOT="${CURSOR_PLUGIN_ROOT:-${PLUGIN_ROOT}}"

package/hooks/stop-hook.ps1

@@ -15,7 +15,7 @@ $StateDir = if ($env:BABYSITTER_STATE_DIR) { $env:BABYSITTER_STATE_DIR } else {
 $env:CURSOR_PLUGIN_ROOT = $PluginRoot
 $env:BABYSITTER_STATE_DIR = $StateDir
 
-$LogDir = if ($env:BABYSITTER_LOG_DIR) { $env:BABYSITTER_LOG_DIR } else { Join-Path $PluginRoot ".a5c\logs" }
+$LogDir = if ($env:BABYSITTER_LOG_DIR) { $env:BABYSITTER_LOG_DIR } else { Join-Path $HOME ".a5c\logs" }
 $LogFile = Join-Path $LogDir "babysitter-stop-hook.log"
 New-Item -ItemType Directory -Path $LogDir -Force -ErrorAction SilentlyContinue | Out-Null
 

package/hooks/stop-hook.sh

@@ -13,7 +13,7 @@ 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:-$PLUGIN_ROOT/.a5c/logs}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}"
 LOG_FILE="$LOG_DIR/babysitter-stop-hook.log"
 
 export CURSOR_PLUGIN_ROOT="${CURSOR_PLUGIN_ROOT:-${PLUGIN_ROOT}}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a5c-ai/babysitter-cursor",
-  "version": "0.1.4",
+  "version": "0.1.5-staging.06f78f92",
   "description": "Babysitter orchestration plugin for Cursor IDE with SDK-managed process-library bootstrapping and in-turn iteration model",
   "scripts": {
     "test": "node scripts/sync-command-surfaces.js --check",
@@ -44,6 +44,6 @@
   },
   "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-cursor#readme",
   "dependencies": {
-    "@a5c-ai/babysitter-sdk": "0.0.187"
+    "@a5c-ai/babysitter-sdk": "0.0.188-staging.06f78f92"
   }
 }

package/skills/babysit/SKILL.md

@@ -18,28 +18,21 @@ Read the SDK version from `versions.json` to ensure version compatibility:
 
 ```bash
 SDK_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('${PLUGIN_ROOT}/versions.json','utf8')).sdkVersion||'latest')}catch{console.log('latest')}")
+CLI="npx -y @a5c-ai/babysitter-sdk@$SDK_VERSION"
 ```
 
-Then ensure the CLI is installed:
-
-```bash
-sudo npm i -g @a5c-ai/babysitter-sdk@$SDK_VERSION
-```
-
-Use the CLI alias: `CLI="babysitter"`
-
-**Alternatively:** `CLI="npx -y @a5c-ai/babysitter-sdk@$SDK_VERSION"`
+If `babysitter` is already installed globally at the correct version, you may use `CLI="babysitter"` instead.
 
 ### jq
 
-make sure you have jq installed and available in the path. if not, install it.
+Make sure `jq` is installed and available in the path. If not, install it.
 
 ## Instructions
 
 Run the following command to get full orchestration instructions:
 
 ```bash
-babysitter instructions:babysit-skill --harness cursor --json
+$CLI instructions:babysit-skill --harness cursor --json
 ```
 
 Follow the instructions returned by the command above to orchestrate the run.
@@ -53,9 +46,9 @@ automatically re-enter the orchestration loop.
 Therefore, you MUST use **in-turn iteration**: run the full orchestration loop
 within a single session turn. The pattern is:
 
-1. `babysitter run:iterate --json` -- get pending actions
+1. `$CLI run:iterate --json` -- get pending actions
 2. For each pending action: execute it (run tasks, post results via `task:post`)
-3. `babysitter run:iterate --json` -- check for more pending actions
+3. `$CLI run:iterate --json` -- check for more pending actions
 4. Repeat steps 2-3 until run completes or reaches a breakpoint requiring user input
 5. If a breakpoint requires user input, ask the user and post the response, then continue iterating
 
@@ -67,7 +60,7 @@ the orchestration loop. The agent drives the loop directly by calling
 
 ```bash
 # Initial iterate
-RESULT=$(babysitter run:iterate --run-id "$RUN_ID" --json)
+RESULT=$($CLI run:iterate --run-id "$RUN_ID" --json)
 STATUS=$(echo "$RESULT" | jq -r '.status')
 
 while [ "$STATUS" != "completed" ] && [ "$STATUS" != "failed" ]; do
@@ -75,7 +68,7 @@ while [ "$STATUS" != "completed" ] && [ "$STATUS" != "failed" ]; do
   # ... execute tasks, post results ...
 
   # Iterate again
-  RESULT=$(babysitter run:iterate --run-id "$RUN_ID" --json)
+  RESULT=$($CLI run:iterate --run-id "$RUN_ID" --json)
   STATUS=$(echo "$RESULT" | jq -r '.status')
 done
 ```

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
 
 ---
 
@@ -178,13 +182,13 @@ Mark as PASS if no issues. Mark as WARN if runaway loops or stale sessions detec
 **Goal:** Analyze babysitter log files for errors, warnings, and stop hook decisions.
 
 Read the last 50 lines of each of these log files (if they exist):
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/hooks.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook-stderr.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-session-start-hook.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-session-start-hook-stderr.log`
-- `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter.log`
-- `$HOME/.a5c/logs/` and relevant logs and run/session specific logs there
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/hooks.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook-stderr.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-session-start-hook.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-session-start-hook-stderr.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter.log`
+- `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/` and relevant run/session specific logs there
 
 
 For each log file:
@@ -286,7 +290,7 @@ The hooks delegate to the `babysitter` CLI. Check if it is available:
 Check whether the stop hook has actually been invoked during this run's lifetime:
 
 **From log files:**
-- Read `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook.log` (if it exists).
+- Read `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook.log` (if it exists).
 - Count the number of "Hook script invoked" lines. This is the total invocation count.
 - Count the number of "CLI exit code=" lines and extract exit codes.
 - If the log file does not exist or has zero invocations, the stop hook has NOT been running.
@@ -298,7 +302,7 @@ Check whether the stop hook has actually been invoked during this run's lifetime
 - If no STOP_HOOK_INVOKED events exist in the journal, note that the stop hook has not recorded any decisions for this run.
 
 **From stderr:**
-- Read `$CLAUDE_PLUGIN_ROOT/.a5c/logs/babysitter-stop-hook-stderr.log`.
+- Read `${BABYSITTER_LOG_DIR:-$HOME/.a5c/logs}/babysitter-stop-hook-stderr.log`.
 - If it contains error output, display it and diagnose:
   - "command not found" or exit code 127 → CLI not installed (see 10c)
   - "MODULE_NOT_FOUND" or "Cannot find module" → SDK package corrupted or not built
@@ -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/versions.json

@@ -1,3 +1,3 @@
 {
-  "sdkVersion": "0.0.187"
+  "sdkVersion": "0.0.188-staging.06f78f92"
 }