@guildai/cli 0.8.1 → 0.9.1

package/dist/lib/api-types.d.ts

@@ -71,6 +71,7 @@ export interface WorkspaceAgent {
         id: string;
         name: string;
     };
+    is_default_chat_agent: boolean;
     should_autoupdate: boolean;
 }
 /**
@@ -116,6 +117,12 @@ export interface ValidationStep {
 export interface ValidationStepsResponse {
     steps: ValidationStep[];
 }
+/**
+ * Response from /versions/{id}/publish/steps
+ */
+export interface PublishStepsResponse {
+    steps: ValidationStep[];
+}
 /**
  * Workspace context entity from the API.
  * Used by: workspace context list, get, edit

package/dist/lib/generated-types.d.ts

@@ -2,6 +2,6 @@ export declare const WEBHOOK_SERVICES: readonly ["AZURE_DEVOPS", "BITBUCKET", "C
 export type WebhookService = (typeof WEBHOOK_SERVICES)[number];
 export declare const TIME_TRIGGER_FREQUENCIES: readonly ["HOURLY", "DAILY", "WEEKLY", "MONTHLY", "CRON"];
 export type TimeTriggerFrequency = (typeof TIME_TRIGGER_FREQUENCIES)[number];
-export declare const EVENT_TYPES: readonly ["user_message", "agent_console", "runtime_start", "runtime_running", "runtime_waiting", "runtime_error", "runtime_done", "credentials_request", "agent_install_request", "agent_notification_message", "agent_notification_progress", "agent_notification_error", "system_error", "trigger_message", "interrupted", "llm_start", "llm_done"];
+export declare const EVENT_TYPES: readonly ["user_message", "agent_console", "runtime_start", "runtime_running", "runtime_waiting", "runtime_error", "runtime_done", "credentials_request", "agent_install_request", "agent_notification_message", "agent_notification_progress", "agent_notification_error", "system_error", "system_message", "trigger_message", "interrupted", "llm_start", "llm_done"];
 export type EventType = (typeof EVENT_TYPES)[number];
 //# sourceMappingURL=generated-types.d.ts.map

package/dist/lib/generated-types.js

@@ -47,6 +47,7 @@ export const EVENT_TYPES = [
     'agent_notification_progress',
     'agent_notification_error',
     'system_error',
+    'system_message',
     'trigger_message',
     'interrupted',
     'llm_start',

package/dist/lib/guild-config.d.ts

@@ -83,4 +83,17 @@ export declare function getWorkspaceId(cwd?: string): Promise<{
  * Check if we're in an agent directory (has guild.json)
  */
 export declare function isAgentDirectory(cwd?: string): Promise<boolean>;
+/**
+ * Get a human-readable label for the workspace source.
+ * Returns undefined for 'env' (treated as explicit, like --workspace flag; no label needed).
+ *
+ * @param source - The source of workspace resolution
+ * @returns Human-readable label, or undefined for env source
+ *
+ * @example
+ * getWorkspaceSourceLabel('local')  // → 'guild.json'
+ * getWorkspaceSourceLabel('global') // → 'global config'
+ * getWorkspaceSourceLabel('env')    // → undefined
+ */
+export declare function getWorkspaceSourceLabel(source: 'env' | 'local' | 'global'): string | undefined;
 //# sourceMappingURL=guild-config.d.ts.map

package/dist/lib/guild-config.js

