@telelabsai/ship 1.1.11 → 1.1.14

package/cli/commands/sync.js

@@ -1,47 +1,29 @@
 const https = require('https');
 const http = require('http');
+const { execSync, spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const prompts = require('prompts');
 const { loadCredentials, DASHBOARD_URL } = require('./auth.js');
 
 /**
- * ship sync [--workspace <slug>] [--org <slug>] [--key <key>] [--dir <path>]
+ * ship sync [--workspace <slug>]
  *
  * Interactive mode (no flags): picks workspace with arrow keys
- * CI mode (with flags): uses provided org + workspace directly
+ * CI mode (with --workspace flag): direct install
  */
 function sync(args) {
-  const workspace = getArg(args, '--workspace') || getArg(args, '-w');
-  const org = getArg(args, '--org') || getArg(args, '-o');
-  const key = getArg(args, '--key') || getArg(args, '-k');
-  const dir = getArg(args, '--dir') || process.cwd();
+  const workspaceSlug = getArg(args, '--workspace') || getArg(args, '-w');
 
   // Resolve auth token
-  let token = key;
-  if (!token) {
-    const creds = loadCredentials();
-    if (creds?.token) token = creds.token;
-  }
-
-  if (!token) {
+  const creds = loadCredentials();
+  if (!creds?.token) {
     console.error('  Error: No authentication found.');
     console.error('  Run: ship auth login\n');
     process.exit(1);
   }
 
-  // If both org and workspace provided → direct sync (CI mode)
-  if (org && workspace) {
-    doSync(org, workspace, token, dir);
-    return;
-  }
-
-  // Interactive mode
-  if (!process.stdin.isTTY) {
-    console.error('  Error: --org and --workspace required in non-interactive mode.');
-    console.error('  Usage: ship sync --org <slug> --workspace <slug>\n');
-    process.exit(1);
-  }
+  const token = creds.token;
 
   console.log('  Fetching your workspaces...\n');
 
@@ -55,102 +37,97 @@ function sync(args) {
       process.exit(1);
     }
 
-    const orgs = data.orgs || [];
-    if (orgs.length === 0) {
-      console.log('  No organizations found. Create one at your Ship dashboard.\n');
+    const workspaces = data.workspaces || [];
+    if (workspaces.length === 0) {
+      console.log('  No workspaces found. Join one at your Ship dashboard.\n');
       process.exit(0);
     }
 
-    // Flatten all workspaces
-    const allWorkspaces = [];
-    for (const o of orgs) {
-      for (const w of o.workspaces) {
-        allWorkspaces.push({
-          orgSlug: o.slug,
-          orgName: o.name,
-          wsSlug: w.slug,
-          wsName: w.name,
-          files: w.files,
-        });
+    let selected;
+
+    // If workspace slug provided → direct mode
+    if (workspaceSlug) {
+      selected = workspaces.find((w) => w.slug === workspaceSlug);
+      if (!selected) {
+        console.error(`  Error: Workspace "${workspaceSlug}" not found.\n`);
+        console.log('  Available workspaces:');
+        workspaces.forEach((w) => console.log(`    - ${w.slug} (${w.name})`));
+        console.log('');
+        process.exit(1);
+      }
+    } else {
+      // Interactive mode
+      if (!process.stdin.isTTY) {
+        console.error('  Error: --workspace required in non-interactive mode.');
+        console.error('  Usage: ship sync --workspace <slug>\n');
+        process.exit(1);
       }
-    }
-
-    if (allWorkspaces.length === 0) {
-      console.log('  No workspaces found. Create one at your Ship dashboard.\n');
-      process.exit(0);
-    }
 
-    // Arrow-key workspace picker
-    const { selected } = await prompts({
-      type: 'select',
-      name: 'selected',
-      message: 'Select workspace',
-      choices: allWorkspaces.map((w) => ({
-        title: `${w.wsName} (${w.orgName})`,
-        description: `${w.files} files`,
-        value: w,
-      })),
-    });
+      const { picked } = await prompts({
+        type: 'select',
+        name: 'picked',
+        message: 'Select workspace',
+        choices: workspaces.map((w) => ({
+          title: w.name,
+          description: w.description || '',
+          value: w,
+        })),
+      });
+
+      if (!picked) {
+        console.log('  Cancelled.\n');
+        process.exit(0);
+      }
 
-    if (!selected) {
-      console.log('  Cancelled.\n');
-      process.exit(0);
+      selected = picked;
     }
 
     // Confirmation
-    const { confirmed } = await prompts({
-      type: 'confirm',
-      name: 'confirmed',
-      message: `Sync "${selected.wsName}" (${selected.files} files) to ${path.join(dir, '.claude')}?`,
-      initial: true,
-    });
-
-    if (!confirmed) {
-      console.log('  Cancelled.\n');
-      process.exit(0);
+    if (process.stdin.isTTY && !workspaceSlug) {
+      const { confirmed } = await prompts({
+        type: 'confirm',
+        name: 'confirmed',
+        message: `Install "${selected.name}" plugin into Claude Code?`,
+        initial: true,
+      });
+
+      if (!confirmed) {
+        console.log('  Cancelled.\n');
+        process.exit(0);
+      }
     }
 
-    console.log('');
-    doSync(selected.orgSlug, selected.wsSlug, token, dir);
-  });
-}
-
-function doSync(orgSlug, workspaceSlug, token, dir) {
-  console.log(`  Syncing workspace "${workspaceSlug}"...\n`);
-
-  const url = `${DASHBOARD_URL}/api/sync/${orgSlug}?workspace=${workspaceSlug}`;
+    // Install via claude plugin add
+    console.log(`\n  Installing "${selected.name}"...\n`);
 
-  fetchJson(url, token, (err, data) => {
-    if (err) {
-      console.error(`  Error: ${err.message}\n`);
-      process.exit(1);
-    }
-    if (data.error) {
-      console.error(`  Error: ${data.error}\n`);
+    try {
+      // Check if claude is installed
+      execSync('claude --version', { stdio: 'pipe' });
+    } catch {
+      console.error('  Error: Claude Code is not installed.');
+      console.error('  Install it at: https://claude.ai/code\n');
       process.exit(1);
     }
 
-    const claudeDir = path.join(dir, '.claude');
-    let written = 0;
-
-    for (const file of data.files || []) {
-      if (file.path.endsWith('.gitkeep')) continue;
-
-      const filePath = path.join(claudeDir, file.path);
-      const fileDir = path.dirname(filePath);
+    const claude = spawn('claude', ['/plugin', 'marketplace', 'add', selected.deployUrl], {
+      stdio: 'inherit',
+      cwd: process.cwd(),
+    });
 
-      if (!fs.existsSync(fileDir)) {
-        fs.mkdirSync(fileDir, { recursive: true });
+    claude.on('close', (code) => {
+      if (code === 0) {
+        console.log(`\n  ✓ "${selected.name}" installed successfully.\n`);
+        saveSyncConfig(process.cwd(), selected.slug);
+      } else {
+        console.error(`\n  Plugin install exited with code ${code}\n`);
       }
+      process.exit(code || 0);
+    });
 
-      fs.writeFileSync(filePath, file.content, 'utf8');
-      written++;
-      console.log(`  + .claude/${file.path}`);
-    }
-
-    console.log(`\n  ✓ Synced ${written} files to ${claudeDir}\n`);
-
-    saveSyncConfig(dir, orgSlug, workspaceSlug);
+    claude.on('error', (err) => {
+      console.error(`  Error running Claude Code: ${err.message}\n`);
+      process.exit(1);
+    });
   });
 }
 
@@ -182,9 +159,9 @@ function getArg(args, flag) {
   return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : null;
 }
 
-function saveSyncConfig(dir, orgSlug, workspace) {
+function saveSyncConfig(dir, workspaceSlug) {
   const configFile = path.join(dir, '.ship.json');
-  const config = { org: orgSlug, workspace, lastSynced: new Date().toISOString() };
+  const config = { workspace: workspaceSlug, lastSynced: new Date().toISOString() };
   fs.writeFileSync(configFile, JSON.stringify(config, null, 2), 'utf8');
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telelabsai/ship",
-  "version": "1.1.11",
+  "version": "1.1.14",
   "description": "Ship code faster with pre-configured agents, skills, rules, and hooks for Claude Code.",
   "bin": {
     "ship": "cli/bin.js"