@orchagent/cli 0.2.15 → 0.2.16

package/dist/commands/index.js

@@ -18,6 +18,7 @@ const delete_1 = require("./delete");
 const github_1 = require("./github");
 const doctor_1 = require("./doctor");
 const status_1 = require("./status");
+const workspace_1 = require("./workspace");
 function registerCommands(program) {
     (0, login_1.registerLoginCommand)(program);
     (0, whoami_1.registerWhoamiCommand)(program);
@@ -36,4 +37,5 @@ function registerCommands(program) {
     (0, github_1.registerGitHubCommand)(program);
     (0, doctor_1.registerDoctorCommand)(program);
     (0, status_1.registerStatusCommand)(program);
+    (0, workspace_1.registerWorkspaceCommand)(program);
 }

package/dist/commands/workspace.js

@@ -1,133 +1,254 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerWorkspaceCommand = registerWorkspaceCommand;
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("../lib/config");
 const api_1 = require("../lib/api");
+const errors_1 = require("../lib/errors");
+const analytics_1 = require("../lib/analytics");
+function deriveSlug(name) {
+    return name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+}
+async function resolveWorkspaceId(config, slug) {
+    const configFile = await (0, config_1.loadConfig)();
+    const targetSlug = slug ?? configFile.workspace;
+    if (!targetSlug) {
+        throw new errors_1.CliError('No workspace specified. Use --workspace <slug> or run `orchagent workspace use <slug>` first.');
+    }
+    const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+    const workspace = response.workspaces.find((w) => w.slug === targetSlug);
+    if (!workspace) {
+        throw new errors_1.CliError(`Workspace '${targetSlug}' not found.`);
+    }
+    return workspace.id;
+}
+async function listWorkspaces(config, options) {
+    const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+    const workspaces = response.workspaces;
+    const configFile = await (0, config_1.loadConfig)();
+    const currentSlug = configFile.workspace;
+    await (0, analytics_1.track)('cli_workspace_list');
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(workspaces, null, 2)}\n`);
+        return;
+    }
+    if (workspaces.length === 0) {
+        process.stdout.write('No workspaces found.\n');
+        process.stdout.write('\nCreate one with: orchagent workspace create <name>\n');
+        return;
+    }
+    const table = new cli_table3_1.default({
+        head: [
+            '',
+            chalk_1.default.bold('Name'),
+            chalk_1.default.bold('Slug'),
+            chalk_1.default.bold('Type'),
+            chalk_1.default.bold('Role'),
+            chalk_1.default.bold('Members'),
+        ],
+    });
+    workspaces.forEach((workspace) => {
+        const isCurrent = workspace.slug === currentSlug;
+        const marker = isCurrent ? chalk_1.default.green('\u2192') : '';
+        table.push([
+            marker,
+            workspace.name,
+            workspace.slug,
+            workspace.type,
+            workspace.role,
+            workspace.member_count.toString(),
+        ]);
+    });
+    process.stdout.write(`${table.toString()}\n`);
+}
+async function createWorkspace(config, name, options) {
+    const slug = options.slug ?? deriveSlug(name);
+    const response = await (0, api_1.request)(config, 'POST', '/workspaces', {
+        body: JSON.stringify({ name, slug }),
+        headers: { 'Content-Type': 'application/json' },
+    });
+    await (0, analytics_1.track)('cli_workspace_create', { slug });
+    process.stdout.write(chalk_1.default.green('\u2713') + ` Created workspace: ${response.workspace.name} (${response.workspace.slug})\n`);
+}
+async function useWorkspace(slug) {
+    const config = await (0, config_1.getResolvedConfig)();
+    // Verify workspace exists
+    const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+    const workspace = response.workspaces.find((w) => w.slug === slug);
+    if (!workspace) {
+        throw new errors_1.CliError(`Workspace '${slug}' not found.`);
+    }
+    // Save to config
+    const configFile = await (0, config_1.loadConfig)();
+    configFile.workspace = slug;
+    await (0, config_1.saveConfig)(configFile);
+    await (0, analytics_1.track)('cli_workspace_use', { slug });
+    process.stdout.write(chalk_1.default.green('\u2713') + ` Now using workspace: ${workspace.name} (${workspace.slug})\n`);
+}
+async function listMembers(config, workspaceSlug, options) {
+    const workspaceId = await resolveWorkspaceId(config, workspaceSlug);
+    const response = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/members`);
+    await (0, analytics_1.track)('cli_workspace_members');
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(response, null, 2)}\n`);
+        return;
+    }
+    // Members table
+    if (response.members.length > 0) {
+        process.stdout.write('Members:\n');
+        const membersTable = new cli_table3_1.default({
+            head: [
+                chalk_1.default.bold('Name'),
+                chalk_1.default.bold('Email'),
+                chalk_1.default.bold('Role'),
+                chalk_1.default.bold('Joined'),
+            ],
+        });
+        response.members.forEach((member) => {
+            membersTable.push([
+                member.name ?? '-',
+                member.email ?? '-',
+                member.role,
+                member.accepted_at ? new Date(member.accepted_at).toLocaleDateString() : '-',
+            ]);
+        });
+        process.stdout.write(`${membersTable.toString()}\n`);
+    }
+    else {
+        process.stdout.write('No members found.\n');
+    }
+    // Pending invites table (the gateway only returns pending invites)
+    if (response.invites.length > 0) {
+        process.stdout.write('\nPending Invites:\n');
+        const invitesTable = new cli_table3_1.default({
+            head: [
+                chalk_1.default.bold('Email'),
+                chalk_1.default.bold('Role'),
+                chalk_1.default.bold('Sent'),
+            ],
+        });
+        response.invites.forEach((invite) => {
+            invitesTable.push([
+                invite.email,
+                invite.role,
+                new Date(invite.created_at).toLocaleDateString(),
+            ]);
+        });
+        process.stdout.write(`${invitesTable.toString()}\n`);
+    }
+}
+async function inviteMember(config, email, options) {
+    const workspaceId = await resolveWorkspaceId(config, options.workspace);
+    const role = options.role ?? 'member';
+    const response = await (0, api_1.request)(config, 'POST', `/workspaces/${workspaceId}/invites`, {
+        body: JSON.stringify({ email, role }),
+        headers: { 'Content-Type': 'application/json' },
+    });
+    await (0, analytics_1.track)('cli_workspace_invite', { role });
+    process.stdout.write(chalk_1.default.green('\u2713') + ` Invited ${email} as ${role}\n`);
+    if (response.invite.invite_url) {
+        process.stdout.write(`\nInvite URL: ${response.invite.invite_url}\n`);
+    }
+}
+async function leaveWorkspace(config, workspaceSlug) {
+    const workspaceId = await resolveWorkspaceId(config, workspaceSlug);
+    // Get current user's email and members list to find our clerk_user_id
+    const [userResponse, membersResponse] = await Promise.all([
+        (0, api_1.request)(config, 'GET', '/users/me'),
+        (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/members`),
+    ]);
+    const currentUserEmail = userResponse.user.email;
+    const currentMember = membersResponse.members.find((m) => m.email === currentUserEmail);
+    if (!currentMember) {
+        throw new errors_1.CliError('Could not find your membership in this workspace.');
+    }
+    await (0, api_1.request)(config, 'DELETE', `/workspaces/${workspaceId}/members/${currentMember.clerk_user_id}`);
+    await (0, analytics_1.track)('cli_workspace_leave');
+    // Clear workspace from config if it was the current one
+    const configFile = await (0, config_1.loadConfig)();
+    if (configFile.workspace) {
+        const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+        const leftWorkspace = response.workspaces.find((w) => w.id === workspaceId);
+        if (leftWorkspace && configFile.workspace === leftWorkspace.slug) {
+            delete configFile.workspace;
+            await (0, config_1.saveConfig)(configFile);
+        }
+    }
+    process.stdout.write(chalk_1.default.green('\u2713') + ' Left workspace\n');
+}
 function registerWorkspaceCommand(program) {
     const workspace = program
         .command('workspace')
         .description('Manage workspaces');
-    // List workspaces
+    // workspace list
     workspace
         .command('list')
         .description('List all workspaces')
-        .action(async () => {
+        .option('--json', 'Output raw JSON')
+        .action(async (options) => {
         const config = await (0, config_1.getResolvedConfig)();
-        const fileConfig = await (0, config_1.loadConfig)();
-        const workspaces = await (0, api_1.listWorkspaces)(config);
-        if (workspaces.length === 0) {
-            process.stdout.write('No workspaces found.\n');
-            return;
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
-        const currentId = fileConfig.current_workspace;
-        for (const ws of workspaces) {
-            const isCurrent = ws.id === currentId || ws.slug === currentId;
-            const marker = isCurrent ? '* ' : '  ';
-            const type = ws.type === 'team' ? '(team)' : '(personal)';
-            const members = ws.type === 'team' ? ` - ${ws.member_count} members` : '';
-            process.stdout.write(`${marker}${ws.slug} - ${ws.name} ${type}${members}\n`);
+        await listWorkspaces(config, options);
+    });
+    // workspace create <name>
+    workspace
+        .command('create <name>')
+        .description('Create a new workspace')
+        .option('--slug <slug>', 'Workspace slug (default: derived from name)')
+        .action(async (name, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
+        await createWorkspace(config, name, options);
     });
-    // Switch workspace
+    // workspace use <slug>
     workspace
         .command('use <slug>')
-        .description('Switch to a different workspace')
+        .description('Set the current workspace')
         .action(async (slug) => {
-        const config = await (0, config_1.getResolvedConfig)();
-        const workspaces = await (0, api_1.listWorkspaces)(config);
-        const target = workspaces.find(ws => ws.slug === slug || ws.id === slug);
-        if (!target) {
-            process.stderr.write(`Workspace "${slug}" not found.\n`);
-            process.exit(1);
-        }
-        const fileConfig = await (0, config_1.loadConfig)();
-        fileConfig.current_workspace = target.id;
-        await (0, config_1.saveConfig)(fileConfig);
-        process.stdout.write(`Switched to workspace: ${target.name} (${target.slug})\n`);
+        await useWorkspace(slug);
     });
-    // Create workspace
+    // workspace members [workspace]
     workspace
-        .command('create <name>')
-        .description('Create a new team workspace')
-        .option('--slug <slug>', 'Workspace URL slug')
-        .action(async (name, options) => {
+        .command('members [workspace]')
+        .description('List workspace members and pending invites')
+        .option('--json', 'Output raw JSON')
+        .action(async (workspaceSlug, options) => {
         const config = await (0, config_1.getResolvedConfig)();
-        // Auto-generate slug from name if not provided
-        const slug = options.slug || name
-            .toLowerCase()
-            .replace(/\s+/g, '-')
-            .replace(/[^a-z0-9-]/g, '')
-            .replace(/-+/g, '-')
-            .slice(0, 30);
-        try {
-            const workspace = await (0, api_1.createWorkspace)(config, { name, slug });
-            // Switch to the new workspace
-            const fileConfig = await (0, config_1.loadConfig)();
-            fileConfig.current_workspace = workspace.id;
-            await (0, config_1.saveConfig)(fileConfig);
-            process.stdout.write(`Created workspace: ${workspace.name} (${workspace.slug})\n`);
-            process.stdout.write(`Switched to new workspace.\n`);
-        }
-        catch (err) {
-            process.stderr.write(`Failed to create workspace: ${err instanceof Error ? err.message : 'Unknown error'}\n`);
-            process.exit(1);
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
+        await listMembers(config, workspaceSlug, options);
     });
-    // Invite member
+    // workspace invite <email>
     workspace
         .command('invite <email>')
-        .description('Invite a member to the current workspace')
-        .option('--role <role>', 'Role: owner or member', 'member')
+        .description('Invite a user to the workspace')
+        .option('--role <role>', 'Role for the invited user (default: member)', 'member')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
         .action(async (email, options) => {
         const config = await (0, config_1.getResolvedConfig)();
-        const fileConfig = await (0, config_1.loadConfig)();
-        if (!fileConfig.current_workspace) {
-            process.stderr.write('No workspace selected. Run `orch workspace use <slug>` first.\n');
-            process.exit(1);
-        }
-        const role = options.role;
-        if (role !== 'owner' && role !== 'member') {
-            process.stderr.write('Role must be "owner" or "member".\n');
-            process.exit(1);
-        }
-        try {
-            await (0, api_1.inviteToWorkspace)(config, fileConfig.current_workspace, { email, role });
-            process.stdout.write(`Invited ${email} as ${role}.\n`);
-        }
-        catch (err) {
-            process.stderr.write(`Failed to send invite: ${err instanceof Error ? err.message : 'Unknown error'}\n`);
-            process.exit(1);
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
+        await inviteMember(config, email, options);
     });
-    // List members
+    // workspace leave [workspace]
     workspace
-        .command('members')
-        .description('List members of the current workspace')
-        .action(async () => {
+        .command('leave [workspace]')
+        .description('Leave a workspace')
+        .action(async (workspaceSlug) => {
         const config = await (0, config_1.getResolvedConfig)();
-        const fileConfig = await (0, config_1.loadConfig)();
-        if (!fileConfig.current_workspace) {
-            process.stderr.write('No workspace selected. Run `orch workspace use <slug>` first.\n');
-            process.exit(1);
-        }
-        try {
-            const { members, invites } = await (0, api_1.getWorkspaceMembers)(config, fileConfig.current_workspace);
-            process.stdout.write('Members:\n');
-            for (const member of members) {
-                const roleLabel = member.role === 'owner' ? '[owner]' : '[member]';
-                process.stdout.write(`  ${member.clerk_user_id} ${roleLabel}\n`);
-            }
-            if (invites.length > 0) {
-                process.stdout.write('\nPending invites:\n');
-                for (const invite of invites) {
-                    const expires = new Date(invite.expires_at).toLocaleDateString();
-                    process.stdout.write(`  ${invite.email} (${invite.role}) - expires ${expires}\n`);
-                }
-            }
-        }
-        catch (err) {
-            process.stderr.write(`Failed to list members: ${err instanceof Error ? err.message : 'Unknown error'}\n`);
-            process.exit(1);
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
+        await leaveWorkspace(config, workspaceSlug);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Command-line interface for the OrchAgent AI agent marketplace",
   "license": "MIT",
   "author": "OrchAgent <hello@orchagent.io>",