@a5c-ai/babysitter-codex 0.1.11-staging.fd3ab4c2 → 5.0.1-staging.08b18580

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-proxied-session-start.sh

@@ -0,0 +1,166 @@
+#!/usr/bin/env bash
+# Unified Session Start Hook - routes through hooks-proxy for all hook execution.
+#
+# Ensures the babysitter CLI and hooks-proxy are installed (from versions.json
+# sdkVersion), then delegates to the TypeScript handler via hooks-proxy.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+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"
+SDK_MARKER_FILE="${PLUGIN_ROOT}/.babysitter-install-attempted"
+PROXY_MARKER_FILE="${PLUGIN_ROOT}/.hooks-proxy-install-attempted"
+
+export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"
+export BABYSITTER_STATE_DIR="${STATE_DIR}"
+
+mkdir -p "$LOG_DIR" 2>/dev/null
+
+blog() {
+  local msg="$1"
+  local ts
+  ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+  echo "[INFO] $ts $msg" >> "$LOG_FILE" 2>/dev/null
+  if command -v babysitter &>/dev/null; then
+    babysitter log --type hook --label "hook:session-start" --message "$msg" --source shell-hook 2>/dev/null || true
+  fi
+}
+
+blog "Unified hook script invoked"
+blog "PLUGIN_ROOT=$PLUGIN_ROOT"
+blog "STATE_DIR=$STATE_DIR"
+
+# Get required SDK version from versions.json (used for both SDK and hooks-proxy)
+SDK_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('${PLUGIN_ROOT}/versions.json','utf8')).sdkVersion||'latest')}catch{console.log('latest')}" 2>/dev/null || echo "latest")
+
+# ---------------------------------------------------------------------------
+# SDK install/upgrade
+# ---------------------------------------------------------------------------
+
+install_sdk() {
+  local target_version="$1"
+  if npm i -g "@a5c-ai/babysitter-sdk@${target_version}" --loglevel=error 2>/dev/null; then
+    blog "Installed SDK globally (${target_version})"
+    return 0
+  else
+    if npm i -g "@a5c-ai/babysitter-sdk@${target_version}" --prefix "$HOME/.local" --loglevel=error 2>/dev/null; then
+      export PATH="$HOME/.local/bin:$PATH"
+      blog "Installed SDK to user prefix (${target_version})"
+      return 0
+    fi
+  fi
+  return 1
+}
+
+NEEDS_SDK_INSTALL=false
+if command -v babysitter &>/dev/null; then
+  CURRENT_VERSION=$(babysitter --version 2>/dev/null || echo "unknown")
+  if [ "$CURRENT_VERSION" != "$SDK_VERSION" ]; then
+    blog "SDK version mismatch: installed=${CURRENT_VERSION}, required=${SDK_VERSION}"
+    NEEDS_SDK_INSTALL=true
+  else
+    blog "SDK version OK: ${CURRENT_VERSION}"
+  fi
+else
+  blog "SDK CLI not found, will install"
+  NEEDS_SDK_INSTALL=true
+fi
+
+if [ "$NEEDS_SDK_INSTALL" = true ] && [ ! -f "$SDK_MARKER_FILE" ]; then
+  install_sdk "$SDK_VERSION"
+  echo "$SDK_VERSION" > "$SDK_MARKER_FILE" 2>/dev/null
+fi
+
+if ! command -v babysitter &>/dev/null; then
+  blog "CLI not found after install, using npx fallback"
+  babysitter() { npx -y "@a5c-ai/babysitter-sdk@${SDK_VERSION}" "$@"; }
+  export -f babysitter
+fi
+
+# ---------------------------------------------------------------------------
+# Hooks-proxy install/upgrade (same pattern as SDK)
+# ---------------------------------------------------------------------------
+
+install_hooks_proxy() {
+  local target_version="$1"
+  if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --loglevel=error 2>/dev/null; then
+    blog "Installed hooks-proxy globally (${target_version})"
+    return 0
+  else
+    if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --prefix "$HOME/.local" --loglevel=error 2>/dev/null; then
+      export PATH="$HOME/.local/bin:$PATH"
+      blog "Installed hooks-proxy to user prefix (${target_version})"
+      return 0
+    fi
+  fi
+  return 1
+}
+
+NEEDS_PROXY_INSTALL=false
+if command -v a5c-hooks-proxy &>/dev/null; then
+  PROXY_VERSION=$(a5c-hooks-proxy --version 2>/dev/null || echo "unknown")
+  if [ "$PROXY_VERSION" != "$SDK_VERSION" ]; then
+    blog "hooks-proxy version mismatch: installed=${PROXY_VERSION}, required=${SDK_VERSION}"
+    NEEDS_PROXY_INSTALL=true
+  else
+    blog "hooks-proxy version OK: ${PROXY_VERSION}"
+  fi
+elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+  export PATH="$HOME/.local/bin:$PATH"
+  PROXY_VERSION=$(a5c-hooks-proxy --version 2>/dev/null || echo "unknown")
+  if [ "$PROXY_VERSION" != "$SDK_VERSION" ]; then
+    blog "hooks-proxy version mismatch: installed=${PROXY_VERSION}, required=${SDK_VERSION}"
+    NEEDS_PROXY_INSTALL=true
+  else
+    blog "hooks-proxy version OK: ${PROXY_VERSION}"
+  fi
+else
+  blog "hooks-proxy not found, will install"
+  NEEDS_PROXY_INSTALL=true
+fi
+
+if [ "$NEEDS_PROXY_INSTALL" = true ] && [ ! -f "$PROXY_MARKER_FILE" ]; then
+  install_hooks_proxy "$SDK_VERSION"
+  echo "$SDK_VERSION" > "$PROXY_MARKER_FILE" 2>/dev/null
+fi
+
+# Resolve hooks-proxy binary (npx fallback if still not found)
+PROXY=""
+if command -v a5c-hooks-proxy &>/dev/null; then
+  PROXY="a5c-hooks-proxy"
+elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+  PROXY="$HOME/.local/bin/a5c-hooks-proxy"
+fi
+
+if [ -z "$PROXY" ]; then
+  blog "hooks-proxy not found after install, using npx fallback"
+  PROXY="npx -y @a5c-ai/hooks-proxy-cli@${SDK_VERSION} "
+fi
+
+# ---------------------------------------------------------------------------
+# Capture stdin and delegate to hooks-proxy
+# ---------------------------------------------------------------------------
+
+INPUT_FILE=$(mktemp 2>/dev/null || echo "/tmp/codex-session-start-hook-$$.json")
+cat > "$INPUT_FILE"
+
+blog "Hook input received ($(wc -c < "$INPUT_FILE") bytes)"
+
+STDERR_LOG="$LOG_DIR/babysitter-session-start-hook-stderr.log"
+
+blog "Using hooks-proxy: $PROXY"
+RESULT=$($PROXY invoke \
+  --adapter codex \
+  --handler "babysitter hook:run --harness unified --hook-type session-start --plugin-root ${CODEX_PLUGIN_ROOT} --state-dir ${BABYSITTER_STATE_DIR}" \
+  --json \
+  < "$INPUT_FILE" 2>"$STDERR_LOG")
+EXIT_CODE=$?
+
+blog "CLI exit code=$EXIT_CODE"
+
+rm -f "$INPUT_FILE" 2>/dev/null
+printf '%s\n' "$RESULT"
+exit $EXIT_CODE

