@orchagent/cli 0.3.55 → 0.3.57

package/dist/commands/fork.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerForkCommand = registerForkCommand;
+const chalk_1 = __importDefault(require("chalk"));
+const config_1 = require("../lib/config");
+const api_1 = require("../lib/api");
+const agent_ref_1 = require("../lib/agent-ref");
+const errors_1 = require("../lib/errors");
+const analytics_1 = require("../lib/analytics");
+const output_1 = require("../lib/output");
+function getWorkspaceAuthError(err) {
+    if (!(err instanceof api_1.ApiError) || (err.status !== 401 && err.status !== 403)) {
+        return null;
+    }
+    const message = err.message.toLowerCase();
+    if (message.includes('workspace targeting') ||
+        message.includes('specified workspace') ||
+        message.includes('user authentication') ||
+        message.includes('clerk')) {
+        return new errors_1.CliError('Forking into a specific workspace requires a user session key. Run `orch login` (browser sign-in, without `--key`) and retry.');
+    }
+    return null;
+}
+async function resolveWorkspace(config, workspaceSlug) {
+    const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+    const workspace = response.workspaces.find((w) => w.slug === workspaceSlug);
+    if (!workspace) {
+        throw new errors_1.CliError(`Workspace '${workspaceSlug}' not found. Run \`orchagent workspace list\` to see available workspaces.`);
+    }
+    return workspace;
+}
+function registerForkCommand(program) {
+    program
+        .command('fork <agent>')
+        .description('Fork a public agent into your workspace')
+        .option('--name <new-name>', 'Rename the forked agent')
+        .option('-w, --workspace <workspace-slug>', 'Target workspace slug')
+        .option('--json', 'Output raw JSON')
+        .addHelpText('after', `
+Examples:
+  orch fork orchagent/my-discord-agent
+  orch fork orchagent/my-discord-agent --workspace acme-corp
+  orch fork orchagent/my-discord-agent --name customer-support-bot
+  orch fork orchagent/my-discord-agent@v2 --json
+`)
+        .action(async (agentRef, options) => {
+        const write = (message) => {
+            if (!options.json)
+                process.stdout.write(message);
+        };
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Not logged in. Run `orchagent login` first.');
+        }
+        const { org, agent, version } = (0, agent_ref_1.parseAgentRef)(agentRef);
+        write('Resolving source agent...\n');
+        const source = await (0, api_1.getPublicAgent)(config, org, agent, version);
+        if (!source.id) {
+            throw new errors_1.CliError(`Could not resolve source agent ID for '${org}/${agent}@${version}'.`);
+        }
+        let targetWorkspace = null;
+        if (options.workspace) {
+            write('Resolving target workspace...\n');
+            targetWorkspace = await resolveWorkspace(config, options.workspace);
+        }
+        write('Forking agent...\n');
+        const payload = {};
+        if (targetWorkspace)
+            payload.workspace_id = targetWorkspace.id;
+        const requestedName = options.name?.trim();
+        if (requestedName)
+            payload.new_name = requestedName;
+        let result;
+        try {
+            result = await (0, api_1.forkAgent)(config, source.id, payload);
+        }
+        catch (err) {
+            const authErr = getWorkspaceAuthError(err);
+            if (authErr)
+                throw authErr;
+            throw err;
+        }
+        await (0, analytics_1.track)('cli_fork', {
+            source_org: org,
+            source_agent: agent,
+            source_version: version,
+            target_workspace: targetWorkspace?.slug ?? null,
+        });
+        if (options.json) {
+            (0, output_1.printJson)(result);
+            return;
+        }
+        const forked = result.agent;
+        const targetOrgSlug = forked.org_slug ?? targetWorkspace?.slug ?? 'current-workspace';
+        write(`\n${chalk_1.default.green('\u2713')} Forked ${org}/${agent}@${version}\n`);
+        write(`  New agent: ${targetOrgSlug}/${forked.name}@${forked.version}\n`);
+        if (targetWorkspace) {
+            write(`  Workspace: ${targetWorkspace.name} (${targetWorkspace.slug})\n`);
+        }
+        if (result.service_key) {
+            write(`\nService key (save this - shown only once):\n`);
+            write(`  ${result.service_key}\n`);
+        }
+    });
+}

package/dist/commands/index.js

@@ -12,6 +12,7 @@ const run_1 = require("./run");
 const info_1 = require("./info");
 const skill_1 = require("./skill");
 const delete_1 = require("./delete");
+const fork_1 = require("./fork");
 const github_1 = require("./github");
 const doctor_1 = require("./doctor");
 const status_1 = require("./status");
