@orchagent/cli 0.3.60 → 0.3.62

package/dist/commands/init.js

@@ -165,30 +165,27 @@ license: MIT
 Instructions and guidance for AI agents...
 `;
 function resolveInitFlavor(typeOption) {
-    const normalized = (typeOption || 'agent').trim().toLowerCase();
+    const normalized = (typeOption || 'prompt').trim().toLowerCase();
     if (normalized === 'skill') {
         return { type: 'skill' };
     }
-    if (normalized === 'agent') {
-        return { type: 'agent', flavor: 'direct_llm' };
-    }
     if (normalized === 'prompt') {
-        return { type: 'agent', flavor: 'direct_llm' };
+        return { type: 'prompt', flavor: 'direct_llm' };
     }
-    if (normalized === 'agentic') {
+    if (normalized === 'agent' || normalized === 'agentic') {
         return { type: 'agent', flavor: 'managed_loop' };
     }
     if (normalized === 'tool' || normalized === 'code') {
-        return { type: 'agent', flavor: 'code_runtime' };
+        return { type: 'tool', flavor: 'code_runtime' };
     }
-    throw new errors_1.CliError(`Unknown --type '${typeOption}'. Use 'agent' or 'skill' (legacy: prompt, tool, agentic, code).`);
+    throw new errors_1.CliError(`Unknown --type '${typeOption}'. Use 'prompt', 'tool', 'agent', or 'skill' (legacy aliases: agentic, code).`);
 }
 function registerInitCommand(program) {
     program
         .command('init')
         .description('Initialize a new agent project')
         .argument('[name]', 'Agent name (default: current directory name)')
-        .option('--type <type>', 'Type: agent or skill (legacy: prompt, tool, agentic, code)', 'agent')
+        .option('--type <type>', 'Type: prompt, tool, agent, or skill (legacy aliases: agentic, code)', 'prompt')
         .option('--run-mode <mode>', 'Run mode for agents: on_demand or always_on', 'on_demand')
         .action(async (name, options) => {
         const cwd = process.cwd();
@@ -247,13 +244,13 @@ function registerInitCommand(program) {
                 throw err;
             }
         }
-        if (initMode.flavor === 'direct_llm' && runMode === 'always_on') {
-            throw new errors_1.CliError("run_mode=always_on requires runtime.command in orchagent.json (e.g. \"runtime\": { \"command\": \"python main.py\" }).");
+        if (initMode.flavor !== 'code_runtime' && runMode === 'always_on') {
+            throw new errors_1.CliError("run_mode=always_on requires runtime.command in orchagent.json (e.g. \"runtime\": { \"command\": \"python main.py\" }). Use --type tool for code-runtime agents.");
         }
         // Create manifest and type-specific files
         const manifest = JSON.parse(MANIFEST_TEMPLATE);
         manifest.name = agentName;
-        manifest.type = 'agent';
+        manifest.type = initMode.type;
         manifest.run_mode = runMode;
         if (initMode.flavor === 'managed_loop') {
             manifest.description = 'An AI agent with tool use';

package/dist/commands/publish.js

@@ -163,13 +163,17 @@ async function collectSkillFiles(skillDir, maxFiles = 20, maxTotalSize = 500_000
 }
 function canonicalizeManifestType(typeValue) {
     const rawType = (typeValue || 'agent').trim().toLowerCase();
-    if (rawType === 'skill') {
-        return { canonicalType: 'skill', rawType };
+    if (['prompt', 'tool', 'agent', 'skill'].includes(rawType)) {
+        return { canonicalType: rawType, rawType };
     }
-    if (['agent', 'prompt', 'tool', 'agentic', 'code'].includes(rawType)) {
+    // Legacy aliases
+    if (rawType === 'agentic') {
         return { canonicalType: 'agent', rawType };
     }
-    throw new errors_1.CliError(`Invalid type '${typeValue}'. Use 'agent' or 'skill' (legacy values accepted: prompt, tool, agentic, code).`);
+    if (rawType === 'code') {
+        return { canonicalType: 'tool', rawType };
+    }
+    throw new errors_1.CliError(`Invalid type '${typeValue}'. Use 'prompt', 'tool', 'agent', or 'skill' (legacy aliases: agentic, code).`);
 }
 function normalizeRunMode(runMode) {
     const normalized = (runMode || 'on_demand').trim().toLowerCase();
@@ -628,6 +632,7 @@ function registerPublishCommand(program) {
                 sdk_compatible: sdkCompatible || undefined,
                 // Orchestration manifest (includes dependencies)
                 manifest: manifest.manifest,
+                required_secrets: manifest.required_secrets,
                 default_skills: skillsFromFlag || manifest.default_skills,
                 skills_locked: manifest.skills_locked || options.skillsLocked || undefined,
                 allow_local_download: options.localDownload || false,
@@ -726,6 +731,10 @@ function registerPublishCommand(program) {
                         process.stdout.write(`  ${chalk_1.default.cyan('Using workspace default environment')}\n`);
                     }
                 }
+                // Show service auto-update info
+                if (uploadResult.services_updated && uploadResult.services_updated > 0) {
+                    process.stdout.write(`  ${chalk_1.default.green(`Updated ${uploadResult.services_updated} service(s) to ${assignedVersion}`)}\n`);
+                }
             }
             finally {
                 // Clean up temp files

package/dist/commands/service.js

@@ -92,6 +92,7 @@ function registerServiceCommand(program) {
         .option('--secret <NAME>', 'Workspace secret name (repeatable)', collectArray, [])
         .option('--command <cmd>', 'Override entrypoint command')
         .option('--arg <value>', 'Command argument (repeatable)', collectArray, [])
+        .option('--pin', 'Pin to deployed version (disable auto-update on publish)')
         .option('--json', 'Output as JSON')
         .action(async (agentArg, options) => {
         const config = await (0, config_1.getResolvedConfig)();
@@ -160,6 +161,7 @@ function registerServiceCommand(program) {
                     args: options.arg.length > 0 ? options.arg : null,
                     env: Object.keys(options.env).length > 0 ? options.env : null,
                     secret_names: options.secret.length > 0 ? options.secret : null,
+                    ...(options.pin ? { auto_update: false } : {}),
                 }),
                 headers: { 'Content-Type': 'application/json' },
             });
@@ -175,6 +177,9 @@ function registerServiceCommand(program) {
             process.stdout.write(`  ${chalk_1.default.bold('Agent:')}    ${svc.agent_name}@${svc.agent_version}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('State:')}    ${stateColor(svc.current_state)}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('URL:')}      ${svc.provider_url || svc.cloud_run_url || '-'}\n`);
+            if (options.pin) {
+                process.stdout.write(`  ${chalk_1.default.bold('Pinned:')}   ${chalk_1.default.yellow(`yes (won't auto-update on publish)`)}\n`);
+            }
             process.stdout.write(`\n`);
             process.stdout.write(chalk_1.default.gray(`View logs: orch service logs ${svc.id}\n`));
         }
@@ -344,6 +349,28 @@ function registerServiceCommand(program) {
         if (svc.alert_webhook_url) {
             process.stdout.write(`  Alert URL:    ${svc.alert_webhook_url.slice(0, 50)}...\n`);
         }
+        // Environment variables
+        const envKeys = Object.keys(svc.env_json || {});
+        if (envKeys.length > 0) {
+            process.stdout.write(`\n${chalk_1.default.bold('Environment Variables')} (${envKeys.length})\n`);
+            for (const key of envKeys) {
+                process.stdout.write(`  ${key}=${svc.env_json[key]}\n`);
+            }
+        }
+        else {
+            process.stdout.write(`\n  Env Vars:     ${chalk_1.default.gray('none')}\n`);
+        }
+        // Attached secrets
+        const secrets = svc.secret_names || [];
+        if (secrets.length > 0) {
+            process.stdout.write(`\n${chalk_1.default.bold('Attached Secrets')} (${secrets.length})\n`);
+            for (const name of secrets) {
+                process.stdout.write(`  ${name}\n`);
+            }
+        }
+        else {
+            process.stdout.write(`  Secrets:      ${chalk_1.default.gray('none')}\n`);
+        }
         // Events timeline
         const events = svc.events || [];
         if (events.length > 0) {
@@ -383,6 +410,230 @@ function registerServiceCommand(program) {
             throw e;
         }
     });
+    // ============================================
+    // orch service env — manage environment variables
+    // ============================================
+    const envCmd = service
+        .command('env')
+        .description('Manage service environment variables');
+    // orch service env set <service-id> <KEY=VALUE...>
+    envCmd
+        .command('set <service-id> <pairs...>')
+        .description('Set environment variables on a service (KEY=VALUE pairs)')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (serviceId, pairs, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Parse KEY=VALUE pairs
+        const newEnv = {};
+        for (const pair of pairs) {
+            const idx = pair.indexOf('=');
+            if (idx < 0) {
+                throw new errors_1.CliError(`Invalid format: '${pair}'. Use KEY=VALUE.`);
+            }
+            newEnv[pair.slice(0, idx)] = pair.slice(idx + 1);
+        }
+        // Fetch current service to merge env
+        const current = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/services/${serviceId}`);
+        const currentEnv = current.service.env_json || {};
+        const mergedEnv = { ...currentEnv, ...newEnv };
+        const spinner = (0, spinner_1.createSpinner)('Updating environment...');
+        spinner.start();
+        try {
+            const result = await (0, api_1.request)(config, 'PATCH', `/workspaces/${workspaceId}/services/${serviceId}`, {
+                body: JSON.stringify({ env: mergedEnv }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            spinner.succeed('Environment updated');
+            if (options.json) {
+                (0, output_1.printJson)(result.service);
+                return;
+            }
+            const addedKeys = Object.keys(newEnv);
+            process.stdout.write(`${chalk_1.default.green('\u2713')} Set ${addedKeys.length} variable${addedKeys.length !== 1 ? 's' : ''}: ${addedKeys.join(', ')}\n`);
+            if (current.service.desired_state !== 'stopped') {
+                process.stdout.write(chalk_1.default.gray('Service restarted to apply changes.\n'));
+            }
+        }
+        catch (e) {
+            spinner.fail('Failed to update environment');
+            throw e;
+        }
+    });
+    // orch service env unset <service-id> <KEY...>
+    envCmd
+        .command('unset <service-id> <keys...>')
+        .description('Remove environment variables from a service')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (serviceId, keys, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Fetch current service
+        const current = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/services/${serviceId}`);
+        const currentEnv = { ...(current.service.env_json || {}) };
+        // Remove specified keys
+        const removed = [];
+        for (const key of keys) {
+            if (key in currentEnv) {
+                delete currentEnv[key];
+                removed.push(key);
+            }
+        }
+        if (removed.length === 0) {
+            process.stdout.write(chalk_1.default.yellow('No matching environment variables found.\n'));
+            return;
+        }
+        const spinner = (0, spinner_1.createSpinner)('Updating environment...');
+        spinner.start();
+        try {
+            const result = await (0, api_1.request)(config, 'PATCH', `/workspaces/${workspaceId}/services/${serviceId}`, {
+                body: JSON.stringify({ env: currentEnv }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            spinner.succeed('Environment updated');
+            if (options.json) {
+                (0, output_1.printJson)(result.service);
+                return;
+            }
+            process.stdout.write(`${chalk_1.default.green('\u2713')} Removed ${removed.length} variable${removed.length !== 1 ? 's' : ''}: ${removed.join(', ')}\n`);
+            if (current.service.desired_state !== 'stopped') {
+                process.stdout.write(chalk_1.default.gray('Service restarted to apply changes.\n'));
+            }
+        }
+        catch (e) {
+            spinner.fail('Failed to update environment');
+            throw e;
+        }
+    });
+    // orch service env list <service-id>
+    envCmd
+        .command('list <service-id>')
+        .description('List environment variables for a service')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (serviceId, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        const result = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/services/${serviceId}`);
+        const envJson = result.service.env_json || {};
+        if (options.json) {
+            (0, output_1.printJson)(envJson);
+            return;
+        }
+        const keys = Object.keys(envJson);
+        if (keys.length === 0) {
+            process.stdout.write('No environment variables set.\n');
+            return;
+        }
+        for (const key of keys) {
+            process.stdout.write(`${key}=${envJson[key]}\n`);
+        }
+    });
+    // ============================================
+    // orch service secret — manage attached workspace secrets
+    // ============================================
+    const secretCmd = service
+        .command('secret')
+        .description('Manage workspace secrets attached to a service');
+    // orch service secret add <service-id> <NAME...>
+    secretCmd
+        .command('add <service-id> <names...>')
+        .description('Attach workspace secrets to a service')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (serviceId, names, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Fetch current service and merge
+        const current = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/services/${serviceId}`);
+        const currentSecrets = current.service.secret_names || [];
+        const merged = [...new Set([...currentSecrets, ...names])];
+        const spinner = (0, spinner_1.createSpinner)('Attaching secrets...');
+        spinner.start();
+        try {
+            const result = await (0, api_1.request)(config, 'PATCH', `/workspaces/${workspaceId}/services/${serviceId}`, {
+                body: JSON.stringify({ secret_names: merged }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            spinner.succeed('Secrets attached');
+            if (options.json) {
+                (0, output_1.printJson)(result.service);
+                return;
+            }
+            const added = names.filter(n => !currentSecrets.includes(n));
+            if (added.length > 0) {
+                process.stdout.write(`${chalk_1.default.green('\u2713')} Attached ${added.length} secret${added.length !== 1 ? 's' : ''}: ${added.join(', ')}\n`);
+            }
+            else {
+                process.stdout.write(chalk_1.default.yellow('All specified secrets were already attached.\n'));
+            }
+            if (current.service.desired_state !== 'stopped') {
+                process.stdout.write(chalk_1.default.gray('Service restarted to apply changes.\n'));
+            }
+        }
+        catch (e) {
+            spinner.fail('Failed to attach secrets');
+            throw e;
+        }
+    });
+    // orch service secret remove <service-id> <NAME...>
+    secretCmd
+        .command('remove <service-id> <names...>')
+        .description('Detach workspace secrets from a service')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (serviceId, names, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Fetch current service and filter
+        const current = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/services/${serviceId}`);
+        const currentSecrets = current.service.secret_names || [];
+        const namesToRemove = new Set(names);
+        const filtered = currentSecrets.filter(n => !namesToRemove.has(n));
+        const removed = currentSecrets.filter(n => namesToRemove.has(n));
+        if (removed.length === 0) {
+            process.stdout.write(chalk_1.default.yellow('No matching secrets found on this service.\n'));
+            return;
+        }
+        const spinner = (0, spinner_1.createSpinner)('Detaching secrets...');
+        spinner.start();
+        try {
+            const result = await (0, api_1.request)(config, 'PATCH', `/workspaces/${workspaceId}/services/${serviceId}`, {
+                body: JSON.stringify({ secret_names: filtered }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            spinner.succeed('Secrets detached');
+            if (options.json) {
+                (0, output_1.printJson)(result.service);
+                return;
+            }
+            process.stdout.write(`${chalk_1.default.green('\u2713')} Detached ${removed.length} secret${removed.length !== 1 ? 's' : ''}: ${removed.join(', ')}\n`);
+            if (current.service.desired_state !== 'stopped') {
+                process.stdout.write(chalk_1.default.gray('Service restarted to apply changes.\n'));
+            }
+        }
+        catch (e) {
+            spinner.fail('Failed to detach secrets');
+            throw e;
+        }
+    });
 }
 // ============================================
 // OPTION COLLECTORS

package/package.json

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