@a5c-ai/babysitter-codex 5.0.1-staging.e4c68b9b → 5.0.1-staging.ee474eb45ea7

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "babysitter",
-  "version": "5.0.0",
+  "version": "5.0.1-staging.ee474eb45ea7",
   "description": "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval",
   "author": {
     "name": "a5c.ai",
@@ -20,7 +20,7 @@
     "LLM"
   ],
   "skills": "./skills/",
-  "hooks": "./hooks/hooks.json",
+  "hooks": "./hooks.json",
   "apps": "./.app.json",
   "interface": {
     "displayName": "Babysitter",
@@ -45,5 +45,5 @@
     "composerIcon": "./assets/icon.svg",
     "logo": "./assets/logo.png"
   },
-  "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-codex#readme"
+  "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-unified/per-harness/codex#readme"
 }

package/bin/install-shared.js

@@ -13,16 +13,16 @@ function getUserHome() {
 }
 
 function getHarnessHome() {
-  return path.join(os.homedir(), '.codex');
+  return path.join(os.homedir(), ".codex");
 }
 
 function getHomePluginRoot(scope) {
   if (scope === 'workspace') return path.join(process.cwd(), '.a5c', 'plugins', PLUGIN_NAME);
-  return path.join(path.join(os.homedir(), '.agents', 'plugins'), PLUGIN_NAME);
+  return path.join(path.join(os.homedir(), ".agents/plugins"), PLUGIN_NAME);
 }
 
 function getHomeMarketplacePath() {
-  return path.join(os.homedir(), '.agents', 'plugins', 'marketplace.json');
+  return path.join(os.homedir(), ".agents/plugins/marketplace.json");
 }
 
 function writeFileIfChanged(filePath, contents) {
@@ -104,7 +104,7 @@ function ensureMarketplaceEntry(marketplacePath, pluginRoot) {
     name: PLUGIN_NAME,
     source: relSource,
     description: "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval",
-    version: "5.0.0",
+    version: "5.0.1-staging.ee474eb45ea7",
     author: { name: "a5c.ai" },
   };
   if (idx >= 0) marketplace.plugins[idx] = entry;
@@ -771,21 +771,28 @@ module.exports = {
   resolveCliCommand,
   runCli,
   ensureGlobalProcessLibrary,
+  PLUGIN_BUNDLE_ENTRIES,
+  copyRecursive,
+  copyPluginBundle,
+  DEFAULT_MARKETPLACE,
+  normalizeMarketplaceSourcePath,
+  ensureMarketplaceEntry,
+  removeMarketplaceEntry,
+  installManagedSkills,
+  mergeManagedHooksConfig,
+  installManagedHooks,
+  warnWindowsHooks,
   LEGACY_MARKETPLACE_PLUGIN_NAMES,
   LEGACY_SKILL_NAMES,
   LEGACY_PROMPT_NAMES,
   LEGACY_HOOK_SCRIPT_NAMES,
   MANAGED_HOOK_SCRIPT_NAMES,
-  DEFAULT_MARKETPLACE,
-  PLUGIN_BUNDLE_ENTRIES,
   getCodexHome,
   getHomePluginRoot,
   getHomeMarketplacePath,
   getWorkspacePluginRoot,
   getWorkspaceMarketplacePath,
   renderCodexConfigToml,
-  copyRecursive,
-  copyPluginBundle,
   insertRootKey,
   ensureSectionLine,
   ensureWritableRoots,
@@ -795,15 +802,8 @@ module.exports = {
   runBabysitterCli,
   ensureGlobalProcessLibrary,
   getMarketplaceRootDir,
-  normalizeMarketplaceSourcePath,
-  ensureMarketplaceEntry,
-  removeMarketplaceEntry,
   removeLegacyCodexSurface,
-  installManagedSkills,
-  mergeManagedHooksConfig,
-  installManagedHooks,
   installCodexSurface,
   harnessInstall,
   harnessTeamInstall,
-  warnWindowsHooks,
 };

package/bin/uninstall.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 'use strict';
 
-const path = require('path');
 const fs = require('fs');
 const shared = require('./install-shared');
 

package/hooks/babysitter-proxied-post-tool-use.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+babysitter hook:run --harness unified --hook-type post-tool-use --json

package/hooks/babysitter-proxied-pre-tool-use.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+babysitter hook:run --harness unified --hook-type pre-tool-use --json

package/hooks/babysitter-proxied-session-end.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+set -euo pipefail
+babysitter hook:run --harness unified --hook-type session-end --json

package/hooks.json

@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-session-start.sh\" --json"
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-session-start.sh' --json\""
           }
         ]
       }