package/hooks/babysitter-proxied-stop-hook.sh

@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+# Unified Stop Hook - routes through hooks-proxy for all hook execution.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+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"
+PROXY_MARKER_FILE="${PLUGIN_ROOT}/.hooks-proxy-install-attempted"
+
+export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"
+export BABYSITTER_STATE_DIR="${STATE_DIR}"
+
+mkdir -p "$LOG_DIR" 2>/dev/null
+
+blog() {
+  local msg="$1"
+  local ts
+  ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+  echo "[INFO] $ts $msg" >> "$LOG_FILE" 2>/dev/null
+  if command -v babysitter &>/dev/null; then
+    babysitter log --type hook --label "hook:stop" --message "$msg" --source shell-hook 2>/dev/null || true
+  fi
+}
+
+blog "Unified hook script invoked"
+blog "PLUGIN_ROOT=$PLUGIN_ROOT"
+blog "STATE_DIR=$STATE_DIR"
+
+# Get required version from versions.json (used for hooks-proxy)
+SDK_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('${PLUGIN_ROOT}/versions.json','utf8')).sdkVersion||'latest')}catch{console.log('latest')}" 2>/dev/null || echo "latest")
+
+# ---------------------------------------------------------------------------
+# Hooks-proxy install (same pattern as SDK install in session-start)
+# ---------------------------------------------------------------------------
+
+install_hooks_proxy() {
+  local target_version="$1"
+  if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --loglevel=error 2>/dev/null; then
+    blog "Installed hooks-proxy globally (${target_version})"
+    return 0
+  else
+    if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --prefix "$HOME/.local" --loglevel=error 2>/dev/null; then
+      export PATH="$HOME/.local/bin:$PATH"
+      blog "Installed hooks-proxy to user prefix (${target_version})"
+      return 0
+    fi
+  fi
+  return 1
+}
+
+# Resolve hooks-proxy binary
+PROXY=""
+if command -v a5c-hooks-proxy &>/dev/null; then
+  PROXY="a5c-hooks-proxy"
+elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+  PROXY="$HOME/.local/bin/a5c-hooks-proxy"
+fi
+
+# Install if not found (only attempt once per plugin version)
+if [ -z "$PROXY" ] && [ ! -f "$PROXY_MARKER_FILE" ]; then
+  blog "hooks-proxy not found, attempting install"
+  install_hooks_proxy "$SDK_VERSION"
+  echo "$SDK_VERSION" > "$PROXY_MARKER_FILE" 2>/dev/null
+  if command -v a5c-hooks-proxy &>/dev/null; then
+    PROXY="a5c-hooks-proxy"
+  elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+    PROXY="$HOME/.local/bin/a5c-hooks-proxy"
+  fi
+fi
+
+# npx fallback if still not found
+if [ -z "$PROXY" ]; then
+  blog "hooks-proxy not found after install, using npx fallback"
+  PROXY="npx -y @a5c-ai/hooks-proxy-cli@${SDK_VERSION} "
+fi
+
+# ---------------------------------------------------------------------------
+# Capture stdin and delegate to hooks-proxy
+# ---------------------------------------------------------------------------
+
+INPUT_FILE=$(mktemp 2>/dev/null || echo "/tmp/codex-stop-hook-$$.json")
+cat > "$INPUT_FILE"
+
+blog "Hook input received ($(wc -c < "$INPUT_FILE") bytes)"
+
+STDERR_LOG="$LOG_DIR/babysitter-stop-hook-stderr.log"
+
+blog "Using hooks-proxy: $PROXY"
+RESULT=$($PROXY invoke \
+  --adapter codex \
+  --handler "babysitter hook:run --harness unified --hook-type stop --plugin-root ${CODEX_PLUGIN_ROOT} --state-dir ${BABYSITTER_STATE_DIR}" \
+  --json \
+  < "$INPUT_FILE" 2>"$STDERR_LOG")
+EXIT_CODE=$?
+
+blog "CLI exit code=$EXIT_CODE"
+
+rm -f "$INPUT_FILE" 2>/dev/null
+printf '%s\n' "$RESULT"
+exit $EXIT_CODE