@@ -43,6 +44,7 @@ function registerCommands(program) {
     (0, keys_1.registerKeysCommand)(program);
     (0, skill_1.registerSkillCommand)(program);
     (0, delete_1.registerDeleteCommand)(program);
+    (0, fork_1.registerForkCommand)(program);
     (0, github_1.registerGitHubCommand)(program);
     (0, doctor_1.registerDoctorCommand)(program);
     (0, status_1.registerStatusCommand)(program);

package/dist/commands/transfer.js

@@ -11,6 +11,18 @@ const api_1 = require("../lib/api");
 const errors_1 = require("../lib/errors");
 const analytics_1 = require("../lib/analytics");
 const output_1 = require("../lib/output");
+function getTransferAuthError(err) {
+    if (!(err instanceof api_1.ApiError) || err.status !== 403) {
+        return null;
+    }
+    const message = err.message.toLowerCase();
+    if (message.includes('personal workspace session key') ||
+        message.includes('user authentication') ||
+        message.includes('clerk jwt')) {
+        return new errors_1.CliError('Transfer requires a user session key. Run `orch login` (browser sign-in, without `--key`) and retry.');
+    }
+    return null;
+}
 async function promptText(message) {
     const rl = promises_1.default.createInterface({
         input: process.stdin,
@@ -25,31 +37,49 @@ function registerTransferCommand(program) {
         .command('transfer <agent-name>')
         .description('Transfer an agent to another workspace')
         .requiredOption('--to <workspace-slug>', 'Target workspace slug')
+        .option('-w, --workspace <workspace-slug>', 'Source workspace slug (defaults to active workspace)')
         .option('-y, --yes', 'Skip confirmation prompt')
         .option('--dry-run', 'Show what would be transferred without making changes')
         .option('--json', 'Output result as JSON')
         .addHelpText('after', `
 Examples:
   orch transfer my-agent --to team-workspace           # Transfer agent to another workspace
+  orch transfer my-agent --to team-workspace --workspace my-team
   orch transfer my-agent --to team-workspace --dry-run  # Preview transfer
   orch transfer my-agent --to team-workspace --yes      # Skip confirmation
 `)
         .action(async (agentName, options) => {
+        const write = (message) => {
+            if (!options.json)
+                process.stdout.write(message);
+        };
         const config = await (0, config_1.getResolvedConfig)();
+        const configFile = await (0, config_1.loadConfig)();
         if (!config.apiKey) {
             throw new errors_1.CliError('Not logged in. Run `orchagent login` first.');
         }
-        process.stdout.write('Finding agent and workspaces...\n');
-        // Fetch workspaces and agents in parallel
-        const [workspacesResponse, agents] = await Promise.all([
-            (0, api_1.request)(config, 'GET', '/workspaces'),
-            (0, api_1.listMyAgents)(config),
-        ]);
+        write('Finding agent and workspaces...\n');
+        // Fetch workspace list first (needed to resolve source/target IDs).
+        const workspacesResponse = await (0, api_1.request)(config, 'GET', '/workspaces');
         // Find the target workspace by slug
         const targetWorkspace = workspacesResponse.workspaces.find((w) => w.slug === options.to);
         if (!targetWorkspace) {
             throw new errors_1.CliError(`Workspace '${options.to}' not found. Run \`orchagent workspace list\` to see available workspaces.`);
         }
+        // Resolve source workspace (optional). If set, list agents from that workspace.
+        const sourceWorkspaceSlug = options.workspace ?? configFile.workspace;
+        const sourceWorkspace = sourceWorkspaceSlug
+            ? workspacesResponse.workspaces.find((w) => w.slug === sourceWorkspaceSlug)
+            : null;
+        if (sourceWorkspaceSlug && !sourceWorkspace) {
+            throw new errors_1.CliError(`Source workspace '${sourceWorkspaceSlug}' not found. Run \`orchagent workspace list\` to see available workspaces.`);
+        }
+        if (sourceWorkspace && sourceWorkspace.id === targetWorkspace.id) {
+            throw new errors_1.CliError('Source and target workspaces must be different.');
+        }
+        const agents = sourceWorkspace
+            ? await (0, api_1.request)(config, 'GET', `/agents?workspace_id=${encodeURIComponent(sourceWorkspace.id)}`)
+            : (await (0, api_1.listMyAgents)(config));
         // Find the agent by name
         const matching = agents.filter((a) => a.name === agentName);
         if (matching.length === 0) {
@@ -58,64 +88,118 @@ Examples:
         // Use the most recent version to get the agent ID
         const agent = matching.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())[0];
         // Check transfer eligibility
-        const check = await (0, api_1.checkAgentTransfer)(config, agent.id, targetWorkspace.id);
+        let check;
+        try {
+            check = await (0, api_1.checkAgentTransfer)(config, agent.id, targetWorkspace.id);
+        }
+        catch (err) {
+            const authErr = getTransferAuthError(err);
+            if (authErr)
+                throw authErr;
+            throw err;
+        }
         // Show transfer summary
-        process.stdout.write(`\n${chalk_1.default.bold('Agent:')} ${agent.name}\n`);
-        process.stdout.write(`${chalk_1.default.bold('Target workspace:')} ${targetWorkspace.name} (${targetWorkspace.slug})\n`);
+        write(`\n${chalk_1.default.bold('Agent:')} ${agent.name}\n`);
+        write(`${chalk_1.default.bold('Target workspace:')} ${targetWorkspace.name} (${targetWorkspace.slug})\n`);
         const { details } = check;
-        process.stdout.write(`${chalk_1.default.bold('Versions:')} ${details.version_count}\n`);
+        write(`${chalk_1.default.bold('Versions:')} ${details.version_count}\n`);
         if (details.grants_count > 0) {
-            process.stdout.write(`${chalk_1.default.bold('Grants to revoke:')} ${details.grants_count}\n`);
+            write(`${chalk_1.default.bold('Grants to revoke:')} ${details.grants_count}\n`);
         }
         if (details.keys_count > 0) {
-            process.stdout.write(`${chalk_1.default.bold('Keys to delete:')} ${details.keys_count}\n`);
+            write(`${chalk_1.default.bold('Keys to delete:')} ${details.keys_count}\n`);
         }
         if (details.schedules_count > 0) {
-            process.stdout.write(`${chalk_1.default.bold('Schedules to disable:')} ${details.schedules_count}\n`);
+            write(`${chalk_1.default.bold('Schedules to disable:')} ${details.schedules_count}\n`);
         }
-        process.stdout.write('\n');
+        write('\n');
         // Show warnings
         if (check.warnings.length > 0) {
             for (const warning of check.warnings) {
-                process.stdout.write(chalk_1.default.yellow(`Warning: ${warning}\n`));
+                write(chalk_1.default.yellow(`Warning: ${warning}\n`));
             }
-            process.stdout.write('\n');
+            write('\n');
         }
         // Show blockers and exit if any
         if (check.blockers.length > 0) {
+            if (options.json) {
+                (0, output_1.printJson)({
+                    can_transfer: false,
+                    blockers: check.blockers,
+                    warnings: check.warnings,
+                    details,
+                    agent_name: agent.name,
+                    target_workspace: {
+                        id: targetWorkspace.id,
+                        slug: targetWorkspace.slug,
+                        name: targetWorkspace.name,
+                    },
+                });
+                process.exit(1);
+            }
             for (const blocker of check.blockers) {
-                process.stdout.write(chalk_1.default.red(`Blocker: ${blocker}\n`));
+                write(chalk_1.default.red(`Blocker: ${blocker}\n`));
             }
-            process.stdout.write(chalk_1.default.red('\nTransfer cannot proceed due to blockers above.\n'));
+            write(chalk_1.default.red('\nTransfer cannot proceed due to blockers above.\n'));
             process.exit(1);
         }
         // Handle dry-run
         if (options.dryRun) {
-            process.stdout.write('DRY RUN - No changes will be made\n\n');
-            process.stdout.write(`Would transfer: ${agent.name} (${details.version_count} version(s))\n`);
-            process.stdout.write(`Target: ${targetWorkspace.name} (${targetWorkspace.slug})\n`);
+            if (options.json) {
+                (0, output_1.printJson)({
+                    dry_run: true,
+                    can_transfer: true,
+                    agent_name: agent.name,
+                    target_workspace: {
+                        id: targetWorkspace.id,
+                        slug: targetWorkspace.slug,
+                        name: targetWorkspace.name,
+                    },
+                    details,
+                    warnings: check.warnings,
+                    blockers: check.blockers,
+                });
+                return;
+            }
+            write('DRY RUN - No changes will be made\n\n');
+            write(`Would transfer: ${agent.name} (${details.version_count} version(s))\n`);
+            write(`Target: ${targetWorkspace.name} (${targetWorkspace.slug})\n`);
             if (details.grants_count > 0 || details.keys_count > 0 || details.schedules_count > 0) {
-                process.stdout.write(chalk_1.default.yellow(`Cleanup: ${details.grants_count} grant(s) revoked, ${details.keys_count} key(s) deleted, ${details.schedules_count} schedule(s) disabled\n`));
+                write(chalk_1.default.yellow(`Cleanup: ${details.grants_count} grant(s) revoked, ${details.keys_count} key(s) deleted, ${details.schedules_count} schedule(s) disabled\n`));
             }
-            process.stdout.write('\nNo changes made (dry run)\n');
+            write('\nNo changes made (dry run)\n');
             return;
         }
         // Prompt for confirmation
         if (!options.yes) {
-            process.stdout.write(chalk_1.default.yellow('This will transfer the agent and all its versions to the target workspace.\n'));
-            process.stdout.write(chalk_1.default.yellow('Existing grants, keys, and schedules in the source workspace will be cleaned up.\n\n'));
+            write(chalk_1.default.yellow('This will transfer the agent and all its versions to the target workspace.\n'));
+            write(chalk_1.default.yellow('Existing grants, keys, and schedules in the source workspace will be cleaned up.\n\n'));
             const confirmName = await promptText(`Type "${agent.name}" to confirm transfer: `);
             if (confirmName !== agent.name) {
-                process.stdout.write(chalk_1.default.red('\nTransfer cancelled. Name did not match.\n'));
+                if (options.json) {
+                    (0, output_1.printJson)({ cancelled: true, reason: 'confirmation_mismatch' });
+                }
+                else {
+                    write(chalk_1.default.red('\nTransfer cancelled. Name did not match.\n'));
+                }
                 process.exit(1);
             }
         }
         // Perform transfer
-        process.stdout.write('Transferring agent...\n');
-        const result = await (0, api_1.transferAgent)(config, agent.id, {
-            target_workspace_id: targetWorkspace.id,
-            confirmation_name: agent.name,
-        });
+        write('Transferring agent...\n');
+        let result;
+        try {
+            result = await (0, api_1.transferAgent)(config, agent.id, {
+                target_workspace_id: targetWorkspace.id,
+                confirmation_name: agent.name,
+            });
+        }
+        catch (err) {
+            const authErr = getTransferAuthError(err);
+            if (authErr)
+                throw authErr;
+            throw err;
+        }
         await (0, analytics_1.track)('cli_transfer', {
             agent_name: result.agent_name,
             versions_transferred: result.versions_transferred,
@@ -125,11 +209,11 @@ Examples:
             (0, output_1.printJson)(result);
             return;
         }
-        process.stdout.write(`\n${chalk_1.default.green('+')} Transferred ${result.agent_name} (${result.versions_transferred} version(s))\n`);
-        process.stdout.write(`  From: ${result.source_workspace.name} (${result.source_workspace.slug})\n`);
-        process.stdout.write(`  To:   ${result.target_workspace.name} (${result.target_workspace.slug})\n`);
+        write(`\n${chalk_1.default.green('+')} Transferred ${result.agent_name} (${result.versions_transferred} version(s))\n`);
+        write(`  From: ${result.source_workspace.name} (${result.source_workspace.slug})\n`);
+        write(`  To:   ${result.target_workspace.name} (${result.target_workspace.slug})\n`);
         if (result.cleanup.grants_revoked > 0 || result.cleanup.keys_deleted > 0 || result.cleanup.schedules_disabled > 0) {
-            process.stdout.write(chalk_1.default.gray(`\nCleanup: ${result.cleanup.grants_revoked} grant(s) revoked, ${result.cleanup.keys_deleted} key(s) deleted, ${result.cleanup.schedules_disabled} schedule(s) disabled\n`));
+            write(chalk_1.default.gray(`\nCleanup: ${result.cleanup.grants_revoked} grant(s) revoked, ${result.cleanup.keys_deleted} key(s) deleted, ${result.cleanup.schedules_disabled} schedule(s) disabled\n`));
         }
     });
 }

package/dist/index.js

@@ -61,6 +61,7 @@ program
 Quick Reference:
   run   Run an agent (cloud by default, --local for local execution)
   info  Show agent details and input/output schemas
+  fork  Fork a public template into your workspace
 
 Installation:
   npm install -g @orchagent/cli   Install globally (then use: orch)

package/dist/lib/api.js

@@ -54,6 +54,7 @@ exports.getAgentWithFallback = getAgentWithFallback;
 exports.downloadCodeBundleAuthenticated = downloadCodeBundleAuthenticated;
 exports.checkAgentDelete = checkAgentDelete;
 exports.deleteAgent = deleteAgent;
+exports.forkAgent = forkAgent;
 exports.checkAgentTransfer = checkAgentTransfer;
 exports.transferAgent = transferAgent;
 exports.previewAgentVersion = previewAgentVersion;
@@ -368,6 +369,15 @@ async function deleteAgent(config, agentId, confirmationName) {
     const params = confirmationName ? `?confirmation_name=${encodeURIComponent(confirmationName)}` : '';
     return request(config, 'DELETE', `/agents/${agentId}${params}`);
 }
+/**
+ * Fork a public agent into the caller's workspace (or an explicit workspace_id).
+ */
+async function forkAgent(config, sourceAgentId, data = {}) {
+    return request(config, 'POST', `/agents/${sourceAgentId}/fork`, {
+        body: JSON.stringify(data),
+        headers: { 'Content-Type': 'application/json' },
+    });
+}
 /**
  * Check if an agent can be transferred to another workspace.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.55",
+  "version": "0.3.57",
   "description": "Command-line interface for orchagent — deploy and run AI agents for your team",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",