@guildai/cli 0.10.0 → 0.11.0

package/dist/commands/chat.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import React, { useState, useEffect, useRef } from 'react';
 import { Box, Text, Static, render, useInput, useApp } from 'ink';
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 import { getAuthToken } from '../lib/auth.js';
 import { GuildAPIClient } from '../lib/api-client.js';
 import { handleAxiosError, ErrorCodes, debug, isDebugMode, retry, } from '../lib/errors.js';
@@ -13,8 +13,8 @@ import chalk from 'chalk';
 import { readFileSync } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { isUnfulfilledAgentInstallRequest, isFilteredTaskName, getTaskDisplayName, getAgentName, getAgentNotificationText, isDoneResponseStreamEvent, isResponseStreamEvent, isRootTaskEvent, } from '../lib/session-events.js';
-import { printResumeHint, fetchSession, fetchSessionEvents, eventsToDisplayMessages, } from '../lib/session-resume.js';
+import { isUnfulfilledAgentInstallRequest, isFilteredTaskName, getTaskDisplayName, getAgentName, getAgentNotificationText, applyResponseStreamText, isDoneResponseStreamEvent, isResponseStreamEvent, isRootTaskEvent, } from '../lib/session-events.js';
+import { printResumeHint, fetchSession, fetchSessionEvents, prepareSessionResumeDisplay, } from '../lib/session-resume.js';
 import { DEFAULT_EVENT_TYPES, parseEventFilter, shouldShowEvent, } from '../lib/event-filter.js';
 import { fetchEvents, fetchTasks } from '../lib/session-events-fetch.js';
 import { AgentInstallPrompt } from '../components/AgentInstallPrompt.js';
@@ -112,6 +112,11 @@ function renderAssistantMessage(text, taskName) {
     const rendered = fixListItemMarkdown(marked.parse(text));
     return `${chalk.green('●')} ${chalk.bold(taskName)}\n${rendered.trim()}`;
 }
