@guildai/cli 0.3.16 → 0.3.17

package/dist/commands/agent/clone.js

@@ -7,6 +7,7 @@ import * as path from 'path';
 import * as readline from 'readline';
 import { getAuthenticatedUrl } from '../../lib/auth.js';
 import { runGit, GitError, formatGitError } from '../../lib/git.js';
+import { createOutputWriter } from '../../lib/output.js';
 async function promptForDirectory(suggestedDir) {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -40,17 +41,16 @@ export function createAgentCloneCommand() {
         .option('--directory <path>', 'Target directory for clone')
         .option('--force', 'Clone even if directory is not empty', false)
         .action(async (agentId, options) => {
+        const output = createOutputWriter();
         try {
             // Fetch agent details
             const client = new GuildAPIClient();
             const agent = await client.get(`/agents/${agentId}`);
             if (!agent.git_url) {
-                console.error('Error: Agent does not have a git repository');
-                console.error('');
-                console.error('This agent may not have been initialized with git.');
+                output.error('Error: Agent does not have a git repository', 'This agent may not have been initialized with git.');
                 process.exit(1);
             }
-            console.log(`✓ Fetched agent '${agent.name}' (${agent.id})`);
+            output.progress(`✓ Fetched agent '${agent.name}' (${agent.id})`);
             // Determine target directory
             let targetDir = options.directory;
             if (!targetDir) {
@@ -59,12 +59,7 @@ export function createAgentCloneCommand() {
                     targetDir = await promptForDirectory(suggestedDir);
                 }
                 else {
-                    console.error('Error: Target directory required in non-interactive mode');
-                    console.error('');
-                    console.error('Provide a directory:');
-                    console.error(`  guild agent clone ${agentId} --directory ./my-agent`);
-                    console.error('');
-                    console.error('Or run interactively to be prompted.');
+                    output.error('Error: Target directory required in non-interactive mode', `Provide a directory:\n  guild agent clone ${agentId} --directory ./my-agent\n\nOr run interactively to be prompted.`);
                     process.exit(1);
                 }
             }
@@ -76,25 +71,18 @@ export function createAgentCloneCommand() {
             if (dirExists) {
                 const isEmpty = await isDirectoryEmpty(targetDir);
                 if (!isEmpty && !options.force) {
-                    console.error(`Error: Directory '${targetDir}' is not empty`);
-                    console.error('');
-                    console.error(`To clone anyway, use: guild agent clone ${agentId} --force`);
-                    console.error('');
-                    console.error('Or choose a different directory:');
-                    console.error(`  guild agent clone ${agentId} --directory ./path/to/dir`);
+                    output.error(`Error: Directory '${targetDir}' is not empty`, `To clone anyway, use: guild agent clone ${agentId} --force\n\nOr choose a different directory:\n  guild agent clone ${agentId} --directory ./path/to/dir`);
                     process.exit(1);
                 }
             }
             // Clone repository
             const cloneUrl = await getAuthenticatedUrl(agent.git_url);
             if (!cloneUrl) {
-                console.error('Error: Not authenticated');
-                console.error('');
-                console.error('Run: guild auth login');
+                output.error('Error: Not authenticated', 'Run: guild auth login');
                 process.exit(1);
             }
             await runGit(['clone', cloneUrl, targetDir]);
-            console.log(`✓ Cloned repository to ${targetDir}`);
+            output.progress(`✓ Cloned repository to ${targetDir}`);
             // Create guild.json if it doesn't exist
             const guildJsonPath = path.join(targetDir, 'guild.json');
             const guildJsonExists = await fs
@@ -102,7 +90,7 @@ export function createAgentCloneCommand() {
                 .then(() => true)
                 .catch(() => false);
             if (guildJsonExists) {
-                console.log('✓ Verified guild.json');
+                output.progress('✓ Verified guild.json');
             }
             else {
                 // Create guild.json for local development
@@ -111,42 +99,35 @@ export function createAgentCloneCommand() {
                     name: agent.name,
                 };
                 await fs.writeFile(guildJsonPath, JSON.stringify(guildConfig, null, 2) + '\n');
-                console.log('✓ Created guild.json');
+                output.progress('✓ Created guild.json');
             }
             // Display next steps
-            console.log('');
-            console.log('Next steps:');
-            console.log(`  1. cd ${targetDir}`);
-            console.log('  2. Make your changes to the code');
-            console.log(`  3. Run 'guild agent save --message "your changes"'`);
-            console.log(`  4. Run 'guild agent test' to test your changes`);
+            output.progress('');
+            output.progress('Next steps:');
+            output.progress(`  1. cd ${targetDir}`);
+            output.progress('  2. Make your changes to the code');
+            output.progress(`  3. Run 'guild agent save --message "your changes"'`);
+            output.progress(`  4. Run 'guild agent test' to test your changes`);
         }
         catch (error) {
             if (error instanceof GitError) {
-                console.error('Error: Failed to clone repository');
-                console.error('');
-                console.error(formatGitError(error));
+                output.error('Error: Failed to clone repository', formatGitError(error));
                 process.exit(1);
             }
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not authenticated. Please log in first.');
-                console.error('');
-                console.error('Run: guild auth login');
+                output.error('Not authenticated. Please log in first.', 'Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error(`Error: Agent not found: ${agentId}`);
-                console.error('');
-                console.error('Check the agent ID:');
-                console.error('  guild agent list');
+                output.error(`Error: Agent not found: ${agentId}`, 'Check the agent ID:\n  guild agent list');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.CONN_REFUSED) {
-                console.error('Cannot connect to Guild servers');
+                output.error('Cannot connect to Guild servers');
                 process.exit(1);
             }
-            console.error(`Failed to clone agent: ${formattedError.details}`);
+            output.error(`Failed to clone agent: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/code.js

@@ -3,6 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
 import { getAgentId } from '../../lib/agent-helpers.js';
+import { createOutputWriter } from '../../lib/output.js';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 export function createAgentCodeCommand() {
@@ -13,6 +14,7 @@ export function createAgentCodeCommand() {
         .option('--draft', 'Include draft versions (default: only published)', false)
         .option('--output <directory>', 'Write files to directory instead of printing JSON')
         .action(async (agentIdArg, options) => {
+        const output = createOutputWriter();
         // Get agent ID from argument or guild.json
         const { agentId } = await getAgentId(agentIdArg);
         const client = new GuildAPIClient();
@@ -24,38 +26,25 @@ export function createAgentCodeCommand() {
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not logged in.');
-                console.error('');
-                console.error('Please authenticate first:');
-                console.error('  guild auth login');
+                output.error('Not logged in.', 'Please authenticate first:\n  guild auth login');
             }
             else if (formattedError.code === ErrorCodes.CONN_REFUSED) {
-                console.error('Cannot connect to Guild servers');
+                output.error('Cannot connect to Guild servers');
             }
             else if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error(`Agent not found: ${agentId}`);
-                console.error('');
-                console.error('Check the agent ID:');
-                console.error('  guild agent list');
+                output.error(`Agent not found: ${agentId}`, 'Check the agent ID:\n  guild agent list');
             }
             else {
-                console.error(`Failed to fetch agent code: ${formattedError.details}`);
+                output.error(`Failed to fetch agent code: ${formattedError.details}`);
             }
             process.exit(1);
         }
         if (files.length === 0) {
-            console.error('No code found for this agent.');
-            console.error('');
             if (options.draft) {
-                console.error('This agent has no versions saved yet.');
-                console.error('');
-                console.error('To save code: cd <agent-directory> && guild agent save --message "..."');
+                output.error('No code found for this agent.', 'This agent has no versions saved yet.\n\nTo save code: cd <agent-directory> && guild agent save --message "..."');
             }
             else {
-                console.error('This agent has no published versions.');
-                console.error('');
-                console.error('To see draft versions: guild agent code <agent-id> --draft');
-                console.error('To publish a version: cd <agent-directory> && guild agent save --message "..." --publish');
+                output.error('No code found for this agent.', 'This agent has no published versions.\n\nTo see draft versions: guild agent code <agent-id> --draft\nTo publish a version: cd <agent-directory> && guild agent save --message "..." --publish');
             }
             process.exit(1);
         }
@@ -71,32 +60,23 @@ export function createAgentCodeCommand() {
                     // Write file
                     await fs.writeFile(filePath, file.content, 'utf-8');
                 }
-                console.log(JSON.stringify({
+                output.data({
                     success: 'Code written to directory',
                     directory: options.output,
                     files_written: files.length,
                     files: files.map((f) => f.path),
-                }, null, 2));
+                });
                 process.exit(0);
             }
             catch (error) {
                 const err = error;
-                console.error(`Could not write files to directory: ${options.output}`);
-                console.error('');
-                console.error(`Error: ${err.message || 'Unknown error'}`);
-                console.error('');
-                console.error('Check that:');
-                console.error('  • Directory is writable');
-                console.error('  • You have permission to create files');
-                console.error('  • Disk space is available');
+                output.error(`Could not write files to directory: ${options.output}`, `Error: ${err.message || 'Unknown error'}\n\nCheck that:\n  • Directory is writable\n  • You have permission to create files\n  • Disk space is available`);
                 process.exit(1);
             }
         }
         else {
             // Just print JSON
-            console.log(JSON.stringify({
-                files,
-            }, null, 2));
+            output.data({ files });
             process.exit(0);
         }
     });

package/dist/commands/agent/create.js

@@ -5,6 +5,7 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getGuildcoreUrl } from '../../lib/config.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
 import { pollAgentStatus } from '../../lib/polling.js';
+import { createOutputWriter } from '../../lib/output.js';
 const TEMPLATE_CHOICES = [
     {
         name: 'LLM - Simple language model agent (recommended)',
@@ -47,6 +48,7 @@ export function createAgentCreateCommand() {
         .option('--template <template>', 'Agent template (LLM, AUTO_MANAGED_STATE, BLANK)')
         .option('--no-wait', 'Return immediately without waiting for initialization')
         .action(async (name, options) => {
+        const output = createOutputWriter();
         const baseUrl = getGuildcoreUrl();
         const client = new GuildAPIClient({ baseUrl });
         try {
@@ -63,18 +65,12 @@ export function createAgentCreateCommand() {
                     template = await promptForTemplate();
                 }
                 else {
-                    console.error('Error: --template is required in non-interactive mode');
-                    console.error('');
-                    console.error('Provide a template:');
-                    console.error(`  guild agent create ${name} --template LLM`);
-                    console.error('');
-                    console.error('Available templates:');
-                    console.error('  • LLM - Simple language model agent (recommended)');
-                    console.error('  • AUTO_MANAGED_STATE - Agent with automatic state management');
-                    console.error('  • BLANK - Start from scratch');
+                    output.error('Error: --template is required in non-interactive mode', `Provide a template:\n  guild agent create ${name} --template LLM\n\nAvailable templates:\n  • LLM - Simple language model agent (recommended)\n  • AUTO_MANAGED_STATE - Agent with automatic state management\n  • BLANK - Start from scratch`);
                     process.exit(1);
                 }
             }
+            // Normalize template to uppercase for case-insensitive matching
+            template = template.toUpperCase();
             // Validate template
             const validTemplates = [
                 'LLM',
@@ -82,12 +78,7 @@ export function createAgentCreateCommand() {
                 'BLANK',
             ];
             if (!validTemplates.includes(template)) {
-                console.error(`Error: Invalid template '${template}'`);
-                console.error('');
-                console.error('Valid templates:');
-                console.error('  • LLM');
-                console.error('  • AUTO_MANAGED_STATE');
-                console.error('  • BLANK');
+                output.error(`Error: Invalid template '${template}'`, 'Valid templates:\n  • LLM\n  • AUTO_MANAGED_STATE\n  • BLANK');
                 process.exit(1);
             }
             const response = await client.post('/agents', {
@@ -101,43 +92,36 @@ export function createAgentCreateCommand() {
                 const pollResult = await pollAgentStatus(response.id, 'READY');
                 if (pollResult.success && pollResult.response) {
                     // Display the updated response with READY status
-                    console.log(JSON.stringify(pollResult.response, null, 2));
+                    output.data(pollResult.response);
                 }
                 else {
                     // Polling failed or timed out - this is an error
-                    console.error('Agent initialization failed or timed out');
-                    console.error(`Check status: guild agent get ${response.id}`);
-                    console.log(JSON.stringify(response, null, 2));
+                    output.error('Agent initialization failed or timed out', `Check status: guild agent get ${response.id}`);
+                    output.data(response);
                     process.exit(1);
                 }
             }
             else {
                 // --no-wait: return immediately without polling
-                console.log(JSON.stringify(response, null, 2));
+                output.data(response);
             }
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             // Provide specific error messages based on error code
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not logged in.');
-                console.error('');
-                console.error('Please authenticate first:');
-                console.error('  guild auth login');
+                output.error('Not logged in.', 'Please authenticate first:\n  guild auth login');
             }
             else if (formattedError.code === ErrorCodes.CONN_REFUSED) {
-                console.error('Cannot connect to Guild servers');
+                output.error('Cannot connect to Guild servers');
             }
             else if (formattedError.code === ErrorCodes.API_ERROR &&
                 formattedError.details.includes('already exists')) {
-                console.error(`Agent name '${name}' already exists.`);
-                console.error('');
-                console.error('Try a different name:');
-                console.error(`  guild agent create ${name}-v2`);
+                output.error(`Agent name '${name}' already exists.`, `Try a different name:\n  guild agent create ${name}-v2`);
             }
             else {
                 // Generic error with details from server
-                console.error(`Failed to create agent: ${formattedError.details}`);
+                output.error(`Failed to create agent: ${formattedError.details}`);
             }
             process.exit(1);
         }

package/dist/commands/agent/fork.js

@@ -5,6 +5,7 @@ import { handleAxiosError, ErrorCodes, debug } from '../../lib/errors.js';
 import * as fs from 'fs/promises';
 import * as readline from 'readline';
 import { runGit, GitError, formatGitError } from '../../lib/git.js';
+import { createOutputWriter } from '../../lib/output.js';
 import { resolveOwnerId } from '../../lib/owner-helpers.js';
 async function promptForName() {
     const rl = readline.createInterface({
@@ -53,17 +54,12 @@ export function createAgentForkCommand() {
         .option('--directory <path>', 'Target directory for clone')
         .option('--owner <owner-id>', 'Owner account (user or organization ID)')
         .action(async (sourceArg, options) => {
+        const output = createOutputWriter();
         try {
             // Parse agent-id:version-id format
             const parts = sourceArg.split(':');
             if (parts.length !== 2 || !parts[0] || !parts[1]) {
-                console.error('Error: Invalid argument format');
-                console.error('');
-                console.error('Expected: <agent-id>:<version-id>');
-                console.error('Example: guild agent fork agent_abc123:version_xyz789');
-                console.error('');
-                console.error('To find versions:');
-                console.error(`  guild agent versions ${parts[0] || '<agent-id>'}`);
+                output.error('Error: Invalid argument format', `Expected: <agent-id>:<version-id>\nExample: guild agent fork agent_abc123:version_xyz789\n\nTo find versions:\n  guild agent versions ${parts[0] || '<agent-id>'}`);
                 process.exit(1);
             }
             const [sourceAgentId, sourceVersionId] = parts;
@@ -73,29 +69,18 @@ export function createAgentForkCommand() {
                 if (isInteractive()) {
                     agentName = await promptForName();
                     if (!agentName) {
-                        console.error('Error: Agent name is required');
+                        output.error('Error: Agent name is required');
                         process.exit(1);
                     }
                 }
                 else {
-                    console.error('Error: Agent name required in non-interactive mode');
-                    console.error('');
-                    console.error('Provide a name:');
-                    console.error(`  guild agent fork ${sourceArg} --name my-forked-agent`);
-                    console.error('');
-                    console.error('Or run interactively to be prompted.');
+                    output.error('Error: Agent name required in non-interactive mode', `Provide a name:\n  guild agent fork ${sourceArg} --name my-forked-agent\n\nOr run interactively to be prompted.`);
                     process.exit(1);
                 }
             }
             // Validate name format (before API call)
             if (!/^[a-z0-9_-]{5,100}$/.test(agentName)) {
-                console.error('Error: Invalid agent name');
-                console.error('');
-                console.error('Name must:');
-                console.error('  • Be between 5 and 100 characters');
-                console.error('  • Only contain lowercase letters, numbers, hyphens, and underscores');
-                console.error('');
-                console.error('Examples: my-agent, weather_bot, agent-007');
+                output.error('Error: Invalid agent name', 'Name must:\n  • Be between 5 and 100 characters\n  • Only contain lowercase letters, numbers, hyphens, and underscores\n\nExamples: my-agent, weather_bot, agent-007');
                 process.exit(1);
             }
             // Determine directory (default to agent name)
@@ -108,19 +93,14 @@ export function createAgentForkCommand() {
             if (dirExists) {
                 const isEmpty = await isDirectoryEmpty(targetDir);
                 if (!isEmpty) {
-                    console.error(`Error: Directory '${targetDir}' already exists and is not empty`);
-                    console.error('');
-                    console.error('Choose a different directory:');
-                    console.error(`  guild agent fork ${sourceArg} --directory ./different-path`);
-                    console.error('');
-                    console.error('Or remove the existing directory first.');
+                    output.error(`Error: Directory '${targetDir}' already exists and is not empty`, `Choose a different directory:\n  guild agent fork ${sourceArg} --directory ./different-path\n\nOr remove the existing directory first.`);
                     process.exit(1);
                 }
             }
             // Now fetch source version from API (after local validations)
             const client = new GuildAPIClient();
             const sourceVersion = await client.get(`/agents/${sourceAgentId}/versions/${sourceVersionId}`);
-            console.log(`✓ Fetched source version from '${sourceVersion.agent.name}' (${sourceVersionId.substring(0, 12)})`);
+            output.progress(`✓ Fetched source version from '${sourceVersion.agent.name}' (${sourceVersionId.substring(0, 12)})`);
             // Determine description
             let description = options.description;
             if (!description) {
@@ -139,16 +119,16 @@ export function createAgentForkCommand() {
                 interactive: isInteractive(),
             });
             // Create forked agent
-            console.log(`✓ Forking agent '${agentName}'...`);
+            output.progress(`✓ Forking agent '${agentName}'...`);
             const newAgent = await client.post('/agents', {
                 name: agentName,
                 description,
                 forked_from_version: sourceVersionId,
                 owner_id: owner.id,
             });
-            console.log(`✓ Agent created: ${newAgent.name} (${newAgent.id})`);
+            output.progress(`✓ Agent created: ${newAgent.name} (${newAgent.id})`);
             // Poll until repository is ready
-            console.log('✓ Waiting for repository initialization...');
+            output.progress('✓ Waiting for repository initialization...');
             let attempts = 0;
             const maxAttempts = 60; // 2 minutes
             let agent = newAgent;
@@ -161,75 +141,49 @@ export function createAgentForkCommand() {
                 debug(`Agent status: ${agent.status} (attempt ${attempts}/${maxAttempts})`);
             }
             if (agent.status === 'FAILED') {
-                console.error('Error: Repository initialization failed');
-                console.error('');
-                console.error('The agent was created but the repository could not be initialized.');
-                console.error('Check the agent status:');
-                console.error(`  guild agent get ${newAgent.id}`);
+                output.error('Error: Repository initialization failed', `The agent was created but the repository could not be initialized.\nCheck the agent status:\n  guild agent get ${newAgent.id}`);
                 process.exit(1);
             }
             if (agent.status !== 'READY') {
-                console.error('Error: Timed out waiting for repository initialization');
-                console.error('');
-                console.error('The agent was created but the repository is not ready yet.');
-                console.error('Check the status with:');
-                console.error(`  guild agent get ${newAgent.id}`);
-                console.error('');
-                console.error('Once ready, clone manually:');
-                console.error(`  guild agent clone ${newAgent.id} --directory ${targetDir}`);
+                output.error('Error: Timed out waiting for repository initialization', `The agent was created but the repository is not ready yet.\nCheck the status with:\n  guild agent get ${newAgent.id}\n\nOnce ready, clone manually:\n  guild agent clone ${newAgent.id} --directory ${targetDir}`);
                 process.exit(1);
             }
-            console.log('✓ Repository ready!');
+            output.progress('✓ Repository ready!');
             if (!agent.git_url) {
-                console.error('Error: Agent repository URL not available');
-                console.error('');
-                console.error('The agent was created but git_url is missing.');
-                console.error('Check the agent details:');
-                console.error(`  guild agent get ${newAgent.id}`);
+                output.error('Error: Agent repository URL not available', `The agent was created but git_url is missing.\nCheck the agent details:\n  guild agent get ${newAgent.id}`);
                 process.exit(1);
             }
             // Clone the new repository
             await runGit(['clone', agent.git_url, targetDir]);
-            console.log(`✓ Cloned repository to ${targetDir}`);
+            output.progress(`✓ Cloned repository to ${targetDir}`);
             // Display next steps
-            console.log('');
-            console.log('Next steps:');
-            console.log(`  1. cd ${targetDir}`);
-            console.log('  2. Make your changes to the code');
-            console.log(`  3. Run 'guild agent save --message "your changes"'`);
-            console.log(`  4. Run 'guild agent test' to test your changes`);
+            output.progress('');
+            output.progress('Next steps:');
+            output.progress(`  1. cd ${targetDir}`);
+            output.progress('  2. Make your changes to the code');
+            output.progress(`  3. Run 'guild agent save --message "your changes"'`);
+            output.progress(`  4. Run 'guild agent test' to test your changes`);
         }
         catch (error) {
             if (error instanceof GitError) {
-                console.error('Error: Failed to clone repository');
-                console.error('');
-                console.error(formatGitError(error));
-                console.error('');
-                console.error('The agent was created successfully, but cloning failed.');
-                console.error('Try cloning manually:');
-                console.error(`  guild agent clone <agent-id>`);
+                output.error('Error: Failed to clone repository', `${formatGitError(error)}\n\nThe agent was created successfully, but cloning failed.\nTry cloning manually:\n  guild agent clone <agent-id>`);
                 process.exit(1);
             }
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not authenticated. Please log in first.');
-                console.error('');
-                console.error('Run: guild auth login');
+                output.error('Not authenticated. Please log in first.', 'Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
                 const [sourceAgentId] = sourceArg.split(':');
-                console.error(`Error: Version not found: ${sourceArg}`);
-                console.error('');
-                console.error('Check available versions:');
-                console.error(`  guild agent versions ${sourceAgentId}`);
+                output.error(`Error: Version not found: ${sourceArg}`, `Check available versions:\n  guild agent versions ${sourceAgentId}`);
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.CONN_REFUSED) {
-                console.error('Cannot connect to Guild servers');
+                output.error('Cannot connect to Guild servers');
                 process.exit(1);
             }
-            console.error(`Failed to fork agent: ${formattedError.details}`);
+            output.error(`Failed to fork agent: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/get.js

@@ -4,28 +4,29 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { getAgentId } from '../../lib/agent-helpers.js';
 import { handleAxiosError } from '../../lib/errors.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createAgentGetCommand() {
     const cmd = new Command('get');
     cmd
         .description('Get agent details')
         .argument('[identifier]', 'Agent ID or full name (e.g., owner/agent-name)')
         .action(async (idArg) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                console.error('Not authenticated. Please log in first.');
-                console.error('Run: guild auth login');
+                output.error('Not authenticated. Please log in first.', 'Run: guild auth login');
                 process.exit(1);
             }
             // Get agent ID from argument or guild.json
             const { agentId } = await getAgentId(idArg);
             const client = new GuildAPIClient();
             const response = await client.get(`/agents/${agentId}`);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            console.error(`Failed to get agent: ${formattedError.details}`);
+            output.error(`Failed to get agent: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/grep.js

@@ -15,15 +15,15 @@ export function createAgentGrepCommand() {
 }
 const BATCH_SIZE = 20;
 async function grep(patternArg, options) {
+    const output = createOutputWriter();
     try {
         const token = await getAuthToken();
         if (!token) {
-            console.error('Not authenticated. Please log in first.');
-            console.error('Run: guild auth login');
+            output.error('Not authenticated. Please log in first.', 'Run: guild auth login');
             process.exit(1);
         }
         if (patternArg === undefined) {
-            console.error('Please specify a pattern to match');
+            output.error('Please specify a pattern to match');
             process.exit(1);
         }
         let patternRE;
@@ -31,7 +31,7 @@ async function grep(patternArg, options) {
             patternRE = new RegExp(patternArg);
         }
         catch {
-            console.error(`Invalid regex pattern: ${patternArg}`);
+            output.error(`Invalid regex pattern: ${patternArg}`);
             process.exit(1);
         }
         const client = new GuildAPIClient();
@@ -50,15 +50,14 @@ async function grep(patternArg, options) {
                     files = await client.get(`/agents/${agent.id}/code`);
                 }
                 catch (ex) {
-                    const out = createOutputWriter();
                     const formattedError = handleAxiosError(ex);
-                    out.error(`${agent.owner?.name}/${agent.name}: ${formattedError.details}`);
+                    output.error(`${agent.owner?.name}/${agent.name}: ${formattedError.details}`);
                     return;
                 }
                 for (const { path, content } of files) {
                     content.split('\n').forEach((line, lineNumber) => {
                         if (patternRE.test(line)) {
-                            console.log(`${agent.owner?.name}/${agent.name}/${path}:${lineNumber + 1}:${line}`);
+                            output.progress(`${agent.owner?.name}/${agent.name}/${path}:${lineNumber + 1}:${line}`);
                         }
                     });
                 }
@@ -69,9 +68,8 @@ async function grep(patternArg, options) {
         }
     }
     catch (error) {
-        const out = createOutputWriter();
         const formattedError = handleAxiosError(error);
-        out.error(`Failed to search agents: ${formattedError.details}`);
+        output.error(`Failed to search agents: ${formattedError.details}`);
         process.exit(1);
     }
 }

package/dist/commands/agent/init.js

@@ -130,6 +130,8 @@ export function createAgentInitCommand() {
                     process.exit(1);
                 }
             }
+            // Normalize template to uppercase for case-insensitive matching
+            template = template.toUpperCase();
             // Validate template
             const validTemplates = [
                 'LLM',