@guildai/cli 0.6.0 → 0.6.1

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

@@ -1,6 +1,11 @@
 import { GuildAPIClient } from './api-client.js';
+export interface PollResult {
+    response: string | null;
+    /** Last event ID seen — pass as `afterEventId` on next call. */
+    lastEventId: string | undefined;
+}
 /**
- * Poll for agent response after a certain event count.
+ * Poll for agent response using from_id cursor.
  *
  * Handles both multi-turn agents (which emit agent_notification_message)
  * and one-shot agents (which may only emit runtime_done with output content).
@@ -10,5 +15,5 @@ import { GuildAPIClient } from './api-client.js';
  * 2. runtime_done from agent tasks — fallback for one-shot agents
  * 3. runtime_error from agent tasks — fail fast
  */
-export declare function pollForResponse(client: GuildAPIClient, sessionId: string, afterEventCount: number, maxWaitTime?: number): Promise<string | null>;
+export declare function pollForResponse(client: GuildAPIClient, sessionId: string, afterEventId: string | undefined, maxWaitTime?: number): Promise<PollResult>;
 //# sourceMappingURL=session-polling.d.ts.map

package/dist/lib/session-polling.js

@@ -1,8 +1,9 @@
 // Copyright 2026 Guild.ai
 // SPDX-License-Identifier: Apache-2.0
-import { isDebugMode } from './errors.js';
+import { debug, isDebugMode } from './errors.js';
+import { fetchEvents } from './session-events-fetch.js';
 /**
- * Poll for agent response after a certain event count.
+ * Poll for agent response using from_id cursor.
  *
  * Handles both multi-turn agents (which emit agent_notification_message)
  * and one-shot agents (which may only emit runtime_done with output content).
@@ -12,16 +13,16 @@ import { isDebugMode } from './errors.js';
  * 2. runtime_done from agent tasks — fallback for one-shot agents
  * 3. runtime_error from agent tasks — fail fast
  */
