@guildai/cli 0.8.1 → 0.9.1

package/dist/commands/integration/create.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Command } from 'commander';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
 import { handleAxiosError } from '../../lib/errors.js';
@@ -66,47 +65,44 @@ export function createIntegrationCreateCommand() {
             });
             // Resolve description
             let description = options.description;
-            if (!description) {
-                if (interactive) {
-                    const answer = await inquirer.prompt([
-                        { type: 'input', name: 'description', message: 'Description:' },
-                    ]);
-                    description = answer.description;
-                }
+            if (!description && interactive) {
+                const { default: inquirer } = await import('inquirer');
+                const answer = await inquirer.prompt([
+                    { type: 'input', name: 'description', message: 'Description:' },
+                ]);
+                description = answer.description;
             }
             // Resolve base URL
             let baseUrl = options.baseUrl;
-            if (!baseUrl) {
-                if (interactive) {
-                    const answer = await inquirer.prompt([
-                        { type: 'input', name: 'baseUrl', message: 'Base URL:' },
-                    ]);
-                    baseUrl = answer.baseUrl;
-                }
+            if (!baseUrl && interactive) {
+                const { default: inquirer } = await import('inquirer');
+                const answer = await inquirer.prompt([
+                    { type: 'input', name: 'baseUrl', message: 'Base URL:' },
+                ]);
+                baseUrl = answer.baseUrl;
             }
             // Resolve auth scheme
             let authScheme = options.authScheme;
-            if (!authScheme) {
-                if (interactive) {
-                    const answer = await inquirer.prompt([
-                        {
-                            type: 'list',
-                            name: 'authScheme',
-                            message: 'Select authentication scheme:',
-                            choices: [
-                                {
-                                    name: 'API Key - Static token sent in request headers',
-                                    value: 'api-key',
-                                },
-                                {
-                                    name: 'OAuth 2.0 - User grants access via authorization flow',
-                                    value: 'oauth',
-                                },
-                            ],
-                        },
-                    ]);
-                    authScheme = answer.authScheme;
-                }
+            if (!authScheme && interactive) {
+                const { default: inquirer } = await import('inquirer');
+                const answer = await inquirer.prompt([
+                    {
+                        type: 'list',
+                        name: 'authScheme',
+                        message: 'Select authentication scheme:',
+                        choices: [
+                            {
+                                name: 'API Key - Static token sent in request headers',
+                                value: 'api-key',
+                            },
+                            {
+                                name: 'OAuth 2.0 - User grants access via authorization flow',
+                                value: 'oauth',
+                            },
+                        ],
+                    },
+                ]);
+                authScheme = answer.authScheme;
             }
             // Validate required fields in non-interactive mode
             const missing = [];
@@ -126,6 +122,7 @@ export function createIntegrationCreateCommand() {
             if (normalizedScheme === 'api-key') {
                 let headerTemplate = options.headerTemplate || 'X-API-Key: {token}';
                 if (interactive && !options.headerTemplate) {
+                    const { default: inquirer } = await import('inquirer');
                     const answer = await inquirer.prompt([
                         {
                             type: 'input',
@@ -151,6 +148,7 @@ export function createIntegrationCreateCommand() {
                 let clientId = options.clientId;
                 let clientSecret = options.clientSecret;
                 if (interactive) {
+                    const { default: inquirer } = await import('inquirer');
                     if (!installUrl) {
                         const a = await inquirer.prompt([
                             { type: 'input', name: 'val', message: 'Install URL:' },
@@ -205,6 +203,7 @@ export function createIntegrationCreateCommand() {
                     authConfig.scopes = options.scopes.split(',').map((s) => s.trim());
                 }
                 else if (interactive) {
+                    const { default: inquirer } = await import('inquirer');
                     const answer = await inquirer.prompt([
                         {
                             type: 'input',
@@ -237,6 +236,7 @@ export function createIntegrationCreateCommand() {
                 }
             }
             else if (interactive) {
+                const { default: inquirer } = await import('inquirer');
                 const answer = await inquirer.prompt([
                     {
                         type: 'confirm',

package/dist/commands/integration/operation/create.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Command } from 'commander';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 import { readFileSync, existsSync } from 'fs';
 import { GuildAPIClient } from '../../../lib/api-client.js';
 import { getAuthToken } from '../../../lib/auth.js';
@@ -59,6 +58,7 @@ export function createIntegrationOperationCreateCommand() {
                 let method = options.method;
                 let operationPath = options.path;
                 if (isInteractive()) {
+                    const { default: inquirer } = await import('inquirer');
                     if (!operation) {
                         const a = await inquirer.prompt([
                             {
@@ -110,6 +110,7 @@ export function createIntegrationOperationCreateCommand() {
                 };
                 let summary = options.summary;
                 if (!summary && isInteractive()) {
+                    const { default: inquirer } = await import('inquirer');
                     const a = await inquirer.prompt([
                         { type: 'input', name: 'val', message: 'Summary (optional):' },
                     ]);

package/dist/commands/integration/operation/list.js

@@ -41,24 +41,32 @@ export function createIntegrationOperationListCommand() {
                 }
                 console.log(chalk.bold('Operations'));
                 console.log();
+                const isMcp = response.items.some((ep) => !ep.method);
                 const table = new Table({
-                    columns: [
-                        { name: 'operation', title: 'OPERATION', alignment: 'left' },
-                        {
-                            name: 'method',
-                            title: 'METHOD',
-                            alignment: 'left',
-                            color: 'cyan',
-                        },
-                        { name: 'path', title: 'PATH', alignment: 'left' },
-                    ],
+                    columns: isMcp
+                        ? [
+                            { name: 'operation', title: 'OPERATION', alignment: 'left' },
+                            { name: 'description', title: 'DESCRIPTION', alignment: 'left' },
+                        ]
+                        : [
+                            { name: 'operation', title: 'OPERATION', alignment: 'left' },
+                            {
+                                name: 'method',
+                                title: 'METHOD',
+                                alignment: 'left',
+                                color: 'cyan',
+                            },
+                            { name: 'path', title: 'PATH', alignment: 'left' },
+                        ],
                 });
                 response.items.forEach((ep) => {
-                    table.addRow({
-                        operation: ep.operation,
-                        method: ep.method,
-                        path: ep.path,
-                    });
+                    table.addRow(isMcp
+                        ? { operation: ep.operation, description: ep.description ?? '' }
+                        : {
+                            operation: ep.operation,
+                            method: ep.method ?? '',
+                            path: ep.path ?? '',
+                        });
                 });
                 table.printTable();
                 const showing = Math.min(response.pagination.limit, response.items.length);

package/dist/commands/job/get-step.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function createJobGetStepCommand(): Command;
+//# sourceMappingURL=get-step.d.ts.map

package/dist/commands/job/{step-get.js → get-step.js}

@@ -5,8 +5,8 @@ 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 createJobStepGetCommand() {
-    const cmd = new Command('step-get');
+export function createJobGetStepCommand() {
+    const cmd = new Command('get-step');
     cmd
         .description('Get details of a step in a job')
         .argument('<job-id>', 'Job ID')
@@ -37,4 +37,4 @@ export function createJobStepGetCommand() {
     });
     return cmd;
 }
-//# sourceMappingURL=step-get.js.map
+//# sourceMappingURL=get-step.js.map

package/dist/commands/mcp.js

@@ -1,12 +1,11 @@
 // Copyright 2026 Guild.ai
 // SPDX-License-Identifier: Apache-2.0
 import { Command } from 'commander';
-import { startMcpServer } from '../mcp/server.js';
 export function createMcpCommand() {
     const cmd = new Command('mcp');
     cmd
         .description('Start an MCP server over stdio for use with Claude Code, Cursor, and other MCP hosts')
-        .option('--workspace <id>', 'Workspace ID (defaults to configured workspace)')
+        .option('--workspace <id>', 'Workspace ID or name (defaults to configured workspace)')
         .option('--debug', 'Enable debug logging to stderr')
         .addHelpText('after', `
 Configuration:
@@ -24,6 +23,7 @@ Configuration:
   Or run: guild setup --mcp
 `)
         .action(async (options) => {
+        const { startMcpServer } = await import('../mcp/server.js');
         await startMcpServer({
             workspace: options.workspace,
             debug: options.debug,

package/dist/commands/session/create.js

@@ -10,7 +10,7 @@ export function createSessionCreateCommand() {
     const cmd = new Command('create');
     cmd
         .description('Create a new session')
-        .option('--workspace <id>', 'Workspace ID or name')
+        .option('--workspace <id>', 'Workspace ID or name (e.g., owner~workspace-name)')
         .option('--type <type>', 'Session type: chat or agent_test', 'chat')
         .option('--prompt <text>', 'Initial prompt (required for chat sessions)')
         .option('--agent <identifier>', 'Agent identifier, e.g., owner~agent-name')

package/dist/commands/session/events.js

@@ -3,7 +3,7 @@
 import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAuthToken } from '../../lib/auth.js';
-import { parseEventFilter } from '../../lib/event-filter.js';
+import { parseEventFilter, DEFAULT_EVENT_TYPES, USER_EVENT_TYPES, SYSTEM_EVENT_TYPES, } from '../../lib/event-filter.js';
 import { handleAxiosError } from '../../lib/errors.js';
 import { createOutputWriter } from '../../lib/output.js';
 export function createSessionEventsCommand() {
@@ -11,9 +11,18 @@ export function createSessionEventsCommand() {
     cmd
         .description('List events in a session')
         .argument('<session-id>', 'Session ID')
-        .option('--events <types>', 'Event types to show. Shorthands: none, user, system, all, or comma-separated type names')
+        .option('--events <types>', 'Event types to show (default: user). Shorthands: none, user, system, all, or comma-separated type names')
         .option('--limit <number>', 'Number of results to return', '100')
         .option('--offset <number>', 'Offset for pagination', '0')
+        .addHelpText('after', [
+        '',
+        'Available event types:',
+        '  User events (shown by default):',
+        `    ${USER_EVENT_TYPES.join(', ')}`,
+        '',
+        '  System / debug events:',
+        `    ${SYSTEM_EVENT_TYPES.join(', ')}`,
+    ].join('\n'))
         .action(async (sessionId, options) => {
         const output = createOutputWriter();
         try {
@@ -26,11 +35,11 @@ export function createSessionEventsCommand() {
             const params = new URLSearchParams();
             params.append('limit', options.limit);
             params.append('offset', options.offset);
-            if (options.events) {
-                const filter = parseEventFilter(options.events);
-                if (filter.size > 0) {
-                    params.append('types', [...filter].join(','));
-                }
+            const rawFilter = options.events
+                ? parseEventFilter(options.events)
+                : DEFAULT_EVENT_TYPES;
+            if (rawFilter.size > 0) {
+                params.append('types', [...rawFilter].join(','));
             }
             const response = await client.get(`/sessions/${sessionId}/events?${params.toString()}`);
             output.data(response);

package/dist/commands/session/list.js

@@ -11,7 +11,7 @@ export function createSessionListCommand() {
     const cmd = new Command('list');
     cmd
         .description('List sessions in a workspace')
-        .option('--workspace <id>', 'Workspace ID or name')
+        .option('--workspace <id>', 'Workspace ID or name (e.g., owner~workspace-name)')
         .option('--type <type>', 'Filter by session type: chat, webhook, time, agent_test')
         .option('--limit <number>', 'Number of results to return', '20')
         .option('--offset <number>', 'Offset for pagination', '0')

package/dist/commands/session/send.js

@@ -8,7 +8,7 @@ import { createOutputWriter } from '../../lib/output.js';
 export function createSessionSendCommand() {
     const cmd = new Command('send');
     cmd
-        .description('Send a message or event to a session')
+        .description('Send a user message to a session')
         .argument('<session-id>', 'Session ID')
         .option('--message <text>', 'Text message content')
         .option('--json <json>', 'JSON content object (sets mode to json)')

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

@@ -6,13 +6,14 @@ 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';
+import { resolveWorkspaceId } from '../../../lib/workspace-helpers.js';
 export function createWorkspaceAgentAddCommand() {
     const cmd = new Command('add');
     cmd
         .description('Add an agent to a workspace')
         .argument('<agent>', 'Agent identifier (e.g., owner~agent-name or UUID)')
-        .option('--workspace <id>', 'Target workspace ID or name')
-        .option('--no-autoupdate', 'Disable automatic updates for this agent')
+        .option('--workspace <id>', 'Workspace ID or name')
+        .option('--no-autoupdate', 'Disable automatic updates for this agent (default: autoupdate enabled)')
         .action(async (agentIdentifier, options) => {
         const output = createOutputWriter();
         try {
@@ -24,7 +25,19 @@ export function createWorkspaceAgentAddCommand() {
             const client = new GuildAPIClient();
             // Resolve workspace
             let workspaceId = options.workspace;
-            if (!workspaceId) {
+            if (workspaceId) {
+                try {
+                    workspaceId = await resolveWorkspaceId(client, workspaceId);
+                }
+                catch (err) {
+                    if (err instanceof Error && err.message.startsWith('Workspace "')) {
+                        output.error('Workspace not found');
+                        process.exit(1);
+                    }
+                    throw err; // let the outer catch handle network/auth errors via handleAxiosError
+                }
+            }
+            else {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
                     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');

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

@@ -7,6 +7,7 @@ import { getWorkspaceId } from '../../../lib/guild-config.js';
 import { handleAxiosError, ErrorCodes } from '../../../lib/errors.js';
 import { createOutputWriter, formatWorkspaceAgentTable } from '../../../lib/output.js';
 import { getOutputMode } from '../../../lib/output-mode.js';
+import { resolveWorkspaceId } from '../../../lib/workspace-helpers.js';
 export function createWorkspaceAgentListCommand() {
     const cmd = new Command('list');
     cmd
@@ -25,7 +26,19 @@ export function createWorkspaceAgentListCommand() {
             const client = new GuildAPIClient();
             // Resolve workspace
             let workspaceId = options.workspace;
-            if (!workspaceId) {
+            if (workspaceId) {
+                try {
+                    workspaceId = await resolveWorkspaceId(client, workspaceId);
+                }
+                catch (err) {
+                    if (err instanceof Error && err.message.startsWith('Workspace "')) {
+                        output.error('Workspace not found');
+                        process.exit(1);
+                    }
+                    throw err; // let the outer catch handle network/auth errors via handleAxiosError
+                }
+            }
+            else {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
                     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');

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

@@ -6,6 +6,7 @@ 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';
+import { resolveWorkspaceId } from '../../../lib/workspace-helpers.js';
 export function createWorkspaceAgentRemoveCommand() {
     const cmd = new Command('remove');
     cmd
@@ -23,7 +24,19 @@ export function createWorkspaceAgentRemoveCommand() {
             const client = new GuildAPIClient();
             // Resolve workspace
             let workspaceId = options.workspace;
-            if (!workspaceId) {
+            if (workspaceId) {
+                try {
+                    workspaceId = await resolveWorkspaceId(client, workspaceId);
+                }
+                catch (err) {
+                    if (err instanceof Error && err.message.startsWith('Workspace "')) {
+                        output.error('Workspace not found');
+                        process.exit(1);
+                    }
+                    throw err; // let the outer catch handle network/auth errors via handleAxiosError
+                }
+            }
+            else {
                 const resolved = await getWorkspaceId();
                 if (!resolved) {
                     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');

package/dist/commands/workspace/clear.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare function createWorkspaceClearCommand(): Command;
+//# sourceMappingURL=clear.d.ts.map

package/dist/commands/workspace/clear.js

@@ -0,0 +1,45 @@
+// Copyright 2026 Guild.ai
+// SPDX-License-Identifier: Apache-2.0
+import { Command } from 'commander';
+import * as fs from 'fs/promises';
+import { createOutputWriter } from '../../lib/output.js';
+import { isAgentDirectory, loadLocalConfig, getLocalConfigPath, loadGlobalConfig, getGlobalConfigDir, getGlobalConfigPath, } from '../../lib/guild-config.js';
+export function createWorkspaceClearCommand() {
+    const cmd = new Command('clear');
+    cmd.description('Clear the default workspace setting').action(async () => {
+        const output = createOutputWriter();
+        try {
+            if (await isAgentDirectory()) {
+                // In agent directory: remove workspace_id from guild.json
+                const localConfig = await loadLocalConfig();
+                if (!localConfig || !('workspace_id' in localConfig)) {
+                    output.progress('No default workspace was set.');
+                    return;
+                }
+                const { workspace_id: _removed, ...updated } = localConfig;
+                await fs.writeFile(getLocalConfigPath(), JSON.stringify(updated, null, 2) + '\n');
+                output.success('Cleared workspace setting for this agent');
+                return;
+            }
+            // Not in agent directory: remove default_workspace from global config
+            const globalConfig = await loadGlobalConfig();
+            if (!globalConfig ||
+                (!('default_workspace' in globalConfig) &&
+                    !('default_workspace_name' in globalConfig))) {
+                output.progress('No default workspace was set.');
+                return;
+            }
+            const { default_workspace: _ws, default_workspace_name: _wsName, ...rest } = globalConfig;
+            await fs.mkdir(getGlobalConfigDir(), { recursive: true });
+            await fs.writeFile(getGlobalConfigPath(), JSON.stringify(rest, null, 2) + '\n');
+            output.success('Default workspace cleared');
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            output.error(`Failed to clear workspace: ${message}`);
+            process.exit(1);
+        }
+    });
+    return cmd;
+}
+//# sourceMappingURL=clear.js.map

package/dist/commands/workspace/select.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Command } from 'commander';
 import * as fs from 'fs/promises';
-import search from '@inquirer/search';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
 import { createOutputWriter } from '../../lib/output.js';
@@ -83,6 +82,7 @@ export function createWorkspaceSelectCommand() {
                 }
                 else {
                     output.success(`Default workspace set to: ${formatWorkspaceDisplay(workspace)}`);
+                    output.progress('To clear the default, run: guild workspace clear');
                 }
                 return;
             }
@@ -110,6 +110,7 @@ export function createWorkspaceSelectCommand() {
             const current = await getWorkspaceId();
             const currentId = current?.workspaceId;
             // Interactive searchable selection
+            const { default: search } = await import('@inquirer/search');
             const selectedId = await search({
                 message: 'Select a workspace (type to filter)',
                 pageSize: 15,
@@ -138,6 +139,7 @@ export function createWorkspaceSelectCommand() {
             }
             else {
                 output.success(`Default workspace set to: ${formatWorkspaceDisplay(selectedWorkspace)}`);
+                output.progress('To clear the default, run: guild workspace clear');
             }
         }
         catch (error) {

package/dist/index.js

@@ -17,12 +17,10 @@ import { createAgentVersionsCommand } from './commands/agent/versions.js';
 import { createAgentSaveCommand } from './commands/agent/save.js';
 import { createAgentPullCommand } from './commands/agent/pull.js';
 import { createAgentCodeCommand } from './commands/agent/code.js';
-import { createAgentChatCommand } from './commands/agent/chat.js';
 import { createAgentInitCommand } from './commands/agent/init.js';
 import { createAgentGrepCommand } from './commands/agent/grep.js';
 import { createAgentCloneCommand } from './commands/agent/clone.js';
 import { createAgentForkCommand } from './commands/agent/fork.js';
-import { createAgentTestCommand } from './commands/agent/test.js';
 import { createAgentPublishCommand } from './commands/agent/publish.js';
 import { createAgentUnpublishCommand } from './commands/agent/unpublish.js';
 import { createAgentRevalidateCommand } from './commands/agent/revalidate.js';
@@ -33,12 +31,12 @@ import { createAgentTagsListCommand } from './commands/agent/tags/list.js';
 import { createAgentTagsAddCommand } from './commands/agent/tags/add.js';
 import { createAgentTagsRemoveCommand } from './commands/agent/tags/remove.js';
 import { createAgentTagsSetCommand } from './commands/agent/tags/set.js';
-import { createChatCommand } from './commands/chat.js';
 import { createWorkspaceListCommand } from './commands/workspace/list.js';
 import { createWorkspaceCreateCommand } from './commands/workspace/create.js';
 import { createWorkspaceGetCommand } from './commands/workspace/get.js';
 import { createWorkspaceSelectCommand } from './commands/workspace/select.js';
 import { createWorkspaceCurrentCommand } from './commands/workspace/current.js';
+import { createWorkspaceClearCommand } from './commands/workspace/clear.js';
 import { createWorkspaceAgentAddCommand } from './commands/workspace/agent/add.js';
 import { createWorkspaceAgentListCommand } from './commands/workspace/agent/list.js';
 import { createWorkspaceAgentRemoveCommand } from './commands/workspace/agent/remove.js';
@@ -61,7 +59,7 @@ import { createSessionCreateCommand } from './commands/session/create.js';
 import { createSessionSendCommand } from './commands/session/send.js';
 import { createSessionInterruptCommand } from './commands/session/interrupt.js';
 import { createJobGetCommand } from './commands/job/get.js';
-import { createJobStepGetCommand } from './commands/job/step-get.js';
+import { createJobGetStepCommand } from './commands/job/get-step.js';
 import { createConfigListCommand } from './commands/config/list.js';
 import { createConfigGetCommand } from './commands/config/get.js';
 import { createConfigSetCommand } from './commands/config/set.js';
@@ -130,7 +128,23 @@ program
 });
 // Register commands
 program.addCommand(createVersionCommand());
-program.addCommand(createChatCommand());
+// chat — lazy-loaded to avoid importing React, Ink, marked at startup
+program
+    .command('chat')
+    .description('Chat with an agent (default: Guild assistant)')
+    .argument('[prompt...]', 'Optional initial prompt (multiple words)')
+    .option('--agent <identifier>', 'Agent ID or full name, e.g., foo~bar (default: assistant)')
+    .option('--once', 'One-shot mode: send message, wait for response, exit (non-interactive)')
+    .option('--mode <format>', 'Machine-readable output format: json or jsonl')
+    .option('--workspace <identifier>', 'Workspace ID or full name (e.g., owner/workspace-name)')
+    .option('--no-splash', 'Skip the splash screen animation')
+    .option('--resume <session-id>', 'Resume an existing session')
+    .option('--events <types>', 'Event types to show (default: user). Shorthands: none, user, system, all, or comma-separated type names (e.g. agent_console,llm_start)')
+    .addHelpText('after', '\nTo chat with a local agent under development: guild agent chat')
+    .action(async (promptArgs, options) => {
+    const { handleChatAction } = await import('./commands/chat.js');
+    await handleChatAction(promptArgs, options);
+});
 program.addCommand(createMcpCommand());
 program.addCommand(createDoctorCommand());
 program.addCommand(createSetupCommand());
@@ -149,12 +163,44 @@ agentCmd.addCommand(createAgentVersionsCommand());
 agentCmd.addCommand(createAgentSaveCommand());
 agentCmd.addCommand(createAgentPullCommand());
 agentCmd.addCommand(createAgentCodeCommand());
-agentCmd.addCommand(createAgentChatCommand());
+// agent chat — lazy-loaded to avoid importing React, Ink, open at startup
+agentCmd
+    .command('chat')
+    .description('Chat with the agent in current directory')
+    .argument('[prompt...]', 'Optional initial prompt for the agent')
+    .option('--path <dir>', 'Path to agent directory (defaults to current directory)')
+    .option('--workspace <identifier>', 'Workspace ID or full name (e.g., owner~workspace-name)')
+    .option('--mode <format>', 'Input mode: json (one-shot) or jsonl (line-by-line)')
+    .option('--agent-version <id>', 'Chat with a specific version (UUID or version number)')
+    .option('--no-splash', 'Skip the splash screen animation')
+    .option('--resume <session-id>', 'Resume an existing session')
+    .option('--open', 'Open session in web dashboard')
+    .option('--no-cache', 'Skip ephemeral build cache (force a fresh build)')
+    .addHelpText('after', '\nTo chat with a published agent by name: guild chat --agent owner~agent-name')
+    .action(async (promptArgs, options) => {
+    const { handleAgentChatAction } = await import('./commands/agent/chat.js');
+    await handleAgentChatAction(promptArgs, options);
+});
 agentCmd.addCommand(createAgentInitCommand());
 agentCmd.addCommand(createAgentGrepCommand());
 agentCmd.addCommand(createAgentCloneCommand());
 agentCmd.addCommand(createAgentForkCommand());
-agentCmd.addCommand(createAgentTestCommand());
+// agent test — lazy-loaded to avoid importing React, Ink, open at startup
+agentCmd
+    .command('test')
+    .description('Test agent in interactive REPL session')
+    .option('--workspace <identifier>', 'Workspace ID or full name (e.g., owner/workspace-name)')
+    .option('--mode <format>', 'Input mode: json (one-shot) or jsonl (line-by-line)')
+    .option('--agent-version <id>', 'Test a specific version (UUID or version number)')
+    .option('--resume <session-id>', 'Resume an existing test session')
+    .option('--open', 'Open session in web dashboard')
+    .option('--events <types>', 'Event types to stream (default: all). Shorthands: none, user, system, all, or comma-separated type names')
+    .option('--bundle <file>', 'Path to a pre-built gzip+base64 bundle file')
+    .option('--no-cache', 'Skip ephemeral build cache (force a fresh build)')
+    .action(async (options) => {
+    const { handleAgentTestAction } = await import('./commands/agent/test.js');
+    await handleAgentTestAction(options);
+});
 agentCmd.addCommand(createAgentPublishCommand());
 agentCmd.addCommand(createAgentUnpublishCommand());
 agentCmd.addCommand(createAgentRevalidateCommand());
@@ -199,6 +245,7 @@ workspaceCmd.addCommand(createWorkspaceCreateCommand());
 workspaceCmd.addCommand(createWorkspaceGetCommand());
 workspaceCmd.addCommand(createWorkspaceSelectCommand());
 workspaceCmd.addCommand(createWorkspaceCurrentCommand());
+workspaceCmd.addCommand(createWorkspaceClearCommand());
 // Workspace agent subcommand group
 const workspaceAgentCmd = workspaceCmd
     .command('agent')
@@ -281,7 +328,10 @@ sessionCmd.addCommand(createSessionInterruptCommand());
 // Job command group
 const jobCmd = program.command('job').description('Job management');
 jobCmd.addCommand(createJobGetCommand());
-jobCmd.addCommand(createJobStepGetCommand());
+jobCmd.addCommand(createJobGetStepCommand());
+const stepGetAlias = createJobGetStepCommand();
+stepGetAlias.name('step-get');
+jobCmd.addCommand(stepGetAlias, { hidden: true });
 // Config command group
 const configCmd = program
     .command('config')