@a5c-ai/babysitter-omp 0.1.4-staging.fd3ab4c2 → 5.0.0

package/README.md

@@ -80,6 +80,8 @@ Read the pinned SDK version from `versions.json` when you need a local CLI:
 ```bash
 PLUGIN_ROOT="${OMP_PLUGIN_ROOT:-$(pwd)}"
 SDK_VERSION=$(node -e "try{const fs=require('fs');const path=require('path');const pluginRoot=process.env.OMP_PLUGIN_ROOT||process.env.PLUGIN_ROOT||process.cwd();const probes=[path.join(pluginRoot,'versions.json'),path.join(pluginRoot,'plugins','babysitter-omp','versions.json'),path.join(pluginRoot,'node_modules','@a5c-ai','babysitter-omp','versions.json'),path.join(process.cwd(),'node_modules','@a5c-ai','babysitter-omp','versions.json')];for(const probe of probes){if(fs.existsSync(probe)){console.log(JSON.parse(fs.readFileSync(probe,'utf8')).sdkVersion||'latest');process.exit(0)}}console.log('latest')}catch{console.log('latest')}")
+npm i -g @a5c-ai/babysitter-sdk@$SDK_VERSION
+
 CLI="npx -y @a5c-ai/babysitter-sdk@$SDK_VERSION"
 ```
 

package/bin/cli.cjs

@@ -5,45 +5,51 @@ const path = require('path');
 const { spawnSync } = require('child_process');
 
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
+let shared;
+try { shared = require('./install-shared'); } catch {}
 
 function printUsage() {
   console.error([
     'Usage:',
     '  babysitter-omp install [--global]',
     '  babysitter-omp install --workspace [path]',
-    '  babysitter-omp uninstall [--global]',
     '  babysitter-omp uninstall',
   ].join('\n'));
 }
 
-function parseArgs(argv) {
+function parseInstallArgs(argv) {
+  let scope = 'global';
   let workspace = null;
+  const passthrough = [];
 
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
+    if (arg === '--global') {
+      scope = 'global';
+      continue;
+    }
     if (arg === '--workspace') {
+      scope = 'workspace';
       const next = argv[i + 1];
-      workspace = next && !next.startsWith('-') ? path.resolve(next) : process.cwd();
       if (next && !next.startsWith('-')) {
+        workspace = path.resolve(next);
         i += 1;
+      } else {
+        workspace = process.cwd();
       }
       continue;
     }
-    if (arg === '--global') {
-      workspace = null;
-      continue;
-    }
-    throw new Error(`unknown argument: ${arg}`);
+    passthrough.push(arg);
   }
 
-  return { workspace };
+  return { scope, workspace, passthrough };
 }
 
