@a5c-ai/babysitter-github 5.0.1-staging.d73033a7 → 5.0.1-staging.daf8e165bc4a

package/bin/install.js

@@ -2,126 +2,86 @@
 'use strict';
 
 const path = require('path');
-const { spawnSync } = require('child_process');
-const {
-  copyPluginBundle,
-  ensureGlobalProcessLibrary,
-  ensureMarketplaceEntry,
-  getCopilotHome,
-  getHomeMarketplacePath,
-  getHomePluginRoot,
-  installCloudAgentSurface,
-  installCopilotSurface,
-  warnWindowsHooks,
-} = require('./install-shared');
+const shared = require('./install-shared');
 
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
 
 function parseArgs(argv) {
-  const args = {
-    cloudAgent: false,
-    workspace: process.cwd(),
-  };
+  let workspace = null;
+  let cloudAgent = false;
 
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
     if (arg === '--cloud-agent') {
-      args.cloudAgent = true;
+      cloudAgent = true;
       continue;
     }
     if (arg === '--workspace') {
       const next = argv[i + 1];
       if (next && !next.startsWith('-')) {
-        args.workspace = path.resolve(next);
+        workspace = path.resolve(next);
         i += 1;
       } else {
-        args.workspace = process.cwd();
+        workspace = process.cwd();
       }
     }
   }
 