@@ -17,7 +17,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-stop.sh\" --json"
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-stop.sh' --json\""
           }
         ]
       }
@@ -28,7 +28,40 @@
         "hooks": [
           {
             "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-user-prompt-submit.sh\" --json"
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-user-prompt-submit.sh' --json\""
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-pre-tool-use.sh' --json\""
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-post-tool-use.sh' --json\""
+          }
+        ]
+      }
+    ],
+    "SessionEnd": [
+      {
+        "matcher": ".*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "npx -y -p @a5c-ai/hooks-mux-cli -c \"a5c-hooks-mux invoke --adapter codex --handler 'bash ./hooks/babysitter-proxied-session-end.sh' --json\""
           }
         ]
       }

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@a5c-ai/babysitter-codex",
-  "version": "5.0.1-staging.e4c68b9b",
+  "version": "5.0.1-staging.ee474eb45ea7",
   "description": "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval",
   "scripts": {
-    "test": "node test/integration.test.js && node test/packaged-install.test.js",
-    "sync:commands": "node scripts/sync-command-skills.js",
+    "test": "npm run validate:ci",
+    "test:integration": "node test/integration.test.js",
+    "test:packaged-install": "node test/packaged-install.test.js",
+    "validate:ci": "npm run test:integration && npm run test:packaged-install",
+    "team:install": "node scripts/team-install.js",
     "deploy": "npm publish --access public",
-    "deploy:staging": "npm publish --access public --tag staging",
-    "sync:skills": "node scripts/sync-command-skills.js"
+    "deploy:staging": "npm publish --access public --tag staging"
   },
   "bin": {
     "babysitter-codex": "bin/cli.js"
@@ -36,9 +38,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/a5c-ai/babysitter"
+    "url": "git+https://github.com/a5c-ai/babysitter-codex.git"
   },
-  "dependencies": {
-    "@a5c-ai/babysitter-sdk": "5.0.1-staging.e4c68b9b"
+  "homepage": "https://github.com/a5c-ai/babysitter-codex#readme",
+  "bugs": {
+    "url": "https://github.com/a5c-ai/babysitter-codex/issues"
   }
 }

package/scripts/create-release-tag.mjs

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+
+function run(command, args) {
+  const result = spawnSync(command, args, { encoding: 'utf8', stdio: 'inherit' });
+  if (result.status !== 0) process.exit(result.status || 1);
+}
+
+const branch = process.env.GITHUB_REF_NAME || 'develop';
+const sha = (process.env.GITHUB_SHA || '').slice(0, 12);
+const version = existsSync('package.json') ? JSON.parse(readFileSync('package.json', 'utf8')).version : JSON.parse(readFileSync('versions.json', 'utf8')).sdkVersion;
+const normalized = String(version).replace(/[^0-9A-Za-z._-]/g, '-');
+const tag = 'release/' + branch + '/v' + normalized + '-' + sha;
+run('git', ['config', 'user.name', 'github-actions[bot]']);
+run('git', ['config', 'user.email', 'github-actions[bot]@users.noreply.github.com']);
+run('git', ['tag', tag]);
+run('git', ['push', 'origin', tag]);

package/scripts/publish-from-tag.mjs

