@guildai/cli 0.3.15 → 0.3.17

package/dist/commands/chat.js

@@ -76,7 +76,11 @@ function CustomInput({ value, onChange, onSubmit, trackedTasksSize, setShowTaskP
     const renderedValue = value + chalk.inverse(' ');
     return React.createElement(Text, null, renderedValue);
 }
-function InputWrapper({ isReady, input, setInput, handleSubmit, trackedTasksSize, setShowTaskPanel, isActive, }) {
+function InputWrapper({ isReady, isInterrupted, input, setInput, handleSubmit, trackedTasksSize, setShowTaskPanel, isActive, }) {
+    if (isInterrupted) {
+        return (React.createElement(Box, { height: 1 },
+            React.createElement(Text, { color: "gray" }, chalk.dim('Interrupted — this session cannot be resumed. Press Ctrl+C to exit.'))));
+    }
     return (React.createElement(Box, { height: 1 },
         React.createElement(Text, { color: isReady ? BRAND_COLOR : 'gray' }, "> "),
         isReady && isActive ? (React.createElement(CustomInput, { value: input, onChange: setInput, onSubmit: handleSubmit, trackedTasksSize: trackedTasksSize, setShowTaskPanel: setShowTaskPanel, isActive: isActive })) : isReady ? (React.createElement(Text, null, input)) : (React.createElement(Text, null, chalk.dim('(connecting...)')))));
@@ -229,11 +233,22 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             ]
             : []);
     const [input, setInput] = useState('');
+    const inputTextRef = useRef('');
+    // Keep ref in sync so useInput handler can read current input text
+    const updateInput = (value) => {
+        inputTextRef.current = value;
+        setInput(value);
+    };
     const [currentOperation, setCurrentOperation] = useState(resumeEvents ? '' : 'Waiting for response...');
     const [exitHint, setExitHint] = useState(null);
+    const [isInterrupted, setIsInterrupted] = useState(false);
     // Double-tap exit tracking (shared for Ctrl+C and Ctrl+D)
     const exitKeyPressed = useRef(false);
     const exitKeyTimeout = useRef(null);
+    // Interrupt tracking - prevents duplicate interrupt requests
+    const isInterrupting = useRef(false);
+    // Debounce Escape after mount so splash-skip doesn't trigger interrupt
+    const mountedAt = useRef(Date.now());
     // Track terminal size for layout calculations
     // Debounce resize to prevent spam during rapid resize events
     const [terminalSize, setTerminalSize] = useState({
@@ -264,11 +279,55 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     }, []);
     // Global keyboard shortcuts
     useInput((input, key) => {
-        // Ctrl-C / Ctrl-D: Double-tap to exit
+        // Escape: Interrupt agent while processing
+        // Ignore Escape within 300ms of mount to prevent splash-skip from triggering interrupt
+        if (key.escape &&
+            client &&
+            session &&
+            currentOperation &&
+            !isInterrupting.current &&
+            Date.now() - mountedAt.current > 300) {
+            isInterrupting.current = true;
+            client
+                .post(`/sessions/${session.id}/interrupt`, {})
+                .then(() => {
+                debug('Session interrupted');
+            })
+                .catch((err) => {
+                debug('Interrupt failed (session may already be done):', err);
+            })
+                .finally(() => {
+                isInterrupting.current = false;
+            });
+            return;
+        }
+        // Ctrl-C: Clear input on first press (if text present), double-tap to exit
         const isCtrlC = input === '\x03' || (key.ctrl && input === 'c');
+        if (isCtrlC) {
+            // If there's text in the input, clear it instead of showing exit hint
+            if (inputTextRef.current && !exitKeyPressed.current) {
+                updateInput('');
+                return;
+            }
+            if (exitKeyPressed.current) {
+                if (preConnectedSession?.id && resumeCommand) {
+                    printResumeHint(preConnectedSession.id, resumeCommand);
+                }
+                process.exit(0);
+            }
+            exitKeyPressed.current = true;
+            setExitHint('ctrl-c');
+            if (exitKeyTimeout.current)
+                clearTimeout(exitKeyTimeout.current);
+            exitKeyTimeout.current = setTimeout(() => {
+                exitKeyPressed.current = false;
+                setExitHint(null);
+            }, 2000);
+            return;
+        }
+        // Ctrl-D: Double-tap to exit
         const isCtrlD = input === '\x04' || (key.ctrl && input === 'd');
-        if (isCtrlC || isCtrlD) {
-            const keyName = isCtrlC ? 'ctrl-c' : 'ctrl-d';
+        if (isCtrlD) {
             if (exitKeyPressed.current) {
                 if (preConnectedSession?.id && resumeCommand) {
                     printResumeHint(preConnectedSession.id, resumeCommand);
@@ -276,7 +335,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                 process.exit(0);
             }
             exitKeyPressed.current = true;
-            setExitHint(keyName);
+            setExitHint('ctrl-d');
             if (exitKeyTimeout.current)
                 clearTimeout(exitKeyTimeout.current);
             exitKeyTimeout.current = setTimeout(() => {
@@ -539,6 +598,19 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                                 setCurrentOperation('');
                             }
                         }
+                        else if (event.type === 'interrupted') {
+                            // Session was interrupted — interrupted sessions are terminal on the backend
+                            setMessages((prev) => [
+                                ...prev,
+                                {
+                                    key: `interrupted-${Date.now()}`,
+                                    content: chalk.dim('⊘ Interrupted'),
+                                    type: 'assistant',
+                                },
+                            ]);
+                            setCurrentOperation('');
+                            setIsInterrupted(true);
+                        }
                         else if (isUnfulfilledAgentInstallRequest(event)) {
                             // Check for agent install requests that need user approval
                             if (!promptedEventIds.current.has(event.id) && !pendingInstallRequest) {
@@ -589,7 +661,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             },
         ]);
         // Clear input right after showing the message
-        setInput('');
+        updateInput('');
         try {
             await client.post(`/sessions/${session.id}/events`, {
                 content: value,
@@ -657,18 +729,21 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     const showTasksHintText = '[ctrl-t to show tasks]';
     const showTasksHint = `[${chalk.bold('ctrl-t')} to show tasks]`;
     // Build status line with right-aligned hint
-    // Exit hint takes priority (temporary, 2s), otherwise show ctrl-t task hint
+    // Priority: exit hint > esc to interrupt > ctrl-t task hint
     // Strip ANSI codes to get visible length (statusLine contains spinner with color codes)
     const stripAnsi = (str) => str.replace(/\x1b\[[0-9;]*m/g, '');
     const statusWithHint = (() => {
-        // Pick which hint to show: exit hint takes priority
         let hintText = null;
         let hint = null;
         if (exitHint) {
             hintText = `[${exitHint} again to exit]`;
             hint = `[${chalk.bold(exitHint)} again to exit]`;
         }
-        else if (activeTaskCount > 0 && currentOperation) {
+        else if (currentOperation) {
+            hintText = '(esc to interrupt)';
+            hint = `(${chalk.bold('esc')} to interrupt)`;
+        }
+        if (!hintText && activeTaskCount > 0 && currentOperation) {
             hintText = showTaskPanel ? hideTasksHintText : showTasksHintText;
             hint = showTaskPanel ? hideTasksHint : showTasksHint;
         }
@@ -721,7 +796,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             React.createElement(Text, null, statusWithHint)),
         React.createElement(Box, { height: 1 },
             React.createElement(Text, { color: "gray" }, '─'.repeat(Math.max(1, terminalWidth - 2)))),
-        React.createElement(InputWrapper, { isReady: isReady, input: input, setInput: setInput, handleSubmit: handleSubmit, trackedTasksSize: tasks.length, setShowTaskPanel: setShowTaskPanel, isActive: isActive })));
+        React.createElement(InputWrapper, { isReady: isReady, isInterrupted: isInterrupted, input: input, setInput: updateInput, handleSubmit: handleSubmit, trackedTasksSize: tasks.length, setShowTaskPanel: setShowTaskPanel, isActive: isActive })));
 }
 export async function ensureAuthenticated() {
     const token = await getAuthToken();

package/dist/commands/config/get.js

@@ -2,6 +2,7 @@
 import { Command } from 'commander';
 import { loadConfig, } from '../../lib/guild-config.js';
 import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 /**
  * All valid config keys across global and local configs.
  * Note: default_workspace_name is internal (auto-resolved from API).
@@ -21,14 +22,11 @@ export function createConfigGetCommand() {
         .description('Get a configuration value')
         .argument('<key>', `Config key (${ALL_VALID_KEYS.join(', ')})`)
         .action(async (key) => {
+        const output = createOutputWriter();
         const config = await loadConfig();
         const mode = getOutputMode();
         if (!ALL_VALID_KEYS.includes(key)) {
-            console.error(`Unknown config key: ${key}`);
-            console.error('');
-            console.error('Valid keys:');
-            console.error(`  Global: ${VALID_GLOBAL_KEYS.join(', ')}`);
-            console.error(`  Local:  ${VALID_LOCAL_KEYS.join(', ')}`);
+            output.error(`Unknown config key: ${key}\n\nValid keys:\n  Global: ${VALID_GLOBAL_KEYS.join(', ')}\n  Local:  ${VALID_LOCAL_KEYS.join(', ')}`);
             process.exit(1);
         }
         // Look up in global first, then local
@@ -46,18 +44,18 @@ export function createConfigGetCommand() {
         }
         if (value === undefined) {
             if (mode === 'json') {
-                console.log(JSON.stringify({ key, value: null, source: null }));
+                output.data({ key, value: null, source: null });
             }
             else {
-                console.error(`Key not found: ${key}`);
+                output.error(`Key not found: ${key}`);
             }
             process.exit(1);
         }
         if (mode === 'json') {
-            console.log(JSON.stringify({ key, value, source }, null, 2));
+            output.data({ key, value, source });
         }
         else {
-            console.log(value);
+            output.data(value);
         }
     });
     return cmd;

package/dist/commands/config/list.js

@@ -3,39 +3,41 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import { loadConfig } from '../../lib/guild-config.js';
 import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createConfigListCommand() {
     const cmd = new Command('list');
     cmd.description('Show all configuration values').action(async () => {
+        const output = createOutputWriter();
         const config = await loadConfig();
         const mode = getOutputMode();
         if (mode === 'json') {
-            console.log(JSON.stringify({
+            output.data({
                 global: config.global || null,
                 local: config.local || null,
-            }, null, 2));
+            });
             return;
         }
         const hasGlobal = config.global && Object.keys(config.global).length > 0;
         const hasLocal = config.local && Object.keys(config.local).length > 0;
         if (!hasGlobal && !hasLocal) {
-            console.log('No configuration found.');
-            console.log('');
-            console.log('Set a default workspace:');
-            console.log(chalk.dim('  guild workspace select'));
+            output.progress('No configuration found.');
+            output.progress('');
+            output.progress('Set a default workspace:');
+            output.progress(chalk.dim('  guild workspace select'));
             return;
         }
         if (hasGlobal) {
-            console.log(chalk.bold('Global config') + chalk.dim(' (~/.guild/config.json):'));
+            output.progress(chalk.bold('Global config') + chalk.dim(' (~/.guild/config.json):'));
             for (const [key, value] of Object.entries(config.global)) {
-                console.log(`  ${key}: ${chalk.cyan(String(value))}`);
+                output.progress(`  ${key}: ${chalk.cyan(String(value))}`);
             }
         }
         if (hasLocal) {
             if (hasGlobal)
-                console.log('');
-            console.log(chalk.bold('Local config') + chalk.dim(' (guild.json):'));
+                output.progress('');
+            output.progress(chalk.bold('Local config') + chalk.dim(' (guild.json):'));
             for (const [key, value] of Object.entries(config.local)) {
-                console.log(`  ${key}: ${chalk.cyan(String(value))}`);
+                output.progress(`  ${key}: ${chalk.cyan(String(value))}`);
             }
         }
     });

package/dist/commands/config/path.js

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import * as fs from 'fs/promises';
 import { getGlobalConfigPath, getLocalConfigPath } from '../../lib/guild-config.js';
 import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 async function fileExists(filePath) {
     return fs
         .access(filePath)
@@ -13,22 +14,23 @@ async function fileExists(filePath) {
 export function createConfigPathCommand() {
     const cmd = new Command('path');
     cmd.description('Show configuration file paths').action(async () => {
+        const output = createOutputWriter();
         const globalPath = getGlobalConfigPath();
         const localPath = getLocalConfigPath();
         const mode = getOutputMode();
         const globalExists = await fileExists(globalPath);
         const localExists = await fileExists(localPath);
         if (mode === 'json') {
-            console.log(JSON.stringify({
+            output.data({
                 global: { path: globalPath, exists: globalExists },
                 local: { path: localPath, exists: localExists },
-            }, null, 2));
+            });
             return;
         }
         const globalStatus = globalExists ? chalk.green('exists') : chalk.dim('not found');
         const localStatus = localExists ? chalk.green('exists') : chalk.dim('not found');
-        console.log(`Global: ${globalPath} (${globalStatus})`);
-        console.log(`Local:  ${localPath} (${localStatus})`);
+        output.progress(`Global: ${globalPath} (${globalStatus})`);
+        output.progress(`Local:  ${localPath} (${localStatus})`);
     });
     return cmd;
 }

package/dist/commands/config/set.js

@@ -3,6 +3,7 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import { saveGlobalConfig } from '../../lib/guild-config.js';
 import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { debug } from '../../lib/errors.js';
 /**
@@ -19,15 +20,13 @@ const VALID_GLOBAL_KEYS = [
 const BOOLEAN_KEYS = new Set(['debug', 'json', 'quiet']);
 const TRUTHY = new Set(['true', 'yes', 'on', '1']);
 const FALSY = new Set(['false', 'no', 'off', '0']);
-function parseBoolean(value, key) {
+function parseBoolean(value, key, output) {
     const lower = value.toLowerCase();
     if (TRUTHY.has(lower))
         return true;
     if (FALSY.has(lower))
         return false;
-    console.error(`Invalid boolean value for "${key}": "${value}"`);
-    console.error('');
-    console.error('Accepted values: true/false, yes/no, on/off, 1/0');
+    output.error(`Invalid boolean value for "${key}": "${value}"\n\nAccepted values: true/false, yes/no, on/off, 1/0`);
     process.exit(1);
 }
 /**
@@ -66,12 +65,12 @@ async function resolveOwnerName(ownerId) {
         return undefined;
     }
 }
-function printResult(key, value, mode) {
+function printResult(key, value, mode, output) {
     if (mode === 'json') {
-        console.log(JSON.stringify({ key, value }, null, 2));
+        output.data({ key, value });
     }
     else {
-        console.log(`Set ${chalk.bold(key)} = ${chalk.cyan(String(value))}`);
+        output.success(`Set ${chalk.bold(key)} = ${chalk.cyan(String(value))}`);
     }
 }
 export function createConfigSetCommand() {
@@ -81,21 +80,17 @@ export function createConfigSetCommand() {
         .argument('<key>', `Config key (${VALID_GLOBAL_KEYS.join(', ')})`)
         .argument('<value>', 'Value to set')
         .action(async (key, value) => {
+        const output = createOutputWriter();
         const mode = getOutputMode();
         if (!VALID_GLOBAL_KEYS.includes(key)) {
-            console.error(`Unknown config key: ${key}`);
-            console.error('');
-            console.error('Valid keys:');
-            for (const k of VALID_GLOBAL_KEYS) {
-                console.error(`  ${k}`);
-            }
+            output.error(`Unknown config key: ${key}\n\nValid keys:\n${VALID_GLOBAL_KEYS.map((k) => `  ${k}`).join('\n')}`);
             process.exit(1);
         }
         const typedKey = key;
         if (BOOLEAN_KEYS.has(typedKey)) {
-            const boolValue = parseBoolean(value, key);
+            const boolValue = parseBoolean(value, key, output);
             await saveGlobalConfig({ [typedKey]: boolValue });
-            printResult(key, boolValue, mode);
+            printResult(key, boolValue, mode, output);
             return;
         }
         if (typedKey === 'default_workspace') {
@@ -104,15 +99,15 @@ export function createConfigSetCommand() {
                 default_workspace: value,
                 default_workspace_name: name,
             });
-            printResult(key, value, mode);
+            printResult(key, value, mode, output);
             if (name) {
                 if (mode !== 'json') {
-                    console.log(chalk.dim(`  Workspace name: ${name}`));
+                    output.progress(`  Workspace name: ${name}`);
                 }
             }
             else {
                 if (mode !== 'json') {
-                    console.error(chalk.dim('  Could not resolve workspace name (not authenticated?)'));
+                    output.error('Could not resolve workspace name (not authenticated?)');
                 }
             }
             return;
@@ -123,21 +118,21 @@ export function createConfigSetCommand() {
                 default_owner: value,
                 default_owner_name: name,
             });
-            printResult(key, value, mode);
+            printResult(key, value, mode, output);
             if (name) {
                 if (mode !== 'json') {
-                    console.log(chalk.dim(`  Owner name: ${name}`));
+                    output.progress(`  Owner name: ${name}`);
                 }
             }
             else {
                 if (mode !== 'json') {
-                    console.error(chalk.dim('  Could not resolve owner name (not authenticated?)'));
+                    output.error('Could not resolve owner name (not authenticated?)');
                 }
             }
             return;
         }
         await saveGlobalConfig({ [typedKey]: value });
-        printResult(key, value, mode);
+        printResult(key, value, mode, output);
     });
     return cmd;
 }

package/dist/commands/doctor.js

@@ -6,6 +6,7 @@ import { getAuthToken } from '../lib/auth.js';
 import { getGuildcoreUrl } from '../lib/config.js';
 import { loadGlobalConfig, isAgentDirectory, getGlobalConfigPath, loadLocalConfig, } from '../lib/guild-config.js';
 import { getOutputMode } from '../lib/output-mode.js';
+import { createOutputWriter } from '../lib/output.js';
 async function checkAuth() {
     const token = await getAuthToken();
     if (token) {
@@ -175,10 +176,11 @@ async function checkGit() {
 export function createDoctorCommand() {
     const cmd = new Command('doctor');
     cmd.description('Check CLI setup and diagnose issues').action(async () => {
+        const output = createOutputWriter();
         const mode = getOutputMode();
         const checks = [];
         if (mode !== 'json') {
-            console.log('\nChecking Guild CLI setup...\n');
+            output.progress('\nChecking Guild CLI setup...\n');
         }
         const runners = [
             checkAuth,
@@ -199,10 +201,10 @@ export function createDoctorCommand() {
                         ? chalk.red('✗')
                         : chalk.dim('-');
                 const nameCol = result.name.padEnd(20);
-                console.log(`  ${icon} ${chalk.bold(nameCol)} ${result.message}`);
+                output.progress(`  ${icon} ${chalk.bold(nameCol)} ${result.message}`);
                 if (result.suggestion) {
-                    console.log(`    ${chalk.dim(result.suggestion)}`);
-                    console.log('');
+                    output.progress(`    ${chalk.dim(result.suggestion)}`);
+                    output.progress('');
                 }
             }
         }
@@ -210,10 +212,10 @@ export function createDoctorCommand() {
         const failed = checks.filter((c) => c.status === 'fail').length;
         const skipped = checks.filter((c) => c.status === 'skip').length;
         if (mode === 'json') {
-            console.log(JSON.stringify({ checks, passed, failed, skipped }, null, 2));
+            output.data({ checks, passed, failed, skipped });
         }
         else {
-            console.log('');
+            output.progress('');
             const parts = [];
             if (passed > 0)
                 parts.push(chalk.green(`${passed} passed`));
@@ -221,7 +223,7 @@ export function createDoctorCommand() {
                 parts.push(chalk.red(`${failed} failed`));
             if (skipped > 0)
                 parts.push(chalk.dim(`${skipped} skipped`));
-            console.log(parts.join(', '));
+            output.progress(parts.join(', '));
         }
         process.exit(failed > 0 ? 1 : 0);
     });

package/dist/commands/session/create.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 } from '../../lib/errors.js';
+import { createOutputWriter } from '../../lib/output.js';
 export function createSessionCreateCommand() {
     const cmd = new Command('create');
     cmd
@@ -13,21 +14,22 @@ export function createSessionCreateCommand() {
         .option('--prompt <text>', 'Initial prompt (required for chat sessions)')
         .option('--agent <identifier>', 'Agent identifier, e.g., owner/agent-name')
         .action(async (options) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                console.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             if (options.type === 'chat' && !options.prompt) {
-                console.error('Error: --prompt is required for chat sessions');
+                output.error('--prompt is required for chat sessions');
                 process.exit(1);
             }
             let workspaceId = options.workspace;
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    console.error('No workspace specified. Run: guild workspace select');
+                    output.error('No workspace specified. Run: guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -43,11 +45,11 @@ export function createSessionCreateCommand() {
                 body.agent_id = options.agent;
             }
             const response = await client.post(`/workspaces/${workspaceId}/sessions`, body);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            console.error(`Failed to create session: ${formattedError.details}`);
+            output.error(`Failed to create session: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/session/events.js

@@ -3,6 +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 } from '../../lib/output.js';
 export function createSessionEventsCommand() {
     const cmd = new Command('events');
     cmd
@@ -12,10 +13,11 @@ export function createSessionEventsCommand() {
         .option('--limit <number>', 'Number of results to return', '100')
         .option('--offset <number>', 'Offset for pagination', '0')
         .action(async (sessionId, options) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                console.error('Not authenticated. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             const client = new GuildAPIClient();
@@ -26,11 +28,11 @@ export function createSessionEventsCommand() {
                 params.append('types', options.types);
             }
             const response = await client.get(`/sessions/${sessionId}/events?${params.toString()}`);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            console.error(`Failed to get session events: ${formattedError.details}`);
+            output.error(`Failed to get session events: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/session/get.js

@@ -3,25 +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 { createOutputWriter } from '../../lib/output.js';
 export function createSessionGetCommand() {
     const cmd = new Command('get');
     cmd
         .description('Get session details')
         .argument('<session-id>', 'Session ID')
         .action(async (sessionId) => {
+        const output = createOutputWriter();
         try {
             const token = await getAuthToken();
             if (!token) {
-                console.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(`/sessions/${sessionId}`);
-            console.log(JSON.stringify(response, null, 2));
+            output.data(response);
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            console.error(`Failed to get session: ${formattedError.details}`);
+            output.error(`Failed to get session: ${formattedError.details}`);
             process.exit(1);
         }
     });

package/dist/commands/session/list.js

@@ -5,7 +5,7 @@ import { getAuthToken } from '../../lib/auth.js';
 import { getWorkspaceId } from '../../lib/guild-config.js';
 import { handleAxiosError } from '../../lib/errors.js';
 import { getOutputMode } from '../../lib/output-mode.js';
-import { formatSessionTable } from '../../lib/output.js';
+import { createOutputWriter, formatSessionTable } from '../../lib/output.js';
 export function createSessionListCommand() {
     const cmd = new Command('list');
     cmd
@@ -15,17 +15,18 @@ export function createSessionListCommand() {
         .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. Run: guild auth login');
+                output.error('Not authenticated. Run: guild auth login');
                 process.exit(1);
             }
             let workspaceId = options.workspace;
             if (!workspaceId) {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
-                    console.error('No workspace specified. Run: guild workspace select');
+                    output.error('No workspace specified. Run: guild workspace select');
                     process.exit(1);
                 }
                 workspaceId = resolved.workspaceId;
@@ -47,7 +48,7 @@ export function createSessionListCommand() {
         }
         catch (error) {
             const formattedError = handleAxiosError(error);
-            console.error(`Failed to list sessions: ${formattedError.details}`);
+            output.error(`Failed to list sessions: ${formattedError.details}`);
             process.exit(1);
         }
     });