-  return args;
-}
-
-/**
- * Attempt to register the plugin via `copilot plugin install ./path`.
- * Falls back to manual config.json registration if the CLI is not available.
- */
-function registerViaCopilotCli(pluginRoot) {
-  const result = spawnSync('copilot', ['plugin', 'install', pluginRoot], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout: 30000,
-  });
-
-  if (result.status === 0) {
-    console.log(`[babysitter] Registered plugin via 'copilot plugin install'`);
-    return true;
-  }
-
-  // CLI not available or failed -- fall back to manual registration
-  const stderr = (result.stderr || '').trim();
-  if (result.error || stderr.includes('not found') || stderr.includes('not recognized')) {
-    console.log(`[babysitter] Copilot CLI not found, using manual registration`);
-  } else {
-    console.warn(`[babysitter] 'copilot plugin install' failed: ${stderr || 'unknown error'}, using manual registration`);
-  }
-  return false;
+  return { cloudAgent, workspace };
 }
 
 function main() {
-  const args = parseArgs(process.argv.slice(2));
-  const copilotHome = getCopilotHome();
-  const pluginRoot = getHomePluginRoot();
-  const marketplacePath = getHomeMarketplacePath();
+  const options = parseArgs(process.argv.slice(2));
 
-  if (args.cloudAgent) {
-    const active = ensureGlobalProcessLibrary(PACKAGE_ROOT);
-    const installed = installCloudAgentSurface(PACKAGE_ROOT, args.workspace);
-    console.log(`[babysitter] Installed Copilot cloud-agent support into ${args.workspace}`);
-    console.log(`[babysitter]   plugin bundle: ${installed.bundleRoot}`);
-    console.log(`[babysitter]   skills: ${path.join(args.workspace, '.github', 'skills')}`);
-    console.log(`[babysitter]   instructions: ${installed.copilotInstructionsPath}`);
-    console.log(`[babysitter]   agents: ${installed.agentsPath}`);
-    if (installed.setupWorkflow.needsManualMerge) {
-      console.warn(`[babysitter] Existing copilot-setup-steps workflow preserved: ${installed.setupWorkflow.workflowPath}`);
-      console.warn(`[babysitter] Merge Babysitter setup steps from: ${installed.setupWorkflow.examplePath}`);
-    } else {
-      console.log(`[babysitter]   setup workflow: ${installed.setupWorkflow.workflowPath}`);
+  if (options.cloudAgent) {
+    if (!options.workspace) {
+      console.error(`[${shared.PLUGIN_NAME}] Failed to install: --cloud-agent requires --workspace <path>.`);
+      process.exitCode = 1;
+      return;
+    }
+
+    try {
+      const installResult = shared.installCloudAgentSurface(PACKAGE_ROOT, options.workspace);
+      shared.ensureGlobalProcessLibrary(PACKAGE_ROOT);
+      console.log(`[${shared.PLUGIN_NAME}] Installed cloud-agent support into ${options.workspace}`);
+      if (installResult.setupWorkflow && installResult.setupWorkflow.examplePath) {
+        console.log(
+          `[${shared.PLUGIN_NAME}] Existing copilot setup workflow preserved; merge candidate written to ${installResult.setupWorkflow.examplePath}`,
+        );
+      }
+      return;
+    } catch (err) {
+      console.error(`[${shared.PLUGIN_NAME}] Failed to install cloud-agent support: ${err.message}`);
+      process.exitCode = 1;
+      return;
     }
-    console.log(`[babysitter]   process library: ${active.binding?.dir}`);
-    console.log(`[babysitter]   process library state: ${active.stateFile}`);
-    console.log('[babysitter] Cloud-agent installation complete!');
-    return;
   }
 
-  console.log(`[babysitter] Installing plugin to ${pluginRoot}`);
+  const pluginRoot = shared.getHomePluginRoot();
+  const marketplacePath = shared.getHomeMarketplacePath();
 
-  try {
-    copyPluginBundle(PACKAGE_ROOT, pluginRoot);
-    ensureMarketplaceEntry(marketplacePath, pluginRoot);
+  console.log(`[${shared.PLUGIN_NAME}] Installing plugin to ${pluginRoot}`);
 
-    // Try native copilot CLI registration first; fall back to manual config.json
-    if (!registerViaCopilotCli(pluginRoot)) {
-      const { registerCopilotPlugin } = require('./install-shared');
-      registerCopilotPlugin(pluginRoot);
+  try {
+    shared.copyPluginBundle(PACKAGE_ROOT, pluginRoot);
+    shared.ensureMarketplaceEntry(marketplacePath, pluginRoot);
+    if (typeof shared.registerCopilotPlugin === 'function') {
+      shared.registerCopilotPlugin(pluginRoot);
     }
-
-    installCopilotSurface(PACKAGE_ROOT, copilotHome);
-
-    const active = ensureGlobalProcessLibrary(PACKAGE_ROOT);
-    console.log(`[babysitter]   marketplace: ${marketplacePath}`);
-    console.log(`[babysitter]   copilot config: ${path.join(copilotHome, 'config.json')}`);
-    console.log(`[babysitter]   process library: ${active.binding?.dir}`);
-    if (active.defaultSpec?.cloneDir) {
-      console.log(`[babysitter]   process library clone: ${active.defaultSpec.cloneDir}`);
+    if (typeof shared.installCopilotSurface === 'function' && typeof shared.getCopilotHome === 'function') {
+      shared.installCopilotSurface(PACKAGE_ROOT, shared.getCopilotHome());
+    }
+    if (typeof shared.warnWindowsHooks === 'function') {
+      shared.warnWindowsHooks();
+    }
+    if (typeof shared.harnessInstall === 'function') {
+      shared.harnessInstall(PACKAGE_ROOT, pluginRoot);
     }
-    console.log(`[babysitter]   process library state: ${active.stateFile}`);
-    warnWindowsHooks();
-    console.log('[babysitter] Installation complete!');
-    console.log('[babysitter] Restart GitHub Copilot CLI to pick up the installed plugin and config changes.');
+    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(`[babysitter] Failed to install plugin: ${err.message}`);
+    console.error(`[${shared.PLUGIN_NAME}] Failed to install: ${err.message}`);
     process.exitCode = 1;
   }
 }

package/bin/uninstall.js

@@ -1,76 +1,46 @@
 #!/usr/bin/env node
 'use strict';
 
+const path = require('path');
 const fs = require('fs');
-const { spawnSync } = require('child_process');
-const {
-  deregisterCopilotPlugin,
-  getCopilotHome,
-  getHomeMarketplacePath,
-  getHomePluginRoot,
-  removeLegacyHooks,
-  removeMarketplaceEntry,
-} = require('./install-shared');
-
-const PLUGIN_NAME = 'babysitter';
-
-/**
- * Attempt to unregister the plugin via `copilot plugin uninstall`.
- * Falls back to manual config.json cleanup if the CLI is not available.
- */
-function unregisterViaCopilotCli() {
-  const result = spawnSync('copilot', ['plugin', 'uninstall', PLUGIN_NAME], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-    encoding: 'utf8',
-    timeout: 30000,
-  });
-
-  if (result.status === 0) {
-    console.log(`[${PLUGIN_NAME}] Unregistered plugin via 'copilot plugin uninstall'`);
-    return true;
-  }
-
-  // CLI not available or failed
-  const stderr = (result.stderr || '').trim();
-  if (result.error || stderr.includes('not found') || stderr.includes('not recognized')) {
-    console.log(`[${PLUGIN_NAME}] Copilot CLI not found, using manual cleanup`);
-  } else {
-    console.warn(`[${PLUGIN_NAME}] 'copilot plugin uninstall' failed: ${stderr || 'unknown error'}, using manual cleanup`);
-  }
-  return false;
-}
+const shared = require('./install-shared');
 
 function main() {
-  const copilotHome = getCopilotHome();
-  const pluginRoot = getHomePluginRoot();
-  const marketplacePath = getHomeMarketplacePath();
-  let removedPlugin = false;
-
-  if (fs.existsSync(pluginRoot)) {
+  const pluginRoot = shared.getHomePluginRoot();
+  const marketplacePath = typeof shared.getHomeMarketplacePath === 'function'
+    ? shared.getHomeMarketplacePath()
+    : null;
+  const copilotHome = typeof shared.getCopilotHome === 'function'
+    ? shared.getCopilotHome()
+    : null;
+
+  if (!fs.existsSync(pluginRoot)) {
+    console.log(`[${shared.PLUGIN_NAME}] Plugin not installed at ${pluginRoot}`);
+  } else {
     try {
       fs.rmSync(pluginRoot, { recursive: true, force: true });
-      console.log(`[${PLUGIN_NAME}] Removed ${pluginRoot}`);
-      removedPlugin = true;
+      console.log(`[${shared.PLUGIN_NAME}] Uninstalled from ${pluginRoot}`);
     } catch (err) {
-      console.warn(`[${PLUGIN_NAME}] Warning: Could not remove plugin directory ${pluginRoot}: ${err.message}`);
+      console.error(`[${shared.PLUGIN_NAME}] Failed to uninstall: ${err.message}`);
+      process.exitCode = 1;
+      return;
     }
   }
 
-  removeMarketplaceEntry(marketplacePath);
-
-  // Try native copilot CLI unregistration first; fall back to manual config.json
-  if (!unregisterViaCopilotCli()) {
-    deregisterCopilotPlugin(pluginRoot);
-  }
-
-  removeLegacyHooks(copilotHome);
-
-  if (!removedPlugin) {
-    console.log(`[${PLUGIN_NAME}] Plugin directory not found, config and hooks cleaned if present.`);
-    return;
+  try {
+    if (typeof shared.deregisterCopilotPlugin === 'function') {
+      shared.deregisterCopilotPlugin(pluginRoot);
+    }
+    if (copilotHome && typeof shared.removeManagedHooks === 'function') {
+      shared.removeManagedHooks(copilotHome);
+    }
+    if (marketplacePath && typeof shared.removeMarketplaceEntry === 'function') {
+      shared.removeMarketplaceEntry(marketplacePath);
+    }
+  } catch (err) {
+    console.error(`[${shared.PLUGIN_NAME}] Failed to clean up uninstall state: ${err.message}`);
+    process.exitCode = 1;
   }
-
-  console.log(`[${PLUGIN_NAME}] Restart GitHub Copilot CLI to complete uninstallation.`);
 }
 
 main();

package/commands/blueprints.md

@@ -0,0 +1,64 @@
+---
+description: manage Babysitter blueprints. Use this command to list installed blueprints, browse marketplaces, install, update, uninstall, configure, or create a new blueprint.
+argument-hint: Blueprint action and options.
+---
+
+This command installs and manages Babysitter blueprints. A blueprint is a version-managed package of contextual instructions or deterministic Babysitter processes, not a conventional software plugin.
+
+If the command is run without arguments, list installed blueprints with their name, version, marketplace, installation date, and last update date. Also list configured marketplaces and show how to add the default marketplace when none exist.
+
+Blueprints can be installed at two scopes:
+
+- **global** (`--global`): stored under `~/.a5c/`, available for all projects
+- **project** (`--project`): stored under `<projectDir>/.a5c/`, project-specific
+
+## Marketplace Management
+
+Marketplaces are git repositories containing a `marketplace.json` manifest and blueprint package directories. The SDK clones new marketplaces to `.a5c/blueprints/marketplaces/` for the selected scope and reads legacy `.a5c/marketplaces/` clones for compatibility.
+
+### Add a marketplace
+
+```bash
+babysitter blueprint:add-marketplace --marketplace-url <url> [--marketplace-path <relative-path>] [--marketplace-branch <ref>] [--force] --global|--project [--json]
+```
+
+### Update a marketplace
+
+```bash
+babysitter blueprint:update-marketplace --marketplace-name <name> [--marketplace-branch <ref>] --global|--project [--json]
+```
+
+### List blueprints in a marketplace
+
+```bash
+babysitter blueprint:list-plugins --marketplace-name <name> --global|--project [--json]
+```
+
+## Blueprint Lifecycle
+
+For `blueprint:install`, `blueprint:update`, `blueprint:configure`, and `blueprint:list-plugins`, the `--marketplace-name` flag is auto-detected when only one marketplace is cloned for the selected scope.
+
+```bash
+babysitter blueprint:install --plugin-name <name> [--marketplace-name <mp>] --global|--project [--json]
+babysitter blueprint:update --plugin-name <name> --marketplace-name <mp> --global|--project [--json]
+babysitter blueprint:configure --plugin-name <name> --marketplace-name <mp> --global|--project [--json]
+babysitter blueprint:uninstall --plugin-name <name> --marketplace-name <mp> --global|--project [--json]
+```
+
+The `--plugin-name` flag is preserved for CLI compatibility with existing marketplace manifests. User-facing docs should call the installable a blueprint.
+
+## Registry Management
+
+```bash
+babysitter blueprint:list-installed --global|--project [--json]
+babysitter blueprint:update-registry --plugin-name <name> --plugin-version <ver> --marketplace-name <mp> --global|--project [--json]
+babysitter blueprint:remove-from-registry --plugin-name <name> --global|--project [--json]
+```
+
+## Deprecated Aliases
+
+The old `plugin:*` commands remain available as deprecated aliases for one release. Prefer `blueprint:*` in new docs, skills, and process instructions.
+
+## Agent Plugins Are Separate
+
+Do not rename or reinterpret agent harness plugins while handling blueprints. `CLAUDE_PLUGIN_ROOT`, `PI_PLUGIN_ROOT`, `.claude/plugins/`, hooks-mux, extension-mux, and agent plugin manifests stay plugin-specific.

package/commands/call.md

@@ -1,7 +1,11 @@
----
-description: Orchestrate a babysitter run. use this command to start babysitting a complex workflow.
-argument-hint: Specific instructions for the run.
-allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
----
-
-Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md).
+---
+description: Orchestrate a babysitter run. use this command to start babysitting a complex workflow.
+argument-hint: Specific instructions for the run.
+allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
+---
+
+Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md). Then continue executing the returned instructions in this same turn. Do not stop after the Skill tool returns; carry the requested run through to completion proof.
+
+User arguments for this command:
+
+$ARGUMENTS

package/commands/check-forbidden-markers.md

@@ -0,0 +1,68 @@
+---
+description: Pre-deploy gate that scans built JS chunks for forbidden substring markers (saga-era / obsolete code paths) listed in a project-local forbidden-markers.txt
+argument-hint: "[--markers-file <path>] [--chunks-dir <path>] [--json] Optional overrides; defaults are project-relative."
+allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
+---
+
+Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md). Compose the gate from the shared helper at `library/processes/shared/forbidden-markers-scanner.js` (issue #477).
+
+## What this gate does
+
+Reads a list of literal substring markers from `scripts/forbidden-markers.txt` (blank lines and `#`-prefixed comments stripped) and greps every `.js` chunk under `.vercel/output/static/_next/static/chunks/` (Next.js / Vercel default; configurable) for any occurrence. Reports structured hits per `(marker, chunk)` pair with occurrence counts. Designed to chain between `vercel build --prod` and `vercel deploy --prod`.
+
+Use this gate when a refactor or restart-from-baseline replaced load-bearing code paths and you need a structural guarantee the obsolete symbols never re-ship. Burned-in evidence: cookbook VI-9 / VI-12 near-miss revivals during the 2026-05 iOS-Safari saga; the prototype lives at `cookbook/scripts/check-no-forbidden.mjs` and shipped two upstream contributions before being generalized as this gate.
+
+## When to use
+
+- **Pre-deploy.** Insert after build, before deploy. Block the deploy when `ok: false`.
+- **Post-restart.** After a baseline rollback + step-by-step re-add, snapshot the saga-era markers in `forbidden-markers.txt` and let CI hold the line.
+- **Post-refactor.** When old helper / handler / module names must not coexist with the new ones in the same bundle.
+
+## Expected config locations
+
+- `scripts/forbidden-markers.txt` — one marker per line, `#` for comments. The list is the contract; the gate is mechanical. Commit this file to source control.
+- `.vercel/output/static/_next/static/chunks/` — default scan target. Override for non-Vercel frameworks via the `--chunks-dir` flag or the `chunksDir` task input.
+
+A missing markers file is a no-op (`ok: true`, `reason: 'missing-markers-file'`) — misconfiguration is never a deploy block. A missing chunks directory is likewise a no-op (`reason: 'missing-chunks-dir'`) so the gate is safe to chain into `check:all` before the build runs.
+
+## Exit semantics
+
+| Reason                  | `ok`   | Deploy decision                |
+|-------------------------|--------|--------------------------------|
+| `missing-markers-file`  | true   | Pass (no gate active)          |
+| `missing-chunks-dir`    | true   | Pass (run before build)        |
+| `empty-markers`         | true   | Pass (list is empty)           |
+| `no-chunks`             | true   | Pass (nothing to scan)         |
+| `clean`                 | true   | Pass — proceed to deploy       |
+| `hits`                  | false  | **BLOCK** — surface hits, ask for triage |
+
+For each hit, the gate emits `{ marker, chunk, count }` so the operator sees the exact marker string, the absolute chunk path, and the number of occurrences in that chunk. Multiple hits across chunks for the same marker are reported separately.
+
+## Programmatic surface
+
+```js
+import { scanForbiddenMarkers, checkForbiddenMarkersTask } from '@a5c-ai/babysitter-library/processes/shared';
+
+// Direct call:
+const result = await scanForbiddenMarkers({
+  markersFile: 'scripts/forbidden-markers.txt',
+  chunksDir:   '.vercel/output/static/_next/static/chunks',
+});
+if (!result.ok) {
+  // result.hits: Array<{ marker, chunk, count }>
+  // result.reason === 'hits'
+  process.exit(1);
+}
+
+// Or dispatched as a babysitter task:
+const gate = await ctx.task(checkForbiddenMarkersTask, {
+  projectDir: '.',
+  // markersFile / chunksDir are inferred from projectDir if omitted
+});
+```
+
+## Reference
+
+- Issue: https://github.com/a5c-ai/babysitter/issues/477
+- Helper module: `library/processes/shared/forbidden-markers-scanner.js`
+- Origin (cookbook prototype): `cookbook/scripts/check-no-forbidden.mjs` (81 lines)

package/commands/cleanup.md

@@ -6,15 +6,43 @@ allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSea
 
 Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md).
 
-Create and run a cleanup process using the process at `skills\babysit\process\cradle\cleanup-runs.js/processes/cleanup-runs.js`.
+Resolve the active process library with:
+
+```bash
+babysitter process-library:active --json
+```
+
+Read `binding.dir` from that JSON and create/run the cleanup process from `cradle/cleanup-runs.js#process` relative to that active library root. Do not use plugin-cache-relative cradle paths.
 
 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/commands/contrib.md

@@ -1,33 +1,33 @@
----
-description: Submit feedback or contribute to babysitter project
-argument-hint: Specific instructions for the run.
-allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
----
-
-Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md).
-
-## Process Routing
-
+---
+description: Submit feedback or contribute to babysitter project
+argument-hint: Specific instructions for the run.
+allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
+---
+
+Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md).
+
+## Process Routing
+
 Contribution processes live under the active process library's `cradle/` directory. Resolve the active library root with `babysitter process-library:active --json` and route based on arguments:
-
-### Issue-based (opens a GitHub issue in a5c-ai/babysitter)
- * **Bug report** → `cradle/bug-report.js#process` — Report a bug in the SDK, CLI, process library, etc.
- * **Feature request** → `cradle/feature-request.js#process` — Request a new feature or enhancement
- * **Documentation question** → `cradle/documentation-question.js#process` — Ask about undocumented behavior or missing docs
-
-### PR-based (forks repo, creates branch, submits PR to a5c-ai/babysitter)
- * **Bugfix** → `cradle/bugfix.js#process` — User already has the fix for a bug
- * **Feature implementation** → `cradle/feature-implementation-contribute.js#process` — User already has a feature implementation
- * **Harness integration** → `cradle/feature-harness-integration-contribute.js#process` — User has a harness (CI/CD, IDE, editor) integration
- * **Library contribution** → `cradle/library-contribution.js#process` — New or improved process/skill/subagent for the library
- * **Documentation answer** → `cradle/documentation-contribute-answer.js#process` — User has an answer for an unanswered docs question
-
-### Router (when arguments are empty or general)
- * **Contribute** → `cradle/contribute.js#process` — Explains contribution types and routes to the specific process
-
-## Contribution Rules
-
- * PR-based contributions: fork the babysitter repo (a5c-ai/babysitter) for the user, ask to star if not already starred, perform changes, submit PR
- * Issue-based contributions: gather details, search for duplicates, review, then open an issue in a5c-ai/babysitter
- * Add breakpoints (permissions) before ALL gh actions (fork, star, submit PR/issue) to allow user review and cancellation
+
+### Issue-based (opens a GitHub issue in a5c-ai/babysitter)
+ * **Bug report** → `cradle/bug-report.js#process` — Report a bug in the SDK, CLI, process library, etc.
+ * **Feature request** → `cradle/feature-request.js#process` — Request a new feature or enhancement
+ * **Documentation question** → `cradle/documentation-question.js#process` — Ask about undocumented behavior or missing docs
+
+### PR-based (forks repo, creates branch, submits PR to a5c-ai/babysitter)
+ * **Bugfix** → `cradle/bugfix.js#process` — User already has the fix for a bug
+ * **Feature implementation** → `cradle/feature-implementation-contribute.js#process` — User already has a feature implementation
+ * **Harness integration** → `cradle/feature-harness-integration-contribute.js#process` — User has a harness (CI/CD, IDE, editor) integration
+ * **Library contribution** → `cradle/library-contribution.js#process` — New or improved process/skill/subagent for the library
+ * **Documentation answer** → `cradle/documentation-contribute-answer.js#process` — User has an answer for an unanswered docs question
+
+### Router (when arguments are empty or general)
+ * **Contribute** → `cradle/contribute.js#process` — Explains contribution types and routes to the specific process
+
+## Contribution Rules
+
+ * PR-based contributions: fork the babysitter repo (a5c-ai/babysitter) for the user, ask to star if not already starred, perform changes, submit PR
+ * Issue-based contributions: gather details, search for duplicates, review, then open an issue in a5c-ai/babysitter
+ * Add breakpoints (permissions) before ALL gh actions (fork, star, submit PR/issue) to allow user review and cancellation
  * If arguments are empty: use the `contribute.js` router process to show options and route accordingly

package/commands/doctor.md

@@ -156,7 +156,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:
@@ -260,7 +259,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`.
@@ -315,7 +314,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`.
@@ -362,13 +361,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 +389,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 +500,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/forever.md

@@ -1,7 +1,7 @@
----
-description: Use this command to start babysitting a never-ending babysitter run.
-argument-hint: Specific instructions for the run.
-allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
----
-
+---
+description: Use this command to start babysitting a never-ending babysitter run.
+argument-hint: Specific instructions for the run.
+allowed-tools: Read, Grep, Write, Task, Bash, Edit, Grep, Glob, WebFetch, WebSearch, Search, AskUserQuestion, TodoWrite, TodoRead, Skill, BashOutput, KillShell, MultiEdit, LS
+---
+
 Invoke the babysitter:babysit skill (using the Skill tool) and follow its instructions (SKILL.md). but create a process that uses an infinte loop and a ctx.sleep to create a never-ending babysitter loop. an example of such process is a daily process that reads new support ticket every day and tries to resolve them, then sleeps for 4 hours and repeats the process.