a2acalling 0.6.72 → 0.6.74

package/src/lib/runtime-adapter.js

@@ -5,8 +5,10 @@
  * - openclaw: uses `openclaw` CLI for turn handling, summaries, notifications
  * - claude: uses `claude` CLI as a real LLM subagent for conversations
  *
+ * - test: minimal runtime for CI/headless — echoes messages or spawns A2A_AGENT_COMMAND
+ *
  * Selection:
- * - A2A_RUNTIME=openclaw|claude|auto (default: auto)
+ * - A2A_RUNTIME=openclaw|claude|test|auto (default: auto)
  * - auto picks openclaw → claude → error (no supported CLI)
  */
 
@@ -43,6 +45,18 @@ function resolveRuntimeMode() {
   const hasOpenClaw = commandExists('openclaw');
   const hasClaude = commandExists('claude');
 
+  // A2A-66: test runtime for CI/headless environments — minimal runTurn with
+  // optional A2A_AGENT_COMMAND bridge support.
+  if (requested === 'test') {
+    return {
+      mode: 'test',
+      requested,
+      hasOpenClaw,
+      hasClaude,
+      reason: 'A2A_RUNTIME=test'
+    };
+  }
+
   if (requested === 'generic') {
     return {
       mode: 'none',
@@ -138,6 +152,11 @@ function normalizeOpenClawOutput(raw) {
 }
 
 
+function readPositiveIntEnv(name, fallback) {
+  const parsed = Number.parseInt(process.env[name] || '', 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
 function createRuntimeAdapter(options = {}) {
   const workspaceDir = options.workspaceDir || process.cwd();
   const modeInfo = resolveRuntimeMode();
@@ -158,6 +177,33 @@ function createRuntimeAdapter(options = {}) {
   // Design decision (A2A-29): we keep per-conversation state for prompt/metadata
   // continuity, but Claude execution itself is stateless (no `--resume`).
   const claudeSessions = new Map();
+  const CLAUDE_SESSION_TTL_MS = readPositiveIntEnv('A2A_CLAUDE_SESSION_TTL_MS', 6 * 60 * 60 * 1000);
+  const MAX_CLAUDE_SESSIONS = readPositiveIntEnv('A2A_CLAUDE_MAX_SESSIONS', 500);
+
+  // A2A-69: TTL-based pruning for Claude session state.
+  // Follows the same pattern as pruneCollaborationSessions() in server.js:
+  // 1. Evict entries older than TTL
+  // 2. If still over max, evict oldest-first
+  function pruneClaudeSessions() {
+    const now = Date.now();
+    for (const [id, session] of claudeSessions.entries()) {
+      const updatedAt = Number(session?.updatedAt || 0);
+      if (!updatedAt || now - updatedAt > CLAUDE_SESSION_TTL_MS) {
+        claudeSessions.delete(id);
+      }
+    }
+
+    if (claudeSessions.size <= MAX_CLAUDE_SESSIONS) {
+      return;
+    }
+
+    const oldest = Array.from(claudeSessions.entries())
+      .sort((a, b) => (a[1]?.updatedAt || 0) - (b[1]?.updatedAt || 0));
+    const toDelete = claudeSessions.size - MAX_CLAUDE_SESSIONS;
+    for (let i = 0; i < toDelete; i++) {
+      claudeSessions.delete(oldest[i][0]);
+    }
+  }
 
   async function runClaudeTurnAdapter({ sessionId, message, caller, context, timeoutMs }) {
     const traceId = context?.traceId || context?.trace_id;
@@ -165,6 +211,9 @@ function createRuntimeAdapter(options = {}) {
     const conversationId = context?.conversationId || context?.conversation_id;
     const startAt = Date.now();
 
+    // A2A-69: prune stale sessions before accessing/creating state
+    pruneClaudeSessions();
+
     // Get or create session state
     let session = claudeSessions.get(sessionId);
     if (!session) {
@@ -177,6 +226,7 @@ function createRuntimeAdapter(options = {}) {
         systemPrompt: '',
         turnCount: 0,
         lastMeta: null,
+        updatedAt: Date.now(),
         // Keep a permission snapshot so summary runs with the same policy envelope.
         permissionSnapshot: {
           capabilities: Array.isArray(context?.capabilities) ? context.capabilities : [],
@@ -213,6 +263,7 @@ function createRuntimeAdapter(options = {}) {
       claudeSessions.set(sessionId, session);
     }
 
+    session.updatedAt = Date.now();
     session.turnCount++;
 
     logger.debug('Invoking Claude subagent turn', {
@@ -372,6 +423,39 @@ function createRuntimeAdapter(options = {}) {
       }
     }
 
+    // A2A-66: test runtime — spawn A2A_AGENT_COMMAND if set, otherwise echo.
+    // Uses shell: true so the command string is parsed by the shell (supports
+    // quoted args, paths with spaces, pipes, etc.).
+    if (modeInfo.mode === 'test') {
+      const agentCommand = process.env.A2A_AGENT_COMMAND;
+      if (agentCommand) {
+        const payload = JSON.stringify({ message, caller, context });
+        const result = spawnSync(agentCommand, {
+          input: payload,
+          encoding: 'utf8',
+          shell: true,
+          timeout: (timeoutMs || 65000) + 5000,
+          maxBuffer: 1024 * 1024,
+          cwd: workspaceDir,
+          env: process.env
+        });
+        if (result.error) {
+          throw result.error;
+        }
+        // A2A-66: check exit code — non-zero means the bridge command failed.
+        if (result.status !== 0) {
+          const stderr = String(result.stderr || '').trim();
+          throw new Error(
+            `A2A_AGENT_COMMAND exited with code ${result.status}` +
+            (stderr ? `: ${stderr.slice(0, 200)}` : '')
+          );
+        }
+        return String(result.stdout || '').trim() || '[test-runtime] Empty command output';
+      }
+      const snippet = cleanText(message || prompt || '', 120);
+      return `[test-runtime] Echo: ${snippet}`;
+    }
+
     if (modeInfo.mode !== 'openclaw') {
       throw new Error(
         `No supported A2A runtime available (mode=${modeInfo.mode}). ` +
@@ -457,6 +541,12 @@ function createRuntimeAdapter(options = {}) {
       throw new Error('Claude summary returned empty result');
     }
 
+    // A2A-66: test runtime — return canned summary.
+    if (modeInfo.mode === 'test') {
+      const text = 'Test conversation concluded.';
+      return { summary: text, ownerSummary: text };
+    }
+
     if (modeInfo.mode !== 'openclaw') {
       throw new Error(
         `No supported A2A runtime available for summarization (mode=${modeInfo.mode}). ` +
@@ -526,14 +616,15 @@ function createRuntimeAdapter(options = {}) {
       data: { level }
     });
 
-    if (modeInfo.mode === 'claude') {
-      // Claude mode: notifications are a no-op (no notification transport available)
-      logger.debug('Notification skipped (claude mode has no notification transport)', {
-        event: 'notify_skipped_claude',
+    if (modeInfo.mode === 'claude' || modeInfo.mode === 'test') {
+      // Claude/test mode: notifications are a no-op (no notification transport available)
+      logger.debug('Notification skipped (no notification transport in this mode)', {
+        event: 'notify_skipped',
         traceId,
         requestId,
         conversationId,
-        tokenId: token?.id
+        tokenId: token?.id,
+        data: { mode: modeInfo.mode }
       });
       return;
     }
@@ -597,7 +688,10 @@ function createRuntimeAdapter(options = {}) {
     runTurn,
     summarize,
     notify,
-    getLastTurnMeta
+    getLastTurnMeta,
+    // A2A-69: exposed for testing
+    _claudeSessions: claudeSessions,
+    _pruneClaudeSessions: pruneClaudeSessions
   };
 }