@orchagent/cli 0.3.29 → 0.3.33

package/dist/adapters/agents-md.js

@@ -32,13 +32,26 @@ exports.agentsMdAdapter = {
         const orgSlug = agent.org_slug || 'unknown';
         const agentRef = `${orgSlug}/${agent.name}`;
         const description = agent.description || '';
+        // Build skills section if present
+        let skillsSection = '';
+        if (agent.resolvedSkills && agent.resolvedSkills.length > 0) {
+            skillsSection = '\n### Bundled Skills\n\nThe following skills are bundled with this agent and must be applied.';
+            for (const skill of agent.resolvedSkills) {
+                skillsSection += `\n\n#### ${skill.name}`;
+                if (skill.description) {
+                    skillsSection += `\n\n${skill.description}`;
+                }
+                skillsSection += `\n\n${skill.prompt}`;
+            }
+            skillsSection += '\n';
+        }
         // Use orchagent markers for managed section
         const content = `<!-- orchagent:${agentRef} -->
 ## ${agent.name}
 
 ${description}
 
-${agent.prompt || ''}
+${agent.prompt || ''}${skillsSection}
 <!-- /orchagent:${agentRef} -->
 `;
         return [

package/dist/adapters/claude-code.js

@@ -70,6 +70,17 @@ exports.claudeCodeAdapter = {
         if (agent.output_schema) {
             body += `\n\n## Output Schema\n\nThis agent should return output matching:\n\`\`\`json\n${JSON.stringify(agent.output_schema, null, 2)}\n\`\`\``;
         }
+        // Embed resolved skills
+        if (agent.resolvedSkills && agent.resolvedSkills.length > 0) {
+            body += '\n\n## Bundled Skills\n\nThe following skills are bundled with this agent and must be applied.';
+            for (const skill of agent.resolvedSkills) {
+                body += `\n\n### ${skill.name}`;
+                if (skill.description) {
+                    body += `\n\n${skill.description}`;
+                }
+                body += `\n\n${skill.prompt}`;
+            }
+        }
         // Combine frontmatter + body
         const content = `---\n${yaml_1.default.stringify(frontmatter).trim()}\n---\n\n${body.trim()}\n`;
         return [

package/dist/adapters/cursor.js

@@ -38,6 +38,18 @@ exports.cursorAdapter = {
     convert(agent) {
         const normalizedName = (0, utils_1.normalizeAgentName)(agent.name);
         const description = agent.description || `Rules from ${agent.name}`;
+        // Build skills section if present
+        let skillsSection = '';
+        if (agent.resolvedSkills && agent.resolvedSkills.length > 0) {
+            skillsSection = '\n\n## Bundled Skills\n\nThe following skills are bundled with this agent and must be applied.';
+            for (const skill of agent.resolvedSkills) {
+                skillsSection += `\n\n### ${skill.name}`;
+                if (skill.description) {
+                    skillsSection += `\n\n${skill.description}`;
+                }
+                skillsSection += `\n\n${skill.prompt}`;
+            }
+        }
         // Cursor .mdc format
         const content = `---
 description: ${description}
@@ -47,7 +59,7 @@ alwaysApply: false
 
 # ${agent.name}
 
-${agent.prompt || ''}
+${agent.prompt || ''}${skillsSection}
 `;
         return [
             {

package/dist/commands/call.js

@@ -15,6 +15,8 @@ const llm_1 = require("../lib/llm");
 const analytics_1 = require("../lib/analytics");
 const pricing_1 = require("../lib/pricing");
 const DEFAULT_VERSION = 'latest';
+// Well-known field names for file content in prompt agent schemas (priority order)
+const CONTENT_FIELD_NAMES = ['code', 'content', 'text', 'source', 'input', 'file_content', 'body'];
 // Keys that might indicate local file path references in JSON payloads
 const LOCAL_PATH_KEYS = ['path', 'directory', 'file', 'filepath', 'dir', 'folder', 'local'];
 /**
@@ -43,13 +45,42 @@ function warnIfLocalPathReference(jsonBody) {
         if (pathKey) {
             process.stderr.write(`Warning: Your payload contains a local path reference ('${pathKey}').\n` +
                 `Remote agents cannot access your local filesystem. The path will be interpreted\n` +
-                `by the server, not your local machine. Use --help for more information.\n\n`);
+                `by the server, not your local machine.\n\n` +
+                `Tip: Use 'orchagent run <agent>' instead to execute locally with filesystem access.\n\n`);
         }
     }
     catch {
         // If parsing fails, skip the warning (the actual error will be thrown later)
     }
 }
+/**
+ * Infer the best JSON field name for file content based on the agent's input schema.
+ * Returns the field name to use, or 'content' as a safe default.
+ */
+function inferFileField(inputSchema) {
+    if (!inputSchema || typeof inputSchema !== 'object')
+        return 'content';
+    const props = inputSchema.properties;
+    if (!props || typeof props !== 'object')
+        return 'content';
+    const properties = props;
+    // Check for well-known field names in priority order
+    for (const field of CONTENT_FIELD_NAMES) {
+        if (properties[field] && properties[field].type === 'string')
+            return field;
+    }
+    // If there's exactly one required string property, use that
+    const required = (inputSchema.required ?? []);
+    const stringProps = Object.entries(properties)
+        .filter(([, v]) => v.type === 'string')
+        .map(([k]) => k);
+    if (stringProps.length === 1)
+        return stringProps[0];
+    const requiredStrings = stringProps.filter(k => required.includes(k));
+    if (requiredStrings.length === 1)
+        return requiredStrings[0];
+    return 'content';
+}
 function parseAgentRef(value) {
     const [ref, versionPart] = value.split('@');
     const version = versionPart?.trim() || DEFAULT_VERSION;
@@ -147,16 +178,24 @@ function registerCallCommand(program) {
         .option('--skills-only <skills>', 'Use only these skills')
         .option('--no-skills', 'Ignore default skills')
         .option('--file <path...>', 'File(s) to upload (can specify multiple)')
+        .option('--file-field <field>', 'Schema field name for file content (prompt agents)')
         .option('--metadata <json>', 'JSON metadata to send with files')
         .addHelpText('after', `
 Examples:
   orch call orchagent/invoice-scanner invoice.pdf
+  orch call orchagent/useeffect-checker --file src/App.tsx
+  orch call orchagent/useeffect-checker --file src/App.tsx --file-field code
   orch call orchagent/leak-finder --data '{"repo_url": "https://github.com/org/repo"}'
   cat input.json | orch call acme/agent --data @-
   orch call acme/image-processor photo.jpg --output result.png
 
 Note: Use 'call' for server-side execution (requires login), 'run' for local execution.
 
+File handling:
+  For prompt agents, file content is read and sent as JSON mapped to the agent's
+  input schema. Use --file-field to specify the field name (auto-detected by default).
+  For code agents, files are uploaded as multipart form data.
+
 Important: Remote agents cannot access your local filesystem. If your --data payload
 contains keys like 'path', 'directory', 'file', etc., those values will be interpreted
 by the server, not your local machine. To send local files, use the positional file
@@ -354,8 +393,45 @@ Paid Agents:
             }
             headers['Content-Type'] = 'application/json';
         }
+        else if ((filePaths.length > 0 || options.metadata) && agentMeta.type === 'prompt') {
+            // Prompt agent + files/metadata: read content and send as JSON
+            const fieldName = options.fileField || inferFileField(agentMeta.input_schema);
+            let bodyObj = {};
+            // Include metadata if provided
+            if (options.metadata) {
+                try {
+                    bodyObj = JSON.parse(options.metadata);
+                }
+                catch {
+                    throw new errors_1.CliError('--metadata must be valid JSON.');
+                }
+            }
+            if (filePaths.length === 1) {
+                // Single file: map content to the inferred/specified schema field
+                const fileContent = await promises_1.default.readFile(filePaths[0], 'utf-8');
+                bodyObj[fieldName] = fileContent;
+                sourceLabel = filePaths[0];
+            }
+            else if (filePaths.length > 1) {
+                // Multiple files: map first to the schema field, add all as files object
+                const allContents = {};
+                for (const fp of filePaths) {
+                    allContents[path_1.default.basename(fp)] = await promises_1.default.readFile(fp, 'utf-8');
+                }
+                // Set the primary field to the first file's content
+                const firstContent = await promises_1.default.readFile(filePaths[0], 'utf-8');
+                bodyObj[fieldName] = firstContent;
+                bodyObj.files = allContents;
+                sourceLabel = `${filePaths.length} files`;
+            }
+            if (llmCredentials) {
+                bodyObj.llm_credentials = llmCredentials;
+            }
+            body = JSON.stringify(bodyObj);
+            headers['Content-Type'] = 'application/json';
+        }
         else if (filePaths.length > 0 || options.metadata) {
-            // Handle multipart file uploads
+            // Code agent: handle multipart file uploads
             // Inject llm_credentials into metadata if available
             let metadata = options.metadata;
             if (llmCredentials) {

package/dist/commands/config.js

@@ -10,7 +10,7 @@ function getAllValidFormatIds() {
     const skillFormatIds = [...config_1.VALID_FORMAT_IDS];
     return [...new Set([...adapterIds, ...skillFormatIds])];
 }
-const SUPPORTED_KEYS = ['default-format'];
+const SUPPORTED_KEYS = ['default-format', 'default-scope'];
 function isValidKey(key) {
     return SUPPORTED_KEYS.includes(key);
 }
@@ -29,6 +29,13 @@ async function setConfigValue(key, value) {
         await (0, config_1.setDefaultFormats)(formats);
         process.stdout.write(`Set default-format to: ${formats.join(',')}\n`);
     }
+    if (key === 'default-scope') {
+        if (value !== 'user' && value !== 'project') {
+            throw new errors_1.CliError('Invalid scope. Must be "user" or "project"');
+        }
+        await (0, config_1.setDefaultScope)(value);
+        process.stdout.write(`Set default-scope to: ${value}\n`);
+    }
 }
 async function getConfigValue(key) {
     if (!isValidKey(key)) {
@@ -44,6 +51,15 @@ async function getConfigValue(key) {
             process.stdout.write(`${formats.join(',')}\n`);
         }
     }
+    if (key === 'default-scope') {
+        const scope = await (0, config_1.getDefaultScope)();
+        if (!scope) {
+            process.stdout.write('(not set)\n');
+        }
+        else {
+            process.stdout.write(`${scope}\n`);
+        }
+    }
 }
 async function listConfigValues() {
     const config = await (0, config_1.loadConfig)();
@@ -56,6 +72,14 @@ async function listConfigValues() {
     else {
         process.stdout.write('  default-format: (not set)\n');
     }
+    // default-scope
+    const scope = config.default_scope;
+    if (scope) {
+        process.stdout.write(`  default-scope: ${scope}\n`);
+    }
+    else {
+        process.stdout.write('  default-scope: (not set)\n');
+    }
     process.stdout.write('\n');
 }
 function registerConfigCommand(program) {

package/dist/commands/delete.js

@@ -9,6 +9,7 @@ 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 agent_ref_1 = require("../lib/agent-ref");
 const analytics_1 = require("../lib/analytics");
 async function promptText(message) {
     const rl = promises_1.default.createInterface({
@@ -23,16 +24,6 @@ async function promptConfirm(message) {
     const answer = await promptText(`${message} (y/N): `);
     return answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes';
 }
-function parseAgentArg(value) {
-    const atIndex = value.lastIndexOf('@');
-    if (atIndex === -1 || atIndex === 0) {
-        return { name: value, version: 'latest' };
-    }
-    return {
-        name: value.slice(0, atIndex),
-        version: value.slice(atIndex + 1) || 'latest',
-    };
-}
 function registerDeleteCommand(program) {
     program
         .command('delete <agent>')
@@ -41,29 +32,29 @@ function registerDeleteCommand(program) {
         .option('--dry-run', 'Show what would be deleted without making changes')
         .addHelpText('after', `
 Examples:
-  orch delete my-agent           # Delete latest version
-  orch delete my-agent@v1        # Delete specific version
-  orch delete my-agent --dry-run # Preview deletion
+  orch delete org/my-agent           # Delete latest version
+  orch delete org/my-agent@v1        # Delete specific version
+  orch delete org/my-agent --dry-run # Preview deletion
 `)
         .action(async (agent, options) => {
-        const { name: agentName, version } = parseAgentArg(agent);
+        const ref = (0, agent_ref_1.parseAgentRef)(agent);
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
             throw new errors_1.CliError('Not logged in. Run `orch login` first.');
         }
         process.stdout.write('Finding agent...\n');
-        // Find the agent
+        // Find the agent by name, filtering by org if provided
         const agents = await (0, api_1.listMyAgents)(config);
-        const matching = agents.filter(a => a.name === agentName);
+        const matching = agents.filter(a => a.name === ref.agent && (!a.org_slug || a.org_slug === ref.org));
         if (matching.length === 0) {
-            throw new errors_1.CliError(`Agent '${agentName}' not found`);
+            throw new errors_1.CliError(`Agent '${ref.org}/${ref.agent}' not found`);
         }
         // Select version
         let selectedAgent;
-        if (version !== 'latest') {
-            selectedAgent = matching.find(a => a.version === version);
+        if (ref.version !== 'latest') {
+            selectedAgent = matching.find(a => a.version === ref.version);
             if (!selectedAgent) {
-                throw new errors_1.CliError(`Version '${version}' not found for agent '${agentName}'`);
+                throw new errors_1.CliError(`Version '${ref.version}' not found for agent '${ref.org}/${ref.agent}'`);
             }
         }
         else {

package/dist/commands/init.js

@@ -45,6 +45,80 @@ const SCHEMA_TEMPLATE = `{
   }
 }
 `;
+const CODE_TEMPLATE_PY = `"""
+orchagent code agent entrypoint.
+
+Reads JSON input from stdin, processes it, and writes JSON output to stdout.
+This is the standard orchagent code agent protocol.
+
+Usage:
+  echo '{"input": "hello"}' | python main.py
+"""
+
+import json
+import sys
+
+
+def main():
+    # Read JSON input from stdin
+    raw = sys.stdin.read()
+    try:
+        data = json.loads(raw) if raw.strip() else {}
+    except json.JSONDecodeError:
+        print(json.dumps({"error": "Invalid JSON input"}))
+        sys.exit(1)
+
+    user_input = data.get("input", "")
+
+    # --- Your logic here ---
+    result = f"Received: {user_input}"
+    # --- End your logic ---
+
+    # Write JSON output to stdout
+    print(json.dumps({"result": result}))
+
+
+if __name__ == "__main__":
+    main()
+`;
+function readmeTemplate(agentName, type) {
+    const callExample = type === 'code'
+        ? `orchagent call ${agentName} input-file.txt`
+        : `orchagent call ${agentName} --data '{"input": "Hello world"}'`;
+    const runExample = type === 'code'
+        ? `orchagent run ${agentName} --input '{"file_path": "src/app.py"}'`
+        : `orchagent run ${agentName} --input '{"input": "Hello world"}'`;
+    return `# ${agentName}
+
+A brief description of what this agent does.
+
+## Usage
+
+### Server execution
+
+\`\`\`sh
+${callExample}
+\`\`\`
+
+### Local execution
+
+\`\`\`sh
+${runExample}
+\`\`\`
+
+## Input
+
+| Field | Type | Description |
+|-------|------|-------------|
+| \`input\` | string | The input to process |
+
+## Output
+
+| Field | Type | Description |
+|-------|------|-------------|
+| \`result\` | string | The agent's response |
+`;
+}
 const SKILL_TEMPLATE = `---
 name: my-skill
 description: When to use this skill
@@ -63,27 +137,50 @@ function registerInitCommand(program) {
         .option('--type <type>', 'Type: prompt, code, or skill (default: prompt)', 'prompt')
         .action(async (name, options) => {
         const cwd = process.cwd();
+        // When a name is provided, create a subdirectory for the project
+        const targetDir = name ? path_1.default.join(cwd, name) : cwd;
         const agentName = name || path_1.default.basename(cwd);
+        // Create the subdirectory if a name was provided
+        if (name) {
+            await promises_1.default.mkdir(targetDir, { recursive: true });
+        }
         // Handle skill type separately
         if (options.type === 'skill') {
-            const skillPath = path_1.default.join(cwd, 'SKILL.md');
+            const skillPath = path_1.default.join(targetDir, 'SKILL.md');
+            // Check if already initialized
+            try {
+                await promises_1.default.access(skillPath);
+                throw new errors_1.CliError(`Already initialized (SKILL.md exists in ${name ? name + '/' : 'current directory'})`);
+            }
+            catch (err) {
+                if (err.code !== 'ENOENT') {
+                    throw err;
+                }
+            }
             const skillContent = SKILL_TEMPLATE.replace('my-skill', agentName);
             await promises_1.default.writeFile(skillPath, skillContent);
-            process.stdout.write(`Initialized skill "${agentName}" in ${cwd}\n`);
+            process.stdout.write(`Initialized skill "${agentName}" in ${targetDir}\n`);
             process.stdout.write(`\nFiles created:\n`);
-            process.stdout.write(`  SKILL.md - Skill content with frontmatter\n`);
+            process.stdout.write(`  ${name ? name + '/' : ''}SKILL.md - Skill content with frontmatter\n`);
             process.stdout.write(`\nNext steps:\n`);
-            process.stdout.write(`  1. Edit SKILL.md with your skill content\n`);
-            process.stdout.write(`  2. Run: orchagent publish\n`);
+            if (name) {
+                process.stdout.write(`  1. cd ${name}\n`);
+                process.stdout.write(`  2. Edit SKILL.md with your skill content\n`);
+                process.stdout.write(`  3. Run: orchagent publish\n`);
+            }
+            else {
+                process.stdout.write(`  1. Edit SKILL.md with your skill content\n`);
+                process.stdout.write(`  2. Run: orchagent publish\n`);
+            }
             return;
         }
-        const manifestPath = path_1.default.join(cwd, 'orchagent.json');
-        const promptPath = path_1.default.join(cwd, 'prompt.md');
-        const schemaPath = path_1.default.join(cwd, 'schema.json');
+        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');
         // Check if already initialized
         try {
             await promises_1.default.access(manifestPath);
-            throw new errors_1.CliError(`Already initialized (orchagent.json exists)`);
+            throw new errors_1.CliError(`Already initialized (orchagent.json exists in ${name ? name + '/' : 'current directory'})`);
         }
         catch (err) {
             if (err.code !== 'ENOENT') {
@@ -95,29 +192,49 @@ function registerInitCommand(program) {
         manifest.name = agentName;
         manifest.type = ['code', 'skill'].includes(options.type) ? options.type : 'prompt';
         await promises_1.default.writeFile(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
-        // Create prompt template (for prompt-based agents)
-        if (options.type !== 'code') {
+        // Create prompt template (for prompt-based agents) or entrypoint (for code agents)
+        if (options.type === 'code') {
+            const entrypointPath = path_1.default.join(targetDir, 'main.py');
+            await promises_1.default.writeFile(entrypointPath, CODE_TEMPLATE_PY);
+        }
+        else {
             await promises_1.default.writeFile(promptPath, PROMPT_TEMPLATE);
         }
         // Create schema template
         await promises_1.default.writeFile(schemaPath, SCHEMA_TEMPLATE);
-        process.stdout.write(`Initialized agent "${agentName}" in ${cwd}\n`);
+        // Create README
+        const readmePath = path_1.default.join(targetDir, 'README.md');
+        await promises_1.default.writeFile(readmePath, readmeTemplate(agentName, options.type));
+        process.stdout.write(`Initialized agent "${agentName}" in ${targetDir}\n`);
         process.stdout.write(`\nFiles created:\n`);
-        process.stdout.write(`  orchagent.json - Agent configuration\n`);
-        if (options.type !== 'code') {
-            process.stdout.write(`  prompt.md      - Prompt template\n`);
+        const prefix = name ? name + '/' : '';
+        process.stdout.write(`  ${prefix}orchagent.json - Agent configuration\n`);
+        if (options.type === 'code') {
+            process.stdout.write(`  ${prefix}main.py        - Agent entrypoint (stdin/stdout JSON)\n`);
         }
-        process.stdout.write(`  schema.json    - Input/output schemas\n`);
+        else {
+            process.stdout.write(`  ${prefix}prompt.md      - Prompt template\n`);
+        }
+        process.stdout.write(`  ${prefix}schema.json    - Input/output schemas\n`);
+        process.stdout.write(`  ${prefix}README.md      - Agent documentation\n`);
         process.stdout.write(`\nNext steps:\n`);
         if (options.type !== 'code') {
-            process.stdout.write(`  1. Edit prompt.md with your prompt template\n`);
-            process.stdout.write(`  2. Edit schema.json with your input/output schemas\n`);
-            process.stdout.write(`  3. Run: orchagent publish\n`);
+            const stepNum = name ? 2 : 1;
+            if (name) {
+                process.stdout.write(`  1. cd ${name}\n`);
+            }
+            process.stdout.write(`  ${stepNum}. Edit prompt.md with your prompt template\n`);
+            process.stdout.write(`  ${stepNum + 1}. Edit schema.json with your input/output schemas\n`);
+            process.stdout.write(`  ${stepNum + 2}. Run: orchagent publish\n`);
         }
         else {
-            process.stdout.write(`  1. Edit schema.json with your input/output schemas\n`);
-            process.stdout.write(`  2. Deploy your code and get the URL\n`);
-            process.stdout.write(`  3. Run: orchagent publish --url <your-agent-url>\n`);
+            const stepNum = name ? 2 : 1;
+            if (name) {
+                process.stdout.write(`  1. cd ${name}\n`);
+            }
+            process.stdout.write(`  ${stepNum}. Edit main.py with your agent logic\n`);
+            process.stdout.write(`  ${stepNum + 1}. Test: echo '{"input": "test"}' | python main.py\n`);
+            process.stdout.write(`  ${stepNum + 2}. Run: orchagent publish\n`);
         }
     });
 }

package/dist/commands/install.js

@@ -12,6 +12,7 @@ const api_1 = require("../lib/api");
 const errors_1 = require("../lib/errors");
 const analytics_1 = require("../lib/analytics");
 const adapters_1 = require("../adapters");
+const skill_resolve_1 = require("../lib/skill-resolve");
 const installed_1 = require("../lib/installed");
 const agents_md_utils_1 = require("../lib/agents-md-utils");
 const pricing_1 = require("../lib/pricing");
@@ -123,7 +124,7 @@ function registerInstallCommand(program) {
         .command('install <agent>')
         .description('Install agent as sub-agent (Claude Code, Cursor, etc.)')
         .option('--format <formats>', 'Comma-separated format IDs (e.g., claude-code,cursor)')
-        .option('--scope <scope>', 'Install scope: user (home dir) or project (current dir)', 'user')
+        .option('--scope <scope>', 'Install scope: user (home dir) or project (current dir)')
         .option('--dry-run', 'Show what would be installed without making changes')
         .option('--json', 'Output result as JSON (for automation/tooling)')
         .addHelpText('after', `
@@ -187,8 +188,8 @@ Note: Paid agents cannot be installed locally - they run on server only.
             }
         }
         result.formats = targetFormats;
-        // Validate scope
-        let scope = options.scope;
+        // Resolve scope: CLI flag > config default > fallback to 'user'
+        let scope = (options.scope ?? await (0, config_1.getDefaultScope)() ?? 'user');
         if (scope !== 'user' && scope !== 'project') {
             const errMsg = 'Scope must be "user" or "project"';
             if (jsonMode) {
@@ -213,6 +214,18 @@ Note: Paid agents cannot be installed locally - they run on server only.
             }
             throw err;
         }
+        // Resolve default skills if present
+        if (agent.default_skills && agent.default_skills.length > 0) {
+            log(`Resolving ${agent.default_skills.length} bundled skill(s)...\n`);
+            const skills = await (0, skill_resolve_1.resolveSkills)(resolved, agent.default_skills, (warning) => {
+                result.warnings.push(warning);
+                logErr(`Warning: ${warning}\n`);
+            });
+            if (skills.length > 0) {
+                agent.resolvedSkills = skills;
+                log(`Bundled ${skills.length} skill(s): ${skills.map(s => s.name).join(', ')}\n`);
+            }
+        }
         // Install for each format
         let filesWritten = 0;
         for (const formatId of targetFormats) {

package/dist/commands/search.js

@@ -14,7 +14,8 @@ function registerSearchCommand(program) {
         .argument('[query]', 'Search query (required unless using --popular or --recent)')
         .option('--popular', 'Show top agents/skills by stars')
         .option('--recent', 'Show most recently published')
-        .option('--type <type>', 'Filter by type: agents, skills, all (default: all)', 'all')
+        .option('--mine', 'Show only your own agents (including private)')
+        .option('--type <type>', 'Filter by type: agents, skills, code, prompt, skill, all (default: all)', 'all')
         .option('--limit <n>', `Max results (default: ${DEFAULT_LIMIT})`, String(DEFAULT_LIMIT))
         .option('--free', 'Show only free agents')
         .option('--paid', 'Show only paid agents')
@@ -23,29 +24,40 @@ function registerSearchCommand(program) {
 Pricing Filters:
   --free    Show only free agents
   --paid    Show only paid agents
+
+Ownership Filters:
+  --mine    Show your own agents (public and private). Requires login.
 `)
         .action(async (query, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         const limit = parseInt(options.limit, 10) || DEFAULT_LIMIT;
-        // Default to popular when no args
-        if (!query && !options.popular && !options.recent) {
-            options.popular = true;
-        }
+        // Map type filter for API (null means no filter)
+        const typeFilter = options.type === 'all' ? undefined : options.type;
+        const sort = options.popular ? 'stars' : options.recent ? 'recent' : undefined;
         let agents;
-        if (query) {
-            agents = await (0, api_1.searchAgents)(config, query);
-            await (0, analytics_1.track)('cli_search', { query, type: options.type });
+        if (options.mine) {
+            // --mine: search within user's own agents (public + private)
+            if (!config.apiKey) {
+                process.stderr.write('Error: --mine requires authentication. Run `orchagent login` first.\n');
+                process.exitCode = 1;
+                return;
+            }
+            agents = await (0, api_1.searchMyAgents)(config, query, { sort, type: typeFilter });
+            await (0, analytics_1.track)('cli_search', { query, type: options.type, mine: true });
         }
         else {
-            agents = await (0, api_1.listPublicAgents)(config);
-            await (0, analytics_1.track)('cli_search', { mode: options.popular ? 'popular' : 'recent', type: options.type });
-        }
-        // Filter by type
-        if (options.type === 'agents') {
-            agents = agents.filter(a => a.type !== 'skill');
-        }
-        else if (options.type === 'skills') {
-            agents = agents.filter(a => a.type === 'skill');
+            // Default to popular when no args
+            if (!query && !options.popular && !options.recent) {
+                options.popular = true;
+            }
+            if (query) {
+                agents = await (0, api_1.searchAgents)(config, query, { sort, type: typeFilter });
+                await (0, analytics_1.track)('cli_search', { query, type: options.type });
+            }
+            else {
+                agents = await (0, api_1.listPublicAgents)(config, { sort, type: typeFilter });
+                await (0, analytics_1.track)('cli_search', { mode: options.popular ? 'popular' : 'recent', type: options.type });
+            }
         }
         // Filter by pricing if requested
         if (options.free) {
@@ -55,7 +67,7 @@ Pricing Filters:
             agents = agents.filter(a => (0, pricing_1.isPaidAgent)(a));
         }
         // Sort results
-        if (options.popular || (!query && !options.recent)) {
+        if (options.popular || (!query && !options.recent && !options.mine)) {
             agents.sort((a, b) => (b.stars_count ?? 0) - (a.stars_count ?? 0));
         }
         else if (options.recent) {
@@ -68,14 +80,27 @@ Pricing Filters:
             return;
         }
         if (agents.length === 0) {
-            process.stdout.write(query ? 'No results found matching your search.\n' : 'No public agents found.\n');
-            process.stdout.write('\nBrowse all agents at: https://orchagent.io/explore\n');
+            if (options.mine) {
+                process.stdout.write(query
+                    ? `No agents found matching "${query}" in your account.\n`
+                    : 'You have no published agents yet.\n');
+                process.stdout.write('\nTip: Run "orchagent init" to create your first agent.\n');
+            }
+            else {
+                process.stdout.write(query ? 'No results found matching your search.\n' : 'No public agents found.\n');
+                process.stdout.write('\nBrowse all agents at: https://orchagent.io/explore\n');
+            }
             return;
         }
-        (0, output_1.printAgentsTable)(agents);
+        (0, output_1.printAgentsTable)(agents, { showVisibility: options.mine });
         if (agents.length === limit) {
             process.stdout.write(`\nShowing top ${limit} results. Use --limit <n> for more.\n`);
         }
-        process.stdout.write('\nTip: Run "orchagent info <agent>" to see input schema and details.\n');
+        if (options.mine) {
+            process.stdout.write('\nTip: Run "orchagent info <agent>" to see details, or "orchagent delete <agent>" to remove.\n');
+        }
+        else {
+            process.stdout.write('\nTip: Run "orchagent info <agent>" to see input schema and details.\n');
+        }
     });
 }

package/dist/commands/skill.js

@@ -269,7 +269,7 @@ Instructions and guidance for AI agents...
         .command('install <skill>')
         .description('Install skill to local AI tool directories (Claude Code, Cursor, etc.)')
         .option('--global', 'Install to home directory (default: current directory)')
-        .option('--scope <scope>', 'Install scope: user or project', 'project')
+        .option('--scope <scope>', 'Install scope: user or project')
         .option('--dry-run', 'Show what would be installed without making changes')
         .option('--format <formats>', 'Comma-separated format IDs (e.g., claude-code,cursor)')
         .option('--all-formats', 'Install to all supported AI tool directories')
@@ -401,8 +401,8 @@ Instructions and guidance for AI agents...
                 'The skill exists but has an empty prompt. This may be a publishing issue.\n' +
                 'Try re-publishing the skill or contact the skill author.');
         }
-        // Determine scope (--global is legacy alias for --scope user)
-        const scope = options.global ? 'user' : (options.scope || 'project');
+        // Determine scope (--global is legacy alias for --scope user; then config default; then 'project')
+        const scope = options.global ? 'user' : (options.scope || await (0, config_1.getDefaultScope)() || 'project');
         result.scope = scope;
         // Build skill content with header
         const skillContent = `# ${skillData.name}
@@ -495,7 +495,10 @@ ${skillData.prompt}
             for (const tool of installed) {
                 log(`  - ${tool}\n`);
             }
-            log(`\nLocation: ${scope === 'user' ? '~/.claude/skills/ (and other AI tool dirs)' : './<tool>/skills/'}\n`);
+            log(`\nLocations:\n`);
+            for (const file of result.files) {
+                log(`  - ${file.tool}: ${file.path}\n`);
+            }
         }
     });
     // orch skill uninstall <skill>
@@ -503,7 +506,7 @@ ${skillData.prompt}
         .command('uninstall <skill>')
         .description('Uninstall skill from local AI tool directories')
         .option('--global', 'Uninstall from home directory (default: current directory)')
-        .option('--scope <scope>', 'Uninstall scope: user or project', 'project')
+        .option('--scope <scope>', 'Uninstall scope: user or project')
         .option('--json', 'Output result as JSON')
         .action(async (skillRef, options) => {
         const jsonMode = options.json === true;
@@ -530,8 +533,8 @@ ${skillData.prompt}
             throw new errors_1.CliError(errMsg);
         }
         result.skill = `${org}/${parsed.skill}`;
-        // Determine scope
-        const scope = options.global ? 'user' : (options.scope || 'project');
+        // Determine scope (--global is legacy alias for --scope user; then config default; then 'project')
+        const scope = options.global ? 'user' : (options.scope || await (0, config_1.getDefaultScope)() || 'project');
         result.scope = scope;
         // Remove from all AI tool directories
         for (const formatId of config_1.VALID_FORMAT_IDS) {

package/dist/commands/update.js

@@ -53,100 +53,135 @@ function registerUpdateCommand(program) {
             process.stdout.write(`Agent "${agentRef}" is not installed.\n`);
             return;
         }
-        process.stdout.write(`Checking ${toCheck.length} installed agent(s) for updates...\n\n`);
+        // Group installed entries by agent name to avoid duplicates
+        // (same agent installed to multiple formats shows once)
+        const grouped = new Map();
+        for (const item of toCheck) {
+            const existing = grouped.get(item.agent);
+            if (existing) {
+                existing.push(item);
+            }
+            else {
+                grouped.set(item.agent, [item]);
+            }
+        }
+        process.stdout.write(`Checking ${grouped.size} installed agent(s) for updates...\n\n`);
         let updatesAvailable = 0;
         let updatesApplied = 0;
         let skippedModified = 0;
         let skippedMissing = 0;
-        for (const item of toCheck) {
-            // Check if file was modified locally or is missing
-            const fileStatus = await (0, installed_1.checkModified)(item);
-            // Fetch latest version
-            const latest = await fetchLatestAgent(resolved, item.agent);
+        for (const [agentName, entries] of grouped) {
+            // Check file status for all entries in this group
+            const fileStatuses = [];
+            for (const item of entries) {
+                fileStatuses.push({ item, status: await (0, installed_1.checkModified)(item) });
+            }
+            // Fetch latest version once per agent
+            const latest = await fetchLatestAgent(resolved, agentName);
             if (!latest) {
-                process.stdout.write(`  ${chalk_1.default.yellow('?')} ${item.agent} - could not fetch latest\n`);
+                process.stdout.write(`  ${chalk_1.default.yellow('?')} ${agentName} - could not fetch latest\n`);
                 continue;
             }
-            const hasUpdate = latest.latestVersion !== item.version;
-            if (!hasUpdate && !fileStatus.modified && !fileStatus.missing) {
-                process.stdout.write(`  ${chalk_1.default.green('✓')} ${item.agent}@${item.version} - up to date\n`);
+            // Use the version from the first entry (all entries for the same
+            // agent should share the same version after install/update)
+            const installedVersion = entries[0].version;
+            const hasUpdate = latest.latestVersion !== installedVersion;
+            const anyMissing = fileStatuses.some(f => f.status.missing);
+            const anyModified = fileStatuses.some(f => f.status.modified);
+            if (!hasUpdate && !anyModified && !anyMissing) {
+                const formatSuffix = entries.length > 1
+                    ? ` ${chalk_1.default.dim(`(${entries.map(e => e.format).join(', ')})`)}`
+                    : '';
+                process.stdout.write(`  ${chalk_1.default.green('✓')} ${agentName}@${installedVersion} - up to date${formatSuffix}\n`);
                 continue;
             }
-            // Handle missing file without --force
-            if (fileStatus.missing && !options.force) {
-                process.stdout.write(`  ${chalk_1.default.yellow('!')} ${item.agent} - file missing (use --force to reinstall)\n`);
+            // Handle missing files without --force
+            if (anyMissing && !hasUpdate && !options.force) {
+                const missingFormats = fileStatuses.filter(f => f.status.missing).map(f => f.item.format);
+                process.stdout.write(`  ${chalk_1.default.yellow('!')} ${agentName} - file missing [${missingFormats.join(', ')}] (use --force to reinstall)\n`);
                 skippedMissing++;
                 continue;
             }
-            // Handle modified file without --force
-            if (fileStatus.modified && !options.force) {
-                process.stdout.write(`  ${chalk_1.default.yellow('!')} ${item.agent} - local modifications (use --force to overwrite)\n`);
+            // Handle modified files without --force
+            if (anyModified && !hasUpdate && !options.force) {
+                const modifiedFormats = fileStatuses.filter(f => f.status.modified).map(f => f.item.format);
+                process.stdout.write(`  ${chalk_1.default.yellow('!')} ${agentName} - local modifications [${modifiedFormats.join(', ')}] (use --force to overwrite)\n`);
                 skippedModified++;
                 continue;
             }
-            if (hasUpdate || fileStatus.missing) {
+            if (hasUpdate || anyMissing) {
                 if (hasUpdate) {
                     updatesAvailable++;
                 }
-                process.stdout.write(`  ${chalk_1.default.blue('↑')} ${item.agent}@${item.version} → ${latest.latestVersion}`);
-                if (fileStatus.modified) {
+                process.stdout.write(`  ${chalk_1.default.blue('↑')} ${agentName}@${installedVersion} → ${latest.latestVersion}`);
+                if (anyModified) {
                     process.stdout.write(` ${chalk_1.default.yellow('(modified)')}`);
                 }
-                if (fileStatus.missing) {
+                if (anyMissing) {
                     process.stdout.write(` ${chalk_1.default.yellow('(reinstalling)')}`);
                 }
                 process.stdout.write('\n');
                 if (options.check) {
                     continue;
                 }
-                // Apply update
-                const adapter = adapters_1.adapterRegistry.get(item.format);
-                if (!adapter) {
-                    process.stderr.write(`    Skipped: Unknown format "${item.format}"\n`);
-                    continue;
-                }
-                const checkResult = adapter.canConvert(latest.agent);
-                if (!checkResult.canConvert) {
-                    process.stderr.write(`    Skipped: ${checkResult.errors.join(', ')}\n`);
-                    continue;
-                }
-                const files = adapter.convert(latest.agent);
-                if (files.length > 1) {
-                    process.stderr.write(`    Skipped: Multi-file adapters not supported for update. Reinstall instead.\n`);
-                    continue;
-                }
-                for (const file of files) {
-                    // Use the original path from tracking
-                    const fullPath = item.path;
-                    try {
-                        const dir = path_1.default.dirname(fullPath);
-                        await promises_1.default.mkdir(dir, { recursive: true });
-                        // Special handling for AGENTS.md - append/replace instead of overwrite
-                        if (file.filename === 'AGENTS.md') {
-                            let existingContent = '';
-                            try {
-                                existingContent = await promises_1.default.readFile(fullPath, 'utf-8');
-                            }
-                            catch {
-                                // File doesn't exist, will create new
+                // Apply update to each format entry
+                for (const { item, status: fileStatus } of fileStatuses) {
+                    // Skip unmodified and non-missing entries if no version update
+                    if (!hasUpdate && !fileStatus.missing)
+                        continue;
+                    // Skip modified entries without --force
+                    if (fileStatus.modified && !options.force) {
+                        process.stderr.write(`    Skipped ${item.format}: local modifications (use --force)\n`);
+                        continue;
+                    }
+                    const adapter = adapters_1.adapterRegistry.get(item.format);
+                    if (!adapter) {
+                        process.stderr.write(`    Skipped ${item.format}: unknown format\n`);
+                        continue;
+                    }
+                    const checkResult = adapter.canConvert(latest.agent);
+                    if (!checkResult.canConvert) {
+                        process.stderr.write(`    Skipped ${item.format}: ${checkResult.errors.join(', ')}\n`);
+                        continue;
+                    }
+                    const files = adapter.convert(latest.agent);
+                    if (files.length > 1) {
+                        process.stderr.write(`    Skipped ${item.format}: multi-file adapters not supported for update. Reinstall instead.\n`);
+                        continue;
+                    }
+                    for (const file of files) {
+                        // Use the original path from tracking
+                        const fullPath = item.path;
+                        try {
+                            const dir = path_1.default.dirname(fullPath);
+                            await promises_1.default.mkdir(dir, { recursive: true });
+                            // Special handling for AGENTS.md - append/replace instead of overwrite
+                            if (file.filename === 'AGENTS.md') {
+                                let existingContent = '';
+                                try {
+                                    existingContent = await promises_1.default.readFile(fullPath, 'utf-8');
+                                }
+                                catch {
+                                    // File doesn't exist, will create new
+                                }
+                                file.content = (0, agents_md_utils_1.mergeAgentsMdContent)(existingContent, file.content, item.agent);
                             }
-                            file.content = (0, agents_md_utils_1.mergeAgentsMdContent)(existingContent, file.content, item.agent);
+                            await promises_1.default.writeFile(fullPath, file.content);
+                            // Update tracking
+                            const updatedItem = {
+                                ...item,
+                                version: latest.latestVersion,
+                                installedAt: new Date().toISOString(),
+                                adapterVersion: adapter.version,
+                                contentHash: (0, installed_1.computeHash)(file.content),
+                            };
+                            await (0, installed_1.trackInstall)(updatedItem);
+                            process.stdout.write(`    Updated: ${fullPath}\n`);
+                            updatesApplied++;
+                        }
+                        catch (err) {
+                            process.stderr.write(`    Error (${item.format}): ${err.message}\n`);
                         }
-                        await promises_1.default.writeFile(fullPath, file.content);
-                        // Update tracking
-                        const updatedItem = {
-                            ...item,
-                            version: latest.latestVersion,
-                            installedAt: new Date().toISOString(),
-                            adapterVersion: adapter.version,
-                            contentHash: (0, installed_1.computeHash)(file.content),
-                        };
-                        await (0, installed_1.trackInstall)(updatedItem);
-                        process.stdout.write(`    Updated: ${fullPath}\n`);
-                        updatesApplied++;
-                    }
-                    catch (err) {
-                        process.stderr.write(`    Error: ${err.message}\n`);
                     }
                 }
             }

package/dist/index.js

@@ -61,6 +61,10 @@ Quick Reference:
   call  Execute an agent on orchagent servers (requires login)
   info  Show agent details and input/output schemas
 
+Installation:
+  npm install -g @orchagent/cli   Install globally (then use: orch)
+  npx orchagent <command>         Run without installing
+
 Documentation: https://docs.orchagent.io
   orchagent docs         Open docs in browser
   orchagent docs cli     CLI command reference

package/dist/lib/api.js

@@ -48,6 +48,7 @@ exports.starAgent = starAgent;
 exports.unstarAgent = unstarAgent;
 exports.forkAgent = forkAgent;
 exports.searchAgents = searchAgents;
+exports.searchMyAgents = searchMyAgents;
 exports.fetchLlmKeys = fetchLlmKeys;
 exports.downloadCodeBundle = downloadCodeBundle;
 exports.uploadCodeBundle = uploadCodeBundle;
@@ -233,8 +234,14 @@ async function updateOrg(config, payload) {
         headers: { 'Content-Type': 'application/json' },
     });
 }
-async function listPublicAgents(config) {
-    return publicRequest(config, '/public/agents');
+async function listPublicAgents(config, options) {
+    const params = new URLSearchParams();
+    if (options?.sort)
+        params.append('sort', options.sort);
+    if (options?.type)
+        params.append('type', options.type);
+    const queryStr = params.toString();
+    return publicRequest(config, `/public/agents${queryStr ? `?${queryStr}` : ''}`);
 }
 async function getPublicAgent(config, org, agent, version) {
     return publicRequest(config, `/public/agents/${org}/${agent}/${version}`);
@@ -266,9 +273,68 @@ async function searchAgents(config, query, options) {
         params.append('sort', options.sort);
     if (options?.tags?.length)
         params.append('tags', options.tags.join(','));
+    if (options?.type)
+        params.append('type', options.type);
     const queryStr = params.toString();
     return publicRequest(config, `/public/agents${queryStr ? `?${queryStr}` : ''}`);
 }
+/**
+ * Search within the authenticated user's own agents (public and private).
+ * Uses the authenticated /agents endpoint with client-side filtering.
+ */
+async function searchMyAgents(config, query, options) {
+    let agents = await listMyAgents(config);
+    // Deduplicate: keep only latest version per agent name
+    const latestByName = new Map();
+    for (const agent of agents) {
+        const existing = latestByName.get(agent.name);
+        if (!existing || new Date(agent.created_at) > new Date(existing.created_at)) {
+            latestByName.set(agent.name, agent);
+        }
+    }
+    agents = Array.from(latestByName.values());
+    // Apply type filter
+    if (options?.type) {
+        const typeFilter = options.type;
+        if (typeFilter === 'agents') {
+            agents = agents.filter(a => a.type === 'prompt' || a.type === 'code');
+        }
+        else if (typeFilter === 'skills' || typeFilter === 'skill') {
+            agents = agents.filter(a => a.type === 'skill');
+        }
+        else if (typeFilter === 'code' || typeFilter === 'prompt') {
+            agents = agents.filter(a => a.type === typeFilter);
+        }
+    }
+    // Apply search filter (match against name and description)
+    if (query) {
+        const words = query.toLowerCase().replace(/-/g, ' ').split(/\s+/);
+        agents = agents.filter(a => {
+            const name = (a.name || '').toLowerCase().replace(/-/g, ' ');
+            const desc = (a.description || '').toLowerCase();
+            return words.every(w => name.includes(w) || desc.includes(w));
+        });
+    }
+    // Map Agent to PublicAgent-compatible objects
+    const org = await getOrg(config);
+    return agents.map(a => ({
+        id: a.id,
+        org_name: org.name || org.slug || 'unknown',
+        org_slug: a.org_slug || org.slug || 'unknown',
+        name: a.name,
+        version: a.version,
+        type: a.type,
+        description: a.description,
+        stars_count: a.stars_count ?? 0,
+        tags: a.tags ?? [],
+        default_endpoint: a.default_endpoint || 'analyze',
+        created_at: a.created_at,
+        supported_providers: a.supported_providers ?? ['any'],
+        is_public: a.is_public,
+        pricing_mode: a.pricing_mode,
+        price_per_call_cents: a.price_per_call_cents,
+    }));
+}
 async function fetchLlmKeys(config) {
     const result = await request(config, 'GET', '/llm-keys/export');
     return result.keys;

package/dist/lib/config.js

@@ -43,6 +43,8 @@ exports.getResolvedConfig = getResolvedConfig;
 exports.getConfigPath = getConfigPath;
 exports.getDefaultFormats = getDefaultFormats;
 exports.setDefaultFormats = setDefaultFormats;
+exports.getDefaultScope = getDefaultScope;
+exports.setDefaultScope = setDefaultScope;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -129,3 +131,12 @@ async function setDefaultFormats(formats) {
     config.default_formats = formats;
     await saveConfig(config);
 }
+async function getDefaultScope() {
+    const config = await loadConfig();
+    return config.default_scope;
+}
+async function setDefaultScope(scope) {
+    const config = await loadConfig();
+    config.default_scope = scope;
+    await saveConfig(config);
+}

package/dist/lib/output.js

@@ -11,17 +11,17 @@ const pricing_1 = require("./pricing");
 function printJson(value) {
     process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
 }
-function printAgentsTable(agents) {
-    const table = new cli_table3_1.default({
-        head: [
-            chalk_1.default.bold('Agent'),
-            chalk_1.default.bold('Type'),
-            chalk_1.default.bold('Providers'),
-            chalk_1.default.bold('Stars'),
-            chalk_1.default.bold('Price'),
-            chalk_1.default.bold('Description'),
-        ],
-    });
+function printAgentsTable(agents, options) {
+    const head = [
+        chalk_1.default.bold('Agent'),
+        chalk_1.default.bold('Type'),
+        ...(options?.showVisibility ? [chalk_1.default.bold('Visibility')] : []),
+        chalk_1.default.bold('Providers'),
+        chalk_1.default.bold('Stars'),
+        chalk_1.default.bold('Price'),
+        chalk_1.default.bold('Description'),
+    ];
+    const table = new cli_table3_1.default({ head });
     agents.forEach((agent) => {
         const fullName = `${agent.org_slug}/${agent.name}`;
         const type = agent.type || 'code';
@@ -34,7 +34,14 @@ function printAgentsTable(agents) {
                 ? agent.description.slice(0, 27) + '...'
                 : agent.description
             : '-';
-        table.push([fullName, type, providers, stars.toString(), priceColored, desc]);
+        const visibility = agent.is_public === false
+            ? chalk_1.default.yellow('private')
+            : chalk_1.default.green('public');
+        const row = [fullName, type];
+        if (options?.showVisibility)
+            row.push(visibility);
+        row.push(providers, stars.toString(), priceColored, desc);
+        table.push(row);
     });
     process.stdout.write(`${table.toString()}\n`);
 }

package/dist/lib/skill-resolve.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSkills = resolveSkills;
+const api_1 = require("./api");
+function parseSkillRef(ref) {
+    const [namePart, versionPart] = ref.split('@');
+    const version = versionPart?.trim() || 'latest';
+    const segments = namePart.split('/');
+    if (segments.length !== 2 || !segments[0] || !segments[1]) {
+        throw new Error(`Invalid skill reference: ${ref}. Expected format: org/name[@version]`);
+    }
+    return { org: segments[0], name: segments[1], version };
+}
+/**
+ * Download a single skill's content.
+ * Tries public endpoint first, falls back to authenticated for private skills.
+ * Returns null if the skill can't be found.
+ */
+async function downloadSkill(config, org, name, version) {
+    // Try public download endpoint first
+    try {
+        return await (0, api_1.publicRequest)(config, `/public/agents/${org}/${name}/${version}/download`);
+    }
+    catch (err) {
+        if (!(err instanceof api_1.ApiError) || err.status !== 404) {
+            // Non-404 errors (network, 500, etc.) - rethrow
+            throw err;
+        }
+    }
+    // Public not found - try authenticated endpoint for private skills
+    if (!config.apiKey) {
+        return null;
+    }
+    try {
+        const userOrg = await (0, api_1.getOrg)(config);
+        if (userOrg.slug !== org) {
+            return null;
+        }
+        const agents = await (0, api_1.listMyAgents)(config);
+        const matching = agents.filter(a => a.name === name && a.type === 'skill');
+        if (matching.length === 0) {
+            return null;
+        }
+        let target;
+        if (version === 'latest') {
+            target = matching.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())[0];
+        }
+        else {
+            const found = matching.find(a => a.version === version);
+            if (!found)
+                return null;
+            target = found;
+        }
+        return {
+            name: target.name,
+            version: target.version,
+            description: target.description,
+            prompt: target.prompt,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve an array of skill references to their full content.
+ * Fetches each skill from the API and returns resolved skills with prompts.
+ * Skills that can't be fetched are skipped with a warning.
+ */
+async function resolveSkills(config, skillRefs, onWarning) {
+    const resolved = [];
+    for (const ref of skillRefs) {
+        let parsed;
+        try {
+            parsed = parseSkillRef(ref);
+        }
+        catch {
+            onWarning?.(`Skipping invalid skill reference: ${ref}`);
+            continue;
+        }
+        try {
+            const skill = await downloadSkill(config, parsed.org, parsed.name, parsed.version);
+            if (!skill || !skill.prompt) {
+                onWarning?.(`Could not resolve skill '${ref}' (not found or empty)`);
+                continue;
+            }
+            resolved.push({
+                ref,
+                name: skill.name,
+                description: skill.description,
+                prompt: skill.prompt,
+            });
+        }
+        catch (err) {
+            onWarning?.(`Could not fetch skill '${ref}': ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    return resolved;
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.29",
+  "version": "0.3.33",
   "description": "Command-line interface for the orchagent AI agent marketplace",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",
   "homepage": "https://orchagent.io",
   "repository": {
     "type": "git",
-    "url": "https://github.com/orchagent/orchagent.git",
+    "url": "https://github.com/orchagent/orchagent-cli.git",
     "directory": "cli"
   },
   "bugs": {
@@ -40,7 +40,8 @@
     "test:coverage": "vitest run --coverage",
     "test:e2e": "vitest run --config vitest.e2e.config.ts",
     "test:all": "vitest run && vitest run --config vitest.e2e.config.ts",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "postpublish": "cd ../cli-wrapper && npm version $npm_package_version --no-git-tag-version --allow-same-version && npm publish && echo '\n✓ Wrapper published at orchagent@'$npm_package_version"
   },
   "dependencies": {
     "@sentry/node": "^9.3.0",