@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+
+function run(command, args, options = {}) {
+  const result = spawnSync(command, args, { stdio: options.stdio || 'inherit', encoding: options.encoding });
+  if (result.status !== 0 && !options.allowFailure) process.exit(result.status || 1);
+  return result;
+}
+
+function npmView(packageSpec) {
+  return run('npm', ['view', packageSpec, 'version'], { allowFailure: true, stdio: 'pipe', encoding: 'utf8' }).status === 0;
+}
+
+const pkg = JSON.parse(readFileSync('package.json', 'utf8'));
+const ref = process.env.GITHUB_REF_NAME || '';
+const branch = ref.split('/')[1] || 'develop';
+const tag = branch === 'main' ? 'latest' : branch;
+
+if (!process.env.NODE_AUTH_TOKEN) {
+  console.log('NODE_AUTH_TOKEN is not configured; skipping npm publish.');
+  process.exit(0);
+}
+
+if (npmView(pkg.name + '@' + pkg.version)) {
+  console.log(pkg.name + '@' + pkg.version + ' already exists; ensuring dist-tag ' + tag + '.');
+  run('npm', ['dist-tag', 'add', pkg.name + '@' + pkg.version, tag], { allowFailure: true });
+  process.exit(0);
+}
+
+for (const field of ['dependencies', 'peerDependencies', 'optionalDependencies']) {
+  for (const [name, version] of Object.entries(pkg[field] || {})) {
+    if (!name.startsWith('@a5c-ai/') || version.startsWith('^') || version.startsWith('~') || version === '*' || version.startsWith('workspace:')) continue;
+    if (!npmView(name + '@' + version)) {
+      console.log('Required internal dependency ' + name + '@' + version + ' is not published yet; skipping npm publish.');
+      process.exit(0);
+    }
+  }
+}
+
+run('npm', ['publish', '--access', 'public', '--tag', tag]);

package/skills/cleanup/SKILL.md

