@ghl-ai/aw 0.1.19 → 0.1.21

package/commands/push.mjs

@@ -113,7 +113,8 @@ export function pushCommand(args) {
   const tempDir = mkdtempSync(join(tmpdir(), 'aw-upload-'));
 
   try {
-    execSync(`gh repo clone ${repo} ${tempDir} -- --filter=blob:none --no-checkout`, { stdio: 'pipe' });
+    const repoUrl = repo.startsWith('http') ? repo : `https://github.com/${repo}.git`;
+    execSync(`git clone --filter=blob:none --no-checkout "${repoUrl}" "${tempDir}"`, { stdio: 'pipe' });
     execSync(`git checkout ${REGISTRY_BASE_BRANCH}`, { cwd: tempDir, stdio: 'pipe' });
     s.stop('Repository cloned');
 
@@ -178,20 +179,29 @@ export function pushCommand(args) {
 
     const prTitle = `Add ${slug} (${parentDir}) to ${namespacePath}`;
     const prBody = bodyParts.join('\n');
-    const prUrl = execFileSync('gh', [
-      'pr', 'create',
-      '--base', REGISTRY_BASE_BRANCH,
-      '--title', prTitle,
-      '--body', prBody,
-    ], { cwd: tempDir, encoding: 'utf8' }).trim();
 
-    s3.stop('PR created');
+    // Try gh for PR creation, fall back to manual URL
+    let prUrl;
+    try {
+      prUrl = execFileSync('gh', [
+        'pr', 'create',
+        '--base', REGISTRY_BASE_BRANCH,
+        '--title', prTitle,
+        '--body', prBody,
+      ], { cwd: tempDir, encoding: 'utf8' }).trim();
+    } catch {
+      // gh not available — construct PR URL manually
+      const repoBase = repo.replace(/\.git$/, '');
+      prUrl = `https://github.com/${repoBase}/compare/${REGISTRY_BASE_BRANCH}...${branch}?expand=1`;
+    }
+
+    s3.stop('Branch pushed');
 
     if (newNamespace) {
       fmt.logInfo(`New namespace ${chalk.cyan(topNamespace)} — CODEOWNERS entry added`);
     }
     fmt.logSuccess(`PR: ${chalk.cyan(prUrl)}`);
-    fmt.outro('Upload complete');
+    fmt.outro('Upload complete — open the link above to create the PR');
   } catch (e) {
     fmt.cancel(`Upload failed: ${e.message}`);
   } finally {
@@ -200,10 +210,15 @@ export function pushCommand(args) {
 }
 
 function getGitHubUser() {
+  // Try gh first, fall back to git config
   try {
     return execSync('gh api user --jq .login', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
   } catch {
-    return null;
+    try {
+      return execSync('git config user.name', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    } catch {
+      return null;
+    }
   }
 }
 

package/mcp.mjs

@@ -1,4 +1,5 @@
-// mcp.mjs — MCP config generation for all 3 IDEs (init only, never overwrites)
+// mcp.mjs — MCP config generation for Claude Code + Cursor (global ~/ configs)
+// Uses native Streamable HTTP — no bridge process needed.
 
 import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
 import { join, resolve } from 'node:path';
@@ -6,149 +7,102 @@ import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
 
 const HOME = homedir();
+const DEFAULT_MCP_URL = 'https://staging.services.leadconnectorhq.com/agentic-workspace/mcp';
 
 /**
  * Auto-detect MCP server paths.
  */
 function detectPaths() {
-  const ghlAiBridge = join(HOME, '.claude', 'ghl-ai-bridge.mjs');
   const gitJenkinsCandidates = [
     join(HOME, 'Documents', 'GitHub', 'git-jenkins-mcp', 'dist', 'index.js'),
     resolve('..', 'git-jenkins-mcp', 'dist', 'index.js'),
   ];
 
   const gitJenkinsPath = gitJenkinsCandidates.find(p => existsSync(p)) || null;
-  const ghlMcpUrl = process.env.GHL_MCP_URL || 'https://ghl-ai-staging.highlevel-staging.com';
+  const ghlMcpUrl = process.env.GHL_MCP_URL || DEFAULT_MCP_URL;
 
-  return {
-    ghlAiBridge: existsSync(ghlAiBridge) ? ghlAiBridge : null,
-    gitJenkinsPath,
-    ghlMcpUrl,
-  };
+  return { gitJenkinsPath, ghlMcpUrl };
 }
 
 /**
- * Setup MCP configs for all IDEs. Only writes if file doesn't exist.
- * Returns list of file paths that were actually created.
+ * Setup MCP configs globally for Claude Code and Cursor.
+ * Merges ghl-ai server into existing configs without overwriting other servers.
+ * Returns list of file paths that were created or updated.
  */
 export function setupMcp(cwd, namespace) {
   const paths = detectPaths();
-  const createdFiles = [];
+  const updatedFiles = [];
 
-  const attempt = (filePath, contentFn, append = false) => {
-    if (writeIfMissing(filePath, contentFn, append)) {
-      createdFiles.push(filePath);
-    }
-  };
-
-  // .claude/settings.local.json
-  attempt(join(cwd, '.claude', 'settings.local.json'), () => {
-    const servers = {};
-    if (paths.ghlAiBridge) {
-      servers['ghl-ai'] = {
-        command: 'node',
-        args: [paths.ghlAiBridge],
-        env: { GHL_MCP_URL: paths.ghlMcpUrl, TEAM_NAME: namespace || '' },
-      };
-    }
-    if (paths.gitJenkinsPath) {
-      servers['git-jenkins'] = { command: 'node', args: [paths.gitJenkinsPath] };
-    }
-    if (Object.keys(servers).length === 0) return null;
-    return JSON.stringify({ mcpServers: servers }, null, 2) + '\n';
-  });
-
-  // .cursor/mcp.json
-  attempt(join(cwd, '.cursor', 'mcp.json'), () => {
-    const servers = {};
-    if (paths.ghlAiBridge) {
-      servers['ghl-ai'] = {
-        command: 'node',
-        args: [paths.ghlAiBridge],
-        env: { GHL_MCP_URL: paths.ghlMcpUrl, TEAM_NAME: namespace || '' },
-      };
-    }
-    if (paths.gitJenkinsPath) {
-      servers['git-jenkins'] = { command: 'node', args: [paths.gitJenkinsPath] };
-    }
-    if (Object.keys(servers).length === 0) return null;
-    return JSON.stringify({ mcpServers: servers }, null, 2) + '\n';
-  });
-
-  // .codex/config.toml — append MCP servers
-  const codexConfig = join(cwd, '.codex', 'config.toml');
-  if (!hasMcpSection(codexConfig)) {
-    attempt(codexConfig, () => {
-      const lines = [];
-      if (paths.ghlAiBridge) {
-        lines.push(
-          '[mcp_servers.ghl-ai]',
-          'command = "node"',
-          `args = ["${paths.ghlAiBridge}"]`,
-          '',
-          '[mcp_servers.ghl-ai.env]',
-          `GHL_MCP_URL = "${paths.ghlMcpUrl}"`,
-          `TEAM_NAME = "${namespace || ''}"`,
-          '',
-        );
-      }
-      if (paths.gitJenkinsPath) {
-        lines.push(
-          '[mcp_servers.git-jenkins]',
-          'command = "node"',
-          `args = ["${paths.gitJenkinsPath}"]`,
-          '',
-        );
-      }
-      if (lines.length === 0) return null;
-      return lines.join('\n');
-    }, true /* append mode */);
-  }
+  const mcpUrl = paths.ghlMcpUrl;
 
-  // mcp.json at project root (Claude Code auto-discovery)
-  attempt(join(cwd, 'mcp.json'), () => {
-    const servers = {};
-    if (paths.ghlAiBridge) {
-      servers['ghl-ai'] = {
-        command: 'node',
-        args: [paths.ghlAiBridge],
-        env: { GHL_MCP_URL: paths.ghlMcpUrl, TEAM_NAME: namespace || '' },
-      };
-    }
-    if (Object.keys(servers).length === 0) return null;
-    return JSON.stringify({ mcpServers: servers }, null, 2) + '\n';
-  });
+  const ghlAiServer = { type: 'url', url: mcpUrl };
+  const gitJenkinsServer = paths.gitJenkinsPath
+    ? { command: 'node', args: [paths.gitJenkinsPath] }
+    : null;
 
-  if (createdFiles.length > 0) {
-    fmt.logSuccess(`Created ${createdFiles.length} MCP config${createdFiles.length > 1 ? 's' : ''}`);
+  // ── Claude Code: ~/.claude/settings.json ──
+  const claudeSettingsPath = join(HOME, '.claude', 'settings.json');
+  if (mergeJsonMcpServer(claudeSettingsPath, 'ghl-ai', ghlAiServer)) {
+    updatedFiles.push(claudeSettingsPath);
+  }
+  if (gitJenkinsServer && mergeJsonMcpServer(claudeSettingsPath, 'git-jenkins', gitJenkinsServer)) {
+    updatedFiles.push(claudeSettingsPath);
   }
 
-  const warnings = [];
-  if (!paths.ghlAiBridge) warnings.push('ghl-ai bridge not found at ~/.claude/ghl-ai-bridge.mjs');
-  if (!paths.gitJenkinsPath) warnings.push('git-jenkins MCP not found');
-  for (const w of warnings) {
-    fmt.logWarn(w);
+  // ── Cursor: ~/.cursor/mcp.json ──
+  const cursorMcpPath = join(HOME, '.cursor', 'mcp.json');
+  if (mergeJsonMcpServer(cursorMcpPath, 'ghl-ai', ghlAiServer)) {
+    updatedFiles.push(cursorMcpPath);
+  }
+  if (gitJenkinsServer && mergeJsonMcpServer(cursorMcpPath, 'git-jenkins', gitJenkinsServer)) {
+    updatedFiles.push(cursorMcpPath);
   }
 
-  return createdFiles;
-}
+  // Deduplicate (claude settings may be added twice if both servers written)
+  const unique = [...new Set(updatedFiles)];
 
-function writeIfMissing(filePath, contentFn, append = false) {
-  if (!append && existsSync(filePath)) return false;
-  const content = contentFn();
-  if (!content) return false;
-  mkdirSync(join(filePath, '..'), { recursive: true });
-  if (append && existsSync(filePath)) {
-    const existing = readFileSync(filePath, 'utf8');
-    writeFileSync(filePath, existing + '\n' + content);
+  if (unique.length > 0) {
+    fmt.logSuccess(`MCP configured in ${unique.map(f => fmt.chalk.cyan(f)).join(', ')}`);
   } else {
-    writeFileSync(filePath, content);
+    fmt.logInfo('MCP servers already configured — no changes needed');
   }
-  return true;
+
+  if (!paths.gitJenkinsPath) {
+    fmt.logWarn('git-jenkins MCP not found — skipped');
+  }
+
+  return unique;
 }
 
-function hasMcpSection(filePath) {
-  if (!existsSync(filePath)) return false;
-  const content = readFileSync(filePath, 'utf8');
-  return content.includes('[mcp_servers');
+/**
+ * Merge an MCP server entry into a JSON config file.
+ * Creates the file if it doesn't exist.
+ * Returns true if the file was modified.
+ */
+function mergeJsonMcpServer(filePath, serverName, serverConfig) {
+  let config = {};
+
+  if (existsSync(filePath)) {
+    try {
+      config = JSON.parse(readFileSync(filePath, 'utf8'));
+    } catch {
+      config = {};
+    }
+  }
+
+  if (!config.mcpServers) {
+    config.mcpServers = {};
+  }
+
+  // Check if already configured with same URL
+  const existing = config.mcpServers[serverName];
+  if (existing && JSON.stringify(existing) === JSON.stringify(serverConfig)) {
+    return false;
+  }
+
+  config.mcpServers[serverName] = serverConfig;
+
+  mkdirSync(join(filePath, '..'), { recursive: true });
+  writeFileSync(filePath, JSON.stringify(config, null, 2) + '\n');
+  return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {