@guildai/cli 0.3.15 → 0.3.17

package/dist/commands/agent/list.js

@@ -3,8 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError } from '../../lib/errors.js';
-import { createOutputWriter, formatAgentTable } from '../../lib/output.js';
-import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 const SORT_MAP = {
     updated: 'updated_at',
     newest: 'created_at',
@@ -21,11 +20,11 @@ export function createAgentListCommand() {
         .option('--limit <number>', 'Number of results to return', '20')
         .option('--offset <number>', 'Offset for pagination', '0')
         .action(async (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);
             }
             const client = new GuildAPIClient();
@@ -43,17 +42,11 @@ export function createAgentListCommand() {
                 params.append('sort_by', sortField);
             }
             const response = await client.get(`/agents?${params.toString()}`);
-            if (getOutputMode() === 'json') {
-                console.log(JSON.stringify(response, null, 2));
-            }
-            else {
-                formatAgentTable(response.items, response.pagination);
-            }
+            output.data(response);
         }
         catch (error) {
-            const out = createOutputWriter();
             const formattedError = handleAxiosError(error);
-            out.error(`Failed to list agents: ${formattedError.details}`);
+            output.error(`Failed to list agents: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/publish.js

@@ -4,6 +4,7 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAgentId } from '../../lib/agent-helpers.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
 import { pollUntilComplete } from '../../lib/polling.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createAgentPublishCommand() {
     const cmd = new Command('publish');
     cmd
@@ -11,6 +12,7 @@ export function createAgentPublishCommand() {
         .argument('[identifier]', 'Agent ID or full name (e.g., owner/agent-name)')
         .option('--wait', 'Wait for validation to complete before publishing')
         .action(async (agentIdArg, options) => {
+        const output = createOutputWriter();
         try {
             const client = new GuildAPIClient();
             // Resolve agent ID
@@ -23,19 +25,13 @@ export function createAgentPublishCommand() {
                 .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
             if (draftVersions.length === 0) {
                 const agentName = config?.name || agentId;
-                console.error(`No draft versions available for agent: ${agentName}`);
-                console.error('');
-                console.error('Create a new version:');
-                console.error(`  guild agent save --message "your changes"`);
+                output.error(`No draft versions available for agent: ${agentName}`, 'Create a new version:\n  guild agent save --message "your changes"');
                 process.exit(1);
             }
             const versionToPublish = draftVersions[0];
             // Check if already published
             if (versionToPublish.status === 'PUBLISHED') {
-                console.error(`Version ${versionToPublish.id} is already published`);
-                console.error('');
-                console.error('To unpublish:');
-                console.error('  guild agent unpublish');
+                output.error(`Version ${versionToPublish.id} is already published`, 'To unpublish:\n  guild agent unpublish');
                 process.exit(1);
             }
             // Check validation status before attempting publish
@@ -56,10 +52,7 @@ export function createAgentPublishCommand() {
                         delayMs: 1000,
                     });
                     if (!result.success || !result.response) {
-                        console.error('Validation did not complete in time');
-                        console.error('');
-                        console.error('Check status manually:');
-                        console.error('  guild agent versions');
+                        output.error('Validation did not complete in time', 'Check status manually:\n  guild agent versions');
                         process.exit(1);
                     }
                     currentVersion = result.response;
@@ -68,76 +61,66 @@ export function createAgentPublishCommand() {
                     // by the main validation check
                 }
                 else {
-                    console.error('Cannot publish: validation is still in progress');
-                    console.error('');
-                    console.error(`Validation status: ${validationStatus === 'PENDING' ? 'Waiting to start' : 'Running'}`);
-                    console.error('');
-                    console.error('The version number is extracted from package.json during validation.');
-                    console.error('');
-                    console.error('Options:');
-                    console.error('  • Wait for validation: guild agent publish --wait');
-                    console.error('  • Check status: guild agent versions');
+                    output.error('Cannot publish: validation is still in progress', `Validation status: ${validationStatus === 'PENDING' ? 'Waiting to start' : 'Running'}\n\nThe version number is extracted from package.json during validation.\n\nOptions:\n  • Wait for validation: guild agent publish --wait\n  • Check status: guild agent versions`);
                     process.exit(1);
                 }
             }
             if (validationStatus === 'FAILED') {
-                console.error('Cannot publish: validation failed');
-                console.error('');
                 // Fetch validation steps to show the actual error
+                let failureDetails = '';
                 try {
                     const stepsResponse = await client.get(`/versions/${currentVersion.id}/validation/steps`);
                     const failedSteps = stepsResponse.steps.filter((step) => step.status === 'FAILED');
                     if (failedSteps.length > 0) {
-                        for (const step of failedSteps) {
-                            console.error(`Step "${step.name}" failed:`);
+                        const stepMessages = failedSteps.map((step) => {
+                            let msg = `Step "${step.name}" failed:`;
                             if (step.content) {
-                                console.error(step.content);
+                                msg += `\n  ${step.content}`;
                             }
-                            console.error('');
-                        }
+                            return msg;
+                        });
+                        failureDetails = stepMessages.join('\n\n');
                     }
                     else {
-                        console.error('No failed steps found. Check validation logs for details.');
-                        console.error('');
+                        failureDetails =
+                            'No failed steps found. Check validation logs for details.';
                     }
                 }
                 catch {
                     // If we can't fetch steps, just show generic message
-                    console.error('Could not fetch validation details.');
-                    console.error('');
+                    failureDetails = 'Could not fetch validation details.';
                 }
-                console.error('Fix the issues, then save a new version:');
-                console.error('  guild agent save --message "Fix validation errors"');
+                output.error('Cannot publish: validation failed', `${failureDetails}\n\nFix the issues, then save a new version:\n  guild agent save --message "Fix validation errors"`);
                 process.exit(1);
             }
             // Note: version_number is only set after validation extracts it from package.json,
             // and only enforced at publish time (drafts don't require versions)
             // Publish version
             await client.post(`/versions/${currentVersion.id}/publish`, {});
-            console.log(`✓ Published version ${currentVersion.id}`);
-            console.log(`  Agent: ${currentVersion.agent?.name || config?.name || agentId}${config ? '' : ` (${agentId})`}`);
-            console.log(`  Status: DRAFT → PUBLISHED`);
+            const details = {
+                agent: `${currentVersion.agent?.name || config?.name || agentId}${config ? '' : ` (${agentId})`}`,
+                status: 'DRAFT → PUBLISHED',
+            };
             if (currentVersion.version_number) {
-                console.log(`  Version: ${currentVersion.version_number}`);
+                details.version = currentVersion.version_number;
             }
+            output.success(`Published version ${currentVersion.id}`, details);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error('Agent not found');
-                console.error('');
-                console.error('Run: guild agent list');
+                output.error('Agent not found', 'Run: 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 publish: ${formattedError.details}`);
+            output.error(`Failed to publish: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/pull.js

@@ -23,15 +23,7 @@ export function createAgentPullCommand() {
                 .then(() => true)
                 .catch(() => false);
             if (!guildJsonExists) {
-                console.error('Error: Not in an agent directory');
-                console.error('');
-                console.error('guild.json not found in current directory.');
-                console.error('');
-                console.error('Initialize an agent directory:');
-                console.error('  guild agent init --name my-agent');
-                console.error('');
-                console.error('Or clone an existing agent:');
-                console.error('  guild agent clone <agent-id>');
+                output.error('Not in an agent directory', 'guild.json not found in current directory.\n\nInitialize an agent directory:\n  guild agent init --name my-agent\n\nOr clone an existing agent:\n  guild agent clone <agent-id>');
                 process.exit(1);
             }
             // Read guild.json
@@ -40,15 +32,13 @@ export function createAgentPullCommand() {
             const client = new GuildAPIClient();
             const agent = await client.get(`/agents/${guildConfig.agent_id}`);
             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('Agent does not have a git repository', 'This agent may not have been initialized with git.');
                 process.exit(1);
             }
             // Get authenticated URL
             const authenticatedUrl = await getAuthenticatedUrl(agent.git_url);
             if (!authenticatedUrl) {
-                console.error('Error: Not authenticated. Run: guild auth login');
+                output.error('Not authenticated.', 'Run: guild auth login');
                 process.exit(1);
             }
             // Get current branch name
@@ -93,17 +83,7 @@ export function createAgentPullCommand() {
                 // Check for rebase conflicts
                 if (errMessage.includes('CONFLICT') ||
                     errMessage.includes('could not apply')) {
-                    console.error('Error: Merge conflict detected');
-                    console.error('');
-                    console.error('Your changes conflict with remote changes.');
-                    console.error('');
-                    console.error('To resolve:');
-                    console.error('  1. Fix conflicts in the listed files');
-                    console.error('  2. git add <resolved-files>');
-                    console.error('  3. git rebase --continue');
-                    console.error('');
-                    console.error('Or abort the rebase:');
-                    console.error('  git rebase --abort');
+                    output.error('Merge conflict detected', 'Your changes conflict with remote changes.\n\nTo resolve:\n  1. Fix conflicts in the listed files\n  2. git add <resolved-files>\n  3. git rebase --continue\n\nOr abort the rebase:\n  git rebase --abort');
                     process.exit(1);
                 }
                 // No upstream branch — nothing to pull
@@ -122,26 +102,19 @@ export function createAgentPullCommand() {
         }
         catch (error) {
             if (error instanceof GitError) {
-                console.error('Error: Git operation failed');
-                console.error('');
-                console.error(formatGitError(error));
+                output.error('Git operation failed', 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');
-                console.error('');
-                console.error('The agent may have been deleted.');
-                console.error('Check your guild.json agent_id.');
+                output.error('Agent not found', 'The agent may have been deleted.\nCheck your guild.json agent_id.');
                 process.exit(1);
             }
-            console.error(`Failed to pull: ${formattedError.details}`);
+            output.error(`Failed to pull: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/revalidate.js

@@ -4,6 +4,7 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getGuildcoreUrl } from '../../lib/config.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
 import { getAgentId } from '../../lib/agent-helpers.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createAgentRevalidateCommand() {
     const cmd = new Command('revalidate');
     cmd
@@ -11,6 +12,7 @@ export function createAgentRevalidateCommand() {
         .argument('[identifier]', 'Agent ID or full name (e.g., owner/agent-name)')
         .argument('[version-id]', 'ID of the version to revalidate (uses latest if omitted)')
         .action(async (agentIdArg, versionIdArg) => {
+        const output = createOutputWriter();
         // Get agent ID from argument or guild.json
         const { agentId } = await getAgentId(agentIdArg);
         const baseUrl = getGuildcoreUrl();
@@ -21,38 +23,28 @@ export function createAgentRevalidateCommand() {
             if (!versionId) {
                 const versions = await client.get(`/agents/${agentId}/versions?limit=1&offset=0`);
                 if (!versions.items || versions.items.length === 0) {
-                    console.error('No versions found for this agent.');
-                    console.error('');
-                    console.error('The agent may still be initializing. Check status:');
-                    console.error(`  guild agent get ${agentId}`);
+                    output.error('No versions found for this agent.', `The agent may still be initializing. Check status:\n  guild agent get ${agentId}`);
                     process.exit(1);
                 }
                 versionId = versions.items[0].id;
             }
             // Revalidate the version
             const result = await client.post(`/agents/${agentId}/versions/${versionId}/revalidate`);
-            console.log(JSON.stringify(result, null, 2));
+            output.data(result);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not authenticated.');
-                console.error('');
-                console.error('Please authenticate first:');
-                console.error('  guild auth login');
+                output.error('Not authenticated.', '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 or version not found`);
-                console.error('');
-                console.error('Check the agent and version IDs:');
-                console.error('  guild agent list');
-                console.error(`  guild agent versions ${agentId}`);
+                output.error('Agent or version not found', `Check the agent and version IDs:\n  guild agent list\n  guild agent versions ${agentId}`);
             }
             else {
-                console.error(`Failed to revalidate version: ${formattedError.details}`);
+                output.error(`Failed to revalidate version: ${formattedError.details}`);
             }
             process.exit(1);
         }

package/dist/commands/agent/save.js

@@ -22,10 +22,7 @@ export function createAgentSaveCommand() {
         const output = createOutputWriter();
         // Check for --message
         if (!options.message) {
-            console.error('Error: Commit message is required');
-            console.error('');
-            console.error('Provide a message describing your changes:');
-            console.error('  guild agent save --message "Add new feature"');
+            output.error('Commit message is required', 'Provide a message describing your changes:\n  guild agent save --message "Add new feature"');
             process.exit(1);
         }
         try {
@@ -36,15 +33,7 @@ export function createAgentSaveCommand() {
                 .then(() => true)
                 .catch(() => false);
             if (!guildJsonExists) {
-                console.error('Error: Not in an agent directory');
-                console.error('');
-                console.error('guild.json not found in current directory.');
-                console.error('');
-                console.error('Initialize an agent directory:');
-                console.error('  guild agent init --name my-agent');
-                console.error('');
-                console.error('Or clone an existing agent:');
-                console.error('  guild agent clone <agent-id>');
+                output.error('Not in an agent directory', 'guild.json not found in current directory.\n\nInitialize an agent directory:\n  guild agent init --name my-agent\n\nOr clone an existing agent:\n  guild agent clone <agent-id>');
                 process.exit(1);
             }
             // Read guild.json
@@ -77,9 +66,7 @@ export function createAgentSaveCommand() {
                     }
                 }
                 if (!hasUnpushedCommits) {
-                    console.error('Error: No changes to commit');
-                    console.error('');
-                    console.error('Working tree is clean. Make changes to your code before saving.');
+                    output.error('No changes to commit', 'Working tree is clean. Make changes to your code before saving.');
                     process.exit(1);
                 }
                 output.progress('✓ Found unpushed commits, resuming push...');
@@ -97,7 +84,7 @@ export function createAgentSaveCommand() {
             });
             const authenticatedUrl = await getAuthenticatedUrl(remoteUrl.trim());
             if (!authenticatedUrl) {
-                console.error('Error: Not authenticated. Run: guild auth login');
+                output.error('Not authenticated.', 'Run: guild auth login');
                 process.exit(1);
             }
             // Get current branch name
@@ -120,27 +107,14 @@ export function createAgentSaveCommand() {
                 // Check for rebase conflicts
                 if (errMessage.includes('CONFLICT') ||
                     errMessage.includes('could not apply')) {
-                    console.error('Error: Merge conflict detected');
-                    console.error('');
-                    console.error('Your changes conflict with remote changes.');
-                    console.error('');
-                    console.error('To resolve:');
-                    console.error('  1. Fix conflicts in the listed files');
-                    console.error('  2. git add <resolved-files>');
-                    console.error('  3. git rebase --continue');
-                    console.error('  4. guild agent save --message "..."');
-                    console.error('');
-                    console.error('Or abort the rebase:');
-                    console.error('  git rebase --abort');
+                    output.error('Merge conflict detected', 'Your changes conflict with remote changes.\n\nTo resolve:\n  1. Fix conflicts in the listed files\n  2. git add <resolved-files>\n  3. git rebase --continue\n  4. guild agent save --message "..."\n\nOr abort the rebase:\n  git rebase --abort');
                     process.exit(1);
                 }
                 // If pull fails, check if it's because there's no upstream
                 if (!errMessage.includes('no tracking information') &&
                     !errMessage.includes("couldn't find remote ref")) {
                     // Real error we don't understand
-                    console.error('Error: Failed to sync with remote');
-                    console.error('');
-                    console.error(errMessage);
+                    output.error('Failed to sync with remote', errMessage);
                     process.exit(1);
                 }
                 // No upstream branch yet, that's fine - first push will set it
@@ -225,42 +199,34 @@ export function createAgentSaveCommand() {
                     delayMs: 1000,
                 });
                 if (!pollResult.success || !pollResult.response) {
-                    console.error('Validation did not complete in time');
-                    console.error('');
-                    console.error('Check status manually:');
-                    console.error('  guild agent versions');
+                    output.error('Validation did not complete in time', 'Check status manually:\n  guild agent versions');
                     process.exit(1);
                 }
                 version = pollResult.response;
                 // Check validation status
                 if (version.validation_status === 'FAILED') {
-                    console.error('Validation failed');
-                    console.error('');
+                    let failureDetails = '';
                     // Fetch validation steps to show the actual error
                     try {
                         const stepsResponse = await client.get(`/versions/${version.id}/validation/steps`);
                         const failedSteps = stepsResponse.steps.filter((step) => step.status === 'FAILED');
                         if (failedSteps.length > 0) {
-                            for (const step of failedSteps) {
-                                console.error(`Step "${step.name}" failed:`);
-                                if (step.content) {
-                                    console.error(step.content);
-                                }
-                                console.error('');
-                            }
+                            const stepMessages = failedSteps.map((step) => step.content
+                                ? `Step "${step.name}" failed: ${step.content}`
+                                : `Step "${step.name}" failed`);
+                            failureDetails = stepMessages.join('\n');
                         }
                         else {
-                            console.error('No failed steps found. Check validation logs for details.');
-                            console.error('');
+                            failureDetails =
+                                'No failed steps found. Check validation logs for details.';
                         }
                     }
                     catch {
-                        // If we can't fetch steps, just show generic message
-                        console.error('Could not fetch validation details.');
-                        console.error('');
+                        failureDetails = 'Could not fetch validation details.';
                     }
-                    console.error('Fix the issues, then save a new version:');
-                    console.error('  guild agent save --message "Fix validation errors"');
+                    failureDetails +=
+                        '\n\nFix the issues, then save a new version:\n  guild agent save --message "Fix validation errors"';
+                    output.error('Validation failed', failureDetails);
                     process.exit(1);
                 }
             }
@@ -293,41 +259,24 @@ export function createAgentSaveCommand() {
         }
         catch (error) {
             if (error instanceof GitError) {
-                console.error('Error: Git operation failed');
-                console.error('');
-                console.error(formatGitError(error));
+                output.error('Git operation failed', formatGitError(error));
                 process.exit(1);
             }
             // Handle API errors
             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${guildConfig ? ': ' + guildConfig.agent_id : ''}`);
-                console.error('');
-                console.error('The agent may have been deleted.');
+                output.error(`Agent not found${guildConfig ? ': ' + guildConfig.agent_id : ''}`, 'The agent may have been deleted.');
                 process.exit(1);
             }
             if (formattedError.details.includes('does not exist')) {
-                console.error('Error: Commit not found in repository');
-                console.error('');
-                console.error('This might mean:');
-                console.error("  • The commit wasn't pushed to the remote repository");
-                console.error('  • The git remote is configured incorrectly');
-                console.error("  • There's a sync issue with the backend");
-                console.error('');
-                console.error('Verify the commit exists:');
-                console.error('  git log --oneline');
-                console.error('');
-                console.error('Verify the remote:');
-                console.error('  git remote -v');
+                output.error('Commit not found in repository', "This might mean:\n  • The commit wasn't pushed to the remote repository\n  • The git remote is configured incorrectly\n  • There's a sync issue with the backend\n\nVerify the commit exists:\n  git log --oneline\n\nVerify the remote:\n  git remote -v");
                 process.exit(1);
             }
-            console.error(`Failed to save agent: ${formattedError.details}`);
+            output.error(`Failed to save agent: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/agent/search.js

@@ -3,8 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError } from '../../lib/errors.js';
-import { createOutputWriter, formatAgentTable } from '../../lib/output.js';
-import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 const SORT_MAP = {
     updated: 'updated_at',
     newest: 'created_at',
@@ -21,11 +20,11 @@ export function createAgentSearchCommand() {
         .option('--limit <number>', 'Number of results to return', '20')
         .option('--offset <number>', 'Offset for pagination', '0')
         .action(async (query, 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);
             }
             const client = new GuildAPIClient();
@@ -41,17 +40,11 @@ export function createAgentSearchCommand() {
                 params.append('sort_by', sortField);
             }
             const response = await client.get(`/agents?${params.toString()}`);
-            if (getOutputMode() === 'json') {
-                console.log(JSON.stringify(response, null, 2));
-            }
-            else {
-                formatAgentTable(response.items, response.pagination);
-            }
+            output.data(response);
         }
         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/tags/add.js

@@ -3,6 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../../lib/api-client.js';
 import { getAgentId } from '../../../lib/agent-helpers.js';
 import { handleAxiosError, ErrorCodes } from '../../../lib/errors.js';
+import { createOutputWriter } from '../../../lib/output.js';
 export function createAgentTagsAddCommand() {
     const cmd = new Command('add');
     cmd
@@ -10,6 +11,7 @@ export function createAgentTagsAddCommand() {
         .argument('[agent-id]', 'Agent ID (optional if in agent directory)')
         .argument('<tags...>', 'Tags to add')
         .action(async (agentIdOrFirstTag, remainingTags) => {
+        const output = createOutputWriter();
         try {
             const client = new GuildAPIClient();
             // Parse arguments - need to determine if first arg is agent-id or tag
@@ -32,9 +34,7 @@ export function createAgentTagsAddCommand() {
             // Now resolve agent ID properly
             const { agentId, config } = await getAgentId(agentIdArg);
             if (tagsToAdd.length === 0) {
-                console.error('Error: At least one tag is required');
-                console.error('');
-                console.error('Usage: guild agent tags add [agent-id] <tag...>');
+                output.error('At least one tag is required.', 'Usage: guild agent tags add [agent-id] <tag...>');
                 process.exit(1);
             }
             // Fetch current tags
@@ -45,34 +45,24 @@ export function createAgentTagsAddCommand() {
             // Update tags
             await client.post(`/agents/${agentId}/tags`, { names: updatedTags });
             const agentName = config?.name || `agent ${agentId}`;
-            console.log(`✓ Updated tags for agent: ${agentName}${config ? '' : ` (${agentId})`}`);
-            console.log('');
-            if (updatedTags.length === 0) {
-                console.log('  No tags set');
-            }
-            else {
-                updatedTags.forEach((tag) => {
-                    console.log(`  • ${tag}`);
-                });
-            }
+            const label = `${agentName}${config ? '' : ` (${agentId})`}`;
+            output.success(`Updated tags for agent: ${label}`);
+            output.data({ names: updatedTags });
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                console.error('Not authenticated. Run: guild auth login');
-                process.exit(1);
+                output.error('Not authenticated.', 'Run: guild auth login');
             }
-            if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error('Agent not found');
-                console.error('');
-                console.error('Run: guild agent list');
-                process.exit(1);
+            else if (formattedError.code === ErrorCodes.NOT_FOUND) {
+                output.error('Agent not found.', 'Run: guild agent list');
             }
-            if (formattedError.code === ErrorCodes.CONN_REFUSED) {
-                console.error('Cannot connect to Guild servers');
-                process.exit(1);
+            else if (formattedError.code === ErrorCodes.CONN_REFUSED) {
+                output.error('Cannot connect to Guild servers');
+            }
+            else {
+                output.error(`Failed to add tags: ${formattedError.details}`);
             }
-            console.error(`Failed to add tags: ${formattedError.details}`);
             process.exit(1);
         }
     });