@a5c-ai/babysitter-github 5.0.1-staging.e4f17eff → 5.0.1-staging.fcac7259

package/bin/install.js

@@ -2,126 +2,77 @@
 '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;
     }
-    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}`);
-
-  try {
-    copyPluginBundle(PACKAGE_ROOT, pluginRoot);
-    ensureMarketplaceEntry(marketplacePath, pluginRoot);
-
-    // Try native copilot CLI registration first; fall back to manual config.json
-    if (!registerViaCopilotCli(pluginRoot)) {
-      const { registerCopilotPlugin } = require('./install-shared');
-      registerCopilotPlugin(pluginRoot);
+    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;
     }
+  }
+
+  const pluginRoot = shared.getHomePluginRoot();
+  const marketplacePath = shared.getHomeMarketplacePath();
 
-    installCopilotSurface(PACKAGE_ROOT, copilotHome);
+  console.log(`[${shared.PLUGIN_NAME}] Installing plugin to ${pluginRoot}`);
 
-    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}`);
+  try {
+    shared.copyPluginBundle(PACKAGE_ROOT, pluginRoot);
+    shared.ensureMarketplaceEntry(marketplacePath, pluginRoot);
+    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,25 @@
 #!/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;
+  const pluginRoot = shared.getHomePluginRoot();
 
-  if (fs.existsSync(pluginRoot)) {
-    try {
-      fs.rmSync(pluginRoot, { recursive: true, force: true });
-      console.log(`[${PLUGIN_NAME}] Removed ${pluginRoot}`);
-      removedPlugin = true;
-    } catch (err) {
-      console.warn(`[${PLUGIN_NAME}] Warning: Could not remove plugin directory ${pluginRoot}: ${err.message}`);
-    }
-  }
-
-  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.`);
+  if (!fs.existsSync(pluginRoot)) {
+    console.log(`[${shared.PLUGIN_NAME}] Plugin not installed at ${pluginRoot}`);
     return;
   }
 
-  console.log(`[${PLUGIN_NAME}] Restart GitHub Copilot CLI to complete uninstallation.`);
+  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