@a5c-ai/babysitter-github 5.0.1-staging.92b6f9ae → 5.0.1-staging.954846d7

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) {
@@ -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',
@@ -831,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,
@@ -849,10 +868,8 @@ module.exports = {
   rewriteCloudSkill,
   registerCopilotPlugin,
   deregisterCopilotPlugin,
-  installManagedSkills,
-  mergeManagedHooksConfig,
-  installManagedHooks,
   removeLegacyHooks,
+  removeManagedHooks,
   installCopilotSurface,
   renderCloudAgentAgentsBlock,
   renderCloudAgentCopilotInstructionsBlock,
@@ -862,12 +879,6 @@ module.exports = {
   installCloudAgentInstructions,
   installCloudAgentSetupSteps,
   installCloudAgentSurface,
-  normalizeMarketplaceSourcePath,
-  ensureMarketplaceEntry,
-  removeMarketplaceEntry,
-  warnWindowsHooks,
-  copyPluginBundle,
-  copyRecursive,
   harnessCliRoute,
   harnessInstall,
 };

package/bin/install.js

@@ -65,6 +65,15 @@ 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);
     }

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/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@a5c-ai/babysitter-github",
-  "version": "5.0.1-staging.92b6f9ae",
+  "version": "5.0.1-staging.954846d7",
   "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.92b6f9ae"
+    "@a5c-ai/babysitter-sdk": "5.0.1-staging.954846d7"
   },
   "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.92b6f9ae",
+  "version": "5.0.1-staging.954846d7",
   "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/versions.json

@@ -1,3 +1,4 @@
 {
-  "sdkVersion": "5.0.1-staging.92b6f9ae"
+  "sdkVersion": "5.0.1-staging.954846d7",
+  "extensionVersion": "5.0.0"
 }