-export async function pollForResponse(client, sessionId, afterEventCount, maxWaitTime = 60000) {
+export async function pollForResponse(client, sessionId, afterEventId, maxWaitTime = 60000) {
     const startTime = Date.now();
+    let fromId = afterEventId;
     while (Date.now() - startTime < maxWaitTime) {
-        const response = await client.get(`/sessions/${sessionId}/events?limit=1000`);
-        const events = response?.items || [];
+        const events = await fetchEvents(client, sessionId, { fromId });
         let lastAgentRuntimeDone = null;
-        for (let i = afterEventCount; i < events.length; i++) {
-            const event = events[i];
+        for (const event of events) {
+            debug(`pollForResponse event: ${event.type}`);
             if (event.type === 'agent_notification_message') {
-                return event.content.data;
+                return { response: event.content.data, lastEventId: event.id };
             }
             if (event.type === 'runtime_done' &&
                 event.content !== undefined &&
@@ -30,17 +31,23 @@ export async function pollForResponse(client, sessionId, afterEventCount, maxWai
                 lastAgentRuntimeDone = JSON.stringify(event.content);
             }
             if (event.type === 'runtime_error' && event.task && 'agent' in event.task) {
-                return JSON.stringify({ error: event.content });
+                return {
+                    response: JSON.stringify({ error: event.content }),
+                    lastEventId: event.id,
+                };
             }
             if (event.type === 'agent_console' && isDebugMode()) {
                 process.stderr.write(`[console.${event.level}] ${event.content}\n`);
             }
         }
+        if (events.length > 0) {
+            fromId = events[events.length - 1].id;
+        }
         if (lastAgentRuntimeDone !== null) {
-            return lastAgentRuntimeDone;
+            return { response: lastAgentRuntimeDone, lastEventId: fromId };
         }
         await new Promise((resolve) => setTimeout(resolve, 500));
     }
-    return null;
+    return { 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 { fetchEvents } from './session-events-fetch.js';
 import { brand, code as codeColor } from './colors.js';
 // Configure marked for terminal rendering (same config as chat.tsx)
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -37,11 +38,7 @@ export function printResumeHint(sessionId, command) {
  * Fetch all events for a session from the API.
  */
 export async function fetchSessionEvents(client, sessionId) {
-    const response = await client.get(`/sessions/${sessionId}/events?limit=1000`);
-    const events = (Array.isArray(response)
-        ? response
-        : response?.items || []);
-    return events;
+    return fetchEvents(client, sessionId);
 }
 /**
  * Fetch an existing session by ID.

package/dist/lib/table.d.ts

@@ -6,7 +6,6 @@ interface ColumnConfig {
 }
 /**
  * Minimal table renderer using string-width@7 for ANSI-aware column sizing.
- * Handles OSC8 hyperlink sequences correctly (string-width uses strip-ansi@7).
  */
 export declare class Table {
     private columns;

package/dist/lib/table.js

@@ -4,7 +4,6 @@ import chalk from 'chalk';
 import stringWidth from 'string-width';
 /**
  * Minimal table renderer using string-width@7 for ANSI-aware column sizing.
- * Handles OSC8 hyperlink sequences correctly (string-width uses strip-ansi@7).
  */
 export class Table {
     columns;

package/dist/mcp/tools.js

@@ -24,17 +24,13 @@ async function pollForResponse(apiClient, sessionId, debug) {
     let lastEventId;
     while (Date.now() - startTime < POLL_TIMEOUT_MS) {
         try {
-            const response = await apiClient.get(`/sessions/${sessionId}/events`);
+            let url = `/sessions/${sessionId}/events`;
+            if (lastEventId) {
+                url += `?from_id=${lastEventId}`;
+            }
+            const response = await apiClient.get(url);
             const events = response.events || [];
-            // Find new events after last seen
-            let foundLast = !lastEventId;
             for (const event of events) {
-                if (!foundLast) {
-                    if (event.id === lastEventId) {
-                        foundLast = true;
-                    }
-                    continue;
-                }
                 debugLog(debug, `Event: ${event.event_type}`);
                 if (event.event_type === 'agent_notification_message') {
                     const data = extractEventText(event);
@@ -53,9 +49,7 @@ async function pollForResponse(apiClient, sessionId, debug) {
                     debugLog(debug, 'Runtime done');
                     return messages.join('\n\n') || 'Agent completed without output.';
                 }
-                lastEventId = event.id;
             }
-            // Update lastEventId to latest
             if (events.length > 0) {
                 lastEventId = events[events.length - 1].id;
             }

package/docs/CLI_WORKFLOW.md

@@ -145,6 +145,21 @@ guild agent test --ephemeral
 guild agent chat "Hello, can you help me?"
 ```
 
+### Chatting with Agents
+
+```bash
+# Chat with any published agent by name
+guild chat --agent owner/agent-name
+
+# Chat with a specific agent in a specific workspace
+guild chat --agent owner/agent-name --workspace owner/workspace-name
+
+# One-shot mode (send prompt, get response, exit)
+guild chat --agent owner/agent-name --once "What can you do?"
+```
+
+To chat with the agent you are developing locally, use `guild agent chat` from within the agent directory.
+
 ## File Structure
 
 After `guild agent init`, you get:

package/docs/skills/agent-dev.md

@@ -89,6 +89,21 @@ guild agent test --ephemeral
 guild agent chat "Hello, can you help me?"
 ```
 
+### Chatting with Agents
+
+```bash
+# Chat with any published agent by name
+guild chat --agent owner/agent-name
+
+# Chat with a specific agent in a specific workspace
+guild chat --agent owner/agent-name --workspace owner/workspace-name
+
+# One-shot mode (send prompt, get response, exit)
+guild chat --agent owner/agent-name --once "What can you do?"
+```
+
+To chat with the agent you are developing locally, use `guild agent chat` from within the agent directory.
+
 ## Guild CLI Is the ONLY Tool for Agent Operations
 
 **ALL agent work — creating, saving, testing, debugging, investigating — goes through Guild CLI.**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guildai/cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Guild.ai CLI - Build, test, and deploy AI agents",
   "type": "module",
   "main": "dist/index.js",
@@ -56,6 +56,7 @@
   },
   "dependencies": {
     "@inquirer/search": "^4.1.7",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "@napi-rs/canvas": "^0.1.85",
     "@napi-rs/keyring": "^1.2.0",
     "axios": "^1.13.2",
@@ -76,11 +77,11 @@
     "sharp": "^0.34.5",
     "shell-quote": "^1.8.2",
     "string-width": "^7.2.0",
+    "strip-ansi": "^7.2.0",
     "svg-pathdata": "^8.0.0",
     "svgdom": "^0.1.22",
     "ws": "^8.18.0",
-    "zod": "^3.24.4",
-    "@modelcontextprotocol/sdk": "^1.12.1"
+    "zod": "^3.24.4"
   },
   "devDependencies": {
     "@types/inquirer": "^8.2.10",