@telelabsai/ship 1.1.4 → 1.1.6

package/cli/commands/auth.js

@@ -64,7 +64,7 @@ function login() {
 
   server.listen(0, () => {
     const port = server.address().port;
-    const authUrl = `${DASHBOARD_URL}/cli-auth?port=${port}`;
+    const authUrl = `${DASHBOARD_URL}/authorize-cli?port=${port}`;
 
     console.log(`  Auth URL: ${authUrl}\n`);
     console.log('  Waiting for authorization...\n');

package/cli/commands/sync.js

@@ -2,12 +2,14 @@ const https = require('https');
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
+const readline = require('readline');
 const { loadCredentials, DASHBOARD_URL } = require('./auth.js');
 
 /**
- * ship sync --workspace <slug> [--org <slug>] [--key <key>] [--dir <path>]
+ * ship sync [--workspace <slug>] [--org <slug>] [--key <key>] [--dir <path>]
  *
- * Pulls workspace config files from Ship dashboard and writes to .claude/
+ * Interactive mode (no flags): picks org + workspace from list
+ * CI mode (with flags): uses provided org + workspace directly
  */
 function sync(args) {
   const workspace = getArg(args, '--workspace') || getArg(args, '-w');
@@ -15,54 +17,113 @@ function sync(args) {
   const key = getArg(args, '--key') || getArg(args, '-k');
   const dir = getArg(args, '--dir') || process.cwd();
 
-  if (!workspace) {
-    console.error('  Error: --workspace is required.');
-    console.error('  Usage: ship sync --workspace <slug>\n');
-    process.exit(1);
-  }
-
-  // Resolve auth token: --key flag > saved credentials
+  // Resolve auth token
   let token = key;
   if (!token) {
     const creds = loadCredentials();
-    if (creds?.token) {
-      token = creds.token;
-    }
+    if (creds?.token) token = creds.token;
   }
 
   if (!token) {
     console.error('  Error: No authentication found.');
-    console.error('  Run: ship auth login');
-    console.error('  Or use: ship sync --workspace <slug> --key <api-key>\n');
+    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 — fetch orgs + workspaces, let user pick
+  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);
   }
 
-  // Resolve org slug: --org flag > try to find from workspace
-  // For personal token auth, org is required
-  let orgSlug = org;
-  if (!orgSlug) {
-    // If using workspace API key, we need org slug
-    // For now, require it explicitly or try to read from saved config
-    const savedOrg = loadSavedOrg(dir);
-    if (savedOrg) {
-      orgSlug = savedOrg;
-    } else {
-      console.error('  Error: --org is required (or run ship auth login and set default org).');
-      console.error('  Usage: ship sync --org <org-slug> --workspace <slug>\n');
+  console.log('  Fetching your workspaces...\n');
+
+  fetchJson(`${DASHBOARD_URL}/api/cli/workspaces`, token, (err, data) => {
+    if (err) {
+      console.error(`  Error: ${err.message}\n`);
+      process.exit(1);
+    }
+    if (data.error) {
+      console.error(`  Error: ${data.error}\n`);
       process.exit(1);
     }
-  }
 
-  console.log(`  Syncing workspace "${workspace}" from org "${orgSlug}"...\n`);
+    const orgs = data.orgs || [];
+    if (orgs.length === 0) {
+      console.log('  No organizations found. Create one at your Ship dashboard.\n');
+      process.exit(0);
+    }
 
-  const url = `${DASHBOARD_URL}/api/sync/${orgSlug}?workspace=${workspace}`;
+    // Flatten all workspaces with org info
+    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,
+        });
+      }
+    }
+
+    if (allWorkspaces.length === 0) {
+      console.log('  No workspaces found. Create one at your Ship dashboard.\n');
+      process.exit(0);
+    }
+
+    // Show picker
+    console.log('  Available workspaces:\n');
+    allWorkspaces.forEach((w, i) => {
+      console.log(`    ${i + 1}. ${w.wsName} (${w.orgName}) — ${w.files} files`);
+    });
+    console.log('');
+
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+    rl.question('  Select workspace [1]: ', (answer) => {
+      const idx = parseInt(answer || '1', 10) - 1;
+      if (idx < 0 || idx >= allWorkspaces.length) {
+        console.error('  Invalid selection.\n');
+        rl.close();
+        process.exit(1);
+      }
+
+      const selected = allWorkspaces[idx];
+      console.log(`\n  Will sync "${selected.wsName}" (${selected.files} files) to ${path.join(dir, '.claude')}`);
+
+      rl.question('  Proceed? [Y/n]: ', (confirm) => {
+        rl.close();
+        const c = (confirm || 'y').toLowerCase().trim();
+        if (c !== 'y' && c !== 'yes' && c !== '') {
+          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}" from org "${orgSlug}"...\n`);
+
+  const url = `${DASHBOARD_URL}/api/sync/${orgSlug}?workspace=${workspaceSlug}`;
 
   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`);
       process.exit(1);
@@ -72,7 +133,6 @@ function sync(args) {
     let written = 0;
 
     for (const file of data.files || []) {
-      // Skip .gitkeep files
       if (file.path.endsWith('.gitkeep')) continue;
 
       const filePath = path.join(claudeDir, file.path);
@@ -89,8 +149,8 @@ function sync(args) {
 
     console.log(`\n  Synced ${written} files to ${claudeDir}\n`);
 
-    // Save org for future syncs
-    saveSyncConfig(dir, orgSlug, workspace);
+    // Save config for future syncs
+    saveSyncConfig(dir, orgSlug, workspaceSlug);
   });
 }
 
@@ -128,15 +188,4 @@ function saveSyncConfig(dir, orgSlug, workspace) {
   fs.writeFileSync(configFile, JSON.stringify(config, null, 2), 'utf8');
 }
 
-function loadSavedOrg(dir) {
-  try {
-    const configFile = path.join(dir, '.ship.json');
-    if (fs.existsSync(configFile)) {
-      const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
-      return config.org || null;
-    }
-  } catch {}
-  return null;
-}
-
 module.exports = sync;

package/package.json

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