@@ -156,4 +156,23 @@ export async function getWorkspaceId(cwd = process.cwd()) {
 export async function isAgentDirectory(cwd = process.cwd()) {
     return fileExists(getLocalConfigPath(cwd));
 }
+/**
+ * Get a human-readable label for the workspace source.
+ * Returns undefined for 'env' (treated as explicit, like --workspace flag; no label needed).
+ *
+ * @param source - The source of workspace resolution
+ * @returns Human-readable label, or undefined for env source
+ *
+ * @example
+ * getWorkspaceSourceLabel('local')  // → 'guild.json'
+ * getWorkspaceSourceLabel('global') // → 'global config'
+ * getWorkspaceSourceLabel('env')    // → undefined
+ */
+export function getWorkspaceSourceLabel(source) {
+    if (source === 'local')
+        return 'guild.json';
+    if (source === 'global')
+        return 'global config';
+    return undefined; // 'env' is explicit (GUILD_WORKSPACE_ID), no magic label needed
+}
 //# sourceMappingURL=guild-config.js.map

package/dist/lib/npmrc.js

@@ -8,7 +8,8 @@ function getRegistryUrl() {
     const url = getGuildcoreUrl();
     return url.replace('/api', '/npm') + (url.endsWith('/') ? '' : '/');
 }
-const SCOPES = ['@guildai', '@guildai-services', '@guildai-agents'];
+const SCOPES = ['@guildai-services', '@guildai-agents'];
+const LEGACY_SCOPES = ['@guildai'];
 export async function configureNpmrc() {
     const registryUrl = getRegistryUrl();
     const scope = registryUrl.split(':').slice(1).join(':');
@@ -35,7 +36,10 @@ export async function configureNpmrc() {
 export async function cleanupNpmrc() {
     const registryUrl = getRegistryUrl();
     const scope = registryUrl.split(':').slice(1).join(':');
-    const keys = [...SCOPES.map((s) => `${s}:registry`), `${scope}:_authToken`];
+    const keys = [
+        ...[...SCOPES, ...LEGACY_SCOPES].map((s) => `${s}:registry`),
+        `${scope}:_authToken`,
+    ];
     for (const key of keys) {
         try {
             await execa('npm', [

package/dist/lib/output.js

@@ -38,6 +38,20 @@ function truncate(str, maxLen) {
         return str;
     return str.slice(0, maxLen - 1) + '…';
 }
+/**
+ * Print the "Showing N of M <entity>" footer after a paginated table.
+ */
+function printPaginationFooter(pagination, count, entityName) {
+    const showing = Math.min(pagination.limit, count);
+    if (pagination.has_more) {
+        const nextOffset = pagination.offset + pagination.limit;
+        console.log(`\nShowing ${showing} of ${pagination.total_count} ${entityName}. ` +
+            chalk.dim(`Use --offset ${nextOffset} to see more.`));
+    }
+    else if (pagination.total_count > showing) {
+        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} ${entityName}`));
+    }
+}
 /**
  * Format an agent list as a human-readable table.
  * Shared by agent list and agent search commands.
@@ -75,15 +89,7 @@ export function formatAgentTable(agents, pagination, showArchived = false) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, agents.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} agents. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} agents`));
-    }
+    printPaginationFooter(pagination, agents.length, 'agents');
 }
 /**
  * Format an integration list as a human-readable table.
@@ -113,15 +119,7 @@ export function formatIntegrationTable(integrations, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, integrations.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} integrations. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} integrations`));
-    }
+    printPaginationFooter(pagination, integrations.length, 'integrations');
 }
 /**
  * Format an integration version list as a human-readable table.
@@ -169,15 +167,7 @@ export function formatIntegrationVersionTable(versions, pagination, integrationN
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, versions.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} versions. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} versions`));
-    }
+    printPaginationFooter(pagination, versions.length, 'versions');
 }
 /**
  * Format an agent version list as a human-readable table.
@@ -214,15 +204,7 @@ export function formatVersionTable(versions, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, versions.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} versions. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} versions`));
-    }
+    printPaginationFooter(pagination, versions.length, 'versions');
 }
 /**
  * Format a context list as a human-readable table.
@@ -250,15 +232,7 @@ export function formatContextTable(contexts, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, contexts.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} contexts. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} contexts`));
-    }
+    printPaginationFooter(pagination, contexts.length, 'contexts');
 }
 /**
  * Format a workspace agent list as a human-readable table.
@@ -314,15 +288,7 @@ export function formatWorkspaceTable(workspaces, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, workspaces.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} workspaces. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} workspaces`));
-    }
+    printPaginationFooter(pagination, workspaces.length, 'workspaces');
 }
 /**
  * Format a session list as a human-readable table.
@@ -353,15 +319,7 @@ export function formatSessionTable(sessions, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, sessions.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} sessions. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} sessions`));
-    }
+    printPaginationFooter(pagination, sessions.length, 'sessions');
 }
 /**
  * Format a task list as a human-readable table.
@@ -403,15 +361,7 @@ export function formatTaskTable(tasks, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, tasks.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} tasks. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} tasks`));
-    }
+    printPaginationFooter(pagination, tasks.length, 'tasks');
 }
 /**
  * Format a trigger list as a human-readable table.
@@ -453,15 +403,7 @@ export function formatTriggerTable(triggers, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, triggers.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} triggers. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} triggers`));
-    }
+    printPaginationFooter(pagination, triggers.length, 'triggers');
 }
 export function formatCredentialsTable(credentials, pagination) {
     if (credentials.length === 0) {
@@ -485,15 +427,7 @@ export function formatCredentialsTable(credentials, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, credentials.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} credentials. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} credentials`));
-    }
+    printPaginationFooter(pagination, credentials.length, 'credentials');
 }
 export function formatPoliciesTable(policies, pagination) {
     if (policies.length === 0) {
@@ -534,15 +468,7 @@ export function formatPoliciesTable(policies, pagination) {
         });
     });
     table.printTable();
-    const showing = Math.min(pagination.limit, policies.length);
-    if (pagination.has_more) {
-        const nextOffset = pagination.offset + pagination.limit;
-        console.log(`\nShowing ${showing} of ${pagination.total_count} policies. ` +
-            chalk.dim(`Use --offset ${nextOffset} to see more.`));
-    }
-    else if (pagination.total_count > showing) {
-        console.log(chalk.dim(`\nShowing ${showing} of ${pagination.total_count} policies`));
-    }
+    printPaginationFooter(pagination, policies.length, 'policies');
 }
 /**
  * Format job steps as a human-readable table.

package/dist/lib/polling.d.ts

@@ -37,6 +37,13 @@ export interface PollOptions<T = unknown> {
      * @default "Operation timed out"
      */
     timeoutMessage?: string;
+    /**
+     * Optional callback invoked after each poll when the operation is not yet
+     * complete. Return a non-null string to override the default spinner text
+     * (`${message} (${attempts}/${maxAttempts})`). Return null to keep the
+     * default. Errors thrown by the callback are silently ignored.
+     */
+    onPoll?: (response: T, attempts: number) => Promise<string | null>;
 }
 export interface PollResult<T = unknown> {
     /**

package/dist/lib/polling.js

@@ -21,7 +21,7 @@ import { createSpinner } from './progress.js';
  * ```
  */
 export async function pollUntilComplete(options) {
-    const { endpoint, isComplete, message = 'Waiting for operation to complete...', maxAttempts = 60, delayMs = 1000, successMessage = 'Operation complete', timeoutMessage = 'Operation timed out', } = options;
+    const { endpoint, isComplete, message = 'Waiting for operation to complete...', maxAttempts = 60, delayMs = 1000, successMessage = 'Operation complete', timeoutMessage = 'Operation timed out', onPoll, } = options;
     const client = new GuildAPIClient();
     const spinner = createSpinner(message);
     spinner.start();
@@ -40,8 +40,17 @@ export async function pollUntilComplete(options) {
                     attempts,
                 };
             }
-            // Update spinner with progress
-            spinner.text = `${message} (${attempts}/${maxAttempts})`;
+            // Update spinner with progress — prefer onPoll text when available
+            let spinnerText = null;
+            if (onPoll) {
+                try {
+                    spinnerText = await onPoll(response, attempts);
+                }
+                catch {
+                    // Silently ignore step-fetch errors; fall back to default text
+                }
+            }
+            spinner.text = spinnerText ?? `${message} (${attempts}/${maxAttempts})`;
         }
         catch {
             // If we can't fetch the resource, continue polling

package/dist/lib/session-events.d.ts

@@ -19,10 +19,12 @@ export interface AgentRef {
 }
 export interface SessionTaskAgentItem extends BaseTaskFields {
     agent: AgentRef;
+    parent_task_id: string | null;
 }
 export interface SessionTaskToolItem extends BaseTaskFields {
     tool_name: string;
     tool_call_id: string;
+    parent_task: SessionTaskItem | null;
 }
 export type SessionTaskItem = SessionTaskAgentItem | SessionTaskToolItem;
 export interface SessionTaskAgent extends SessionTaskAgentItem {
@@ -91,26 +93,29 @@ export interface RuntimeDoneEvent extends BaseEvent {
     type: 'runtime_done';
     content: Record<string, unknown>;
 }
+export interface TextContent {
+    type: 'text';
+    data: string;
+}
+export interface ResponseStreamContent {
+    type: 'application/guild-response-stream';
+    stream_id: string;
+    sequence: number;
+    status: 'streaming' | 'done' | 'aborted';
+    text: string;
+}
+export type AgentNotificationMessageContent = TextContent | ResponseStreamContent;
 export interface AgentNotificationMessageEvent extends BaseEvent {
     type: 'agent_notification_message';
-    content: {
-        type: 'text';
-        data: string;
-    };
+    content: AgentNotificationMessageContent;
 }
 export interface AgentNotificationProgressEvent extends BaseEvent {
     type: 'agent_notification_progress';
-    content: {
-        type: 'text';
-        data: string;
-    };
+    content: TextContent;
 }
 export interface AgentNotificationErrorEvent extends BaseEvent {
     type: 'agent_notification_error';
-    content: {
-        type: 'text';
-        data: string;
-    };
+    content: TextContent;
 }
 export interface AgentConsoleEvent extends BaseEvent {
     type: 'agent_console';
@@ -126,10 +131,7 @@ export interface TriggerMessageEvent extends BaseEvent {
 }
 export interface SystemErrorEvent extends BaseEvent {
     type: 'system_error';
-    content: {
-        type: 'text';
-        data: string;
-    };
+    content: TextContent;
     details?: Record<string, unknown>;
 }
 export interface LlmStartEvent extends BaseEvent {
@@ -169,6 +171,20 @@ export interface CredentialsRequestEvent extends BaseEvent {
 export declare function isUnfulfilledAgentInstallRequest(event: SessionEvent): event is AgentInstallRequestEvent;
 /** Check if event is an unfulfilled credentials request */
 export declare function isUnfulfilledCredentialsRequest(event: SessionEvent): event is CredentialsRequestEvent;
+/** Check if an agent notification message is a transient response stream draft. */
+export declare function isResponseStreamEvent(event: SessionEvent): event is AgentNotificationMessageEvent & {
+    content: ResponseStreamContent;
+};
+/** Check if a response stream event carries the final generated text. */
+export declare function isDoneResponseStreamEvent(event: SessionEvent): event is AgentNotificationMessageEvent & {
+    content: ResponseStreamContent & {
+        status: 'done';
+    };
+};
+/** Extract display text from notification content. */
+export declare function getAgentNotificationText(event: AgentNotificationMessageEvent): string;
+/** Check if an event belongs to the root task or has no task context. */
+export declare function isRootTaskEvent(event: SessionEvent): boolean;
 export interface InterruptedEvent extends BaseEvent {
     type: 'interrupted';
     interrupted_at: string;

package/dist/lib/session-events.js

@@ -87,4 +87,26 @@ export function isUnfulfilledAgentInstallRequest(event) {
 export function isUnfulfilledCredentialsRequest(event) {
     return event.type === 'credentials_request' && !event.is_fulfilled;
 }
+/** Check if an agent notification message is a transient response stream draft. */
+export function isResponseStreamEvent(event) {
+    return (event.type === 'agent_notification_message' &&
+        event.content.type === 'application/guild-response-stream');
+}
+/** Check if a response stream event carries the final generated text. */
+export function isDoneResponseStreamEvent(event) {
+    return isResponseStreamEvent(event) && event.content.status === 'done';
+}
+/** Extract display text from notification content. */
+export function getAgentNotificationText(event) {
+    return event.content.type === 'text' ? event.content.data : event.content.text;
+}
+/** Check if an event belongs to the root task or has no task context. */
+export function isRootTaskEvent(event) {
+    const task = event.task;
+    if (!task)
+        return true;
+    if ('parent_task_id' in task)
+        return task.parent_task_id === null;
+    return task.parent_task === null;
+}
 //# sourceMappingURL=session-events.js.map

package/dist/lib/session-polling.d.ts

@@ -11,9 +11,10 @@ export interface PollResult {
  * and one-shot agents (which may only emit runtime_done with output content).
  *
  * Priority:
- * 1. agent_notification_message — preferred, immediate return
- * 2. runtime_done from agent tasks — fallback for one-shot agents
- * 3. runtime_error from agent tasks — fail fast
+ * 1. root agent_notification_message — preferred, immediate return
+ * 2. root runtime_error — fail fast
+ * 3. root runtime_done content — fallback for one-shot agents
+ * 4. root done response-stream after root runtime_done — streaming fallback
  */
 export declare function pollForResponse(client: GuildAPIClient, sessionId: string, afterEventId: string | undefined, maxWaitTime?: number): Promise<PollResult>;
 /**

package/dist/lib/session-polling.js

@@ -3,6 +3,7 @@
 import { debug, isDebugMode } from './errors.js';
 import { shouldShowEvent } from './event-filter.js';
 import { fetchEvents } from './session-events-fetch.js';
+import { getAgentNotificationText, isDoneResponseStreamEvent, isResponseStreamEvent, isRootTaskEvent, } from './session-events.js';
 /**
  * Poll for agent response using from_id cursor.
  *
@@ -10,28 +11,51 @@ import { fetchEvents } from './session-events-fetch.js';
  * and one-shot agents (which may only emit runtime_done with output content).
  *
  * Priority:
- * 1. agent_notification_message — preferred, immediate return
- * 2. runtime_done from agent tasks — fallback for one-shot agents
- * 3. runtime_error from agent tasks — fail fast
+ * 1. root agent_notification_message — preferred, immediate return
+ * 2. root runtime_error — fail fast
+ * 3. root runtime_done content — fallback for one-shot agents
+ * 4. root done response-stream after root runtime_done — streaming fallback
  */
 export async function pollForResponse(client, sessionId, afterEventId, maxWaitTime = 60000) {
     const startTime = Date.now();
     let fromId = afterEventId;
+    let responseStreamDone = null;
     while (Date.now() - startTime < maxWaitTime) {
         const events = await fetchEvents(client, sessionId, { fromId });
         let lastAgentRuntimeDone = null;
+        let rootRuntimeDone = false;
         for (const event of events) {
             debug(`pollForResponse event: ${event.type}`);
             if (event.type === 'agent_notification_message') {
-                return { response: event.content.data, lastEventId: event.id };
+                if (isResponseStreamEvent(event)) {
+                    if (isRootTaskEvent(event) && isDoneResponseStreamEvent(event)) {
+                        responseStreamDone = {
+                            response: getAgentNotificationText(event),
+                            lastEventId: event.id,
+                        };
+                    }
+                    continue;
+                }
+                if (!isRootTaskEvent(event))
+                    continue;
+                return {
+                    response: getAgentNotificationText(event),
+                    lastEventId: event.id,
+                };
             }
             if (event.type === 'runtime_done' &&
-                event.content !== undefined &&
                 event.task &&
-                'agent' in event.task) {
-                lastAgentRuntimeDone = JSON.stringify(event.content);
+                'agent' in event.task &&
+                isRootTaskEvent(event)) {
+                rootRuntimeDone = true;
+                if (event.content !== undefined) {
+                    lastAgentRuntimeDone = JSON.stringify(event.content);
+                }
             }
-            if (event.type === 'runtime_error' && event.task && 'agent' in event.task) {
+            if (event.type === 'runtime_error' &&
+                event.task &&
+                'agent' in event.task &&
+                isRootTaskEvent(event)) {
                 return {
                     response: JSON.stringify({ error: event.content }),
                     lastEventId: event.id,
@@ -47,9 +71,14 @@ export async function pollForResponse(client, sessionId, afterEventId, maxWaitTi
         if (lastAgentRuntimeDone !== null) {
             return { response: lastAgentRuntimeDone, lastEventId: fromId };
         }
+        if (rootRuntimeDone && responseStreamDone !== null) {
+            return { response: responseStreamDone.response, lastEventId: fromId };
+        }
         await new Promise((resolve) => setTimeout(resolve, 2000));
     }
-    return { response: null, lastEventId: fromId };
+    return responseStreamDone
+        ? { response: responseStreamDone.response, lastEventId: fromId }
+        : { response: null, lastEventId: fromId };
 }
 /**
  * Poll for agent response while streaming matching events to stdout as JSONL.
@@ -61,25 +90,49 @@ export async function pollForResponse(client, sessionId, afterEventId, maxWaitTi
 export async function pollForResponseWithEvents(client, sessionId, eventFilter, afterEventId, maxWaitTime = 60000) {
     const startTime = Date.now();
     let fromId = afterEventId;
+    let responseStreamDone = null;
     while (Date.now() - startTime < maxWaitTime) {
         const events = await fetchEvents(client, sessionId, { fromId });
         let lastAgentRuntimeDone = null;
+        let rootRuntimeDone = false;
         for (const event of events) {
             debug(`pollForResponseWithEvents event: ${event.type}`);
-            // Stream matching events to stdout as JSONL
-            if (shouldShowEvent(event.type, eventFilter)) {
+            // Stream matching events to stdout as JSONL. Response-stream events are
+            // transient drafts, so keep automation output stable and wait for the
+            // final agent message or terminal fallback.
+            if (shouldShowEvent(event.type, eventFilter) && !isResponseStreamEvent(event)) {
                 process.stdout.write(JSON.stringify(event) + '\n');
             }
             if (event.type === 'agent_notification_message') {
-                return { response: event.content.data, lastEventId: event.id };
+                if (isResponseStreamEvent(event)) {
+                    if (isRootTaskEvent(event) && isDoneResponseStreamEvent(event)) {
+                        responseStreamDone = {
+                            response: getAgentNotificationText(event),
+                            lastEventId: event.id,
+                        };
+                    }
+                    continue;
+                }
+                if (!isRootTaskEvent(event))
+                    continue;
+                return {
+                    response: getAgentNotificationText(event),
+                    lastEventId: event.id,
+                };
             }
             if (event.type === 'runtime_done' &&
-                event.content !== undefined &&
                 event.task &&
-                'agent' in event.task) {
-                lastAgentRuntimeDone = JSON.stringify(event.content);
+                'agent' in event.task &&
+                isRootTaskEvent(event)) {
+                rootRuntimeDone = true;
+                if (event.content !== undefined) {
+                    lastAgentRuntimeDone = JSON.stringify(event.content);
+                }
             }
-            if (event.type === 'runtime_error' && event.task && 'agent' in event.task) {
+            if (event.type === 'runtime_error' &&
+                event.task &&
+                'agent' in event.task &&
+                isRootTaskEvent(event)) {
                 return {
                     response: JSON.stringify({ error: event.content }),
                     lastEventId: event.id,
@@ -95,8 +148,13 @@ export async function pollForResponseWithEvents(client, sessionId, eventFilter,
         if (lastAgentRuntimeDone !== null) {
             return { response: lastAgentRuntimeDone, lastEventId: fromId };
         }
+        if (rootRuntimeDone && responseStreamDone !== null) {
+            return { response: responseStreamDone.response, lastEventId: fromId };
+        }
         await new Promise((resolve) => setTimeout(resolve, 2000));
     }
-    return { response: null, lastEventId: fromId };
+    return responseStreamDone
+        ? { response: responseStreamDone.response, lastEventId: fromId }
+        : { response: null, lastEventId: fromId };
 }
 //# sourceMappingURL=session-polling.js.map

package/dist/lib/session-resume.js

@@ -7,6 +7,7 @@
 import chalk from 'chalk';
 import { marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
+import { getAgentNotificationText, isResponseStreamEvent, } from './session-events.js';
 import { fetchEvents } from './session-events-fetch.js';
 import { brand, code as codeColor } from './colors.js';
 // Configure marked for terminal rendering (same config as chat.tsx)
@@ -64,7 +65,9 @@ export function eventsToDisplayMessages(events) {
             });
         }
         else if (event.type === 'agent_notification_message') {
-            const text = typeof event.content === 'string' ? event.content : event.content?.data || '';
+            if (isResponseStreamEvent(event))
+                continue;
+            const text = getAgentNotificationText(event);
             if (text.trim()) {
                 const rendered = renderMarkdown(text);
                 const messageContent = `${chalk.green('●')} ${chalk.bold('assistant')}\n${rendered.trim()}`;