package/hooks/babysitter-proxied-user-prompt-submit.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Unified UserPromptSubmit Hook - routes through hooks-proxy for all hook execution.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+GLOBAL_ROOT="${BABYSITTER_GLOBAL_STATE_DIR:-$HOME/.a5c}"
+STATE_DIR="${BABYSITTER_STATE_DIR:-${GLOBAL_ROOT}/state}"
+LOG_DIR="${BABYSITTER_LOG_DIR:-${GLOBAL_ROOT}/logs}"
+PROXY_MARKER_FILE="${PLUGIN_ROOT}/.hooks-proxy-install-attempted"
+
+export CODEX_PLUGIN_ROOT="${CODEX_PLUGIN_ROOT:-${PLUGIN_ROOT}}"
+export BABYSITTER_STATE_DIR="${STATE_DIR}"
+
+mkdir -p "$LOG_DIR" 2>/dev/null
+
+# Get required version from versions.json (used for hooks-proxy)
+SDK_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync('${PLUGIN_ROOT}/versions.json','utf8')).sdkVersion||'latest')}catch{console.log('latest')}" 2>/dev/null || echo "latest")
+
+# ---------------------------------------------------------------------------
+# Hooks-proxy install (same pattern as SDK install in session-start)
+# ---------------------------------------------------------------------------
+
+install_hooks_proxy() {
+  local target_version="$1"
+  if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --loglevel=error 2>/dev/null; then
+    return 0
+  else
+    if npm i -g "@a5c-ai/hooks-proxy-cli@${target_version}" --prefix "$HOME/.local" --loglevel=error 2>/dev/null; then
+      export PATH="$HOME/.local/bin:$PATH"
+      return 0
+    fi
+  fi
+  return 1
+}
+
+# Resolve hooks-proxy binary
+PROXY=""
+if command -v a5c-hooks-proxy &>/dev/null; then
+  PROXY="a5c-hooks-proxy"
+elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+  PROXY="$HOME/.local/bin/a5c-hooks-proxy"
+fi
+
+# Install if not found (only attempt once per plugin version)
+if [ -z "$PROXY" ] && [ ! -f "$PROXY_MARKER_FILE" ]; then
+  install_hooks_proxy "$SDK_VERSION"
+  echo "$SDK_VERSION" > "$PROXY_MARKER_FILE" 2>/dev/null
+  if command -v a5c-hooks-proxy &>/dev/null; then
+    PROXY="a5c-hooks-proxy"
+  elif [ -f "$HOME/.local/bin/a5c-hooks-proxy" ]; then
+    PROXY="$HOME/.local/bin/a5c-hooks-proxy"
+  fi
+fi
+
+# npx fallback if still not found
+if [ -z "$PROXY" ]; then
+  PROXY="npx -y @a5c-ai/hooks-proxy-cli@${SDK_VERSION} "
+fi
+
+# ---------------------------------------------------------------------------
+# Capture stdin and delegate to hooks-proxy
+# ---------------------------------------------------------------------------
+
+INPUT_FILE=$(mktemp 2>/dev/null || echo "/tmp/codex-user-prompt-submit-hook-$$.json")
+cat > "$INPUT_FILE"
+
+if command -v babysitter &>/dev/null; then
+  babysitter log --type hook --label "hook:user-prompt-submit" --message "Unified hook invoked" --source shell-hook 2>/dev/null || true
+fi
+
+STDERR_LOG="$LOG_DIR/babysitter-user-prompt-submit-hook-stderr.log"
+
+RESULT=$($PROXY invoke \
+  --adapter codex \
+  --handler "babysitter hook:run --harness unified --hook-type user-prompt-submit --plugin-root ${CODEX_PLUGIN_ROOT} --state-dir ${BABYSITTER_STATE_DIR}" \
+  --json \
+  < "$INPUT_FILE" 2>"$STDERR_LOG")
+EXIT_CODE=$?
+
+if command -v babysitter &>/dev/null; then
+  babysitter log --type hook --label "hook:user-prompt-submit" --message "CLI exit code=$EXIT_CODE" --source shell-hook 2>/dev/null || true
+fi
+
+rm -f "$INPUT_FILE" 2>/dev/null
+if [ -n "$RESULT" ]; then
+  printf '%s\n' "$RESULT"
+fi
+exit $EXIT_CODE

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/proxied-hooks.json