@@ -11,11 +11,33 @@ Create and run a cleanup process using the process at `skills\babysit\process\cr
 
 Implementation notes (for the process):
 - Parse arguments for `--dry-run` flag (if present, set dryRun: true in inputs) and `--keep-days N` (default: 7)
-- The process scans .a5c/runs/ for completed/failed runs, aggregates insights, writes summaries, then removes old data
-- Always show the user what will be removed before removing (in interactive mode via breakpoints)
-- In non-interactive mode (yolo), proceed with cleanup using defaults
-- The insights file goes to docs/run-history-insights.md
-- Only remove terminal runs (completed/failed) older than the keep-days threshold
-- Never remove active/in-progress runs
-- Remove orphaned process files not referenced by remaining runs
-- After cleanup, show remaining run count and disk usage
+
+CRITICAL: The cleanup MUST follow this exact phase order. Do NOT delete any run before Phase 2 completes.
+
+Phase 1 — Scan:
+- Scan .a5c/runs/ for all runs
+- Classify each as terminal (completed/failed) or active (in-progress/created)
+- Identify terminal runs older than the keep-days threshold as removal candidates
+- Never mark active/in-progress runs for removal
+- Count and report: total runs, terminal, active, removal candidates, disk usage
+
+Phase 2 — Aggregate insights (BEFORE any deletion):
+- For EVERY removal candidate, read its run.json and journal/ events
+- Extract: processId, prompt, status, event count, created date, task summaries
+- Group by process type and extract patterns (retry counts, convergence behavior, failure modes)
+- Append a new dated section to docs/run-history-insights.md with:
+  - Summary statistics (runs removed, disk freed, runs retained)
+  - Run categories with counts and descriptions
+  - Key patterns observed (multi-batch convergence, retry behavior, etc.)
+  - What worked well / what didn't from the run data
+- This file MUST be written and verified before proceeding to Phase 3
+
+Phase 3 — Confirm removal:
+- In interactive mode, show the user what will be removed via a breakpoint
+- In non-interactive mode (yolo), proceed with defaults
+- In dry-run mode, stop here and show what would be removed
+
+Phase 4 — Remove:
+- Delete the terminal runs older than keep-days threshold
+- Identify and remove orphaned process files not referenced by remaining runs
+- Show remaining run count and disk usage after cleanup

package/skills/doctor/SKILL.md

@@ -157,7 +157,6 @@ If it exists:
 **Goal:** Inspect babysitter session files for health and detect runaway loops.
 
 - Search for session state files using Glob:
-  - `plugins/babysitter/skills/babysit/state/*.md`
   - `.a5c/state/*.md`
   - `.a5c/state/*.json`
 - For each session state file found:
@@ -261,7 +260,7 @@ Mark as PASS if total size < 500MB and no files > 10MB. Mark as WARN if total si
 
 ### 10a. Hook Registration
 
-- Locate the plugin root. Check for `CLAUDE_PLUGIN_ROOT` env var, or search for `plugins/babysitter/hooks/hooks.json` by walking up from the current directory.
+- Locate the plugin root. Check for `CLAUDE_PLUGIN_ROOT` env var first, or search for a babysitter `hooks.json` by walking up from the current directory.
 - If found, read `hooks.json` and verify:
   - A `Stop` hook entry exists with a command referencing `babysitter-stop-hook.sh`.
   - A `SessionStart` hook entry exists with a command referencing `babysitter-session-start-hook.sh`.
@@ -316,7 +315,7 @@ If the stop hook shows NO evidence of execution (no log entries, no journal even
 
 Perform these diagnostic steps in order and report the first failure found:
 
-1. **Plugin not installed**: Check if `plugins/babysitter/` exists relative to the project root and if `CLAUDE_PLUGIN_ROOT` is set. If the plugin directory doesn't exist, report: "Plugin not installed — the babysitter plugin directory is missing."
+1. **Plugin not installed**: Check if `CLAUDE_PLUGIN_ROOT` is set or if a babysitter plugin directory exists relative to the project root. If neither exists, report: "Plugin not installed — the babysitter plugin directory is missing."
 
 2. **Plugin not enabled**: Check for Claude settings files:
    - `~/.claude/settings.json` — look for `babysitter` in `enabledPlugins`.

package/hooks/hooks.json

@@ -1,37 +0,0 @@
-{
-  "hooks": {
-    "SessionStart": [
-      {
-        "matcher": ".*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-session-start.sh\" --json"
-          }
-        ]
-      }
-    ],
-    "Stop": [
-      {
-        "matcher": ".*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-stop.sh\" --json"
-          }
-        ]
-      }
-    ],
-    "UserPromptSubmit": [
-      {
-        "matcher": ".*",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "npx -y @a5c-ai/hooks-mux-cli invoke --adapter codex --handler \"bash ./hooks/babysitter-proxied-user-prompt-submit.sh\" --json"
-          }
-        ]
-      }
-    ]
-  }
-}

package/scripts/sync-command-skills.js

@@ -1,45 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const {
-  listDirectories,
-  reportCheckResult,
-  syncSkillsFromCommands,
-} = require('../../../scripts/plugin-command-sync-lib.cjs');
-
-const PACKAGE_ROOT = path.resolve(__dirname, '..');
-const REPO_ROOT = path.resolve(PACKAGE_ROOT, '..', '..');
-const COMMANDS_ROOT = path.join(REPO_ROOT, 'plugins', 'babysitter', 'commands');
-const SKILLS_ROOT = path.join(PACKAGE_ROOT, 'skills');
-const LABEL = 'babysitter-codex sync';
-
-function getCommandBackedSkillNames() {
-  return listDirectories(SKILLS_ROOT)
-    .filter((name) => fs.existsSync(path.join(COMMANDS_ROOT, `${name}.md`)));
-}
-
-function main() {
-  const result = syncSkillsFromCommands({
-    label: LABEL,
-    sourceRoot: COMMANDS_ROOT,
-    skillsRoot: SKILLS_ROOT,
-    names: getCommandBackedSkillNames(),
-    check: process.argv.includes('--check'),
-    cwd: PACKAGE_ROOT,
-  });
-
-  if (process.argv.includes('--check')) {
-    reportCheckResult(LABEL, result.stale);
-    return;
-  }
-
-  if (result.updated === 0) {
-    console.log(`[${LABEL}] no Codex skill changes were needed.`);
-    return;
-  }
-
-  console.log(`[${LABEL}] updated ${result.updated} Codex skill file(s).`);
-}
-
-main();