@guildai/cli 0.6.0 → 0.6.2

package/dist/commands/chat.js

@@ -15,6 +15,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { isUnfulfilledAgentInstallRequest, isFilteredTaskName, getTaskDisplayName, matchesAgent, getAgentName, } from '../lib/session-events.js';
 import { printResumeHint, fetchSession, fetchSessionEvents, eventsToDisplayMessages, } from '../lib/session-resume.js';
+import { fetchEvents, fetchTasks } from '../lib/session-events-fetch.js';
 import { AgentInstallPrompt } from '../components/AgentInstallPrompt.js';
 import { getWorkspaceId } from '../lib/guild-config.js';
 import { ensureInteractiveStdin } from '../lib/stdin.js';
@@ -46,6 +47,35 @@ function fixListItemMarkdown(text) {
     text = text.replace(/(?<![\\w])_([^_]+)_(?![\\w])/g, (_, content) => chalk.italic(content));
     return text;
 }
+/**
+ * Output the result of a --once mode session.
+ * Handles both JSON and human-readable output formats.
+ */
+async function outputOnceResult(sessionId, events, mode) {
+    if (mode === 'json') {
+        console.log(JSON.stringify({ session_id: sessionId, events }, null, 2));
+    }
+    else {
+        const agentMessages = events.filter((e) => e.type === 'agent_notification_message');
+        if (agentMessages.length > 0) {
+            let messageContent = agentMessages[agentMessages.length - 1].content.data;
+            const trimmed = messageContent.trim();
+            if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
+                try {
+                    const parsed = JSON.parse(trimmed);
+                    if (typeof parsed === 'object' && parsed !== null && 'message' in parsed) {
+                        messageContent = parsed.message;
+                    }
+                }
+                catch {
+                    // If parsing fails, use content as-is
+                }
+            }
+            const rendered = fixListItemMarkdown(await marked(messageContent));
+            console.log(rendered.trim());
+        }
+    }
+}
 import { createSpinner as createAnimatedSpinner, createRandomSpinner, } from '../lib/spinners.js';
 function CustomInput({ value, onChange, onSubmit, trackedTasksSize, setShowTaskPanel, isActive, }) {
     useInput((input, key) => {
@@ -146,6 +176,16 @@ export function ChatApp({ initialPrompt, version, workspaceId, versionId, agentN
                     initialDelay: 500,
                     maxDelay: 5000,
                     backoffMultiplier: 1.5,
+                    shouldRetry: (error) => {
+                        if (typeof error === 'object' && error !== null) {
+                            const err = error;
+                            return (err.code === 'ECONNREFUSED' ||
+                                err.code === 'ETIMEDOUT' ||
+                                err.code === 'ENOTFOUND' ||
+                                err.code === 'ECONNABORTED');
+                        }
+                        return false;
+                    },
                 });
                 setConnectedClient(client);
                 setConnectedSession(session);
@@ -382,7 +422,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     const sentMessages = useRef(new Set());
     const pollInterval = useRef(null);
     const spinnerInterval = useRef(null);
-    const lastMessageCountRef = useRef(resumeEvents?.length || 0);
+    const lastEventIdRef = useRef(resumeEvents?.length ? resumeEvents[resumeEvents.length - 1].id : undefined);
     const isPolling = useRef(false);
     const receivedResponseSinceLastInput = useRef(false);
     const firstMessageNotified = useRef(!!resumeEvents);
@@ -435,10 +475,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                 return;
             isPollingTasks.current = true;
             try {
-                const response = await client.get(`/sessions/${session.id}/tasks?limit=1000`);
-                const tasksList = (Array.isArray(response)
-                    ? response
-                    : response?.items || []);
+                const tasksList = await fetchTasks(client, session.id);
                 setTasks(tasksList);
             }
             catch (error) {
@@ -448,9 +485,9 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                 isPollingTasks.current = false;
             }
         };
-        // Poll immediately and then every second (like web)
+        // Poll immediately and then every 2 seconds
         pollTasks();
-        const interval = setInterval(pollTasks, 1000);
+        const interval = setInterval(pollTasks, 2000);
         return () => {
             clearInterval(interval);
         };
@@ -463,20 +500,14 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             if (isPolling.current)
                 return;
             isPolling.current = true;
-            debug(`poll() called, session=${session.id}`);
+            debug(`poll() called, session=${session.id}, fromId=${lastEventIdRef.current}`);
             try {
-                const response = await client.get(`/sessions/${session.id}/events?limit=1000`);
-                // Debug: log raw response structure
-                const keys = response ? Object.keys(response) : [];
-                debug(`Response: isArray=${Array.isArray(response)}, keys=${keys.join(',')}, type=${typeof response}`);
-                const allEvents = (Array.isArray(response)
-                    ? response
-                    : response?.items || []);
-                const newEvents = allEvents.slice(lastMessageCountRef.current);
-                // Debug: log event counts
-                debug(`Events: total=${allEvents.length}, lastCount=${lastMessageCountRef.current}, new=${newEvents.length}`);
+                const newEvents = await fetchEvents(client, session.id, {
+                    fromId: lastEventIdRef.current,
+                });
+                debug(`Events: fromId=${lastEventIdRef.current}, new=${newEvents.length}`);
                 if (newEvents.length > 0) {
-                    lastMessageCountRef.current = allEvents.length;
+                    lastEventIdRef.current = newEvents[newEvents.length - 1].id;
                     for (const event of newEvents) {
                         // Track task from event if present
                         const taskInfo = event.task;
@@ -653,7 +684,7 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                 isPolling.current = false;
             }
         };
-        pollInterval.current = setInterval(poll, 500);
+        pollInterval.current = setInterval(poll, 2000);
         poll();
         return () => {
             if (pollInterval.current) {
@@ -919,7 +950,7 @@ export function createChatCommand() {
         .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')
-        .addHelpText('after', '\nTo chat with the agent you are developing, use: guild agent chat')
+        .addHelpText('after', '\nTo chat with a local agent under development: guild agent chat')
         .action(async (promptArgs, options) => {
         const initialPrompt = promptArgs.length > 0 ? promptArgs.join(' ') : 'Hello';
         if (options.once) {
@@ -941,21 +972,17 @@ export function createChatCommand() {
                 // Timeout after 5 minutes of INACTIVITY (no new messages)
                 // Agent initialization can take 1-2 minutes with no events
                 const inactivityTimeoutMs = 300000; // 5 minutes
-                const pollIntervalMs = 500;
+                const pollIntervalMs = 2000;
                 const maxInactivityAttempts = inactivityTimeoutMs / pollIntervalMs;
-                let lastMessageCount = 0;
+                let lastSeenEventId;
+                const allEvents = [];
                 let inactivityCounter = 0;
                 while (true) {
                     await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-                    const response = await client.get(`/sessions/${session.id}/events?limit=1000`);
-                    // Handle both array and paginated object responses (backend may return either)
-                    const events = (Array.isArray(response)
-                        ? response
-                        : response?.items || []);
-                    // Check if we got new events (reset inactivity counter)
-                    if (events.length > lastMessageCount) {
-                        // Debug: log all new events
-                        const newEvents = events.slice(lastMessageCount);
+                    const newEvents = await fetchEvents(client, session.id, {
+                        fromId: lastSeenEventId,
+                    });
+                    if (newEvents.length > 0) {
                         for (const evt of newEvents) {
                             const taskInfo = evt.task;
                             if (taskInfo) {
@@ -965,8 +992,9 @@ export function createChatCommand() {
                                 debug(`Event: ${evt.type} (no task info)`);
                             }
                         }
-                        lastMessageCount = events.length;
-                        inactivityCounter = 0; // Reset - we got activity!
+                        allEvents.push(...newEvents);
+                        lastSeenEventId = newEvents[newEvents.length - 1].id;
+                        inactivityCounter = 0;
                     }
                     else {
                         inactivityCounter++;
@@ -976,93 +1004,27 @@ export function createChatCommand() {
                     // For orchestrating agents like agent-builder that spawn child tasks, we need to
                     // wait for the root agent's completion, not just any runtime_done event.
                     const targetAgent = options.agent || 'assistant';
-                    const hasRootTaskDone = events.some((e) => e.type === 'runtime_done' &&
+                    const hasRootTaskDone = allEvents.some((e) => e.type === 'runtime_done' &&
                         matchesAgent(e.task?.agent, targetAgent) &&
                         !e.task?.parent_task_id // Root task has no parent
                     );
                     // Also check for agent_notification_message events from the root agent
-                    const hasAgentMessage = events.some((e) => e.type === 'agent_notification_message' &&
+                    const hasAgentMessage = allEvents.some((e) => e.type === 'agent_notification_message' &&
                         matchesAgent(e.task?.agent, targetAgent) &&
                         !e.task?.parent_task_id);
                     // Check for a ui_prompt request... that ends the game.
-                    const hasUIPromptMessage = events.some((e) => e.type === 'agent_notification_message' &&
+                    const hasUIPromptMessage = allEvents.some((e) => e.type === 'agent_notification_message' &&
                         e.task?.tool_name === 'ui_prompt');
                     if (hasRootTaskDone || hasAgentMessage || hasUIPromptMessage) {
                         debug(`Found completion event from root agent (${targetAgent}), exiting --once mode`);
-                        // Output format depends on --mode flag
-                        if (options.mode === 'json') {
-                            // JSON mode: output structured events
-                            console.log(JSON.stringify({
-                                session_id: session.id,
-                                events: events,
-                            }, null, 2));
-                        }
-                        else {
-                            // Human-readable mode (default): extract and render message content
-                            const agentMessages = events.filter((e) => e.type === 'agent_notification_message');
-                            if (agentMessages.length > 0) {
-                                // Get the last message content
-                                let messageContent = agentMessages[agentMessages.length - 1].content.data;
-                                // Handle JSON {"message": "..."} wrapper
-                                const trimmed = messageContent.trim();
-                                if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
-                                    try {
-                                        const parsed = JSON.parse(trimmed);
-                                        if (typeof parsed === 'object' &&
-                                            parsed !== null &&
-                                            'message' in parsed) {
-                                            messageContent = parsed.message;
-                                        }
-                                    }
-                                    catch {
-                                        // If parsing fails, use content as-is
-                                    }
-                                }
-                                // Render markdown and output
-                                const rendered = fixListItemMarkdown(await marked(messageContent));
-                                console.log(rendered.trim());
-                            }
-                        }
+                        await outputOnceResult(session.id, allEvents, options.mode);
                         process.exit(0);
                     }
                     // Timeout if no activity for too long
                     if (inactivityCounter >= maxInactivityAttempts) {
                         debug(`Inactivity timeout reached (${maxInactivityAttempts} attempts with no new events)`);
-                        debug(`Exiting with ${events.length} events total`);
-                        // Output format depends on --mode flag
-                        if (options.mode === 'json') {
-                            // JSON mode: output structured events
-                            console.log(JSON.stringify({
-                                session_id: session.id,
-                                events: events,
-                            }, null, 2));
-                        }
-                        else {
-                            // Human-readable mode (default): extract and render message content
-                            const agentMessages = events.filter((e) => e.type === 'agent_notification_message');
-                            if (agentMessages.length > 0) {
-                                // Get the last message content
-                                let messageContent = agentMessages[agentMessages.length - 1].content.data;
-                                // Handle JSON {"message": "..."} wrapper
-                                const trimmed = messageContent.trim();
-                                if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
-                                    try {
-                                        const parsed = JSON.parse(trimmed);
-                                        if (typeof parsed === 'object' &&
-                                            parsed !== null &&
-                                            'message' in parsed) {
-                                            messageContent = parsed.message;
-                                        }
-                                    }
-                                    catch {
-                                        // If parsing fails, use content as-is
-                                    }
-                                }
-                                // Render markdown and output
-                                const rendered = fixListItemMarkdown(await marked(messageContent));
-                                console.log(rendered.trim());
-                            }
-                        }
+                        debug(`Exiting with ${allEvents.length} events total`);
+                        await outputOnceResult(session.id, allEvents, options.mode);
                         process.exit(0);
                     }
                 }

package/dist/commands/credentials/endpoint-list.js

@@ -35,7 +35,7 @@ export function createCredentialsEndpointListCommand() {
             if (options.search) {
                 params.append('search', options.search);
             }
-            const response = await client.get(`/credentials/${credentialId}/endpoints/new?${params.toString()}`);
+            const response = await client.get(`/credentials/${credentialId}/endpoints?${params.toString()}`);
             if (getOutputMode() === 'json') {
                 console.log(JSON.stringify(response, null, 2));
             }

package/dist/commands/integration/connect.d.ts

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

package/dist/commands/integration/connect.js

@@ -0,0 +1,76 @@
+// Copyright 2026 Guild.ai
+// 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';
+import { getOutputMode } from '../../lib/output-mode.js';
+import { createOutputWriter } from '../../lib/output.js';
+import { isInteractive } from '../../lib/stdin.js';
+export function createIntegrationConnectCommand() {
+    const cmd = new Command('connect');
+    cmd
+        .description('Connect credentials to an integration')
+        .argument('<id_or_name>', 'Integration ID (UUID) or name in owner~name format (e.g. myorg~my-integration)')
+        .option('--token <value>', 'API key value (required in non-interactive mode)')
+        .requiredOption('--owner <id_or_name>', 'Account to own the credential — username, org name, or account ID')
+        .action(async (identifier, options) => {
+        const output = createOutputWriter();
+        try {
+            const token = await getAuthToken();
+            if (!token) {
+                output.error('Not authenticated. Please log in first.', 'Run: guild auth login');
+                process.exit(1);
+            }
+            if (!options.token && !isInteractive()) {
+                output.error('--token is required in non-interactive mode');
+                process.exit(1);
+            }
+            const client = new GuildAPIClient();
+            const integration = await client.get(`/integrations/${identifier}`);
+            if (!integration.auth_config) {
+                output.error('This integration has no authentication configured.');
+                process.exit(1);
+            }
+            if (integration.auth_config.entity_type !== 'EntIntegrationAuthConfigApiKey') {
+                output.error('OAuth integrations must be connected via the dashboard.');
+                process.exit(1);
+            }
+            let apiKey = options.token;
+            if (!apiKey) {
+                const answer = await inquirer.prompt([
+                    {
+                        type: 'password',
+                        name: 'apiKey',
+                        message: 'API Key:',
+                        validate: (input) => input.length > 0 || 'API key cannot be empty',
+                    },
+                ]);
+                apiKey = answer.apiKey;
+            }
+            const params = new URLSearchParams();
+            params.append('auth_config_id', integration.auth_config.id);
+            params.append('owner_id', options.owner);
+            const credential = await client.post(`/credentials/api-key?${params.toString()}`, { tokens: { token: apiKey } });
+            if (getOutputMode() === 'json') {
+                output.data(credential);
+            }
+            else {
+                console.log(chalk.green('Connected to ') + chalk.bold(integration.name));
+                console.log();
+                console.log(`  ${'Credential ID'.padEnd(15)}${credential.id}`);
+                console.log(`  ${'Integration'.padEnd(15)}${integration.owner.name}~${integration.name}`);
+                console.log(`  ${'Owner'.padEnd(15)}${options.owner}`);
+            }
+        }
+        catch (error) {
+            const formattedError = handleAxiosError(error);
+            output.error(`Failed to connect: ${formattedError.details}`);
+            process.exit(1);
+        }
+    });
+    return cmd;
+}
+//# sourceMappingURL=connect.js.map

package/dist/commands/integration/create.d.ts

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