+function applyResponseStreamContentsInSequence(contents) {
+    return [...contents]
+        .sort((left, right) => left.sequence - right.sequence)
+        .reduce((currentText, content) => applyResponseStreamText(currentText, content), '');
+}
 /**
  * Output the result of a --once mode session.
  * Handles both JSON and human-readable output formats.
@@ -124,9 +129,18 @@ async function outputOnceResult(sessionId, events, mode) {
         const finalAgentMessages = events.filter((e) => e.type === 'agent_notification_message' &&
             isRootTaskEvent(e) &&
             !isResponseStreamEvent(e));
-        const streamFallbacks = events.filter((e) => e.type === 'agent_notification_message' &&
-            isRootTaskEvent(e) &&
-            isDoneResponseStreamEvent(e));
+        const responseStreamContents = new Map();
+        const doneStreamIds = [];
+        for (const event of events) {
+            if (!isResponseStreamEvent(event) || !isRootTaskEvent(event))
+                continue;
+            const streamContents = responseStreamContents.get(event.content.stream_id) ?? [];
+            streamContents.push(event.content);
+            responseStreamContents.set(event.content.stream_id, streamContents);
+            if (isDoneResponseStreamEvent(event)) {
+                doneStreamIds.push(event.content.stream_id);
+            }
+        }
         if (finalAgentMessages.length > 0) {
             const messageContent = extractMessageText(getAgentNotificationText(finalAgentMessages[finalAgentMessages.length - 1]));
             const rendered = fixListItemMarkdown(await marked(messageContent));
@@ -142,9 +156,12 @@ async function outputOnceResult(sessionId, events, mode) {
                 return;
             }
         }
-        if (streamFallbacks.length > 0) {
-            const messageContent = extractMessageText(getAgentNotificationText(streamFallbacks[streamFallbacks.length - 1]));
-            const rendered = fixListItemMarkdown(await marked(messageContent));
+        const lastDoneStreamId = doneStreamIds[doneStreamIds.length - 1];
+        const streamFallbackText = lastDoneStreamId !== undefined
+            ? applyResponseStreamContentsInSequence(responseStreamContents.get(lastDoneStreamId) ?? [])
+            : null;
+        if (streamFallbackText !== null) {
+            const rendered = fixListItemMarkdown(await marked(streamFallbackText));
             console.log(rendered.trim());
         }
     }
@@ -303,6 +320,7 @@ export function ChatApp({ initialPrompt, version, workspaceId, versionId, agentN
         };
         connect();
     }, [workspaceId, initialPrompt, versionId]);
+    const chatInstanceKey = `${connectedSession?.id ?? 'pending'}:${resumeEvents?.[resumeEvents.length - 1]?.id ?? 'live'}`;
     // Render both splash and chat, but only show one at a time
     // ChatUIWithConnection is always mounted (when connected) so it can stream events in background
     return (React.createElement(React.Fragment, null,
@@ -316,7 +334,7 @@ export function ChatApp({ initialPrompt, version, workspaceId, versionId, agentN
                 }
                 // If not connected yet, ignore escape (let connection complete)
             } })),
-        phase === 'chat' && (React.createElement(ChatUIWithConnection, { initialPrompt: initialPrompt, version: version, versionId: versionId, agentName: agentName, client: connectedClient, session: connectedSession, onFirstMessage: () => setFirstMessageReceived(true), resumeEvents: resumeEvents, resumeCommand: resumeCommand, eventFilter: eventFilter })),
+        phase === 'chat' && (React.createElement(ChatUIWithConnection, { key: chatInstanceKey, initialPrompt: initialPrompt, version: version, versionId: versionId, agentName: agentName, client: connectedClient, session: connectedSession, onFirstMessage: () => setFirstMessageReceived(true), resumeEvents: resumeEvents, resumeCommand: resumeCommand, eventFilter: eventFilter })),
         (phase === 'splash' || phase === 'finalizing') &&
             connectedSession &&
             connectedClient && (React.createElement(Box, { display: "none" },
@@ -336,9 +354,9 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     // Only include initial prompt when active (not during splash)
     // Static component writes to stdout even with display="none"
     // When resuming, show past events instead of initial prompt
-    const resumeDisplayMessages = resumeEvents
-        ? eventsToDisplayMessages(resumeEvents)
-        : null;
+    const [resumeDisplay] = useState(() => resumeEvents ? prepareSessionResumeDisplay(resumeEvents) : null);
+    const resumeDisplayMessages = resumeDisplay?.displayMessages ?? null;
+    const responseStreamResumeState = resumeDisplay?.responseStreamState ?? null;
     const sessionLinkMessage = isActive && preConnectedSession?.session_url
         ? [
             {
@@ -502,23 +520,53 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
     const isPolling = useRef(false);
     const receivedResponseSinceLastInput = useRef(false);
     const firstMessageNotified = useRef(!!resumeEvents);
-    const responseStreamKeys = useRef(new Map());
-    const responseStreamTimestamps = useRef(new Map());
-    const responseStreamKeysByTask = useRef(new Map());
-    const clearResponseStreamsForTask = (taskId) => {
+    const responseStreamKeys = useRef(responseStreamResumeState?.keys ?? new Map());
+    const responseStreamContents = useRef(responseStreamResumeState?.contents ?? new Map());
+    const responseStreamTexts = useRef(responseStreamResumeState?.texts ?? new Map());
+    const responseStreamTimestamps = useRef(responseStreamResumeState?.timestamps ?? new Map());
+    const responseStreamStatuses = useRef(responseStreamResumeState?.statuses ??
+        new Map());
+    const responseStreamKeysByTask = useRef(responseStreamResumeState?.keysByTask ?? new Map());
+    const clearResponseStreamsForTask = (taskId, options = {}) => {
         if (!taskId)
             return;
         const keys = responseStreamKeysByTask.current.get(taskId);
         if (!keys?.size)
             return;
+        // Removed keys disappear from the transcript; detached keys stay rendered
+        // but are no longer tracked as active streams for future cleanup.
+        const removedKeys = new Set();
+        const detachedKeys = new Set();
         for (const [streamId, key] of responseStreamKeys.current.entries()) {
             if (keys.has(key)) {
+                if (options.preserveContinued &&
+                    responseStreamStatuses.current.get(streamId) === 'continued' &&
+                    responseStreamTexts.current.get(streamId) !== options.finalText) {
+                    responseStreamKeys.current.delete(streamId);
+                    responseStreamContents.current.delete(streamId);
+                    responseStreamTexts.current.delete(streamId);
+                    responseStreamTimestamps.current.delete(streamId);
+                    responseStreamStatuses.current.delete(streamId);
+                    detachedKeys.add(key);
+                    continue;
+                }
                 responseStreamKeys.current.delete(streamId);
+                responseStreamContents.current.delete(streamId);
+                responseStreamTexts.current.delete(streamId);
                 responseStreamTimestamps.current.delete(streamId);
+                responseStreamStatuses.current.delete(streamId);
+                removedKeys.add(key);
             }
         }
-        responseStreamKeysByTask.current.delete(taskId);
-        setMessages((prev) => prev.filter((message) => !keys.has(message.key)));
+        const inactiveKeys = new Set([...removedKeys, ...detachedKeys]);
+        const remainingKeys = new Set([...keys].filter((key) => !inactiveKeys.has(key)));
+        if (remainingKeys.size > 0) {
+            responseStreamKeysByTask.current.set(taskId, remainingKeys);
+        }
+        else {
+            responseStreamKeysByTask.current.delete(taskId);
+        }
+        setMessages((prev) => prev.filter((message) => !removedKeys.has(message.key)));
     };
     const upsertResponseStreamMessage = (event) => {
         if (!isResponseStreamEvent(event))
@@ -529,9 +577,12 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
         const taskId = event.task?.id;
         const existingKey = responseStreamKeys.current.get(streamId);
         if (event.content.status === 'aborted') {
+            responseStreamContents.current.delete(streamId);
+            responseStreamTexts.current.delete(streamId);
+            responseStreamTimestamps.current.delete(streamId);
+            responseStreamStatuses.current.delete(streamId);
             if (existingKey) {
                 responseStreamKeys.current.delete(streamId);
-                responseStreamTimestamps.current.delete(streamId);
                 if (taskId) {
                     const keys = responseStreamKeysByTask.current.get(taskId);
                     keys?.delete(existingKey);
@@ -542,11 +593,22 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
             }
             return;
         }
-        const text = event.content.text;
+        const streamContents = responseStreamContents.current.get(streamId) ?? [];
+        const existingContentIndex = streamContents.findIndex((content) => content.sequence === event.content.sequence);
+        if (existingContentIndex === -1) {
+            streamContents.push(event.content);
+        }
+        else {
+            streamContents[existingContentIndex] = event.content;
+        }
+        responseStreamContents.current.set(streamId, streamContents);
+        const text = applyResponseStreamContentsInSequence(streamContents);
         if (!text.trim())
             return;
         const key = existingKey ?? `response-stream-${streamId}`;
         responseStreamKeys.current.set(streamId, key);
+        responseStreamTexts.current.set(streamId, text);
+        responseStreamStatuses.current.set(streamId, event.content.status);
         if (taskId) {
             const keys = responseStreamKeysByTask.current.get(taskId) ?? new Set();
             keys.add(key);
@@ -798,7 +860,10 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                             }
                             const text = extractMessageText(getAgentNotificationText(event));
                             if (text.trim()) {
-                                clearResponseStreamsForTask(taskInfo?.id);
+                                clearResponseStreamsForTask(taskInfo?.id, {
+                                    preserveContinued: true,
+                                    finalText: text,
+                                });
                                 const taskName = agentName || 'assistant';
                                 const messageContent = renderAssistantMessage(text, taskName);
                                 setMessages((prev) => [
@@ -867,13 +932,16 @@ function ChatUIWithConnection({ initialPrompt, version: _version, versionId: _ve
                                 event.content !== undefined &&
                                 taskInfo &&
                                 'agent' in taskInfo) {
-                                clearResponseStreamsForTask(taskInfo.id);
                                 // One-shot agents may complete with runtime_done without sending
                                 // agent_notification_message. Display the output if we haven't
                                 // already shown a response for this input cycle.
                                 const contentStr = typeof event.content === 'string'
                                     ? event.content
                                     : JSON.stringify(event.content);
+                                clearResponseStreamsForTask(taskInfo.id, {
+                                    preserveContinued: true,
+                                    finalText: contentStr,
+                                });
                                 if (contentStr && contentStr !== '{}' && contentStr !== 'null') {
                                     const rendered = fixListItemMarkdown(marked.parse(contentStr));
                                     const taskName = agentName || 'assistant';
@@ -1170,11 +1238,13 @@ export function createChatCommand() {
         .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)')
+        // Accept --mode so `guild chat --mode json` works when re-parsed.
+        // The actual value is read from process.argv by getOutputMode().
+        .addOption(new Option('--mode <format>').hideHelp())
         .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';
@@ -1245,7 +1315,8 @@ export function createChatCommand() {
                     if (hasRootTaskError) {
                         debug('Found error event from root agent, exiting --once mode');
                         const errorEvents = allEvents.filter((e) => e.type === 'runtime_error' || e.type === 'agent_notification_error');
-                        if (errorEvents.length > 0 && !options.mode) {
+                        const outputMode = getOutputMode();
+                        if (errorEvents.length > 0 && outputMode === 'interactive') {
                             const lastError = errorEvents[errorEvents.length - 1];
                             const content = lastError.content;
                             if (content?.data) {
@@ -1255,7 +1326,7 @@ export function createChatCommand() {
                                 console.error(chalk.red('Agent failed to start'));
                             }
                         }
-                        else if (options.mode === 'json') {
+                        else if (outputMode === 'json') {
                             console.log(JSON.stringify({
                                 session_id: session.id,
                                 events: allEvents,
@@ -1266,14 +1337,14 @@ export function createChatCommand() {
                     }
                     if (hasRootTaskDone || hasAgentMessage || hasUIPromptMessage) {
                         debug('Found completion event from root agent, exiting --once mode');
-                        await outputOnceResult(session.id, allEvents, options.mode);
+                        await outputOnceResult(session.id, allEvents, getOutputMode());
                         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 ${allEvents.length} events total`);
-                        await outputOnceResult(session.id, allEvents, options.mode);
+                        await outputOnceResult(session.id, allEvents, getOutputMode());
                         process.exit(0);
                     }
                 }

package/dist/commands/config/get.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Command } from 'commander';
 import { loadConfig, } from '../../lib/guild-config.js';
-import { getOutputMode } from '../../lib/output-mode.js';
+import { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 /**
  * All valid config keys across global and local configs.
@@ -25,7 +25,7 @@ export function createConfigGetCommand() {
         .action(async (key) => {
         const output = createOutputWriter();
         const config = await loadConfig();
-        const mode = getOutputMode();
+        const jsonMode = isMachineReadable();
         if (!ALL_VALID_KEYS.includes(key)) {
             output.error(`Unknown config key: ${key}\n\nValid keys:\n  Global: ${VALID_GLOBAL_KEYS.join(', ')}\n  Local:  ${VALID_LOCAL_KEYS.join(', ')}`);
             process.exit(1);
@@ -44,7 +44,7 @@ export function createConfigGetCommand() {
             source = 'local';
         }
         if (value === undefined) {
-            if (mode === 'json') {
+            if (jsonMode) {
                 output.data({ key, value: null, source: null });
             }
             else {
@@ -52,7 +52,7 @@ export function createConfigGetCommand() {
             }
             process.exit(1);
         }
-        if (mode === 'json') {
+        if (jsonMode) {
             output.data({ key, value, source });
         }
         else {

package/dist/commands/config/list.js

@@ -3,15 +3,14 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { loadConfig } from '../../lib/guild-config.js';
-import { getOutputMode } from '../../lib/output-mode.js';
+import { isMachineReadable } 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') {
+        if (isMachineReadable()) {
             output.data({
                 global: config.global || null,
                 local: config.local || null,

package/dist/commands/config/path.js

@@ -4,7 +4,7 @@ import { Command } from 'commander';
 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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 async function fileExists(filePath) {
     return fs
@@ -18,10 +18,9 @@ export function createConfigPathCommand() {
         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') {
+        if (isMachineReadable()) {
             output.data({
                 global: { path: globalPath, exists: globalExists },
                 local: { path: localPath, exists: localExists },

package/dist/commands/config/set.js

@@ -3,7 +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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 import { GuildAPIClient } from '../../lib/api-client.js';
 import { debug } from '../../lib/errors.js';
@@ -46,8 +46,8 @@ async function resolveWorkspaceName(workspaceId) {
         return undefined;
     }
 }
-function printResult(key, value, mode, output) {
-    if (mode === 'json') {
+function printResult(key, value, jsonMode, output) {
+    if (jsonMode) {
         output.data({ key, value });
     }
     else {
@@ -62,7 +62,7 @@ export function createConfigSetCommand() {
         .argument('<value>', 'Value to set')
         .action(async (key, value) => {
         const output = createOutputWriter();
-        const mode = getOutputMode();
+        const jsonMode = isMachineReadable();
         if (!VALID_GLOBAL_KEYS.includes(key)) {
             output.error(`Unknown config key: ${key}\n\nValid keys:\n${VALID_GLOBAL_KEYS.map((k) => `  ${k}`).join('\n')}`);
             process.exit(1);
@@ -71,7 +71,7 @@ export function createConfigSetCommand() {
         if (BOOLEAN_KEYS.has(typedKey)) {
             const boolValue = parseBoolean(value, key, output);
             await saveGlobalConfig({ [typedKey]: boolValue });
-            printResult(key, boolValue, mode, output);
+            printResult(key, boolValue, jsonMode, output);
             return;
         }
         if (typedKey === 'default_workspace') {
@@ -80,14 +80,14 @@ export function createConfigSetCommand() {
                 default_workspace: value,
                 default_workspace_name: name,
             });
-            printResult(key, value, mode, output);
+            printResult(key, value, jsonMode, output);
             if (name) {
-                if (mode !== 'json') {
+                if (!jsonMode) {
                     output.progress(`  Workspace name: ${name}`);
                 }
             }
             else {
-                if (mode !== 'json') {
+                if (!jsonMode) {
                     output.error('Could not resolve workspace name (not authenticated?)');
                 }
             }
@@ -111,21 +111,21 @@ export function createConfigSetCommand() {
                 default_owner: ownerId,
                 default_owner_name: ownerName,
             });
-            printResult(key, ownerId, mode, output);
+            printResult(key, ownerId, jsonMode, output);
             if (ownerName) {
-                if (mode !== 'json') {
+                if (!jsonMode) {
                     output.progress(`  Owner name: ${ownerName}`);
                 }
             }
             else {
-                if (mode !== 'json') {
+                if (!jsonMode) {
                     output.error('Could not resolve owner name (not authenticated?)');
                 }
             }
             return;
         }
         await saveGlobalConfig({ [typedKey]: value });
-        printResult(key, value, mode, output);
+        printResult(key, value, jsonMode, output);
     });
     return cmd;
 }

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

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 import { DEFAULT_PAGE_LIMIT } from '../../lib/api-types.js';
 import { Table } from '../../lib/table.js';
@@ -37,7 +37,7 @@ export function createCredentialsEndpointListCommand() {
                 params.append('search', options.search);
             }
             const response = await client.get(`/credentials/${credentialId}/endpoints?${params.toString()}`);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 console.log(JSON.stringify(response, null, 2));
             }
             else {

package/dist/commands/credentials/list.js

@@ -4,7 +4,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 { getOutputMode } from '../../lib/output-mode.js';
+import { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter, formatCredentialsTable } from '../../lib/output.js';
 import { DEFAULT_PAGE_LIMIT } from '../../lib/api-types.js';
 export function createCredentialsListCommand() {
@@ -32,7 +32,7 @@ export function createCredentialsListCommand() {
                 params.append('search', options.search);
             }
             const response = await client.get(`/accounts/${accountId}/credentials?${params.toString()}`);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 console.log(JSON.stringify(response, null, 2));
             }
             else {

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

@@ -4,7 +4,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 { getOutputMode } from '../../lib/output-mode.js';
+import { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter, formatPoliciesTable } from '../../lib/output.js';
 import { DEFAULT_PAGE_LIMIT } from '../../lib/api-types.js';
 export function createCredentialsPolicyListCommand() {
@@ -27,7 +27,7 @@ export function createCredentialsPolicyListCommand() {
             params.append('limit', options.limit);
             params.append('offset', options.offset);
             const response = await client.get(`/credentials/${credentialId}/policies?${params.toString()}`);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 console.log(JSON.stringify(response, null, 2));
             }
             else {

package/dist/commands/doctor.js

@@ -6,7 +6,7 @@ import axios from 'axios';
 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 { isMachineReadable } from '../lib/output-mode.js';
 import { createOutputWriter } from '../lib/output.js';
 async function checkAuth() {
     const token = await getAuthToken();
@@ -178,9 +178,9 @@ 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 jsonMode = isMachineReadable();
         const checks = [];
-        if (mode !== 'json') {
+        if (!jsonMode) {
             output.progress('\nChecking Guild CLI setup...\n');
         }
         const runners = [
@@ -195,7 +195,7 @@ export function createDoctorCommand() {
         for (const runner of runners) {
             const result = await runner();
             checks.push(result);
-            if (mode !== 'json') {
+            if (!jsonMode) {
                 const icon = result.status === 'pass'
                     ? chalk.green('✓')
                     : result.status === 'fail'
@@ -212,7 +212,7 @@ export function createDoctorCommand() {
         const passed = checks.filter((c) => c.status === 'pass').length;
         const failed = checks.filter((c) => c.status === 'fail').length;
         const skipped = checks.filter((c) => c.status === 'skip').length;
-        if (mode === 'json') {
+        if (jsonMode) {
             output.data({ checks, passed, failed, skipped });
         }
         else {

package/dist/commands/integration/connect.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 import { isInteractive } from '../../lib/stdin.js';
 export function createIntegrationConnectCommand() {
@@ -54,7 +54,7 @@ export function createIntegrationConnectCommand() {
             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') {
+            if (isMachineReadable()) {
                 output.data(credential);
             }
             else {

package/dist/commands/integration/create.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 import { resolveOwnerId } from '../../lib/owner-helpers.js';
 import { isInteractive } from '../../lib/stdin.js';
@@ -280,7 +280,7 @@ export function createIntegrationCreateCommand() {
                 body.webhook_config = webhookConfig;
             }
             const response = await client.post(`/accounts/${owner.name}/integrations`, body);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 output.data(response);
             }
             else {

package/dist/commands/integration/get.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 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 { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter } from '../../lib/output.js';
 function formatDate(dateStr) {
     return new Date(dateStr).toLocaleString('en-US', {
@@ -77,7 +77,7 @@ export function createIntegrationGetCommand() {
             }
             const client = new GuildAPIClient();
             const response = await client.get(`/integrations/${identifier}`);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 output.data(response);
             }
             else {

package/dist/commands/integration/list.js

@@ -4,7 +4,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 { getOutputMode } from '../../lib/output-mode.js';
+import { isMachineReadable } from '../../lib/output-mode.js';
 import { createOutputWriter, formatIntegrationTable } from '../../lib/output.js';
 import { DEFAULT_PAGE_LIMIT } from '../../lib/api-types.js';
 const SORT_MAP = {
@@ -44,7 +44,7 @@ export function createIntegrationListCommand() {
                 params.append('sort_by', sortField);
             }
             const response = await client.get(`/integrations?${params.toString()}`);
-            if (getOutputMode() === 'json') {
+            if (isMachineReadable()) {
                 output.data(response);
             }
             else {

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

@@ -6,7 +6,7 @@ import { readFileSync, existsSync } from 'fs';
 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 { isMachineReadable } from '../../../lib/output-mode.js';
 import { createOutputWriter } from '../../../lib/output.js';
 import { resolveVersionId } from '../../../lib/integration-helpers.js';
 import { isInteractive } from '../../../lib/stdin.js';
@@ -43,13 +43,13 @@ export function createIntegrationOperationCreateCommand() {
                 }
                 const content = readFileSync(options.openapi, 'utf-8');
                 const response = await client.post(`/integration_versions/${versionId}/endpoint_generators`, { type: 'openapi', content });
-                if (getOutputMode() === 'json') {
+                if (isMachineReadable()) {
                     output.data(response);
                 }
                 else {
                     console.log(chalk.green('OpenAPI operation generation triggered'));
                     console.log();
-                    console.log("Operations will be generated asynchronously. Use 'guild integration operation list' to check results.");
+                    console.log(`Operations will be generated asynchronously. Use 'guild integration operation list ${identifier}' to check results.`);
                 }
             }
             else {
@@ -138,7 +138,7 @@ export function createIntegrationOperationCreateCommand() {
                     body.output_body_type = JSON.parse(readFileSync(options.outputBodySchema, 'utf-8'));
                 }
                 const response = await client.post(`/integration_versions/${versionId}/endpoints`, body);
-                if (getOutputMode() === 'json') {
+                if (isMachineReadable()) {
                     output.data(response);
                 }
                 else {