agent-relay 2.1.13 → 2.1.15

package/packages/mcp/src/hybrid-client.ts

@@ -1,217 +1,18 @@
-/**
- * Hybrid Client for MCP Tools
- *
- * IMPORTANT: The file-based writes ONLY work when relay-pty is wrapping the agent.
- * relay-pty watches for ->relay-file:* triggers in agent output and processes outbox files.
- * The daemon does NOT watch outbox directories directly.
- *
- * For pure MCP tools (not wrapped by relay-pty), use createRelayClient() instead,
- * which communicates directly with the daemon via socket.
- *
- * This hybrid client is designed for scenarios where:
- * - An agent is wrapped by relay-pty
- * - File-based writes avoid socket connection overhead
- * - Socket is still used for queries (getInbox, listAgents, etc.)
- */
-
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, statSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { randomUUID } from 'node:crypto';
-import type { RelayClient } from './client.js';
-import { createRelayClient } from './client.js';
-import type { AckPayload } from '@agent-relay/protocol';
-import { discoverSocket } from './cloud.js';
-
-export interface HybridClientOptions {
-  /** Agent name */
-  agentName: string;
-  /** Project root directory (where .agent-relay lives) */
-  projectRoot: string;
-  /** Socket path (optional, will discover if not provided) */
-  socketPath?: string;
-  /** Project ID */
-  project?: string;
-}
-
-/**
- * Create a hybrid client that uses file-based for writes, socket for queries.
- */
-export function createHybridClient(options: HybridClientOptions): RelayClient {
-  const { agentName, projectRoot, project = 'default' } = options;
-
-  // Setup directories
-  const relayDir = join(projectRoot, '.agent-relay');
-  const outboxDir = join(relayDir, 'outbox', agentName);
-  const inboxDir = join(relayDir, 'inbox', agentName);
-
-  // Ensure directories exist
-  if (!existsSync(outboxDir)) {
-    mkdirSync(outboxDir, { recursive: true });
-  }
-  if (!existsSync(inboxDir)) {
-    mkdirSync(inboxDir, { recursive: true });
-  }
-
-  // Get socket path for queries
-  // Use discoverSocket() which respects cloud workspace config and env overrides.
-  // Only fall back to relayDir/relay.sock for non-cloud local development.
-  const discovery = discoverSocket();
-  const socketPath = options.socketPath || discovery?.socketPath || join(relayDir, 'relay.sock');
-
-  if (process.env.DEBUG || process.env.RELAY_DEBUG) {
-    console.debug('[hybrid-client] Socket path:', socketPath, 'source:', discovery?.source ?? 'fallback', 'isCloud:', discovery?.isCloud ?? false);
-  }
-
-  // Create socket client for queries only
-  let socketClient: RelayClient | null = null;
-  const getSocketClient = () => {
-    if (!socketClient) {
-      socketClient = createRelayClient({
-        agentName,
-        socketPath,
-        project,
-      });
-    }
-    return socketClient;
-  };
-
-  // File-based send (write to outbox)
-  const send = async (to: string, message: string, opts: { thread?: string } = {}): Promise<void> => {
-    let content = `TO: ${to}\n`;
-    if (opts.thread) {
-      content += `THREAD: ${opts.thread}\n`;
-    }
-    content += `\n${message}`;
-
-    const msgPath = join(outboxDir, 'msg');
-    writeFileSync(msgPath, content);
-    // NOTE: relay-pty (not daemon) watches for ->relay-file:msg trigger.
-    // The agent must output "->relay-file:msg" for relay-pty to process.
-  };
-
-  // File-based sendAndWait (for now, delegate to socket - can improve later)
-  const sendAndWait = async (
-    to: string,
-    message: string,
-    opts: { thread?: string; timeoutMs?: number } = {}
-  ): Promise<AckPayload> => {
-    // For await responses, we still use socket since we need the response
-    // TODO: Implement file-based request/response pattern
-    return getSocketClient().sendAndWait(to, message, opts);
-  };
-
-  // File-based spawn
-  const spawn = async (opts: {
-    name: string;
-    cli: string;
-    task: string;
-    model?: string;
-    cwd?: string;
-  }): Promise<{ success: boolean; error?: string }> => {
-    let content = `KIND: spawn\n`;
-    content += `NAME: ${opts.name}\n`;
-    content += `CLI: ${opts.cli}\n`;
-    if (opts.model) {
-      content += `MODEL: ${opts.model}\n`;
-    }
-    if (opts.cwd) {
-      content += `CWD: ${opts.cwd}\n`;
-    }
-    content += `\n${opts.task}`;
-
-    const spawnPath = join(outboxDir, 'spawn');
-    writeFileSync(spawnPath, content);
-    return { success: true };
-  };
-
-  // File-based release
-  const release = async (name: string, reason?: string): Promise<{ success: boolean; error?: string }> => {
-    let content = `KIND: release\n`;
-    content += `NAME: ${name}\n`;
-    if (reason) {
-      content += `\n${reason}`;
-    }
-
-    const releasePath = join(outboxDir, 'release');
-    writeFileSync(releasePath, content);
-    return { success: true };
-  };
-
-  // File-based continuity (NEW - not in original MCP)
-  const saveContinuity = async (state: {
-    currentTask?: string;
-    completed?: string;
-    inProgress?: string;
-    keyDecisions?: string;
-    files?: string;
-  }): Promise<void> => {
-    let content = `KIND: continuity\n`;
-    content += `ACTION: save\n\n`;
-    if (state.currentTask) content += `Current task: ${state.currentTask}\n`;
-    if (state.completed) content += `Completed: ${state.completed}\n`;
-    if (state.inProgress) content += `In progress: ${state.inProgress}\n`;
-    if (state.keyDecisions) content += `Key decisions: ${state.keyDecisions}\n`;
-    if (state.files) content += `Files: ${state.files}\n`;
-
-    const continuityPath = join(outboxDir, 'continuity');
-    writeFileSync(continuityPath, content);
-  };
-
-  const loadContinuity = async (): Promise<void> => {
-    const content = `KIND: continuity\nACTION: load\n`;
-    const continuityPath = join(outboxDir, 'continuity');
-    writeFileSync(continuityPath, content);
-  };
-
-  const markUncertain = async (item: string): Promise<void> => {
-    const content = `KIND: continuity\nACTION: uncertain\n\n${item}`;
-    const continuityPath = join(outboxDir, 'continuity');
-    writeFileSync(continuityPath, content);
-  };
-
-  // Socket-based queries (these work fine over socket)
-  const getStatus = async () => getSocketClient().getStatus();
-  const getInbox = async (opts?: Parameters<RelayClient['getInbox']>[0]) => getSocketClient().getInbox(opts);
-  const listAgents = async (opts?: Parameters<RelayClient['listAgents']>[0]) => getSocketClient().listAgents(opts);
-  const getHealth = async (opts?: Parameters<RelayClient['getHealth']>[0]) => getSocketClient().getHealth(opts);
-  const getMetrics = async (opts?: Parameters<RelayClient['getMetrics']>[0]) => getSocketClient().getMetrics(opts);
-
-  return {
-    send,
-    sendAndWait,
-    spawn,
-    release,
-    getStatus,
-    getInbox,
-    listAgents,
-    getHealth,
-    getMetrics,
-    // Extended methods (not in base RelayClient interface but useful)
-    saveContinuity,
-    loadContinuity,
-    markUncertain,
-  } as unknown as RelayClient & {
-    saveContinuity: typeof saveContinuity;
-    loadContinuity: typeof loadContinuity;
-    markUncertain: typeof markUncertain;
-  };
-}
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 
 /**
- * Discover project root from socket path or environment.
+ * Discover project root by locating a .agent-relay directory.
  */
 export function discoverProjectRoot(): string | null {
-  // Check RELAY_SOCKET env var
   const socketEnv = process.env.RELAY_SOCKET;
   if (socketEnv) {
-    // Socket path is like /path/to/project/.agent-relay/relay.sock
     const match = socketEnv.match(/^(.+)\/\.agent-relay\/relay\.sock$/);
     if (match) {
       return match[1];
     }
   }
 
-  // Search from cwd upward
   let dir = process.cwd();
   while (dir !== '/') {
     if (existsSync(join(dir, '.agent-relay'))) {

package/packages/mcp/src/index.ts

@@ -1,9 +1,16 @@
-// Client interface
-export type { RelayClient, QueryMessage, HealthResponse, MetricsResponse, MessagesResponse } from './client.js';
-export { createRelayClient } from './client.js';
+// Client interface (SDK adapter)
+export {
+  createRelayClient,
+  createRelayClientAdapter,
+  type RelayClient,
+  type QueryMessage,
+  type HealthResponse,
+  type MetricsResponse,
+  type MessagesResponse,
+} from './client-adapter.js';
 
-// Hybrid client (file-based writes, socket queries)
-export { createHybridClient, discoverProjectRoot } from './hybrid-client.js';
+// Project discovery helper
+export { discoverProjectRoot } from './hybrid-client.js';
 
 // Simple programmatic API (no MCP protocol overhead)
 export {

package/packages/mcp/src/resources/agents.ts

@@ -6,7 +6,7 @@
  */
 
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const agentsResource: Resource = {
   uri: 'relay://agents',

package/packages/mcp/src/resources/inbox.ts

@@ -6,7 +6,7 @@
  */
 
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const inboxResource: Resource = {
   uri: 'relay://inbox',

package/packages/mcp/src/resources/project.ts

@@ -6,7 +6,7 @@
  */
 
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const projectResource: Resource = {
   uri: 'relay://project',

package/packages/mcp/src/server.ts

@@ -8,7 +8,7 @@ import {
   ListResourcesRequestSchema,
   ReadResourceRequestSchema,
 } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from './client.js';
+import type { RelayClient } from './client-adapter.js';
 import {
   relaySendTool,
   relaySendSchema,
@@ -143,6 +143,10 @@ const RESOURCES = [agentsResource, inboxResource, projectResource];
 export interface MCPServerConfig {
   name?: string;
   version?: string;
+  agentName?: string;
+  project?: string;
+  projectRoot?: string;
+  socketPath?: string;
 }
 
 /**

package/packages/mcp/src/simple.ts

@@ -15,7 +15,7 @@
  * ```
  */
 
-import { createRelayClient, type RelayClient, type RelayClientOptions } from './client.js';
+import { createRelayClient, type RelayClient, type RelayClientOptions } from './client-adapter.js';
 import type { AckPayload } from '@agent-relay/protocol';
 
 export interface Message {

package/packages/mcp/src/tools/relay-broadcast.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayBroadcastSchema = z.object({
   message: z.string().describe('The message to broadcast to all agents'),

package/packages/mcp/src/tools/relay-channel.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 // Join channel
 export const relayChannelJoinSchema = z.object({

package/packages/mcp/src/tools/relay-connected.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayConnectedSchema = z.object({
   project: z.string().optional().describe('Filter by project (for multi-project setups)'),

package/packages/mcp/src/tools/relay-consensus.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 // Create proposal
 export const relayProposalSchema = z.object({

package/packages/mcp/src/tools/relay-continuity.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayContinuitySchema = z.object({
   action: z.enum(['save', 'load', 'uncertain']).describe('Action: save state, load previous state, or mark uncertainty'),

package/packages/mcp/src/tools/relay-health.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient, HealthResponse } from '../client.js';
+import type { RelayClient, HealthResponse } from '../client-adapter.js';
 
 export const relayHealthSchema = z.object({
   include_crashes: z.boolean().optional().default(true).describe('Include recent crash history'),

package/packages/mcp/src/tools/relay-inbox.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayInboxSchema = z.object({
   limit: z.number().optional().default(10).describe('Max messages to return'),

package/packages/mcp/src/tools/relay-logs.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import { promisify } from 'node:util';

package/packages/mcp/src/tools/relay-messages.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayQueryMessagesSchema = z.object({
   limit: z.number().optional().describe('Maximum number of messages to return (default: 100)'),

package/packages/mcp/src/tools/relay-metrics.ts

@@ -1,6 +1,8 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient, MetricsResponse } from '../client.js';
+import type { RelayClient, MetricsResponse } from '../client-adapter.js';
+
+type AgentMetric = MetricsResponse['agents'][number];
 
 export const relayMetricsSchema = z.object({
   agent: z.string().optional().describe('Filter metrics to a specific agent'),
@@ -70,9 +72,9 @@ export async function handleRelayMetrics(
 
     // Filter to specific agent if requested
     if (input.agent) {
-      agents = agents.filter(a => a.name === input.agent);
+      agents = agents.filter((a: AgentMetric) => a.name === input.agent);
       if (agents.length === 0) {
-        const available = data.agents.map(a => a.name).join(', ');
+        const available = data.agents.map((a: AgentMetric) => a.name).join(', ');
         return `Agent "${input.agent}" not found.\n\nAvailable agents: ${available || 'none'}`;
       }
     }
@@ -115,8 +117,8 @@ export async function handleRelayMetrics(
     }
 
     // Add recommendations for high resource usage
-    const criticalAgents = agents.filter(a => a.alertLevel === 'critical');
-    const warningAgents = agents.filter(a => a.alertLevel === 'warning');
+    const criticalAgents = agents.filter((a: AgentMetric) => a.alertLevel === 'critical');
+    const warningAgents = agents.filter((a: AgentMetric) => a.alertLevel === 'warning');
 
     if (criticalAgents.length > 0 || warningAgents.length > 0) {
       lines.push('');

package/packages/mcp/src/tools/relay-release.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayReleaseSchema = z.object({
   name: z.string().describe('Name of the worker to release'),

package/packages/mcp/src/tools/relay-remove-agent.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayRemoveAgentSchema = z.object({
   name: z.string().describe('Name of the agent to remove from the registry'),

package/packages/mcp/src/tools/relay-send.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relaySendSchema = z.object({
   to: z.string().describe('Target: agent name, #channel, or * for broadcast'),

package/packages/mcp/src/tools/relay-shadow.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 // Bind as shadow
 export const relayShadowBindSchema = z.object({

package/packages/mcp/src/tools/relay-spawn.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 /**
  * Supported CLI tools for spawning workers.

package/packages/mcp/src/tools/relay-status.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayStatusSchema = z.object({});
 

package/packages/mcp/src/tools/relay-subscribe.ts

@@ -4,7 +4,7 @@
 
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 // Subscribe schema and tool
 export const relaySubscribeSchema = z.object({

package/packages/mcp/src/tools/relay-who.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
-import type { RelayClient } from '../client.js';
+import type { RelayClient } from '../client-adapter.js';
 
 export const relayWhoSchema = z.object({
   include_idle: z.boolean().optional().default(true).describe('Include idle agents'),