@guildai/cli 0.3.16 → 0.3.17

package/dist/commands/trigger/create.js

@@ -4,7 +4,7 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { getWorkspaceId } from '../../lib/guild-config.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
+import { createOutputWriter } from '../../lib/output.js';
 import { WEBHOOK_SERVICES, TIME_TRIGGER_FREQUENCIES, } from '../../lib/api-types.js';
 export function createTriggerCreateCommand() {
     const cmd = new Command('create');
@@ -25,16 +25,17 @@ export function createTriggerCreateCommand() {
         .option('--days-of-month <days>', 'Days of month (comma-separated: 1,15,-1)')
         .option('--input <json>', 'Agent input as JSON object')
         .action(async (options) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             // Validate trigger type
             const triggerType = options.type.toLowerCase();
             if (triggerType !== 'webhook' && triggerType !== 'time') {
-                format.error('--type must be "webhook" or "time"');
+                output.error('--type must be "webhook" or "time"');
                 process.exit(1);
             }
             // Resolve workspace
@@ -42,7 +43,7 @@ export function createTriggerCreateCommand() {
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    format.error('No workspace specified. Run: guild workspace select');
+                    output.error('No workspace specified. Run: guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -54,7 +55,7 @@ export function createTriggerCreateCommand() {
                 wa.agent.name === options.agent ||
                 wa.agent.id === options.agent);
             if (!workspaceAgent) {
-                format.error(`Agent "${options.agent}" not found. Run: guild workspace agent add ${options.agent}`);
+                output.error(`Agent "${options.agent}" not found. Run: guild workspace agent add ${options.agent}`);
                 process.exit(1);
             }
             // Build request body based on trigger type
@@ -62,12 +63,12 @@ export function createTriggerCreateCommand() {
             if (triggerType === 'webhook') {
                 // Validate webhook-specific options
                 if (!options.service) {
-                    format.error(`--service is required for webhook triggers. Valid: ${WEBHOOK_SERVICES.join(', ')}`);
+                    output.error(`--service is required for webhook triggers. Valid: ${WEBHOOK_SERVICES.join(', ')}`);
                     process.exit(1);
                 }
                 const service = options.service.toUpperCase();
                 if (!WEBHOOK_SERVICES.includes(service)) {
-                    format.error(`Invalid service "${options.service}". Valid: ${WEBHOOK_SERVICES.join(', ')}`);
+                    output.error(`Invalid service "${options.service}". Valid: ${WEBHOOK_SERVICES.join(', ')}`);
                     process.exit(1);
                 }
                 body = {
@@ -86,7 +87,7 @@ export function createTriggerCreateCommand() {
                         body.service_config = JSON.parse(options.serviceConfig);
                     }
                     catch {
-                        format.error('--service-config must be valid JSON');
+                        output.error('--service-config must be valid JSON');
                         process.exit(1);
                     }
                 }
@@ -94,12 +95,12 @@ export function createTriggerCreateCommand() {
             else {
                 // Time trigger
                 if (!options.frequency) {
-                    format.error(`--frequency is required for time triggers. Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
+                    output.error(`--frequency is required for time triggers. Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
                     process.exit(1);
                 }
                 const frequency = options.frequency.toUpperCase();
                 if (!TIME_TRIGGER_FREQUENCIES.includes(frequency)) {
-                    format.error(`Invalid frequency "${options.frequency}". Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
+                    output.error(`Invalid frequency "${options.frequency}". Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
                     process.exit(1);
                 }
                 // Parse agent input
@@ -109,7 +110,7 @@ export function createTriggerCreateCommand() {
                         agentInput = JSON.parse(options.input);
                     }
                     catch {
-                        format.error('--input must be valid JSON');
+                        output.error('--input must be valid JSON');
                         process.exit(1);
                     }
                 }
@@ -130,19 +131,19 @@ export function createTriggerCreateCommand() {
                 }
             }
             const response = await client.post(`/workspaces/${workspaceId}/triggers`, body);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                format.error('Workspace not found. Run: guild workspace select');
+                output.error('Workspace not found. Run: guild workspace select');
                 process.exit(1);
             }
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/trigger/deactivate.js

@@ -3,34 +3,35 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createTriggerDeactivateCommand() {
     const cmd = new Command('deactivate');
     cmd
         .description('Deactivate a trigger')
         .argument('<trigger-id>', 'Trigger ID')
         .action(async (triggerId) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             const client = new GuildAPIClient();
             const response = await client.post(`/triggers/${triggerId}/deactivate`, {});
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                format.error('Trigger not found.');
+                output.error('Trigger not found.');
                 process.exit(1);
             }
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/trigger/get.js

@@ -3,26 +3,27 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createTriggerGetCommand() {
     const cmd = new Command('get');
     cmd
         .description('Get trigger details')
         .argument('<trigger-id>', 'Trigger ID')
         .action(async (triggerId) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             const client = new GuildAPIClient();
             const response = await client.get(`/triggers/${triggerId}`);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/trigger/list.js

@@ -4,9 +4,8 @@ import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { getWorkspaceId } from '../../lib/guild-config.js';
 import { handleAxiosError } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
 import { getOutputMode } from '../../lib/output-mode.js';
-import { formatTriggerTable } from '../../lib/output.js';
+import { createOutputWriter, formatTriggerTable } from '../../lib/output.js';
 export function createTriggerListCommand() {
     const cmd = new Command('list');
     cmd
@@ -15,10 +14,11 @@ export function createTriggerListCommand() {
         .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) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             // Resolve workspace
@@ -26,7 +26,7 @@ export function createTriggerListCommand() {
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    format.error('No workspace specified. Run: guild workspace select');
+                    output.error('No workspace specified. Run: guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -46,7 +46,7 @@ export function createTriggerListCommand() {
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/trigger/sessions.js

@@ -3,7 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createTriggerSessionsCommand() {
     const cmd = new Command('sessions');
     cmd
@@ -12,10 +12,11 @@ export function createTriggerSessionsCommand() {
         .option('--limit <number>', 'Number of results to return', '20')
         .option('--offset <number>', 'Offset for pagination', '0')
         .action(async (triggerId, options) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             const client = new GuildAPIClient();
@@ -24,19 +25,19 @@ export function createTriggerSessionsCommand() {
             params.append('limit', options.limit);
             params.append('offset', options.offset);
             const response = await client.get(`/triggers/${triggerId}/sessions?${params.toString()}`);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                format.error('Trigger not found.');
+                output.error('Trigger not found.');
                 process.exit(1);
             }
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/trigger/update.js

@@ -3,7 +3,7 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
-import { format } from '../../lib/progress.js';
+import { createOutputWriter } from '../../lib/output.js';
 import { TIME_TRIGGER_FREQUENCIES, } from '../../lib/api-types.js';
 export function createTriggerUpdateCommand() {
     const cmd = new Command('update');
@@ -21,10 +21,11 @@ export function createTriggerUpdateCommand() {
         .option('--days-of-month <days>', 'Days of month, comma-separated (for time triggers)')
         .option('--input <json>', 'Agent input as JSON object (for time triggers)')
         .action(async (triggerId, options) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             const client = new GuildAPIClient();
@@ -42,7 +43,7 @@ export function createTriggerUpdateCommand() {
                     body.service_config = JSON.parse(options.serviceConfig);
                 }
                 catch {
-                    format.error('--service-config must be valid JSON');
+                    output.error('--service-config must be valid JSON');
                     process.exit(1);
                 }
             }
@@ -50,7 +51,7 @@ export function createTriggerUpdateCommand() {
             if (options.frequency !== undefined) {
                 const frequency = options.frequency.toUpperCase();
                 if (!TIME_TRIGGER_FREQUENCIES.includes(frequency)) {
-                    format.error(`Invalid frequency "${options.frequency}". Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
+                    output.error(`Invalid frequency "${options.frequency}". Valid: ${TIME_TRIGGER_FREQUENCIES.join(', ')}`);
                     process.exit(1);
                 }
                 body.frequency = frequency;
@@ -69,28 +70,28 @@ export function createTriggerUpdateCommand() {
                     body.agent_input = JSON.parse(options.input);
                 }
                 catch {
-                    format.error('--input must be valid JSON');
+                    output.error('--input must be valid JSON');
                     process.exit(1);
                 }
             }
             if (Object.keys(body).length === 0) {
-                format.error('No update options provided. Run: guild trigger update --help');
+                output.error('No update options provided. Run: guild trigger update --help');
                 process.exit(1);
             }
             const response = await client.patch(`/triggers/${triggerId}`, body);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                format.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                format.error('Trigger not found.');
+                output.error('Trigger not found.');
                 process.exit(1);
             }
-            format.error(formattedError.details);
+            output.error(formattedError.details);
             process.exit(1);
         }
     });

package/dist/commands/version.js

@@ -1,20 +1,22 @@
 // Copyright (c) 2026 Guild.ai All Rights Reserved
 import { Command } from 'commander';
-import chalk from 'chalk';
 import { readFileSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { brand } from '../lib/colors.js';
+import { createOutputWriter } from '../lib/output.js';
 // ESM equivalent of __dirname
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export function createVersionCommand() {
     const cmd = new Command('version');
     cmd.description('Show Guild CLI version').action(() => {
+        const output = createOutputWriter();
         const packageJson = JSON.parse(readFileSync(path.join(__dirname, '../../package.json'), 'utf-8'));
-        console.log(chalk.bold.green('Guild CLI'));
-        console.log(`Version: ${brand(packageJson.version)}`);
-        console.log(chalk.dim('\nUnified interface for Guild.ai agent development'));
+        output.data({
+            name: 'Guild CLI',
+            version: packageJson.version,
+            description: 'Unified interface for Guild.ai agent development',
+        });
     });
     return cmd;
 }

package/dist/commands/workspace/agent/add.js

@@ -4,6 +4,7 @@ import { GuildAPIClient } from '../../../lib/api-client.js';
 import { getAuthToken } from '../../../lib/auth.js';
 import { getWorkspaceId } from '../../../lib/guild-config.js';
 import { handleAxiosError, ErrorCodes } from '../../../lib/errors.js';
+import { createOutputWriter } from '../../../lib/output.js';
 export function createWorkspaceAgentAddCommand() {
     const cmd = new Command('add');
     cmd
@@ -12,11 +13,11 @@ export function createWorkspaceAgentAddCommand() {
         .option('--workspace <id>', 'Target workspace ID or name')
         .option('--no-autoupdate', 'Disable automatic updates for this agent')
         .action(async (agentIdentifier, 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();
@@ -25,13 +26,7 @@ export function createWorkspaceAgentAddCommand() {
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    console.error('Error: No workspace specified.');
-                    console.error('');
-                    console.error('Either use --workspace flag:');
-                    console.error('  guild workspace agent add <agent> --workspace <workspace-id>');
-                    console.error('');
-                    console.error('Or select a default workspace:');
-                    console.error('  guild workspace select');
+                    output.error('No workspace specified.', 'Either use --workspace flag:\n  guild workspace agent add <agent> --workspace <workspace-id>\n\nOr select a default workspace:\n  guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -45,7 +40,7 @@ export function createWorkspaceAgentAddCommand() {
             catch (error) {
                 const formattedError = handleAxiosError(error);
                 if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                    console.error(`Error: Agent "${agentIdentifier}" not found`);
+                    output.error(`Agent "${agentIdentifier}" not found`);
                     process.exit(1);
                 }
                 if (formattedError.code === ErrorCodes.FORBIDDEN ||
@@ -65,17 +60,16 @@ export function createWorkspaceAgentAddCommand() {
                 ? `v${response.agent_version.version_number}`
                 : response.agent_version.sha.slice(0, 7);
             const workspaceName = response.workspace?.name || 'workspace';
-            console.log(`✓ Added ${response.agent.full_name} to workspace "${workspaceName}"`);
-            console.log('');
-            console.log(`Agent: ${response.agent.full_name}`);
-            console.log(`Version: ${versionDisplay}`);
-            console.log(`Autoupdate: ${response.should_autoupdate ? 'enabled' : 'disabled'}`);
+            output.success(`Added ${response.agent.full_name} to workspace "${workspaceName}"`, {
+                Agent: response.agent.full_name,
+                Version: versionDisplay,
+                Autoupdate: response.should_autoupdate ? 'enabled' : 'disabled',
+            });
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                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 (formattedError.code === ErrorCodes.BAD_REQUEST) {
@@ -83,21 +77,21 @@ export function createWorkspaceAgentAddCommand() {
                 const details = formattedError.details || '';
                 if (details.includes('already added') ||
                     details.includes('already installed')) {
-                    console.error(`Error: This agent is already installed in the workspace`);
+                    output.error('This agent is already installed in the workspace');
                 }
                 else if (details.includes('No published version')) {
-                    console.error(`Error: No published version found for this agent`);
+                    output.error('No published version found for this agent');
                 }
                 else {
-                    console.error(`Error: ${details}`);
+                    output.error(details);
                 }
                 process.exit(1);
             }
             if (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error(`Error: Workspace not found`);
+                output.error('Workspace not found');
                 process.exit(1);
             }
-            console.error(`Failed to add agent: ${formattedError.details}`);
+            output.error(`Failed to add agent: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/workspace/agent/list.js

@@ -4,6 +4,7 @@ import { GuildAPIClient } from '../../../lib/api-client.js';
 import { getAuthToken } from '../../../lib/auth.js';
 import { getWorkspaceId } from '../../../lib/guild-config.js';
 import { handleAxiosError, ErrorCodes } from '../../../lib/errors.js';
+import { createOutputWriter } from '../../../lib/output.js';
 export function createWorkspaceAgentListCommand() {
     const cmd = new Command('list');
     cmd
@@ -12,11 +13,11 @@ export function createWorkspaceAgentListCommand() {
         .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();
@@ -25,13 +26,7 @@ export function createWorkspaceAgentListCommand() {
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    console.error('Error: No workspace specified.');
-                    console.error('');
-                    console.error('Either use --workspace flag:');
-                    console.error('  guild workspace agent list --workspace <workspace-id>');
-                    console.error('');
-                    console.error('Or select a default workspace:');
-                    console.error('  guild workspace select');
+                    output.error('No workspace specified.', 'Either use --workspace flag:\n  guild workspace agent list --workspace <workspace-id>\n\nOr select a default workspace:\n  guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -43,38 +38,22 @@ export function createWorkspaceAgentListCommand() {
             const response = await client.get(`/workspaces/${workspaceId}/workspace_agents?${params.toString()}`);
             const agents = response.items;
             if (agents.length === 0) {
-                console.log('No agents installed in this workspace.');
-                console.log('');
-                console.log('Add an agent with:');
-                console.log('  guild workspace agent add <agent>');
+                output.data({ items: [], message: 'No agents installed in this workspace.' });
                 return;
             }
-            console.log(`Agents in workspace (${agents.length}):`);
-            console.log('');
-            for (const wa of agents) {
-                let versionDisplay = 'unknown';
-                if (wa.agent_version?.version_number) {
-                    versionDisplay = `v${wa.agent_version.version_number}`;
-                }
-                else if (wa.agent_version?.sha) {
-                    versionDisplay = wa.agent_version.sha.slice(0, 7);
-                }
-                const autoupdate = wa.should_autoupdate ? '' : ' [autoupdate: off]';
-                console.log(`  • ${wa.agent.full_name} (${versionDisplay})${autoupdate}`);
-            }
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                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 (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error('Error: Workspace not found');
+                output.error('Workspace not found');
                 process.exit(1);
             }
-            console.error(`Failed to list agents: ${formattedError.details}`);
+            output.error(`Failed to list agents: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/workspace/agent/remove.js

@@ -4,6 +4,7 @@ import { GuildAPIClient } from '../../../lib/api-client.js';
 import { getAuthToken } from '../../../lib/auth.js';
 import { getWorkspaceId } from '../../../lib/guild-config.js';
 import { handleAxiosError, ErrorCodes } from '../../../lib/errors.js';
+import { createOutputWriter } from '../../../lib/output.js';
 export function createWorkspaceAgentRemoveCommand() {
     const cmd = new Command('remove');
     cmd
@@ -11,11 +12,11 @@ export function createWorkspaceAgentRemoveCommand() {
         .argument('<agent>', 'Agent identifier (e.g., owner/agent-name or UUID)')
         .option('--workspace <id>', 'Workspace ID or name')
         .action(async (agentIdentifier, 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();
@@ -24,13 +25,7 @@ export function createWorkspaceAgentRemoveCommand() {
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    console.error('Error: No workspace specified.');
-                    console.error('');
-                    console.error('Either use --workspace flag:');
-                    console.error('  guild workspace agent remove <agent> --workspace <workspace-id>');
-                    console.error('');
-                    console.error('Or select a default workspace:');
-                    console.error('  guild workspace select');
+                    output.error('No workspace specified.', 'Either use --workspace flag:\n  guild workspace agent remove <agent> --workspace <workspace-id>\n\nOr select a default workspace:\n  guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -43,25 +38,24 @@ export function createWorkspaceAgentRemoveCommand() {
                 wa.agent.name === agentIdentifier ||
                 wa.agent.id === agentIdentifier);
             if (!workspaceAgent) {
-                console.error(`Error: Agent "${agentIdentifier}" is not installed in this workspace`);
+                output.error(`Agent "${agentIdentifier}" is not installed in this workspace`);
                 process.exit(1);
             }
             // Remove the workspace agent
             await client.delete(`/workspace_agents/${workspaceAgent.id}`);
-            console.log(`✓ Removed ${workspaceAgent.agent.full_name} from workspace`);
+            output.success(`Removed ${workspaceAgent.agent.full_name} from workspace`);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
             if (formattedError.code === ErrorCodes.AUTH_REQUIRED) {
-                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 (formattedError.code === ErrorCodes.NOT_FOUND) {
-                console.error('Error: Workspace or agent not found');
+                output.error('Workspace or agent not found');
                 process.exit(1);
             }
-            console.error(`Failed to remove agent: ${formattedError.details}`);
+            output.error(`Failed to remove agent: ${formattedError.details}`);
             process.exit(1);
         }
     });