@orchagent/cli 0.3.91 → 0.3.92

package/dist/commands/init-wizard.js

@@ -4,6 +4,9 @@
  *
  * Runs when `orch init` is invoked without arguments in a TTY.
  * Uses Node.js built-in readline/promises — no extra dependencies.
+ *
+ * The wizard leads with "What do you want to build?" to directly address
+ * the most common new-user friction — not knowing which type/flavor to pick.
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -15,6 +18,7 @@ exports.printTemplateList = printTemplateList;
 const promises_1 = __importDefault(require("readline/promises"));
 const path_1 = __importDefault(require("path"));
 exports.TEMPLATE_REGISTRY = [
+    { name: 'cron-job', description: 'Scheduled task — daily reports, syncs, cleanups', type: 'tool', language: 'both', runMode: 'on_demand' },
     { name: 'discord', description: 'Discord bot powered by Claude (Python)', type: 'agent', language: 'python', runMode: 'always_on' },
     { name: 'discord-js', description: 'Discord bot powered by Claude (JavaScript)', type: 'agent', language: 'javascript', runMode: 'always_on' },
     { name: 'support-agent', description: 'Multi-platform support agent (Discord/Telegram/Slack)', type: 'agent', language: 'python', runMode: 'always_on' },
@@ -54,6 +58,77 @@ async function promptSelect(rl, question, options) {
     }
 }
 // ---------------------------------------------------------------------------
