@guildai/cli 0.6.0 → 0.6.2

package/README.md

@@ -183,6 +183,23 @@ guild trigger deactivate <trigger-id>   # Deactivate a trigger
 guild trigger sessions <trigger-id>     # List sessions spawned by a trigger
 ```
 
+### Integrations
+
+```bash
+guild integration list                  # List integrations
+guild integration get <id>              # Get integration details
+guild integration create <name>         # Create a new integration
+guild integration update <id>           # Update an integration
+guild integration version list <id>     # List versions
+guild integration version create <id>   # Create a draft version
+guild integration version get <id>      # Get version details
+guild integration version build <id>    # Build (validate) a draft
+guild integration version publish <id>  # Publish a built version
+guild integration version test <id>     # Test an endpoint invocation
+guild integration operation list <id>   # List operations for a version
+guild integration operation create <id> # Create operations (or import from OpenAPI)
+```
+
 ### Chat
 
 ```bash

package/dist/commands/agent/chat.js

@@ -38,13 +38,29 @@ export function createAgentChatCommand() {
         .option('--no-splash', 'Skip the splash screen animation')
         .option('--resume <session-id>', 'Resume an existing session')
         .option('--open', 'Open session in web dashboard')
-        .addHelpText('after', '\nFor general chat with the Guild assistant, use: guild chat')
+        .addHelpText('after', '\nTo chat with a published agent by name: guild chat --agent owner/agent-name')
         .action(async (promptArgs, options) => {
         try {
             // Get agent ID from guild.json in the specified path
             const agentPath = options.path || '.';
             const { agentId, config } = await getAgentId(undefined, agentPath);
             const initialPrompt = promptArgs.length > 0 ? promptArgs.join(' ') : 'Hello';
+            // If using JSON input, read it early (before auth) for fast failure on bad input
+            let inputData;
+            if (options.mode === 'json') {
+                try {
+                    inputData = await readStdinAsJSON();
+                }
+                catch (error) {
+                    const err = error;
+                    console.error(`Error: ${err.message}`);
+                    console.error('');
+                    console.error('Example usage:');
+                    console.error('  echo \'{"prompt": "test"}\' | guild agent chat --mode json');
+                    console.error('  guild agent chat --mode json < input.json');
+                    process.exit(1);
+                }
+            }
             // Check authentication (uses shared function from chat.tsx)
             await ensureAuthenticated();
             const client = new GuildAPIClient();
@@ -152,25 +168,14 @@ export function createAgentChatCommand() {
                 console.error(`  guild agent chat ${agentId}`);
                 process.exit(1);
             }
-            // If using JSON input, read it early (before session creation)
-            let inputData;
-            if (options.mode === 'json') {
-                try {
-                    inputData = await readStdinAsJSON();
-                }
-                catch (error) {
-                    const err = error;
-                    console.error(`Error: ${err.message}`);
-                    console.error('');
-                    console.error('Example usage:');
-                    console.error('  echo \'{"prompt": "test"}\' | guild agent chat --mode json');
-                    console.error('  guild agent chat --mode json < input.json');
-                    process.exit(1);
-                }
-            }
             // Branch: JSON/JSONL modes vs interactive
             if (options.mode === 'json' || options.mode === 'jsonl') {
-                const session = await createSession(client, options.workspace, initialPrompt, version.id);
+                // For JSON mode with piped input, use the piped data as the initial prompt
+                // so the agent receives it as its input (not the default 'Hello')
+                const sessionPrompt = options.mode === 'json' && inputData
+                    ? JSON.stringify(inputData)
+                    : initialPrompt;
+                const session = await createSession(client, options.workspace, sessionPrompt, version.id);
                 if (!quiet) {
                     console.log(`✓ Agent: ${config?.name || agentId}`);
                     const sessionLink = session.session_url
@@ -183,13 +188,10 @@ export function createAgentChatCommand() {
                     await open(session.session_url);
                 }
                 if (options.mode === 'json' && inputData) {
-                    // JSON one-shot mode
+                    // JSON one-shot mode — input was passed as initial_prompt during
+                    // session creation, so the agent already has it. Just poll for the response.
                     try {
-                        await client.post(`/sessions/${session.id}/events`, {
-                            mode: 'json',
-                            content: inputData,
-                        });
-                        const response = await pollForResponse(client, session.id, 0);
+                        const { response } = await pollForResponse(client, session.id, undefined);
                         if (!response) {
                             console.error('Timeout: No response received from agent');
                             process.exit(1);
@@ -219,7 +221,7 @@ export function createAgentChatCommand() {
                     });
                     let lineNumber = 0;
                     let processedCount = 0;
-                    let lastEventCount = 0;
+                    let lastEventId;
                     for await (const line of rl) {
                         lineNumber++;
                         if (!line.trim())
@@ -233,15 +235,13 @@ export function createAgentChatCommand() {
                                 mode: 'json',
                                 content: jsonInput,
                             });
-                            const response = await pollForResponse(client, session.id, lastEventCount);
-                            if (!response) {
+                            const result = await pollForResponse(client, session.id, lastEventId);
+                            lastEventId = result.lastEventId;
+                            if (!result.response) {
                                 console.error(`Timeout: No response for line ${lineNumber}`);
-                                const eventsAfterResponse = await client.get(`/sessions/${session.id}/events`);
-                                lastEventCount = eventsAfterResponse?.items?.length || 0;
                                 continue;
                             }
-                            const eventsAfterResponse = await client.get(`/sessions/${session.id}/events`);
-                            lastEventCount = eventsAfterResponse?.items?.length || 0;
+                            const response = result.response;
                             if (quiet) {
                                 console.log(response);
                             }

package/dist/commands/agent/fork.js

@@ -52,7 +52,7 @@ export function createAgentForkCommand() {
         .option('--name <name>', 'Name for the forked agent')
         .option('--description <desc>', 'Description for the forked agent')
         .option('--directory <path>', 'Target directory for clone')
-        .option('--owner <owner-id>', 'Owner account (user or organization ID)')
+        .option('--owner <owner>', 'Owner (name or ID)')
         .action(async (identifierArg, options) => {
         const output = createOutputWriter();
         try {

package/dist/commands/agent/init.js

@@ -79,7 +79,7 @@ export function createAgentInitCommand() {
         .option('--name <name>', 'Agent name')
         .option('--template <template>', 'Agent template (LLM, AUTO_MANAGED_STATE, BLANK)')
         .option('--fork <agent-id>', 'Fork from existing agent')
-        .option('--owner <owner-id>', 'Owner account (user or organization ID)')
+        .option('--owner <owner>', 'Owner (name or ID)')
         .option('--directory <path>', 'Directory to initialize (created if needed)')
         .option('--force', 'Overwrite existing guild.json', false)
         .action(async (options) => {

package/dist/commands/agent/publish.js

@@ -4,8 +4,8 @@ import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { getAgentId, resolveAgentRef } from '../../lib/agent-helpers.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
-import { pollUntilComplete } from '../../lib/polling.js';
 import { createOutputWriter } from '../../lib/output.js';
+import { waitForValidation, waitForPublish } from '../../lib/version-helpers.js';
 export function createAgentPublishCommand() {
     const cmd = new Command('publish');
     cmd
@@ -37,71 +37,31 @@ export function createAgentPublishCommand() {
                 process.exit(1);
             }
             // Check validation status before attempting publish
-            let validationStatus = versionToPublish.validation_status;
             let currentVersion = versionToPublish;
+            const validationStatus = currentVersion.validation_status;
             if (validationStatus === 'PENDING' || validationStatus === 'RUNNING') {
                 if (options.wait) {
-                    // Wait for validation to complete
-                    const result = await pollUntilComplete({
-                        resourceId: versionToPublish.id,
-                        endpoint: `/versions/${versionToPublish.id}`,
-                        isComplete: (response) => response.validation_status !== 'PENDING' &&
-                            response.validation_status !== 'RUNNING',
-                        message: 'Waiting for validation to complete...',
-                        successMessage: 'Validation complete',
-                        timeoutMessage: 'Validation timed out',
-                        maxAttempts: 120, // 2 minutes
-                        delayMs: 1000,
-                    });
-                    if (!result.success || !result.response) {
-                        output.error('Validation did not complete in time', 'Check status manually:\n  guild agent versions');
-                        process.exit(1);
-                    }
-                    currentVersion = result.response;
-                    validationStatus = currentVersion.validation_status;
-                    // Re-check validation status after waiting - will be handled below
-                    // by the main validation check
+                    currentVersion = await waitForValidation(currentVersion.id, output);
                 }
                 else {
-                    output.error('Cannot publish: validation is still in progress', `Validation status: ${validationStatus === 'PENDING' ? 'Waiting to start' : 'Running'}\n\nThe version number is extracted from package.json during validation.\n\nOptions:\n  • Wait for validation: guild agent publish --wait\n  • Check status: guild agent versions`);
+                    output.error('Cannot publish: validation is still in progress', `Validation status: ${validationStatus === 'PENDING' ? 'Waiting to start' : 'Running'}\n\nOptions:\n  • Wait for validation: guild agent publish --wait\n  • Check status: guild agent versions`);
                     process.exit(1);
                 }
             }
-            if (validationStatus === 'FAILED') {
-                // Fetch validation steps to show the actual error
-                let failureDetails = '';
-                try {
-                    const stepsResponse = await client.get(`/versions/${currentVersion.id}/validation/steps`);
-                    const failedSteps = stepsResponse.steps.filter((step) => step.status === 'FAILED');
-                    if (failedSteps.length > 0) {
-                        const stepMessages = failedSteps.map((step) => {
-                            let msg = `Step "${step.name}" failed:`;
-                            if (step.content) {
-                                msg += `\n  ${step.content}`;
-                            }
-                            return msg;
-                        });
-                        failureDetails = stepMessages.join('\n\n');
-                    }
-                    else {
-                        failureDetails =
-                            'No failed steps found. Check validation logs for details.';
-                    }
-                }
-                catch {
-                    // If we can't fetch steps, just show generic message
-                    failureDetails = 'Could not fetch validation details.';
-                }
-                output.error('Cannot publish: validation failed', `${failureDetails}\n\nFix the issues, then save a new version:\n  guild agent save --message "Fix validation errors"`);
+            else if (validationStatus === 'FAILED') {
+                output.error('Cannot publish: validation failed', 'Fix the issues, then save a new version:\n  guild agent save --message "Fix validation errors"');
                 process.exit(1);
             }
-            // Note: version_number is only set after validation extracts it from package.json,
-            // and only enforced at publish time (drafts don't require versions)
             // Publish version
-            await client.post(`/versions/${currentVersion.id}/publish`, {});
+            currentVersion = await client.post(`/versions/${currentVersion.id}/publish`, {});
+            if (options.wait && currentVersion.status !== 'PUBLISHED') {
+                currentVersion = await waitForPublish(currentVersion.id, output);
+            }
             const details = {
                 agent: `${currentVersion.agent?.name || config?.name || agentId}${config ? '' : ` (${agentId})`}`,
-                status: 'DRAFT → PUBLISHED',
+                status: currentVersion.status === 'PUBLISHED'
+                    ? 'DRAFT → PUBLISHED'
+                    : 'DRAFT → PUBLISHING',
             };
             if (currentVersion.version_number) {
                 details.version = currentVersion.version_number;

package/dist/commands/agent/pull.js

@@ -3,6 +3,7 @@
 import { Command } from 'commander';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { handleAxiosError, ErrorCodes } from '../../lib/errors.js';
+import { getOutputMode } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 import * as fs from 'fs/promises';
 import * as path from 'path';
@@ -90,10 +91,12 @@ export function createAgentPullCommand() {
                 if (errMessage.includes('no tracking information') ||
                     errMessage.includes("couldn't find remote ref")) {
                     output.progress('✓ Already up to date (no remote branch yet)');
-                    output.data({
-                        success: true,
-                        message: 'Already up to date (no remote branch yet)',
-                    });
+                    if (getOutputMode() === 'json') {
+                        output.data({
+                            success: true,
+                            message: 'Already up to date (no remote branch yet)',
+                        });
+                    }
                     return;
                 }
                 // Unknown git error
@@ -109,22 +112,28 @@ export function createAgentPullCommand() {
                     // Truly up to date — git pull + version match
                     if (!gitPulledNewCommits) {
                         output.progress('✓ Already up to date');
-                        output.data({ success: true, message: 'Already up to date' });
                     }
-                    else {
-                        output.data({ success: true, message: 'Pulled remote changes' });
+                    if (getOutputMode() === 'json') {
+                        output.data({
+                            success: true,
+                            message: gitPulledNewCommits
+                                ? 'Pulled remote changes'
+                                : 'Already up to date',
+                        });
                     }
                 }
                 else if (latest.sha && latest.sha !== localHead) {
                     // SHA mismatch — warn user
                     output.progress(`⚠ Remote has a newer version (${latest.sha.slice(0, 7)}) not on this branch`);
                     output.progress('  Try: git fetch origin && git log --oneline origin/main');
-                    output.data({
-                        success: true,
-                        message: 'SHA mismatch with latest version',
-                        latest_sha: latest.sha,
-                        local_sha: localHead,
-                    });
+                    if (getOutputMode() === 'json') {
+                        output.data({
+                            success: true,
+                            message: 'SHA mismatch with latest version',
+                            latest_sha: latest.sha,
+                            local_sha: localHead,
+                        });
+                    }
                 }
                 else {
                     // Ephemeral version — download from API
@@ -142,21 +151,27 @@ export function createAgentPullCommand() {
                         await fs.writeFile(filePath, file.content, 'utf-8');
                     }
                     output.progress(`✓ Downloaded ${files.length} files from latest draft version`);
-                    output.data({
-                        success: true,
-                        message: `Downloaded ${files.length} files from draft version`,
-                        files_updated: files.length,
-                    });
+                    if (getOutputMode() === 'json') {
+                        output.data({
+                            success: true,
+                            message: `Downloaded ${files.length} files from draft version`,
+                            files_updated: files.length,
+                        });
+                    }
                 }
             }
             else {
                 // No versions exist yet — just report git pull result
                 if (!gitPulledNewCommits) {
                     output.progress('✓ Already up to date');
-                    output.data({ success: true, message: 'Already up to date' });
                 }
-                else {
-                    output.data({ success: true, message: 'Pulled remote changes' });
+                if (getOutputMode() === 'json') {
+                    output.data({
+                        success: true,
+                        message: gitPulledNewCommits
+                            ? 'Pulled remote changes'
+                            : 'Already up to date',
+                    });
                 }
             }
         }

package/dist/commands/agent/save.js

@@ -9,13 +9,13 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import { getAuthenticatedUrl } from '../../lib/auth.js';
 import { runGit, GitError, formatGitError } from '../../lib/git.js';
-import { pollUntilComplete } from '../../lib/polling.js';
+import { waitForValidation, waitForPublish } from '../../lib/version-helpers.js';
 export function createAgentSaveCommand() {
     const cmd = new Command('save');
     cmd
-        .description('Push committed changes to Guild and create a version')
+        .description('Commit, push, and create a new agent version')
         .option('-A, --all', 'Stage all changes and commit before pushing', false)
-        .option('--message <text>', 'Commit message (required with --all)')
+        .option('-m, --message <text>', 'Commit message (required with --all)')
         .option('--wait', 'Wait for validation to complete before returning', false)
         .option('--publish', 'Publish after validation passes (implies --wait)', false)
         .option('--bump [level]', 'Bump package.json version before saving (patch, or minor/major)', 'patch')
@@ -255,58 +255,18 @@ export function createAgentSaveCommand() {
                 version_type: 'COMMITTED',
             });
             output.progress(`✓ Created version (${version.id})`);
-            // --publish implies --wait
-            const shouldWait = options.wait || options.publish;
-            // If --wait or --publish, wait for validation to complete
-            if (shouldWait) {
-                const pollResult = await pollUntilComplete({
-                    resourceId: version.id,
-                    endpoint: `/versions/${version.id}`,
-                    isComplete: (response) => response.validation_status !== 'PENDING' &&
-                        response.validation_status !== 'RUNNING',
-                    message: 'Waiting for validation to complete...',
-                    successMessage: 'Validation complete',
-                    timeoutMessage: 'Validation timed out',
-                    maxAttempts: 120, // 2 minutes
-                    delayMs: 1000,
-                });
-                if (!pollResult.success || !pollResult.response) {
-                    output.error('Validation did not complete in time', 'Check status manually:\n  guild agent versions');
-                    process.exit(1);
-                }
-                version = pollResult.response;
-                // Check validation status
-                if (version.validation_status === 'FAILED') {
-                    let failureDetails = '';
-                    // Fetch validation steps to show the actual error
-                    try {
-                        const stepsResponse = await client.get(`/versions/${version.id}/validation/steps`);
-                        const failedSteps = stepsResponse.steps.filter((step) => step.status === 'FAILED');
-                        if (failedSteps.length > 0) {
-                            const stepMessages = failedSteps.map((step) => step.content
-                                ? `Step "${step.name}" failed: ${step.content}`
-                                : `Step "${step.name}" failed`);
-                            failureDetails = stepMessages.join('\n');
-                        }
-                        else {
-                            failureDetails =
-                                'No failed steps found. Check validation logs for details.';
-                        }
-                    }
-                    catch {
-                        failureDetails = 'Could not fetch validation details.';
-                    }
-                    failureDetails +=
-                        '\n\nFix the issues, commit, and save a new version:\n  git add . && git commit -m "Fix validation errors"\n  guild agent save';
-                    output.error('Validation failed', failureDetails);
-                    process.exit(1);
-                }
+            if (options.wait) {
+                version = await waitForValidation(version.id, output);
             }
-            // If --publish and validation passed, publish the version
             if (options.publish) {
                 output.progress('Validation passed, publishing...');
                 version = await client.post(`/versions/${version.id}/publish`, {});
-                output.progress('✓ Published');
+                if (options.wait && version.status !== 'PUBLISHED') {
+                    version = await waitForPublish(version.id, output);
+                }
+                else {
+                    output.progress('✓ Published');
+                }
             }
             output.progress('');
             output.progress('Version details:');
@@ -317,10 +277,14 @@ export function createAgentSaveCommand() {
                 output.progress(`  Published at: ${version.published_at}`);
             }
             output.progress(`  Summary: ${version.summary}`);
-            if (options.publish) {
+            if (options.publish && version.status === 'PUBLISHED') {
                 output.progress('');
                 output.progress('Version is now published and available in the catalog.');
             }
+            else if (options.publish) {
+                output.progress('');
+                output.progress('Publish is in progress. Use --wait to wait for completion.');
+            }
             else {
                 output.progress('');
                 output.progress('To publish this version:');

package/dist/commands/agent/test.js

@@ -303,9 +303,9 @@ export function createAgentTestCommand() {
                         mode: 'json',
                         content: inputData,
                     });
-                    // Poll for response (starting from event 0)
+                    // Poll for response (starting from beginning)
                     // 3 minutes - allow time for agents that use LLM calls for input parsing
-                    const response = await pollForResponse(client, session.id, 0, 180000);
+                    const { response } = await pollForResponse(client, session.id, undefined, 180000);
                     if (!response) {
                         console.error('Error: No response received from agent within timeout');
                         console.error('');
@@ -365,7 +365,7 @@ export function createAgentTestCommand() {
                 });
                 let lineNumber = 0;
                 let processedCount = 0;
-                let lastEventCount = 0;
+                let lastEventId;
                 for await (const line of rl) {
                     lineNumber++;
                     if (!line.trim())
@@ -380,18 +380,14 @@ export function createAgentTestCommand() {
                             mode: 'json',
                             content: jsonInput,
                         });
-                        // Wait for response (looking for events after our last count)
-                        const response = await pollForResponse(client, session.id, lastEventCount, 180000);
-                        if (!response) {
+                        // Wait for response (looking for events after last seen)
+                        const result = await pollForResponse(client, session.id, lastEventId, 180000);
+                        lastEventId = result.lastEventId;
+                        if (!result.response) {
                             console.error(`Timeout: No response for line ${lineNumber}`);
-                            // Update event count even if timeout
-                            const eventsAfterResponse = await client.get(`/sessions/${session.id}/events`);
-                            lastEventCount = eventsAfterResponse?.items?.length || 0;
                             continue;
                         }
-                        // Update last event count
-                        const eventsAfterResponse = await client.get(`/sessions/${session.id}/events`);
-                        lastEventCount = eventsAfterResponse?.items?.length || 0;
+                        const response = result.response;
                         // Output response
                         if (quiet) {
                             // In quiet mode, output just the message content (or as JSON if --json is used)

package/dist/commands/auth/login.js

@@ -11,11 +11,11 @@ export function createAuthLoginCommand() {
         .description('Login to Guild.ai')
         .option('--return-url <url>', 'Custom URL to redirect to after authentication')
         .option('--return-label <text>', 'Friendly label for return button (e.g., "VSCode")')
-        .option('--no-browser', 'Skip opening the browser (print URL only)')
+        .option('--non-interactive', 'Skip interactive prompts (for use with coding agents)')
         .action(async (options) => {
         const output = createOutputWriter();
-        const noBrowser = options.browser === false;
-        const success = await login(options.returnUrl, options.returnLabel, noBrowser);
+        const nonInteractive = options.nonInteractive || false;
+        const success = await login(options.returnUrl, options.returnLabel, nonInteractive);
         if (success) {
             try {
                 await configureNpmrc();