-function runNodeScript(scriptPath, args) {
+function runNodeScript(scriptPath, args, extraEnv = {}) {
   const result = spawnSync(process.execPath, [scriptPath, ...args], {
     cwd: process.cwd(),
     stdio: 'inherit',
-    env: process.env,
+    env: { ...process.env, ...extraEnv },
   });
   process.exitCode = result.status ?? 1;
 }
@@ -56,15 +62,35 @@ function main() {
     return;
   }
 
-  if (command !== 'install' && command !== 'uninstall') {
-    printUsage();
-    process.exitCode = 1;
+  if (command === 'install') {
+    if (shared && typeof shared.harnessCliRoute === 'function' && shared.harnessCliRoute(rest, PACKAGE_ROOT, runNodeScript)) {
+      return;
+    }
+    const parsed = parseInstallArgs(rest);
+    if (parsed.scope === 'workspace') {
+      const args = [];
+      if (parsed.workspace) {
+        args.push('--workspace', parsed.workspace);
+      }
+      args.push(...parsed.passthrough);
+      runNodeScript(
+        path.join(PACKAGE_ROOT, 'scripts', 'team-install.cjs'),
+        args,
+        { PLUGIN_PACKAGE_ROOT: PACKAGE_ROOT },
+      );
+      return;
+    }
+    runNodeScript(path.join(PACKAGE_ROOT, 'bin', 'install.cjs'), parsed.passthrough);
+    return;
+  }
+
+  if (command === 'uninstall') {
+    runNodeScript(path.join(PACKAGE_ROOT, 'bin', 'uninstall.cjs'), rest);
     return;
   }
 
-  const parsed = parseArgs(rest);
-  const args = parsed.workspace ? ['--workspace', parsed.workspace] : ['--global'];
-  runNodeScript(path.join(PACKAGE_ROOT, 'bin', `${command}.cjs`), args);
+  printUsage();
+  process.exitCode = 1;
 }
 
 main();

package/bin/install-shared.cjs

@@ -0,0 +1,219 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const PLUGIN_NAME = "babysitter";
+const PLUGIN_CATEGORY = 'Coding';
+
+function getUserHome() {
+  return os.homedir();
+}
+
+function getHarnessHome() {
+  return path.join(os.homedir(), '.a5c');
+}
+
+function getHomePluginRoot(scope) {
+  if (scope === 'workspace') return path.join(process.cwd(), '.a5c', 'plugins', PLUGIN_NAME);
+  return path.join(path.join(getHarnessHome(), 'plugins'), PLUGIN_NAME);
+}
+
+function getHomeMarketplacePath() {
+  return path.join(getHarnessHome(), 'plugins', 'marketplace.json');
+}
+
+function writeFileIfChanged(filePath, contents) {
+  try {
+    const existing = fs.readFileSync(filePath, 'utf8');
+    if (existing === contents) return false;
+  } catch {}
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, contents);
+  return true;
+}
+
+function copyRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    if (entry.name === 'node_modules' || entry.name === '.git') continue;
+    const s = path.join(src, entry.name);
+    const d = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyRecursive(s, d);
+    } else {
+      fs.copyFileSync(s, d);
+    }
+  }
+}
+
+function copyPluginBundle(packageRoot, pluginRoot) {
+  const bundleEntries = fs.readdirSync(packageRoot).filter(
+    e => !['node_modules', '.git', 'test', 'dist'].includes(e)
+  );
+  fs.mkdirSync(pluginRoot, { recursive: true });
+  for (const entry of bundleEntries) {
+    const src = path.join(packageRoot, entry);
+    const dest = path.join(pluginRoot, entry);
+    const stat = fs.statSync(src);
+    if (stat.isDirectory()) {
+      copyRecursive(src, dest);
+    } else {
+      fs.copyFileSync(src, dest);
+    }
+  }
+}
+
+function readJson(filePath) {
+  try {
+    return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function writeJson(filePath, value) {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, JSON.stringify(value, null, 2) + '\n');
+}
+
+function ensureExecutable(filePath) {
+  try {
+    fs.chmodSync(filePath, 0o755);
+  } catch {}
+}
+
+function normalizeMarketplaceSourcePath(source, marketplacePath) {
+  if (typeof source === 'string') {
+    return path.relative(path.dirname(marketplacePath), source).replace(/\\/g, '/');
+  }
+  return source;
+}
+
+function ensureMarketplaceEntry(marketplacePath, pluginRoot) {
+  let marketplace = readJson(marketplacePath) || {
+    name: "a5c.ai",
+    plugins: [],
+  };
+  if (!Array.isArray(marketplace.plugins)) marketplace.plugins = [];
+  const idx = marketplace.plugins.findIndex(p => p.name === PLUGIN_NAME);
+  const relSource = './' + normalizeMarketplaceSourcePath(pluginRoot, marketplacePath);
+  const entry = {
+    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",
+    author: { name: "a5c.ai" },
+  };
+  if (idx >= 0) marketplace.plugins[idx] = entry;
+  else marketplace.plugins.push(entry);
+  writeJson(marketplacePath, marketplace);
+}
+
+function removeMarketplaceEntry(marketplacePath) {
+  const marketplace = readJson(marketplacePath);
+  if (!marketplace || !Array.isArray(marketplace.plugins)) return;
+  marketplace.plugins = marketplace.plugins.filter(p => p.name !== PLUGIN_NAME);
+  writeJson(marketplacePath, marketplace);
+}
+
+function warnWindowsHooks() {
+  if (process.platform === 'win32') {
+    console.warn('[' + PLUGIN_NAME + '] Windows detected — shell hooks (.sh) require Git Bash or WSL.');
+  }
+}
+
+function runPostInstall(pluginRoot) {
+  const postInstall = path.join(pluginRoot, 'scripts', 'post-install.js');
+  if (fs.existsSync(postInstall)) {
+    spawnSync(process.execPath, [postInstall], {
+      cwd: pluginRoot, stdio: 'inherit',
+      env: { ...process.env, PLUGIN_ROOT: pluginRoot },
+    });
+  }
+}
+
+function getGlobalStateDir() {
+  return process.env.BABYSITTER_GLOBAL_STATE_DIR || path.join(getUserHome(), '.a5c');
+}
+
+function resolveCliCommand(packageRoot) {
+  try {
+    const result = spawnSync('babysitter', ['--version'], { stdio: 'pipe', timeout: 10000 });
+    if (result.status === 0) return 'babysitter';
+  } catch {}
+  const versionsPath = path.join(packageRoot, 'versions.json');
+  const versions = readJson(versionsPath) || {};
+  const ver = versions.sdkVersion || 'latest';
+  return `npx -y @a5c-ai/babysitter-sdk@${ver}`;
+}
+
+function runCli(packageRoot, cliArgs, options = {}) {
+  const cmd = resolveCliCommand(packageRoot);
+  const parts = cmd.split(' ');
+  const result = spawnSync(parts[0], [...parts.slice(1), ...cliArgs], {
+    stdio: options.stdio || 'inherit',
+    timeout: options.timeout || 120000,
+    cwd: options.cwd || process.cwd(),
+    env: { ...process.env, ...options.env },
+  });
+  return result;
+}
+
+function ensureGlobalProcessLibrary(packageRoot) {
+  const stateDir = getGlobalStateDir();
+  const activeFile = path.join(stateDir, 'active', 'process-library.json');
+  let active = readJson(activeFile);
+  if (active && active.binding && active.binding.dir) {
+    return active;
+  }
+  const defaultSpec = readJson(path.join(stateDir, 'process-library-defaults.json'));
+  const cloneDir = defaultSpec && defaultSpec.cloneDir
+    ? defaultSpec.cloneDir
+    : path.join(stateDir, 'process-library', PLUGIN_NAME + '-repo');
+  runCli(packageRoot, [
+    'process-library:clone',
+    '--dir', cloneDir,
+    '--state-dir', stateDir,
+    '--json',
+  ], { stdio: 'pipe' });
+  runCli(packageRoot, [
+    'process-library:use',
+    '--dir', cloneDir,
+    '--state-dir', stateDir,
+    '--json',
+  ], { stdio: 'pipe' });
+  active = readJson(activeFile);
+  return {
+    binding: active && active.binding ? active.binding : { dir: cloneDir },
+    defaultSpec: defaultSpec || { cloneDir },
+    stateFile: activeFile,
+  };
+}
+
+
+module.exports = {
+  PLUGIN_NAME,
+  PLUGIN_CATEGORY,
+  getUserHome,
+  getHarnessHome,
+  getHomePluginRoot,
+  getHomeMarketplacePath,
+  writeFileIfChanged,
+  copyRecursive,
+  copyPluginBundle,
+  readJson,
+  writeJson,
+  ensureExecutable,
+  normalizeMarketplaceSourcePath,
+  ensureMarketplaceEntry,
+  removeMarketplaceEntry,
+  warnWindowsHooks,
+  runPostInstall,
+  getGlobalStateDir,
+  resolveCliCommand,
+  runCli,
+  ensureGlobalProcessLibrary,
+};

package/bin/install.cjs

@@ -1,45 +1,30 @@
 #!/usr/bin/env node
 'use strict';
 
-const fs = require('fs');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const shared = require('./install-shared');
 
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
-const PACKAGE_JSON = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
 
-function parseArgs(argv) {
-  let workspace = null;
-  for (let i = 2; i < argv.length; i += 1) {
-    const arg = argv[i];
-    if (arg === '--workspace') {
-      const next = argv[i + 1];
-      workspace = next && !next.startsWith('-') ? path.resolve(argv[++i]) : process.cwd();
-      continue;
-    }
-    if (arg === '--global') {
-      workspace = null;
-      continue;
+function main() {
+  const pluginRoot = shared.getHomePluginRoot();
+  const marketplacePath = shared.getHomeMarketplacePath();
+
+  console.log(`[${shared.PLUGIN_NAME}] Installing plugin to ${pluginRoot}`);
+
+  try {
+    shared.copyPluginBundle(PACKAGE_ROOT, pluginRoot);
+    shared.ensureMarketplaceEntry(marketplacePath, pluginRoot);
+    if (typeof shared.harnessInstall === 'function') {
+      shared.harnessInstall(PACKAGE_ROOT, pluginRoot);
     }
-    throw new Error(`unknown argument: ${arg}`);
+    shared.runPostInstall && shared.runPostInstall(pluginRoot);
+    console.log(`[${shared.PLUGIN_NAME}] Installation complete!`);
+    console.log(`[${shared.PLUGIN_NAME}] Restart your IDE/CLI to pick up the plugin.`);
+  } catch (err) {
+    console.error(`[${shared.PLUGIN_NAME}] Failed to install: ${err.message}`);
+    process.exitCode = 1;
   }
-  return { workspace };
-}
-
-function main() {
-  const { workspace } = parseArgs(process.argv);
-  const result = workspace
-    ? spawnSync('omp', ['plugin', 'link', path.resolve(workspace, 'plugins', 'babysitter-omp')], {
-        cwd: workspace,
-        stdio: 'inherit',
-        env: process.env,
-      })
-    : spawnSync('omp', ['plugin', 'install', `${PACKAGE_JSON.name}@${PACKAGE_JSON.version}`], {
-        cwd: process.cwd(),
-        stdio: 'inherit',
-        env: process.env,
-      });
-  process.exitCode = result.status ?? 1;
 }
 
 main();

package/bin/uninstall.cjs

@@ -2,19 +2,23 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-const PACKAGE_ROOT = path.resolve(__dirname, '..');
-const PACKAGE_JSON = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
+const shared = require('./install-shared');
 
 function main() {
-  const result = spawnSync('omp', ['plugin', 'uninstall', PACKAGE_JSON.name], {
-    cwd: process.cwd(),
-    stdio: 'inherit',
-    env: process.env,
-  });
-  process.exitCode = result.status ?? 1;
+  const pluginRoot = shared.getHomePluginRoot();
+
+  if (!fs.existsSync(pluginRoot)) {
+    console.log(`[${shared.PLUGIN_NAME}] Plugin not installed at ${pluginRoot}`);
+    return;
+  }
+
+  try {
+    fs.rmSync(pluginRoot, { recursive: true, force: true });
+    console.log(`[${shared.PLUGIN_NAME}] Uninstalled from ${pluginRoot}`);
+  } catch (err) {
+    console.error(`[${shared.PLUGIN_NAME}] Failed to uninstall: ${err.message}`);
+    process.exitCode = 1;
+  }
 }
 
 main();

package/commands/doctor.md

@@ -362,13 +362,13 @@ Mark as FAIL if:
 - 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: "env-var"` → mark as WARN ("`AGENT_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 AGENT_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").
+- If `envVarPresent && !envVarMatches`, mark as WARN ("`AGENT_SESSION_ID` in env does not match the resolved session ID; a stale value is shadowing the authoritative one. Unset the env var").
 
 ---
 
@@ -390,7 +390,7 @@ Mark as FAIL if:
 
 - 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").
+- 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 `AGENT_SESSION_ID` appropriately -- the PID marker handles this automatically").
 - Otherwise mark as PASS.
 
 ---
@@ -501,7 +501,7 @@ babysitter session:cleanup --dry-run   # preview
 babysitter session:cleanup             # apply
 
 # 2. Unset a stale env var
-unset BABYSITTER_SESSION_ID
+unset AGENT_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

package/commands/help.md

@@ -230,9 +230,10 @@ SECONDARY COMMANDS
   effect status in your browser. Useful when running /yolo or /forever to watch
   progress without interrupting the run.
 
-  How it works: Runs npx @yoavmayer/babysitter-observer-dashboard@latest which watches
+  How it works: Runs npx @a5c-ai/babysitter-observer-dashboard@latest which watches
   the .a5c/runs/ directory (or a parent directory containing multiple projects) and
-  serves a live dashboard. The process is blocking -- it runs until you stop it.
+  serves a live dashboard. The process is blocking -- it runs until you stop it, and
+  it prints the local URL to share with the user.
 
   Example: /babysitter:observe
   (opens browser showing all runs with live-updating task

package/commands/observe.md

@@ -9,4 +9,4 @@ Run the babysitter observer dashboard:
 1. Determine the watch directory — this is usually the project's container directory (the parent of the project dir), or the current working directory if not specified.
 2. Launch the dashboard: `npx -y @a5c-ai/babysitter-observer-dashboard@latest --watch-dir <dir>`
 3. This is a blocking process — it will keep running until stopped.
-4. Open the browser at the URL printed by the dashboard.
+4. Report the URL printed by the dashboard to the user, then open it in the browser.

package/extensions/index.ts

@@ -1,4 +1,8 @@
 import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
+import { execSync } from "child_process";
+import * as path from "path";
+
+const PLUGIN_ROOT = path.resolve(__dirname, "..");
 
 const COMMANDS = [
   "assimilate",
@@ -22,7 +26,44 @@ function toSkillPrompt(name: string, args: string): string {
   return `/skill:${name}${args ? ` ${args}` : ""}`;
 }
 
+/**
+ * Run a proxied hook script and return parsed JSON result.
+ * Returns empty object on failure (hooks are best-effort).
+ */
+function runProxiedHook(
+  scriptName: string,
+  inputData?: Record<string, unknown>
+): Record<string, unknown> {
+  const scriptPath = path.join(PLUGIN_ROOT, "hooks", scriptName);
+  try {
+    const result = execSync(`node "${scriptPath}"`, {
+      input: inputData ? JSON.stringify(inputData) : undefined,
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 30000,
+      env: {
+        ...process.env,
+        OMP_PLUGIN_ROOT: PLUGIN_ROOT,
+      },
+    });
+    return JSON.parse(result.toString("utf8").trim());
+  } catch {
+    // Hooks are best-effort -- never break the extension
+    return {};
+  }
+}
+
 export default function activate(pi: ExtensionAPI): void {
+  // ---------------------------------------------------------------------------
+  // Trigger session-start hook on activation
+  // ---------------------------------------------------------------------------
+  runProxiedHook("babysitter-proxied-session-start.js", {
+    event: "session_start",
+    cwd: process.cwd(),
+  });
+
+  // ---------------------------------------------------------------------------
+  // Register slash commands (unchanged from legacy)
+  // ---------------------------------------------------------------------------
   const forwardBabysit = async (args: unknown) => {
     pi.sendUserMessage(toSkillPrompt("babysit", String(args ?? "").trim()));
   };

package/package.json

@@ -1,14 +1,12 @@
 {
   "name": "@a5c-ai/babysitter-omp",
-  "version": "0.1.4-staging.fd3ab4c2",
+  "version": "5.0.0",
   "type": "module",
-  "description": "Babysitter package for oh-my-pi",
+  "description": "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval — oh-my-pi",
   "keywords": [
     "oh-my-pi",
-    "omp",
     "babysitter",
-    "orchestration",
-    "ai-agent"
+    "orchestration"
   ],
   "omp": {
     "extensions": [
@@ -18,17 +16,12 @@
       "./skills"
     ]
   },
-  "dependencies": {
-    "@a5c-ai/babysitter-sdk": "0.0.188-staging.fd3ab4c2"
-  },
   "peerDependencies": {
     "@oh-my-pi/pi-coding-agent": "*"
   },
   "scripts": {
     "test": "node --test test/integration.test.js && node test/packaged-install.test.cjs",
-    "test:integration": "node --test test/integration.test.js",
-    "test:packaged-install": "node test/packaged-install.test.cjs",
-    "sync:commands": "node scripts/sync-command-docs.cjs",
+    "validate:ci": "npm test",
     "deploy": "npm publish --access public",
     "deploy:staging": "npm publish --access public --tag staging"
   },
@@ -53,7 +46,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/a5c-ai/babysitter"
+    "url": "git+https://github.com/a5c-ai/babysitter-omp.git"
   },
-  "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-omp#readme"
+  "homepage": "https://github.com/a5c-ai/babysitter-omp#readme",
+  "bugs": {
+    "url": "https://github.com/a5c-ai/babysitter-omp/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,12 @@
+#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+
+function run(command, args) {
+  const result = spawnSync(command, args, { stdio: 'inherit' });
+  if (result.status !== 0) process.exit(result.status || 1);
+}
+
+const ref = process.env.GITHUB_REF_NAME || '';
+const branch = ref.split('/')[1] || 'develop';
+const tag = branch === 'main' ? 'latest' : branch;
+run('npm', ['publish', '--access', 'public', '--tag', tag]);

package/scripts/team-install.cjs

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+'use strict';
+
+var path = require('path');
+var shared = require('../bin/install-shared');
+
+var workspace = process.cwd();
+for (var i = 0; i < process.argv.length; i++) {
+  if (process.argv[i] === '--workspace' && process.argv[i + 1]) {
+    workspace = path.resolve(process.argv[i + 1]);
+  }
+}
+
+var src = process.env.PLUGIN_PACKAGE_ROOT || path.resolve(__dirname, '..');
+var dest = shared.getHomePluginRoot('workspace');
+console.log('[babysitter] Team install to ' + dest);
+
+shared.copyPluginBundle(src, dest);
+if (typeof shared.harnessTeamInstall === 'function') {
+  shared.harnessTeamInstall(src, dest, workspace);
+}
+shared.runPostInstall(dest);
+console.log('[babysitter] Team install complete.');

package/skills/babysit/SKILL.md

@@ -16,6 +16,8 @@ Read the SDK version from `versions.json` to ensure version compatibility:
 ```bash
 PLUGIN_ROOT="${OMP_PLUGIN_ROOT:-$(pwd)}"
 SDK_VERSION=$(node -e "try{const fs=require('fs');const path=require('path');const pluginRoot=process.env.OMP_PLUGIN_ROOT||process.env.PLUGIN_ROOT||process.cwd();const probes=[path.join(pluginRoot,'versions.json'),path.join(pluginRoot,'plugins','babysitter-omp','versions.json'),path.join(pluginRoot,'node_modules','@a5c-ai','babysitter-omp','versions.json'),path.join(process.cwd(),'node_modules','@a5c-ai','babysitter-omp','versions.json')];for(const probe of probes){if(fs.existsSync(probe)){console.log(JSON.parse(fs.readFileSync(probe,'utf8')).sdkVersion||'latest');process.exit(0)}}console.log('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

@@ -363,13 +363,13 @@ Mark as FAIL if:
 - 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: "env-var"` → mark as WARN ("`AGENT_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 AGENT_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").
+- If `envVarPresent && !envVarMatches`, mark as WARN ("`AGENT_SESSION_ID` in env does not match the resolved session ID; a stale value is shadowing the authoritative one. Unset the env var").
 
 ---
 
@@ -391,7 +391,7 @@ Mark as FAIL if:
 
 - 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").
+- 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 `AGENT_SESSION_ID` appropriately -- the PID marker handles this automatically").
 - Otherwise mark as PASS.
 
 ---
@@ -502,7 +502,7 @@ babysitter session:cleanup --dry-run   # preview
 babysitter session:cleanup             # apply
 
 # 2. Unset a stale env var
-unset BABYSITTER_SESSION_ID
+unset AGENT_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

package/skills/help/SKILL.md

@@ -231,9 +231,10 @@ SECONDARY COMMANDS
   effect status in your browser. Useful when running /yolo or /forever to watch
   progress without interrupting the run.
 
-  How it works: Runs npx @yoavmayer/babysitter-observer-dashboard@latest which watches
+  How it works: Runs npx @a5c-ai/babysitter-observer-dashboard@latest which watches
   the .a5c/runs/ directory (or a parent directory containing multiple projects) and
-  serves a live dashboard. The process is blocking -- it runs until you stop it.
+  serves a live dashboard. The process is blocking -- it runs until you stop it, and
+  it prints the local URL to share with the user.
 
   Example: /babysitter:observe
   (opens browser showing all runs with live-updating task

package/skills/observe/SKILL.md

@@ -10,4 +10,4 @@ Run the babysitter observer dashboard:
 1. Determine the watch directory — this is usually the project's container directory (the parent of the project dir), or the current working directory if not specified.
 2. Launch the dashboard: `npx -y @a5c-ai/babysitter-observer-dashboard@latest --watch-dir <dir>`
 3. This is a blocking process — it will keep running until stopped.
-4. Open the browser at the URL printed by the dashboard.
+4. Report the URL printed by the dashboard to the user, then open it in the browser.

package/versions.json

@@ -1,3 +1,4 @@
 {
-  "sdkVersion": "0.0.188-staging.fd3ab4c2"
+  "sdkVersion": "5.0.1-staging.dfac8e4a",
+  "extensionVersion": "5.0.0"
 }

package/scripts/setup.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# setup.sh — Full setup script for babysitter-pi plugin
-#
-# Installs npm dependencies, verifies the babysitter SDK,
-# creates necessary directories, and prints usage instructions.
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PLUGIN_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-RED='\033[0;31m'
-NC='\033[0m' # No Color
-
-log()   { echo -e "${GREEN}[setup]${NC} $1"; }
-warn()  { echo -e "${YELLOW}[setup] WARNING:${NC} $1"; }
-error() { echo -e "${RED}[setup] ERROR:${NC} $1"; }
-
-# ── Check Node.js ──────────────────────────────────────────────────────
-log "Checking Node.js version..."
-if ! command -v node &>/dev/null; then
-  error "Node.js is not installed. Please install Node.js >= 18."
-  exit 1
-fi
-
-NODE_MAJOR=$(node -e "console.log(process.versions.node.split('.')[0])")
-if [ "$NODE_MAJOR" -lt 18 ]; then
-  error "Node.js v$(node -v) detected. babysitter-pi requires Node.js >= 18."
-  exit 1
-fi
-log "Node.js v$(node -v | tr -d 'v') — OK"
-
-# ── Install npm dependencies ──────────────────────────────────────────
-log "Installing npm dependencies..."
-cd "$PLUGIN_DIR"
-if [ -f "package.json" ]; then
-  npm install --no-audit --no-fund 2>&1 || {
-    warn "npm install encountered issues, but continuing setup."
-  }
-  log "Dependencies installed."
-else
-  warn "No package.json found in $PLUGIN_DIR — skipping npm install."
-fi
-
-# ── Verify babysitter SDK ─────────────────────────────────────────────
-log "Checking for @a5c-ai/babysitter-sdk..."
-SDK_CHECK=$(node -e "try { require('@a5c-ai/babysitter-sdk'); console.log('ok'); } catch(e) { console.log('missing'); }" 2>/dev/null)
-if [ "$SDK_CHECK" = "ok" ]; then
-  log "@a5c-ai/babysitter-sdk — OK"
-else
-  warn "@a5c-ai/babysitter-sdk not found. Install it with: npm install @a5c-ai/babysitter-sdk"
-fi
-
-# ── Create necessary directories ─────────────────────────────────────
-log "Creating directories..."
-mkdir -p "$PLUGIN_DIR/state"
-log "State directory ready: $PLUGIN_DIR/state"
-
-# ── Print usage instructions ─────────────────────────────────────────
-echo ""
-echo "============================================"
-echo "  babysitter-pi plugin setup complete"
-echo "============================================"
-echo ""
-echo "Usage:"
-echo "  babysitter plugin:install pi --marketplace-name <name> --project"
-echo "  babysitter plugin:configure pi --marketplace-name <name> --project"
-echo ""
-echo "For more information, see: $PLUGIN_DIR/README.md"
-echo ""
-
-log "Done."

package/scripts/sync-command-docs.cjs

@@ -1,106 +0,0 @@
-'use strict';
-
-const path = require('path');
-const {
-  listMarkdownBasenames,
-  reportCheckResult,
-  syncCommandMirrors,
-  syncSkillsFromCommands,
-  writeFileIfChanged,
-} = require('../../../scripts/plugin-command-sync-lib.cjs');
-
-const PACKAGE_ROOT = path.resolve(__dirname, '..');
-const REPO_ROOT = path.resolve(PACKAGE_ROOT, '..', '..');
-const ROOT_COMMANDS = path.join(REPO_ROOT, 'plugins', 'babysitter', 'commands');
-const COMMANDS_ROOT = path.join(PACKAGE_ROOT, 'commands');
-const SKILLS_ROOT = path.join(PACKAGE_ROOT, 'skills');
-const LABEL = 'babysitter-omp sync';
-
-const BABYSIT_SKILL = `---
-name: babysit
-description: Orchestrate via @babysitter. Use this skill when asked to babysit a run, orchestrate a process or whenever it is called explicitly. (babysit, babysitter, orchestrate, orchestrate a run, workflow, etc.)
----
-
-# babysit
-
-Orchestrate \`.a5c/runs/<runId>/\` through iterative execution.
-
-## Dependencies
-
-### Babysitter SDK and CLI
-
-Read the SDK version from \`versions.json\` to ensure version compatibility:
-
-\`\`\`bash
-PLUGIN_ROOT="\${OMP_PLUGIN_ROOT:-\$(pwd)}"
-SDK_VERSION=$(node -e "try{const fs=require('fs');const path=require('path');const pluginRoot=process.env.OMP_PLUGIN_ROOT||process.env.PLUGIN_ROOT||process.cwd();const probes=[path.join(pluginRoot,'versions.json'),path.join(pluginRoot,'plugins','babysitter-omp','versions.json'),path.join(pluginRoot,'node_modules','@a5c-ai','babysitter-omp','versions.json'),path.join(process.cwd(),'node_modules','@a5c-ai','babysitter-omp','versions.json')];for(const probe of probes){if(fs.existsSync(probe)){console.log(JSON.parse(fs.readFileSync(probe,'utf8')).sdkVersion||'latest');process.exit(0)}}console.log('latest')}catch{console.log('latest')}")
-CLI="npx -y @a5c-ai/babysitter-sdk@$SDK_VERSION"
-\`\`\`
-
-## Instructions
-
-Run the following command to get full orchestration instructions:
-
-\`\`\`bash
-babysitter instructions:babysit-skill --harness oh-my-pi --interactive
-\`\`\`
-
-For non-interactive mode:
-
-\`\`\`bash
-babysitter instructions:babysit-skill --harness oh-my-pi --no-interactive
-\`\`\`
-
-Follow the instructions returned by the command above to orchestrate the run.
-`;
-
-function getCommandNames() {
-  return listMarkdownBasenames(ROOT_COMMANDS);
-}
-
-function main() {
-  const check = process.argv.includes('--check');
-  const commandNames = getCommandNames();
-  const mirrorResult = syncCommandMirrors({
-    label: LABEL,
-    sourceRoot: ROOT_COMMANDS,
-    targetRoot: COMMANDS_ROOT,
-    names: commandNames,
-    check,
-    cwd: PACKAGE_ROOT,
-  });
-  const skillsResult = syncSkillsFromCommands({
-    label: LABEL,
-    sourceRoot: COMMANDS_ROOT,
-    skillsRoot: SKILLS_ROOT,
-    names: commandNames,
-    check,
-    cwd: PACKAGE_ROOT,
-  });
-
-  const babysitSkillPath = path.join(SKILLS_ROOT, 'babysit', 'SKILL.md');
-  if (check) {
-    const fs = require('fs');
-    const stale = [...mirrorResult.stale, ...skillsResult.stale];
-    const current = fs.existsSync(babysitSkillPath)
-      ? fs.readFileSync(babysitSkillPath, 'utf8')
-      : null;
-    if (current !== BABYSIT_SKILL) {
-      stale.push(path.relative(PACKAGE_ROOT, babysitSkillPath));
-    }
-    reportCheckResult(LABEL, stale);
-    return;
-  }
-
-  const babysitUpdated = writeFileIfChanged(babysitSkillPath, BABYSIT_SKILL) ? 1 : 0;
-  const updated = mirrorResult.updated + skillsResult.updated + babysitUpdated;
-
-  if (updated === 0) {
-    console.log(`[${LABEL}] no oh-my-pi command or skill changes were needed.`);
-    return;
-  }
-
-  console.log(`[${LABEL}] updated ${updated} oh-my-pi command/skill file(s).`);
-}
-
-main();