@a5c-ai/babysitter-github 5.0.1-staging.25e625f3 → 5.0.1-staging.26a773f9

package/bin/cli.js

@@ -5,6 +5,8 @@ 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([
@@ -18,7 +20,6 @@ function printUsage() {
 function parseInstallArgs(argv) {
   let scope = 'global';
   let workspace = null;
-  let cloudAgent = false;
   const passthrough = [];
 
   for (let i = 0; i < argv.length; i += 1) {
@@ -38,15 +39,10 @@ function parseInstallArgs(argv) {
       }
       continue;
     }
-    if (arg === '--cloud-agent') {
-      cloudAgent = true;
-      passthrough.push(arg);
-      continue;
-    }
     passthrough.push(arg);
   }
 
-  return { scope, workspace, cloudAgent, passthrough };
+  return { scope, workspace, passthrough };
 }
 
 function runNodeScript(scriptPath, args, extraEnv = {}) {
@@ -67,8 +63,11 @@ function main() {
   }
 
   if (command === 'install') {
+    if (shared && typeof shared.harnessCliRoute === 'function' && shared.harnessCliRoute(rest, PACKAGE_ROOT, runNodeScript)) {
+      return;
+    }
     const parsed = parseInstallArgs(rest);
-    if (parsed.cloudAgent) {
+    if (parsed.passthrough.includes('--cloud-agent')) {
       const args = [...parsed.passthrough];
       if (parsed.workspace) {
         args.push('--workspace', parsed.workspace);

package/bin/install-shared.js

@@ -13,7 +13,7 @@ function getUserHome() {
 }
 
 function getHarnessHome() {
-  return path.join(os.homedir(), '.copilot');
+  return path.join(os.homedir(), ".copilot");
 }
 
 function getHomePluginRoot(scope) {
@@ -206,12 +206,12 @@ const LEGACY_HOOK_SCRIPT_NAMES = [
   'user-prompt-submit.sh',
 ];
 const HOOK_SCRIPT_NAMES = [
-  'session-start.sh',
-  'session-start.ps1',
-  'session-end.sh',
-  'session-end.ps1',
-  'user-prompt-submitted.sh',
-  'user-prompt-submitted.ps1',
+  'babysitter-proxied-session-start.sh',
+  'babysitter-proxied-session-start.ps1',
+  'babysitter-proxied-session-end.sh',
+  'babysitter-proxied-session-end.ps1',
+  'babysitter-proxied-user-prompt-submitted.sh',
+  'babysitter-proxied-user-prompt-submitted.ps1',
 ];
 const DEFAULT_MARKETPLACE = {
   name: 'local-plugins',
@@ -454,8 +454,9 @@ function installManagedHooks(packageRoot, copilotHome) {
   mergeManagedHooksConfig(packageRoot, copilotHome);
 }
 
-function removeLegacyHooks(copilotHome) {
-  for (const hookName of LEGACY_HOOK_SCRIPT_NAMES) {
+function removeManagedHooks(copilotHome) {
+  const managedHookNames = [...LEGACY_HOOK_SCRIPT_NAMES, ...HOOK_SCRIPT_NAMES];
+  for (const hookName of managedHookNames) {
     fs.rmSync(path.join(copilotHome, 'hooks', hookName), { force: true });
   }
 
@@ -476,10 +477,17 @@ function removeLegacyHooks(copilotHome) {
     const eventHooks = Array.isArray(hooksConfig.hooks[eventName]) ? hooksConfig.hooks[eventName] : [];
     const filteredMatchers = eventHooks
       .map((matcher) => {
+        const directBash = String(matcher?.bash || matcher?.command || '');
+        const directPs = String(matcher?.powershell || '');
+        const hasDirectHook = directBash.length > 0 || directPs.length > 0;
+        const directIsManaged = managedHookNames.some((name) => directBash.includes(name) || directPs.includes(name));
+        if (hasDirectHook) {
+          return directIsManaged ? null : matcher;
+        }
         const hooks = Array.isArray(matcher.hooks) ? matcher.hooks : [];
         const keptHooks = hooks.filter((hook) => {
           const command = String(hook.command || '');
-          return !LEGACY_HOOK_SCRIPT_NAMES.some((name) => command.includes(name));
+          return !managedHookNames.some((name) => command.includes(name));
         });
         return keptHooks.length > 0 ? { ...matcher, hooks: keptHooks } : null;
       })
@@ -498,11 +506,13 @@ function removeLegacyHooks(copilotHome) {
 }
 
 function installCopilotSurface(packageRoot, copilotHome) {
-  removeLegacyHooks(copilotHome);
+  removeManagedHooks(copilotHome);
   installManagedSkills(packageRoot, copilotHome);
   installManagedHooks(packageRoot, copilotHome);
 }
 
+const removeLegacyHooks = removeManagedHooks;
+
 function renderCloudAgentAgentsBlock() {
   return [
     '## Babysitter Cloud Agent',
@@ -787,6 +797,36 @@ function copyRecursive(src, dest) {
   fs.copyFileSync(src, dest);
 }
 
+function harnessCliRoute(argv, packageRoot, runNodeScript) {
+  if (argv.includes('--cloud-agent')) {
+    const args = argv.filter(a => a !== '--cloud-agent');
+    args.push('--cloud-agent');
+    runNodeScript(path.join(packageRoot, 'bin', 'install.js'), args);
+    return true;
+  }
+  return false;
+}
+
+function harnessInstall(packageRoot, _pluginRoot) {
+  const argv = process.argv.slice(2);
+  if (!argv.includes('--cloud-agent')) return;
+  const workspaceIdx = argv.indexOf('--workspace');
+  const workspaceRoot = (workspaceIdx >= 0 && argv[workspaceIdx + 1])
+    ? path.resolve(argv[workspaceIdx + 1])
+    : process.cwd();
+  console.log(`[${PLUGIN_NAME}] Installing cloud-agent support into ${workspaceRoot}`);
+  const activeProcessLibrary = runCli(packageRoot, [
+    'process-library:active',
+    '--json',
+  ], { stdio: 'pipe' });
+  if (activeProcessLibrary.status !== 0) {
+    ensureGlobalProcessLibrary(packageRoot);
+  }
+  installCloudAgentSurface(packageRoot, workspaceRoot);
+  console.log(`[${PLUGIN_NAME}] Cloud-agent installation complete!`);
+  process.exit(0);
+}
+
 
 module.exports = {
   PLUGIN_NAME,
@@ -801,10 +841,19 @@ module.exports = {
   resolveCliCommand,
   runCli,
   ensureGlobalProcessLibrary,
+  PLUGIN_BUNDLE_ENTRIES,
+  copyRecursive,
+  copyPluginBundle,
+  DEFAULT_MARKETPLACE,
+  normalizeMarketplaceSourcePath,
+  ensureMarketplaceEntry,
+  removeMarketplaceEntry,
+  installManagedSkills,
+  mergeManagedHooksConfig,
+  installManagedHooks,
+  warnWindowsHooks,
   LEGACY_HOOK_SCRIPT_NAMES,
   HOOK_SCRIPT_NAMES,
-  DEFAULT_MARKETPLACE,
-  PLUGIN_BUNDLE_ENTRIES,
   CLOUD_AGENT_BUNDLE_ENTRIES,
   MANAGED_BLOCK_START,
   MANAGED_BLOCK_END,
@@ -819,10 +868,8 @@ module.exports = {
   rewriteCloudSkill,
   registerCopilotPlugin,
   deregisterCopilotPlugin,
-  installManagedSkills,
-  mergeManagedHooksConfig,
-  installManagedHooks,
   removeLegacyHooks,
+  removeManagedHooks,
   installCopilotSurface,
   renderCloudAgentAgentsBlock,
   renderCloudAgentCopilotInstructionsBlock,
@@ -832,10 +879,6 @@ module.exports = {
   installCloudAgentInstructions,
   installCloudAgentSetupSteps,
   installCloudAgentSurface,
-  normalizeMarketplaceSourcePath,
-  ensureMarketplaceEntry,
-  removeMarketplaceEntry,
-  warnWindowsHooks,
-  copyPluginBundle,
-  copyRecursive,
+  harnessCliRoute,
+  harnessInstall,
 };

package/bin/install.js

@@ -7,8 +7,8 @@ const shared = require('./install-shared');
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
 
 function parseArgs(argv) {
-  let cloudAgent = false;
   let workspace = null;
+  let cloudAgent = false;
 
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
@@ -31,26 +31,30 @@ function parseArgs(argv) {
 }
 
 function main() {
-  const parsed = parseArgs(process.argv.slice(2));
-  if (parsed.cloudAgent) {
-    const workspaceRoot = parsed.workspace || process.cwd();
-    console.log(`[${shared.PLUGIN_NAME}] Installing cloud-agent support into ${workspaceRoot}`);
+  const options = parseArgs(process.argv.slice(2));
+
+  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 activeProcessLibrary = shared.runCli(PACKAGE_ROOT, [
-        'process-library:active',
-        '--json',
-      ], { stdio: 'pipe' });
-      if (activeProcessLibrary.status !== 0) {
-        shared.ensureGlobalProcessLibrary(PACKAGE_ROOT);
+      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}`,
+        );
       }
-      shared.installCloudAgentSurface(PACKAGE_ROOT, workspaceRoot);
-      console.log(`[${shared.PLUGIN_NAME}] Cloud-agent installation complete!`);
+      return;
     } catch (err) {
       console.error(`[${shared.PLUGIN_NAME}] Failed to install cloud-agent support: ${err.message}`);
       process.exitCode = 1;
+      return;
     }
-    return;
   }
 
   const pluginRoot = shared.getHomePluginRoot();
@@ -61,6 +65,18 @@ function main() {
   try {
     shared.copyPluginBundle(PACKAGE_ROOT, pluginRoot);
     shared.ensureMarketplaceEntry(marketplacePath, pluginRoot);
+    if (typeof shared.registerCopilotPlugin === 'function') {
+      shared.registerCopilotPlugin(pluginRoot);
+    }
+    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);
+    }
     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.`);

package/bin/uninstall.js

@@ -7,17 +7,38 @@ const shared = require('./install-shared');
 
 function main() {
   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}`);
-    return;
+  } else {
+    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;
+      return;
+    }
   }
 
   try {
-    fs.rmSync(pluginRoot, { recursive: true, force: true });
-    console.log(`[${shared.PLUGIN_NAME}] Uninstalled from ${pluginRoot}`);
+    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 uninstall: ${err.message}`);
+    console.error(`[${shared.PLUGIN_NAME}] Failed to clean up uninstall state: ${err.message}`);
     process.exitCode = 1;
   }
 }

package/hooks.json

@@ -4,24 +4,24 @@
     "sessionStart": [
       {
         "type": "command",
-        "bash": "./hooks/session-start.sh",
-        "powershell": "./hooks/session-start.ps1",
+        "bash": "./hooks/babysitter-proxied-session-start.sh",
+        "powershell": "./hooks/babysitter-proxied-session-start.ps1",
         "timeoutSec": 30
       }
     ],
     "userPromptSubmitted": [
       {
         "type": "command",
-        "bash": "./hooks/user-prompt-submitted.sh",
-        "powershell": "./hooks/user-prompt-submitted.ps1",
+        "bash": "./hooks/babysitter-proxied-user-prompt-submitted.sh",
+        "powershell": "./hooks/babysitter-proxied-user-prompt-submitted.ps1",
         "timeoutSec": 15
       }
     ],
     "sessionEnd": [
       {
         "type": "command",
-        "bash": "./hooks/session-end.sh",
-        "powershell": "./hooks/session-end.ps1",
+        "bash": "./hooks/babysitter-proxied-session-end.sh",
+        "powershell": "./hooks/babysitter-proxied-session-end.ps1",
         "timeoutSec": 30
       }
     ]

package/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@a5c-ai/babysitter-github",
-  "version": "5.0.1-staging.25e625f3",
+  "version": "5.0.1-staging.26a773f9",
   "description": "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval",
   "scripts": {
     "deploy": "npm publish --access public",
     "deploy:staging": "npm publish --access public --tag staging",
-    "postinstall": "node bin/install.js",
-    "preuninstall": "node bin/uninstall.js",
-    "team:install": "node scripts/team-install.js",
-    "test": "node scripts/sync-command-surfaces.js --check",
-    "sync:commands": "node scripts/sync-command-surfaces.js"
+    "plugin:install": "node bin/install.js --global",
+    "plugin:uninstall": "node bin/uninstall.js --global",
+    "team:install": "node scripts/team-install.js"
   },
   "bin": {
-    "babysitter-github-copilot": "bin/cli.js"
+    "babysitter-github": "bin/cli.js"
   },
   "files": [
     "bin/",
     "hooks.json",
+    "AGENTS.md",
     "hooks/",
     "skills/",
     "commands/",
     "scripts/",
     "plugin.json",
-    "AGENTS.md",
     "README.md",
     "versions.json",
     "package.json"
@@ -38,11 +36,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@a5c-ai/babysitter-sdk": "5.0.1-staging.25e625f3"
+    "@a5c-ai/babysitter-sdk": "5.0.1-staging.26a773f9"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/a5c-ai/babysitter"
+    "url": "git+https://github.com/a5c-ai/babysitter.git",
+    "directory": "plugins/babysitter-github"
   },
-  "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-github#readme"
+  "homepage": "https://github.com/a5c-ai/babysitter/tree/main/plugins/babysitter-github#readme",
+  "bugs": {
+    "url": "https://github.com/a5c-ai/babysitter/issues"
+  }
 }

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "babysitter",
-  "version": "5.0.1-staging.25e625f3",
+  "version": "5.0.1-staging.26a773f9",
   "description": "Orchestrate complex, multi-step workflows with event-sourced state management, hook-based extensibility, and human-in-the-loop approval",
   "author": {
     "name": "a5c.ai"

package/scripts/sync-command-surfaces.js

@@ -1,62 +1,20 @@
+#!/usr/bin/env node
 'use strict';
 
 const path = require('path');
-const {
-  listDirectories,
-  listMarkdownBasenames,
-  reportCheckResult,
-  syncCommandMirrors,
-  syncSkillsFromCommands,
-} = require('../../../scripts/plugin-command-sync-lib.cjs');
+const { spawnSync } = require('child_process');
 
-const PACKAGE_ROOT = path.resolve(__dirname, '..');
-const REPO_ROOT = path.resolve(PACKAGE_ROOT, '..', '..');
-const ROOT_COMMANDS = path.join(REPO_ROOT, 'plugins', 'babysitter', 'commands');
-const PLUGIN_COMMANDS = path.join(PACKAGE_ROOT, 'commands');
-const PLUGIN_SKILLS = path.join(PACKAGE_ROOT, 'skills');
-const LABEL = 'babysitter-github sync';
+const REPO_ROOT = path.resolve(__dirname, '..', '..');
+const syncScript = path.join(REPO_ROOT, 'scripts', 'sync-plugin-commands.cjs');
+const args = [syncScript, '--target', 'github-copilot'];
 
-function getMirroredCommandNames() {
-  const local = new Set(listMarkdownBasenames(PLUGIN_COMMANDS));
-  return listMarkdownBasenames(ROOT_COMMANDS).filter((name) => local.has(name));
+if (process.argv.includes('--check')) {
+  args.push('--check');
 }
 
-function getDerivedSkillNames() {
-  const local = new Set(listDirectories(PLUGIN_SKILLS));
-  return listMarkdownBasenames(PLUGIN_COMMANDS).filter((name) => local.has(name));
-}
-
-function main() {
-  const check = process.argv.includes('--check');
-  const mirrorResult = syncCommandMirrors({
-    label: LABEL,
-    sourceRoot: ROOT_COMMANDS,
-    targetRoot: PLUGIN_COMMANDS,
-    names: getMirroredCommandNames(),
-    check,
-    cwd: PACKAGE_ROOT,
-  });
-  const skillsResult = syncSkillsFromCommands({
-    label: LABEL,
-    sourceRoot: PLUGIN_COMMANDS,
-    skillsRoot: PLUGIN_SKILLS,
-    names: getDerivedSkillNames(),
-    check,
-    cwd: PACKAGE_ROOT,
-  });
-
-  if (check) {
-    reportCheckResult(LABEL, [...mirrorResult.stale, ...skillsResult.stale]);
-    return;
-  }
-
-  const updated = mirrorResult.updated + skillsResult.updated;
-  if (updated === 0) {
-    console.log(`[${LABEL}] no GitHub plugin command changes were needed.`);
-    return;
-  }
-
-  console.log(`[${LABEL}] updated ${updated} GitHub plugin file(s).`);
-}
+const result = spawnSync(process.execPath, args, {
+  cwd: REPO_ROOT,
+  stdio: 'inherit',
+});
 
-main();
+process.exit(result.status ?? 1);

package/scripts/team-install.js

@@ -11,10 +11,13 @@ for (var i = 0; i < process.argv.length; i++) {
   }
 }
 
+var src = process.env.PLUGIN_PACKAGE_ROOT || path.resolve(__dirname, '..');
 var dest = shared.getHomePluginRoot('workspace');
 console.log('[babysitter] Team install to ' + dest);
 
-var src = process.env.PLUGIN_PACKAGE_ROOT || path.resolve(__dirname, '..');
 shared.copyPluginBundle(src, dest);
+if (typeof shared.harnessTeamInstall === 'function') {
+  shared.harnessTeamInstall(src, dest, workspace);
+}
 shared.runPostInstall(dest);
 console.log('[babysitter] Team install complete.');

package/versions.json

@@ -1,3 +1,4 @@
 {
-  "sdkVersion": "5.0.1-staging.25e625f3"
+  "sdkVersion": "5.0.1-staging.26a773f9",
+  "extensionVersion": "5.0.0"
 }

package/hooks/session-end.ps1

@@ -1,12 +0,0 @@
-# PowerShell hook wrapper — sets env vars and delegates to bash
-$env:HOOK_TYPE = 'session-end'
-$env:ADAPTER_NAME = 'copilot'
-$env:PLUGIN_ROOT = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
-
-$input_data = [Console]::In.ReadToEnd()
-$result = $input_data | & bash "$PSScriptRoot/../$($MyInvocation.MyCommand.Name -replace '\.ps1$','.sh')" 2>$null
-if ($LASTEXITCODE -eq 0 -and $result) {
-  Write-Output $result
-} else {
-  Write-Output '{}'
-}

package/hooks/session-end.sh

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

package/hooks/session-start.ps1

@@ -1,12 +0,0 @@
-# PowerShell hook wrapper — sets env vars and delegates to bash
-$env:HOOK_TYPE = 'session-start'
-$env:ADAPTER_NAME = 'copilot'
-$env:PLUGIN_ROOT = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
-
-$input_data = [Console]::In.ReadToEnd()
-$result = $input_data | & bash "$PSScriptRoot/../$($MyInvocation.MyCommand.Name -replace '\.ps1$','.sh')" 2>$null
-if ($LASTEXITCODE -eq 0 -and $result) {
-  Write-Output $result
-} else {
-  Write-Output '{}'
-}

package/hooks/session-start.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-# Session Start — installs SDK if needed, then runs hook handler.
-set -euo pipefail
-PLUGIN_ROOT="${PLUGIN_ROOT:-$(cd "$(dirname "$0")/.." && pwd)}"
-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")
-if ! command -v babysitter &>/dev/null; then
-  npm i -g "@a5c-ai/babysitter-sdk@${SDK_VERSION}" --loglevel=error 2>/dev/null || \
-  npm i -g "@a5c-ai/babysitter-sdk@${SDK_VERSION}" --prefix "$HOME/.local" --loglevel=error 2>/dev/null || true
-  [ -d "$HOME/.local/bin" ] && export PATH="$HOME/.local/bin:$PATH"
-fi
-babysitter hook:run --harness unified --hook-type session-start --json

package/hooks/user-prompt-submitted.ps1

@@ -1,12 +0,0 @@
-# PowerShell hook wrapper — sets env vars and delegates to bash
-$env:HOOK_TYPE = 'user-prompt-submit'
-$env:ADAPTER_NAME = 'copilot'
-$env:PLUGIN_ROOT = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
-
-$input_data = [Console]::In.ReadToEnd()
-$result = $input_data | & bash "$PSScriptRoot/../$($MyInvocation.MyCommand.Name -replace '\.ps1$','.sh')" 2>$null
-if ($LASTEXITCODE -eq 0 -and $result) {
-  Write-Output $result
-} else {
-  Write-Output '{}'
-}

package/hooks/user-prompt-submitted.sh

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