@@ -0,0 +1,38 @@
+{
+  "_comment": "NOT ACTIVE — Alternative hooks.json using per-hook unified scripts with hooks-proxy support. To activate, replace hooks.json with this file.",
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "./hooks/babysitter-proxied-session-start.sh"
+          }
+        ]
+      }
+    ],
+    "UserPromptSubmit": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "./hooks/babysitter-proxied-user-prompt-submit.sh"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "./hooks/babysitter-proxied-stop-hook.sh"
+          }
+        ]
+      }
+    ]
+  }
+}

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,33 +2,33 @@
   "hooks": {
     "SessionStart": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",
-            "command": "./hooks/babysitter-session-start.sh"
+            "command": "./hooks/babysitter-proxied-session-start.sh"
           }
         ]
       }
     ],
     "UserPromptSubmit": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",
-            "command": "./hooks/user-prompt-submit.sh"
+            "command": "./hooks/babysitter-proxied-user-prompt-submit.sh"
           }
         ]
       }
     ],
     "Stop": [
       {
-        "matcher": "*",
+        "matcher": ".*",
         "hooks": [
           {
             "type": "command",
-            "command": "./hooks/babysitter-stop-hook.sh"
+            "command": "./hooks/babysitter-proxied-stop-hook.sh"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a5c-ai/babysitter-codex",
-  "version": "0.1.11-staging.fd3ab4c2",
+  "version": "5.0.1-staging.08b18580",
   "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.fd3ab4c2"
+    "@a5c-ai/babysitter-sdk": "5.0.1-staging.08b18580"
   }
 }

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/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"
-    }
-  }
-}