+// Language follow-up (shared by several use cases)
+// ---------------------------------------------------------------------------
+async function promptLanguage(rl) {
+    return promptSelect(rl, 'Language?', [
+        { value: 'python', label: 'Python', description: 'Recommended — broadest library support' },
+        { value: 'javascript', label: 'JavaScript', description: 'Node.js runtime' },
+    ]);
+}
+// ---------------------------------------------------------------------------
+// "More templates" sub-flow
+// ---------------------------------------------------------------------------
+async function handleMoreTemplates(rl, nameForResult) {
+    const language = await promptLanguage(rl);
+    const applicableTemplates = exports.TEMPLATE_REGISTRY.filter(t => t.language === 'both' || t.language === language);
+    const templateOptions = [
+        { value: 'none', label: 'No template', description: 'Start from scratch (choose type manually)' },
+        ...applicableTemplates.map(t => ({
+            value: t.name,
+            label: t.name,
+            description: t.description,
+        })),
+    ];
+    const template = await promptSelect(rl, 'Pick a template:', templateOptions);
+    if (template !== 'none') {
+        const info = exports.TEMPLATE_REGISTRY.find(t => t.name === template);
+        rl.close();
+        return {
+            name: nameForResult,
+            type: info.type,
+            language,
+            template,
+            runMode: info.runMode,
+            orchestrator: false,
+            loop: false,
+        };
+    }
+    // No template — fall back to manual type selection
+    const type = await promptSelect(rl, 'Agent type?', [
+        { value: 'prompt', label: 'prompt', description: 'Single LLM call with structured I/O' },
+        { value: 'tool', label: 'tool', description: 'Your own code (API calls, file processing)' },
+        { value: 'agent', label: 'agent', description: 'Multi-step LLM reasoning with tool use' },
+    ]);
+    let runMode = 'on_demand';
+    let orchestrator = false;
+    let loop = false;
+    if (type === 'tool') {
+        runMode = await promptSelect(rl, 'Run mode?', [
+            { value: 'on_demand', label: 'on_demand', description: 'Run per invocation (default)' },
+            { value: 'always_on', label: 'always_on', description: 'Long-lived HTTP service' },
+        ]);
+    }
+    if (type === 'agent') {
+        runMode = await promptSelect(rl, 'Run mode?', [
+            { value: 'on_demand', label: 'on_demand', description: 'Run per invocation (default)' },
+            { value: 'always_on', label: 'always_on', description: 'Long-lived HTTP service' },
+        ]);
+        const subtypeOptions = [
+            { value: 'code', label: 'Code runtime', description: 'You write the logic (call any LLM provider)' },
+            { value: 'orchestrator', label: 'Orchestrator', description: 'Coordinate other agents via SDK' },
+        ];
+        if (language === 'python') {
+            subtypeOptions.push({ value: 'loop', label: 'Managed loop', description: 'Platform-managed LLM loop with tool use' });
+        }
+        const agentSubtype = await promptSelect(rl, 'Agent execution mode?', subtypeOptions);
+        orchestrator = agentSubtype === 'orchestrator';
+        loop = agentSubtype === 'loop';
+    }
+    rl.close();
+    return { name: nameForResult, type, language, template: undefined, runMode, orchestrator, loop };
+}
+// ---------------------------------------------------------------------------
 // Wizard
 // ---------------------------------------------------------------------------
 async function runInitWizard() {
@@ -64,77 +139,67 @@ async function runInitWizard() {
         // 1. Agent name
         const dirName = path_1.default.basename(process.cwd());
         const name = await promptText(rl, 'Agent name', dirName);
-        const createSubdir = name !== dirName;
-        // 2. Agent type
-        const type = await promptSelect(rl, 'What type of agent?', [
-            { value: 'prompt', label: 'prompt', description: 'Single LLM call with structured I/O' },
-            { value: 'tool', label: 'tool', description: 'Your own code (API calls, file processing)' },
-            { value: 'agent', label: 'agent', description: 'Multi-step LLM reasoning with tool use' },
-            { value: 'skill', label: 'skill', description: 'Knowledge module for other agents' },
+        const nameForResult = name !== dirName ? name : undefined;
+        // 2. What do you want to build? (use-case-driven — replaces type/template questions)
+        const useCase = await promptSelect(rl, 'What do you want to build?', [
+            { value: 'prompt', label: 'Prompt agent', description: 'Single LLM call with structured I/O (simplest)' },
+            { value: 'tool-py', label: 'Tool (Python)', description: 'Your code processes data (stdin/stdout JSON)' },
+            { value: 'tool-js', label: 'Tool (JavaScript)', description: 'Your code processes data (Node.js)' },
+            { value: 'cron-job', label: 'Scheduled job', description: 'Runs on a cron schedule (reports, syncs, cleanups)' },
+            { value: 'discord-bot', label: 'Discord bot', description: 'Always-on chatbot in Discord channels' },
+            { value: 'orchestrator', label: 'Orchestrator', description: 'Coordinate multiple agents via SDK' },
+            { value: 'agent-loop', label: 'AI agent (LLM loop)', description: 'Multi-step reasoning with tool use' },
+            { value: 'skill', label: 'Knowledge skill', description: 'Reusable knowledge module for other agents' },
+            { value: 'more', label: 'More templates...', description: 'Fan-out, pipeline, map-reduce, support agent, etc.' },
         ]);
-        // Skill and prompt don't need language/template
-        if (type === 'skill' || type === 'prompt') {
+        // --- Direct-resolution use cases (no follow-up needed) ---
+        if (useCase === 'prompt') {
             rl.close();
-            return {
-                name: createSubdir ? name : undefined,
-                type,
-                language: 'python',
-                template: undefined,
-                runMode: 'on_demand',
-                orchestrator: false,
-                loop: false,
-            };
+            return { name: nameForResult, type: 'prompt', language: 'python', template: undefined, runMode: 'on_demand', orchestrator: false, loop: false };
         }
-        // 3. Language (tool/agent only)
-        const language = await promptSelect(rl, 'Language?', [
-            { value: 'python', label: 'Python', description: 'Recommended — broadest library support' },
-            { value: 'javascript', label: 'JavaScript', description: 'Node.js runtime' },
-        ]);
-        // 4. Template (optional)
-        const applicableTemplates = exports.TEMPLATE_REGISTRY.filter(t => {
-            if (t.language !== 'both' && t.language !== language)
-                return false;
-            return true;
-        });
-        const templateOptions = [
-            { value: 'none', label: 'No template', description: 'Start from scratch' },
-            ...applicableTemplates.map(t => ({
-                value: t.name,
-                label: t.name,
-                description: t.description,
-            })),
-        ];
-        const template = await promptSelect(rl, 'Start from a template?', templateOptions);
-        // 5. Run mode (only if no template selected — templates set their own)
-        let runMode = 'on_demand';
-        if (template === 'none') {
-            runMode = await promptSelect(rl, 'Run mode?', [
-                { value: 'on_demand', label: 'on_demand', description: 'Run per invocation (default)' },
-                { value: 'always_on', label: 'always_on', description: 'Long-lived HTTP service' },
-            ]);
+        if (useCase === 'skill') {
+            rl.close();
+            return { name: nameForResult, type: 'skill', language: 'python', template: undefined, runMode: 'on_demand', orchestrator: false, loop: false };
+        }
+        if (useCase === 'tool-py') {
+            rl.close();
+            return { name: nameForResult, type: 'tool', language: 'python', template: undefined, runMode: 'on_demand', orchestrator: false, loop: false };
+        }
+        if (useCase === 'tool-js') {
+            rl.close();
+            return { name: nameForResult, type: 'tool', language: 'javascript', template: undefined, runMode: 'on_demand', orchestrator: false, loop: false };
+        }
+        if (useCase === 'agent-loop') {
+            rl.close();
+            return { name: nameForResult, type: 'agent', language: 'python', template: undefined, runMode: 'on_demand', orchestrator: false, loop: true };
         }
-        // 6. Agent subtype (only for agent type, no template)
-        let orchestrator = false;
-        let loop = false;
-        if (type === 'agent' && template === 'none') {
-            const agentSubtype = await promptSelect(rl, 'Agent execution mode?', [
-                { value: 'code', label: 'Code runtime', description: 'You write the logic (call any LLM provider)' },
-                { value: 'orchestrator', label: 'Orchestrator', description: 'Coordinate other agents via SDK' },
-                ...(language === 'python' ? [{ value: 'loop', label: 'Managed loop', description: 'Platform-managed LLM loop with tool use' }] : []),
+        // --- Use cases that need a language follow-up ---
+        if (useCase === 'cron-job') {
+            const lang = await promptLanguage(rl);
+            rl.close();
+            return { name: nameForResult, type: 'tool', language: lang, template: 'cron-job', runMode: 'on_demand', orchestrator: false, loop: false };
+        }
+        if (useCase === 'discord-bot') {
+            const lang = await promptSelect(rl, 'Language?', [
+                { value: 'python', label: 'Python', description: 'Recommended — discord.py + anthropic' },
+                { value: 'javascript', label: 'JavaScript', description: 'discord.js + @anthropic-ai/sdk' },
             ]);
-            orchestrator = agentSubtype === 'orchestrator';
-            loop = agentSubtype === 'loop';
+            const template = lang === 'javascript' ? 'discord-js' : 'discord';
+            rl.close();
+            return { name: nameForResult, type: 'agent', language: lang, template, runMode: 'always_on', orchestrator: false, loop: false };
+        }
+        if (useCase === 'orchestrator') {
+            const lang = await promptLanguage(rl);
+            rl.close();
+            return { name: nameForResult, type: 'agent', language: lang, template: undefined, runMode: 'on_demand', orchestrator: true, loop: false };
         }
+        // --- "More templates..." sub-flow ---
+        if (useCase === 'more') {
+            return handleMoreTemplates(rl, nameForResult);
+        }
+        // Shouldn't reach here, but handle gracefully
         rl.close();
-        return {
-            name: createSubdir ? name : undefined,
-            type,
-            language,
-            template: template === 'none' ? undefined : template,
-            runMode,
-            orchestrator,
-            loop,
-        };
+        return { name: nameForResult, type: 'prompt', language: 'python', template: undefined, runMode: 'on_demand', orchestrator: false, loop: false };
     }
     catch (err) {
         rl.close();

package/dist/commands/init.js

@@ -10,6 +10,7 @@ const path_1 = __importDefault(require("path"));
 const errors_1 = require("../lib/errors");
 const init_wizard_1 = require("./init-wizard");
 const github_weekly_summary_1 = require("./templates/github-weekly-summary");
+const cron_job_1 = require("./templates/cron-job");
 const support_agent_1 = require("./templates/support-agent");
 const MANIFEST_TEMPLATE = `{
   "name": "my-agent",
@@ -1566,7 +1567,7 @@ function registerInitCommand(program) {
         }
         if (options.template) {
             const template = options.template.trim().toLowerCase();
-            const validTemplates = ['fan-out', 'pipeline', 'map-reduce', 'support-agent', 'discord', 'discord-js', 'github-weekly-summary'];
+            const validTemplates = ['fan-out', 'pipeline', 'map-reduce', 'support-agent', 'discord', 'discord-js', 'github-weekly-summary', 'cron-job'];
             if (!validTemplates.includes(template)) {
                 throw new errors_1.CliError(`Unknown --template '${template}'. Available templates: ${validTemplates.join(', ')}`);
             }
@@ -1600,6 +1601,9 @@ function registerInitCommand(program) {
             else if (template === 'github-weekly-summary') {
                 initMode = { type: 'agent', flavor: 'github_weekly_summary' };
             }
+            else if (template === 'cron-job') {
+                initMode = { type: 'tool', flavor: 'cron_job' };
+            }
         }
         // Validate --language option
         const language = (options.language || 'python').trim().toLowerCase();
@@ -1949,6 +1953,72 @@ function registerInitCommand(program) {
             process.stdout.write(AGENT_BUILDER_HINT);
             return;
         }
+        // Handle cron-job template
+        if (initMode.flavor === 'cron_job') {
+            const manifestPath = path_1.default.join(targetDir, 'orchagent.json');
+            try {
+                await promises_1.default.access(manifestPath);
+                throw new errors_1.CliError(`Already initialized (orchagent.json exists in ${name ? name + '/' : 'current directory'})`);
+            }
+            catch (err) {
+                if (err.code !== 'ENOENT') {
+                    throw err;
+                }
+            }
+            const manifest = {
+                name: agentName,
+                type: 'tool',
+                description: 'A scheduled job that runs on a cron schedule',
+                run_mode: 'on_demand',
+                runtime: { command: isJavaScript ? 'node main.js' : 'python main.py' },
+                required_secrets: [],
+                tags: ['scheduled', 'cron'],
+            };
+            if (isJavaScript) {
+                manifest.entrypoint = 'main.js';
+            }
+            await promises_1.default.writeFile(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
+            if (isJavaScript) {
+                await promises_1.default.writeFile(path_1.default.join(targetDir, 'main.js'), cron_job_1.CRON_JOB_MAIN_JS);
+                await promises_1.default.writeFile(path_1.default.join(targetDir, 'package.json'), JSON.stringify({
+                    name: agentName,
+                    private: true,
+                    type: 'commonjs',
+                    dependencies: {},
+                }, null, 2) + '\n');
+            }
+            else {
+                await promises_1.default.writeFile(path_1.default.join(targetDir, 'main.py'), cron_job_1.CRON_JOB_MAIN_PY);
+            }
+            await promises_1.default.writeFile(path_1.default.join(targetDir, 'schema.json'), cron_job_1.CRON_JOB_SCHEMA);
+            await promises_1.default.writeFile(path_1.default.join(targetDir, 'README.md'), (0, cron_job_1.cronJobReadme)(agentName));
+            const prefix = name ? name + '/' : '';
+            process.stdout.write(`Initialized scheduled job "${agentName}" in ${targetDir}\n`);
+            process.stdout.write(`\nFiles created:\n`);
+            process.stdout.write(`  ${prefix}orchagent.json    - Agent configuration (cron job)\n`);
+            if (isJavaScript) {
+                process.stdout.write(`  ${prefix}main.js           - Scheduled job entrypoint\n`);
+                process.stdout.write(`  ${prefix}package.json      - npm dependencies\n`);
+            }
+            else {
+                process.stdout.write(`  ${prefix}main.py           - Scheduled job entrypoint\n`);
+            }
+            process.stdout.write(`  ${prefix}schema.json       - Input/output schemas\n`);
+            process.stdout.write(`  ${prefix}README.md         - Setup guide with cron patterns\n`);
+            process.stdout.write(`\nNext steps:\n`);
+            const stepNum = name ? 2 : 1;
+            if (name) {
+                process.stdout.write(`  1. cd ${name}\n`);
+            }
+            const mainFile = isJavaScript ? 'main.js' : 'main.py';
+            const testCmd = isJavaScript ? 'node main.js' : 'python main.py';
+            process.stdout.write(`  ${stepNum}. Edit ${mainFile} with your job logic\n`);
+            process.stdout.write(`  ${stepNum + 1}. Test: echo '{}' | ${testCmd}\n`);
+            process.stdout.write(`  ${stepNum + 2}. Publish: orch publish\n`);
+            process.stdout.write(`  ${stepNum + 3}. Schedule: orch schedule create <org>/${agentName} --cron "0 9 * * 1"\n`);
+            process.stdout.write(AGENT_BUILDER_HINT);
+            return;
+        }
         const manifestPath = path_1.default.join(targetDir, 'orchagent.json');
         const promptPath = path_1.default.join(targetDir, 'prompt.md');
         const schemaPath = path_1.default.join(targetDir, 'schema.json');

package/dist/commands/publish.js

@@ -584,7 +584,7 @@ function registerPublishCommand(program) {
         .option('--skills-locked', 'Lock default skills (callers cannot override via headers)')
         .option('--docker', 'Include Dockerfile for custom environment (builds E2B template)')
         .option('--local-download', 'Allow users to download and run locally (default: server-only)')
-        .option('--no-required-secrets', 'Skip required_secrets check for tool/agent types')
+        .option('--no-required-secrets', '(deprecated) No longer needed — required_secrets defaults to []')
         .option('--all', 'Publish all agents in subdirectories (dependency order)')
         .action(async (options) => {
         const cwd = process.cwd();
@@ -718,44 +718,62 @@ function registerPublishCommand(program) {
             }
             throw new errors_1.CliError(`Failed to read orchagent.json: ${err}`);
         }
+        // UX-1: Collect validation errors and report them all at once
+        const validationErrors = [];
         // Validate manifest
         if (!manifest.name) {
-            throw new errors_1.CliError('orchagent.json must have name');
+            validationErrors.push('orchagent.json must have name');
         }
-        // Validate agent name format (must match gateway rules)
-        const agentNameRegex = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
-        const agentName = manifest.name;
-        if (agentName.length < 2 || agentName.length > 50) {
-            throw new errors_1.CliError('Agent name must be 2-50 characters');
-        }
-        if (agentName !== agentName.toLowerCase()) {
-            throw new errors_1.CliError('Agent name must be lowercase');
-        }
-        if (agentName.length > 1 && !agentNameRegex.test(agentName)) {
-            throw new errors_1.CliError('Agent name must contain only lowercase letters, numbers, and hyphens, and must start/end with a letter or number');
-        }
-        if (agentName.includes('--')) {
-            throw new errors_1.CliError('Agent name must not contain consecutive hyphens');
+        else {
+            // Validate agent name format (must match gateway rules)
+            const agentNameRegex = /^[a-z0-9][a-z0-9-]*[a-z0-9]$/;
+            const agentName = manifest.name;
+            if (agentName.length < 2 || agentName.length > 50) {
+                validationErrors.push('Agent name must be 2-50 characters');
+            }
+            if (agentName !== agentName.toLowerCase()) {
+                validationErrors.push('Agent name must be lowercase');
+            }
+            if (agentName.length > 1 && !agentNameRegex.test(agentName)) {
+                validationErrors.push('Agent name must contain only lowercase letters, numbers, and hyphens, and must start/end with a letter or number');
+            }
+            if (agentName.includes('--')) {
+                validationErrors.push('Agent name must not contain consecutive hyphens');
+            }
         }
         const { canonicalType, rawType } = canonicalizeManifestType(manifest.type);
         const runMode = normalizeRunMode(manifest.run_mode);
         const executionEngine = inferExecutionEngineFromManifest(manifest, rawType);
         const callable = manifest.callable !== undefined ? Boolean(manifest.callable) : true;
         if (canonicalType === 'skill') {
-            throw new errors_1.CliError("Use SKILL.md for publishing skills. Remove orchagent.json and run 'orchagent publish' from a skill directory.");
+            throw new errors_1.CliError('Skills use a different publishing format (SKILL.md with YAML front matter).\n\n' +
+                '  To publish a skill:\n' +
+                '    1. Run: orchagent skill create ' + (manifest.name || '<name>') + '\n' +
+                '    2. Edit the generated SKILL.md with your skill content\n' +
+                '    3. Run: orchagent publish\n\n' +
+                '  orchagent.json is not used for skills — SKILL.md replaces it entirely.\n' +
+                '  See: https://orchagent.io/docs/skills');
         }
         if (runMode === 'always_on' && executionEngine === 'direct_llm') {
-            throw new errors_1.CliError('run_mode=always_on requires runtime.command or loop configuration');
+            validationErrors.push('run_mode=always_on requires runtime.command or loop configuration');
         }
         if (manifest.timeout_seconds !== undefined) {
             if (!Number.isInteger(manifest.timeout_seconds) || manifest.timeout_seconds <= 0) {
-                throw new errors_1.CliError('timeout_seconds must be a positive integer');
+                validationErrors.push('timeout_seconds must be a positive integer');
             }
         }
         // Warn about deprecated prompt field
         if (manifest.prompt) {
             process.stderr.write(chalk_1.default.yellow('Warning: "prompt" field in orchagent.json is ignored. Use prompt.md file instead.\n'));
         }
+        // UX-9: Warn about model (singular) vs default_models
+        if (manifest.model && !manifest.default_models) {
+            const modelVal = manifest.model;
+            process.stderr.write(chalk_1.default.yellow(`\nWarning: "model" field in orchagent.json is not recognized.\n` +
+                `  Use "default_models" instead to set per-provider defaults:\n\n` +
+                `  ${chalk_1.default.cyan(`"default_models": { "anthropic": "${modelVal}" }`)}\n\n` +
+                `  The model resolution order is: caller --model flag → agent default_models → platform default.\n\n`));
+        }
         // Auto-migrate inline schemas to schema.json
         const schemaPath = path_1.default.join(cwd, 'schema.json');
         let schemaFileExists = false;
@@ -789,20 +807,8 @@ function registerPublishCommand(program) {
         const manifestFields = ['manifest_version', 'dependencies', 'max_hops', 'timeout_ms', 'per_call_downstream_cap'];
         const misplacedFields = manifestFields.filter(f => f in manifest && !manifest.manifest);
         if (misplacedFields.length > 0) {
-            throw new errors_1.CliError(`Found manifest fields (${misplacedFields.join(', ')}) at top level of orchagent.json.\n` +
-                `These must be nested under a "manifest" key. Example:\n\n` +
-                `  {\n` +
-                `    "name": "${manifest.name}",\n` +
-                `    "type": "${manifest.type || 'agent'}",\n` +
-                `    "manifest": {\n` +
-                `      "manifest_version": 1,\n` +
-                `      "dependencies": [...],\n` +
-                `      "max_hops": 2,\n` +
-                `      "timeout_ms": 60000,\n` +
-                `      "per_call_downstream_cap": 50\n` +
-                `    }\n` +
-                `  }\n\n` +
-                `See docs/manifest.md for details.`);
+            validationErrors.push(`Found manifest fields (${misplacedFields.join(', ')}) at top level of orchagent.json. ` +
+                `These must be nested under a "manifest" key. See docs/manifest.md for details.`);
         }
         // Read prompt for LLM-driven engines (direct_llm + managed_loop).
         let prompt;
@@ -813,11 +819,11 @@ function registerPublishCommand(program) {
             }
             catch (err) {
                 if (err.code === 'ENOENT') {
-                    throw new errors_1.CliError('No prompt.md found for this agent.\n\n' +
-                        'Create a prompt.md file in the current directory with your prompt template.\n' +
-                        'See: https://orchagent.io/docs/publishing');
+                    validationErrors.push('No prompt.md found. Create a prompt.md file with your prompt template.');
+                }
+                else {
+                    throw err;
                 }
-                throw err;
             }
         }
         // Validate managed-loop specific fields + normalize loop payload
@@ -825,7 +831,7 @@ function registerPublishCommand(program) {
         if (executionEngine === 'managed_loop') {
             if (manifest.max_turns !== undefined) {
                 if (typeof manifest.max_turns !== 'number' || manifest.max_turns < 1 || manifest.max_turns > 50) {
-                    throw new errors_1.CliError('max_turns must be a number between 1 and 50');
+                    validationErrors.push('max_turns must be a number between 1 and 50');
                 }
             }
             const providedLoop = manifest.loop && typeof manifest.loop === 'object'
@@ -849,17 +855,17 @@ function registerPublishCommand(program) {
                 const seenNames = new Set();
                 for (const tool of mergedTools) {
                     if (!tool.name || !tool.command) {
-                        throw new errors_1.CliError(`Invalid custom_tool: each tool must have 'name' and 'command' fields.\n` +
-                            `Found: ${JSON.stringify(tool)}`);
-                    }
-                    if (reservedNames.has(tool.name)) {
-                        throw new errors_1.CliError(`Custom tool '${tool.name}' conflicts with a built-in tool name.\n` +
-                            `Reserved names: ${[...reservedNames].join(', ')}`);
+                        validationErrors.push(`Invalid custom_tool: each tool must have 'name' and 'command' fields. Found: ${JSON.stringify(tool)}`);
                     }
-                    if (seenNames.has(tool.name)) {
-                        throw new errors_1.CliError(`Duplicate custom tool name: '${tool.name}'`);
+                    else {
+                        if (reservedNames.has(tool.name)) {
+                            validationErrors.push(`Custom tool '${tool.name}' conflicts with a built-in tool name. Reserved names: ${[...reservedNames].join(', ')}`);
+                        }
+                        if (seenNames.has(tool.name)) {
+                            validationErrors.push(`Duplicate custom tool name: '${tool.name}'`);
+                        }
+                        seenNames.add(tool.name);
                     }
-                    seenNames.add(tool.name);
                 }
             }
             if (!manifest.supported_providers) {
@@ -921,11 +927,13 @@ function registerPublishCommand(program) {
             }
             if (!options.url) {
                 if (!bundleEntrypoint) {
-                    throw new errors_1.CliError('Tool requires either --url <url> or an entry point file (main.py, app.py, index.js, etc.)');
+                    validationErrors.push('Tool requires either --url <url> or an entry point file (main.py, app.py, index.js, etc.)');
+                }
+                else {
+                    shouldUploadBundle = true;
+                    agentUrl = 'https://tool.internal';
+                    process.stdout.write(`Detected code runtime entrypoint: ${bundleEntrypoint}\n`);
                 }
-                shouldUploadBundle = true;
-                agentUrl = 'https://tool.internal';
-                process.stdout.write(`Detected code runtime entrypoint: ${bundleEntrypoint}\n`);
             }
             let runtimeCommand = manifest.runtime?.command?.trim() || '';
             if (!runtimeCommand && manifest.run_command?.trim()) {
@@ -940,7 +948,7 @@ function registerPublishCommand(program) {
             agentUrl = agentUrl || 'https://prompt-agent.internal';
         }
         if (options.docker && executionEngine !== 'code_runtime') {
-            throw new errors_1.CliError('--docker is only supported for code runtime agents');
+            validationErrors.push('--docker is only supported for code runtime agents');
         }
         // Get org info (workspace-aware — returns workspace org if workspace is active)
         const org = await (0, api_1.getOrg)(config, workspaceId);
@@ -982,23 +990,23 @@ function registerPublishCommand(program) {
                     `  the field to use the default) and republish each dependency.\n\n`);
             }
         }
-        // C-1: Block publish if tool/agent type has no required_secrets declared.
+        // UX-2: Default required_secrets to [] when omitted for tool/agent types.
         // Prompt and skill types are exempt (prompt agents get LLM keys from platform,
         // skills don't run standalone).
-        // An explicit empty array (required_secrets: []) is a valid declaration
-        // meaning "this agent deliberately needs no secrets."
-        // Runs before dry-run so --dry-run catches the same errors as real publish (BUG-11).
         if ((canonicalType === 'tool' || canonicalType === 'agent') &&
-            manifest.required_secrets === undefined &&
-            options.requiredSecrets !== false) {
-            process.stderr.write(chalk_1.default.red(`\nError: ${canonicalType} agents must declare required_secrets in orchagent.json.\n\n`) +
-                `  Add the env vars your code needs at runtime:\n` +
-                `  ${chalk_1.default.cyan('"required_secrets": ["ANTHROPIC_API_KEY", "MY_TOKEN"]')}\n\n` +
-                `  If this agent genuinely needs no secrets, add an empty array:\n` +
-                `  ${chalk_1.default.cyan('"required_secrets": []')}\n\n` +
-                `  These are matched by name against your workspace secrets vault.\n` +
-                `  Use ${chalk_1.default.cyan('--no-required-secrets')} to skip this check.\n`);
-            const err = new errors_1.CliError('Missing required_secrets declaration', errors_1.ExitCodes.INVALID_INPUT);
+            manifest.required_secrets === undefined) {
+            manifest.required_secrets = [];
+            process.stderr.write(chalk_1.default.dim(`  ℹ No required_secrets declared — defaulting to [] (no secrets needed)\n`));
+        }
+        // UX-1: Report all validation errors at once
+        if (validationErrors.length > 0) {
+            if (validationErrors.length === 1) {
+                throw new errors_1.CliError(validationErrors[0]);
+            }
+            const numbered = validationErrors.map((e, i) => `  ${i + 1}. ${e}`).join('\n');
+            process.stderr.write(chalk_1.default.red(`\nFound ${validationErrors.length} validation errors:\n\n`) +
+                numbered + '\n');
+            const err = new errors_1.CliError(`Found ${validationErrors.length} validation errors:\n${numbered}`, errors_1.ExitCodes.INVALID_INPUT);
             err.displayed = true;
             throw err;
         }