a2acalling 0.6.49 → 0.6.50

package/bin/cli.js

@@ -37,7 +37,8 @@ const ONBOARDING_EXEMPT = new Set([
   'dashboard',
   'server',
   'setup',
-  'install'
+  'install',
+  'skills'
 ]);
 
 function isOnboarded() {
@@ -710,6 +711,8 @@ const commands = {
     
     // Get objectives from disclosure
     const objectives = tierTopics.objectives || [];
+    const timeoutMsRaw = args.flags['timeout-ms'] || args.flags.timeout_ms;
+    const timeoutMs = timeoutMsRaw ? Number.parseInt(String(timeoutMsRaw), 10) : null;
 
     const { token, record } = store.create({
       name: args.flags.name || args.flags.n || 'unnamed',
@@ -720,7 +723,8 @@ const commands = {
       notify: args.flags.notify || 'all',
       maxCalls,
       allowedTopics,
-      allowedGoals: objectives.map(o => o.objective || o)
+      allowedGoals: objectives.map(o => o.objective || o),
+      timeoutMs
     });
 
     const resolvedHost = await resolveInviteHostname();
@@ -759,6 +763,7 @@ const commands = {
     console.log(`Disclosure: ${record.disclosure}`);
     console.log(`Notify: ${record.notify}`);
     console.log(`Max calls: ${record.max_calls || 'unlimited'}`);
+    if (record.timeout_ms) console.log(`Turn timeout: ${record.timeout_ms}ms`);
     if (linkContact) console.log(`Linked to: ${linkContact}`);
     console.log(`\nTo revoke: a2a revoke ${record.id}`);
     console.log(`\n${'─'.repeat(50)}`);
@@ -1355,11 +1360,15 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
 
       // Build owner context from config for summarizer
       let ownerContext = {};
+      let configTurnTimeoutMs = null;
       try {
         const { A2AConfig } = require('../src/lib/config');
         const config = new A2AConfig();
         const configAll = config.getAll();
         const tierGoals = configAll.tiers?.public?.goals || [];
+        configTurnTimeoutMs = configAll.defaults?.turnTimeoutMs
+          || configAll.defaults?.turn_timeout_ms
+          || null;
         ownerContext = {
           goals: tierGoals,
           agentName: agentContext.name,
@@ -1378,6 +1387,7 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
         disclosure,
         minTurns,
         maxTurns,
+        configTurnTimeoutMs,
         ownerContext,
         onTurn: (info) => {
           const preview = info.messagePreview.length >= 80
@@ -2625,6 +2635,46 @@ a2a add "${inviteUrl}" "${ownerText || 'friend'}" && a2a call "${ownerText || 'f
     return commands.quickstart(args);
   },
 
+  skills: (args) => {
+    const { installSkills, SKILL_FILES } = require('../scripts/install-skills');
+    const check = args.flags.check || args.flags.c;
+    const force = args.flags.force;
+    const targetDir = process.cwd();
+
+    if (check) {
+      console.log('A2A skills for this project:\n');
+      for (const file of SKILL_FILES) {
+        const destPath = path.join(targetDir, file.dest);
+        const exists = fs.existsSync(destPath);
+        const icon = exists ? '  \u2713' : '  \u2717';
+        console.log(`${icon} ${file.dest}${exists ? ' (installed)' : ' (not installed)'}`);
+      }
+      console.log(`\nRun "a2a skills" to install missing files.`);
+      return;
+    }
+
+    const result = installSkills(targetDir, { force });
+
+    if (result.installed.length) {
+      console.log(`\n  Installed ${result.installed.length} A2A skill file(s):\n`);
+      result.installed.forEach(f => console.log(`    + ${f}`));
+    }
+    if (result.skipped.length) {
+      console.log(`\n  Skipped ${result.skipped.length} unchanged file(s)`);
+    }
+    if (result.errors.length) {
+      console.error(`\n  Errors:`);
+      result.errors.forEach(e => console.error(`    ! ${e.file}: ${e.error}`));
+    }
+
+    if (result.installed.length === 0 && result.skipped.length > 0) {
+      console.log('\n  All skills already installed. Use --force to overwrite.\n');
+    } else if (result.installed.length > 0) {
+      console.log('\n  Skills ready. In Claude Code, type /a2a- to see available commands.');
+      console.log('  In Codex CLI, A2A instructions are in .codex/AGENTS.md\n');
+    }
+  },
+
   version: () => {
     const pkg = require('../package.json');
     console.log(pkg.version);
@@ -2645,6 +2695,7 @@ Commands:
     --disclosure, -d  Disclosure level (public, minimal, none)
     --notify          Owner notification (all, summary, none)
     --max-calls       Maximum invocations (default: 100)
+    --timeout-ms      Per-token Claude turn timeout in milliseconds
     --link, -l        Auto-link to contact name
 
   list                List active tokens
@@ -2710,6 +2761,9 @@ Server:
   uninstall           Stop server and remove local config/DB
     --keep-config     Preserve config/DB (for reinstall)
     --force           Skip confirmation prompt
+  skills              Install Claude Code + Codex CLI skills
+    --check, -c       Show what would be installed
+    --force           Overwrite existing files
   version             Show installed package version
 
 Examples:

package/docs/protocol.md

@@ -388,6 +388,48 @@ module.exports = function (test, assert, helpers) {
 };
 ```
 
+## CLI Skills (Claude Code & Codex)
+
+A2A ships with slash commands for Claude Code and agent instructions for Codex CLI.
+
+### Installation
+
+```bash
+a2a skills              # Install into current project
+a2a skills --check      # See what would be installed
+a2a skills --force      # Overwrite existing files
+```
+
+Skills are also installed automatically on `npm install -g a2acalling`.
+
+### Claude Code Commands
+
+| Command | Description |
+|---------|-------------|
+| `/a2a-call <contact> <msg>` | Call another agent (multi-turn) |
+| `/a2a-invite [name] [--tier]` | Create invite token |
+| `/a2a-contacts [add\|show\|ping\|rm]` | Manage contacts |
+| `/a2a-status` | Server and agent health dashboard |
+| `/a2a-setup` | First-time setup and onboarding |
+
+Files installed to: `.claude/commands/a2a-*.md`
+
+### Codex CLI
+
+A2A agent instructions are installed to `.codex/AGENTS.md`. Codex reads this file automatically to understand available A2A commands, permission tiers, and workflows.
+
+### Manual Installation
+
+If the automatic install didn't work, copy the files manually:
+
+```bash
+# Claude Code commands
+cp node_modules/a2acalling/.claude/commands/a2a-*.md .claude/commands/
+
+# Codex instructions
+cp node_modules/a2acalling/.codex/AGENTS.md .codex/AGENTS.md
+```
+
 ## Future Protocol Extensions (v1+)
 
 - **Capability advertisement**: Agents declare what they can help with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2acalling",
-  "version": "0.6.49",
+  "version": "0.6.50",
   "description": "Agent-to-agent calling for OpenClaw - A2A agent communication",
   "main": "src/index.js",
   "bin": {

package/scripts/install-skills.js

@@ -0,0 +1,80 @@
+/**
+ * A2A Skill Installer
+ *
+ * Copies Claude Code commands and Codex AGENTS.md into a target project directory.
+ * Idempotent: skips files that already exist with identical content.
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const PACKAGE_ROOT = path.join(__dirname, '..');
+
+const SKILL_FILES = [
+  { src: '.claude/commands/a2a-call.md', dest: '.claude/commands/a2a-call.md' },
+  { src: '.claude/commands/a2a-invite.md', dest: '.claude/commands/a2a-invite.md' },
+  { src: '.claude/commands/a2a-contacts.md', dest: '.claude/commands/a2a-contacts.md' },
+  { src: '.claude/commands/a2a-status.md', dest: '.claude/commands/a2a-status.md' },
+  { src: '.claude/commands/a2a-setup.md', dest: '.claude/commands/a2a-setup.md' },
+  { src: '.codex/AGENTS.md', dest: '.codex/AGENTS.md' }
+];
+
+function installSkills(targetDir, options = {}) {
+  const result = { installed: [], skipped: [], errors: [] };
+
+  for (const file of SKILL_FILES) {
+    const srcPath = path.join(PACKAGE_ROOT, file.src);
+    const destPath = path.join(targetDir, file.dest);
+
+    try {
+      if (!fs.existsSync(srcPath)) {
+        result.errors.push({ file: file.src, error: 'Source file not found' });
+        continue;
+      }
+
+      const srcContent = fs.readFileSync(srcPath, 'utf8');
+
+      // Check if identical file already exists
+      if (!options.force && fs.existsSync(destPath)) {
+        const existing = fs.readFileSync(destPath, 'utf8');
+        if (existing === srcContent) {
+          result.skipped.push(file.dest);
+          continue;
+        }
+      }
+
+      // Create directory and write file
+      fs.mkdirSync(path.dirname(destPath), { recursive: true });
+      fs.writeFileSync(destPath, srcContent);
+      result.installed.push(file.dest);
+    } catch (err) {
+      result.errors.push({ file: file.dest, error: err.message });
+    }
+  }
+
+  return result;
+}
+
+// CLI mode: node scripts/install-skills.js [targetDir] [--force]
+if (require.main === module) {
+  const args = process.argv.slice(2);
+  const force = args.includes('--force');
+  const targetDir = args.find(a => !a.startsWith('-')) || process.cwd();
+
+  const result = installSkills(targetDir, { force });
+
+  if (result.installed.length) {
+    console.log(`Installed ${result.installed.length} A2A skill file(s):`);
+    result.installed.forEach(f => console.log(`  + ${f}`));
+  }
+  if (result.skipped.length) {
+    console.log(`Skipped ${result.skipped.length} unchanged file(s)`);
+  }
+  if (result.errors.length) {
+    console.error(`Errors: ${result.errors.length}`);
+    result.errors.forEach(e => console.error(`  ! ${e.file}: ${e.error}`));
+    process.exit(1);
+  }
+}
+
+module.exports = { installSkills, SKILL_FILES };

package/scripts/postinstall.js

@@ -43,13 +43,25 @@ const result = spawnSync(process.execPath, [cliPath, 'quickstart'], {
 
 if (result.error) {
   // Don't fail the install — the agent will get onboarding when it runs `a2a`.
+  installSkillFiles();
   installMacOSApp();
   process.exit(0);
 }
 
+installSkillFiles();
 installMacOSApp();
 process.exit(result.status || 0);
 
+// Best-effort: install Claude Code + Codex skills into the workspace
+function installSkillFiles() {
+  try {
+    const { installSkills } = require('./install-skills');
+    installSkills(initCwd);
+  } catch (e) {
+    // Silent — skills can be installed later with `a2a skills`
+  }
+}
+
 // Download and install the native macOS app from GitHub Releases
 function installMacOSApp() {
   const os = require('os');

package/src/lib/claude-subagent.js

@@ -9,6 +9,7 @@
 
 const { execSync, spawn } = require('child_process');
 const { createLogger } = require('./logger');
+const { HARD_FALLBACK_TURN_TIMEOUT_MS } = require('./turn-timeout');
 
 const logger = createLogger({ component: 'a2a.claude-subagent' });
 
@@ -216,7 +217,7 @@ function parseSubagentResponse(resultText) {
  * @param {number} timeoutMs - Timeout in milliseconds
  * @returns {Promise<{ stdout: string, stderr: string }>}
  */
-function spawnClaude(args, timeoutMs = 180000) {
+function spawnClaude(args, timeoutMs = HARD_FALLBACK_TURN_TIMEOUT_MS) {
   return new Promise((resolve, reject) => {
     const proc = spawn('claude', args, {
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -302,7 +303,7 @@ function extractResultFromJson(stdout) {
  * @param {Array} options.activeThreads - Active conversation threads
  * @param {Array} options.candidateCollaborations - Candidate collaboration ideas
  * @param {boolean} options.closeSignal - Whether close has been signaled
- * @param {number} [options.timeoutMs=180000] - Timeout in milliseconds
+ * @param {number} [options.timeoutMs=300000] - Timeout in milliseconds
  * @returns {Promise<{ message: string, statePatch: object|null, flags: array, sessionId: string }>}
  */
 async function runClaudeTurn(options) {
@@ -317,7 +318,7 @@ async function runClaudeTurn(options) {
     activeThreads = [],
     candidateCollaborations = [],
     closeSignal = false,
-    timeoutMs = 180000
+    timeoutMs = HARD_FALLBACK_TURN_TIMEOUT_MS
   } = options;
 
   const turnPrompt = buildTurnPrompt({
@@ -396,10 +397,10 @@ async function runClaudeTurn(options) {
  *
  * @param {string} sessionId - Session ID to resume
  * @param {string} reason - Why the conversation is ending
- * @param {number} [timeoutMs=120000] - Timeout in milliseconds
+ * @param {number} [timeoutMs=300000] - Timeout in milliseconds
  * @returns {Promise<{ summary: string, ownerSummary: string, actionItems: array, flags: array }>}
  */
-async function runClaudeSummary(sessionId, reason, timeoutMs = 120000) {
+async function runClaudeSummary(sessionId, reason, timeoutMs = HARD_FALLBACK_TURN_TIMEOUT_MS) {
   if (!sessionId) {
     throw new Error('Cannot summarize without a session ID');
   }

package/src/lib/config.js

@@ -224,6 +224,7 @@ const DEFAULT_CONFIG = {
       perHour: 100,
       perDay: 1000
     },
+    turnTimeoutMs: 300000,      // default Claude turn timeout
     maxPendingRequests: 5       // max connection requests per hour
   },
   

package/src/lib/conversation-driver.js

@@ -22,6 +22,7 @@ const {
 const { getTopicsForTier, formatTopicsForPrompt, loadManifest } = require('./disclosure');
 const { createLogger } = require('./logger');
 const { buildUnifiedSummaryPrompt } = require('./summary-prompt');
+const { resolveTokenTimeoutMs, resolveTurnTimeoutMs } = require('./turn-timeout');
 
 const logger = createLogger({ component: 'a2a.conversation-driver' });
 
@@ -130,9 +131,16 @@ class ConversationDriver {
     this.summarizer = options.summarizer || null;
     this.ownerContext = options.ownerContext || {};
     this.claudeMode = options.runtime?.mode === 'claude';
-    this.claudeTimeoutMs = options.claudeTimeoutMs || 180000;
 
-    const clientTimeout = this.claudeMode ? 200000 : 65000;
+    const tokenTimeoutMs = options.tokenTimeoutMs
+      || options.claudeTimeoutMs
+      || resolveTokenTimeoutMs(options.token);
+    const configTimeoutMs = options.configTurnTimeoutMs;
+    this.claudeTimeoutMs = resolveTurnTimeoutMs({ tokenTimeoutMs, configTimeoutMs });
+
+    const clientTimeout = this.claudeMode
+      ? Math.max(this.claudeTimeoutMs + 20000, 200000)
+      : 65000;
     this.client = new A2AClient({ caller: this.caller, timeout: clientTimeout });
   }
 
@@ -221,7 +229,8 @@ class ConversationDriver {
             sessionId: `summary-${Date.now()}`,
             prompt,
             messages,
-            callerInfo: { name: agentContext.name, owner: agentContext.owner }
+            callerInfo: { name: agentContext.name, owner: agentContext.owner },
+            timeoutMs: this.claudeMode ? this.claudeTimeoutMs : 35000
           });
         } catch (err) {
           logger.warn('Runtime summarizer failed, using default', {

package/src/lib/runtime-adapter.js

@@ -14,6 +14,7 @@ const { execSync, spawnSync } = require('child_process');
 const { createLogger } = require('./logger');
 const { runClaudeTurn: invokeClaudeTurn, buildSubagentSystemPrompt, runClaudeSummary } = require('./claude-subagent');
 const { getTopicsForTier, formatTopicsForPrompt, loadManifest } = require('./disclosure');
+const { HARD_FALLBACK_TURN_TIMEOUT_MS } = require('./turn-timeout');
 
 function commandExists(command) {
   try {
@@ -208,7 +209,7 @@ function createRuntimeAdapter(options = {}) {
       activeThreads: context?.activeThreads || [],
       candidateCollaborations: context?.candidateCollaborations || [],
       closeSignal: context?.closeSignal || false,
-      timeoutMs: timeoutMs || 180000
+      timeoutMs: timeoutMs || HARD_FALLBACK_TURN_TIMEOUT_MS
     });
 
     // Store session ID from first turn for subsequent --resume
@@ -379,7 +380,7 @@ function createRuntimeAdapter(options = {}) {
     }
   }
 
-  async function summarize({ sessionId, prompt, messages, callerInfo, traceId, conversationId }) {
+  async function summarize({ sessionId, prompt, messages, callerInfo, traceId, conversationId, timeoutMs }) {
     const effectiveTraceId = traceId || callerInfo?.trace_id || callerInfo?.traceId;
     const requestId = callerInfo?.request_id || callerInfo?.requestId;
     const effectiveConversationId = conversationId || callerInfo?.conversation_id || callerInfo?.conversationId;
@@ -388,7 +389,11 @@ function createRuntimeAdapter(options = {}) {
     if (modeInfo.mode === 'claude') {
       const session = claudeSessions.get(sessionId);
       if (session?.claudeSessionId) {
-        const result = await runClaudeSummary(session.claudeSessionId, 'conversation ended');
+        const result = await runClaudeSummary(
+          session.claudeSessionId,
+          'conversation ended',
+          timeoutMs || HARD_FALLBACK_TURN_TIMEOUT_MS
+        );
         if (result && result.summary) {
           return result;
         }

package/src/lib/tokens.js

@@ -56,6 +56,11 @@ function sanitizeCustomFields(fields, options = {}) {
   return cleaned;
 }
 
+function parsePositiveTimeoutMs(value) {
+  const parsed = Number.parseInt(String(value ?? ''), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}
+
 class TokenStore {
   constructor(configDir = DEFAULT_CONFIG_DIR) {
     this.configDir = configDir;
@@ -196,7 +201,8 @@ class TokenStore {
       // Snapshot of actual capabilities at creation time
       allowedTopics = null,  // Array of topic strings, e.g. ['chat', 'calendar.read']
       allowedGoals = null,   // Array of goal strings, e.g. ['grow-network', 'find-collaborators']
-      tierSettings = null    // Object with tier-specific settings
+      tierSettings = null,   // Object with tier-specific settings
+      timeoutMs = null
     } = options;
 
     const tier = String(permissions || 'public').trim() || 'public';
@@ -255,6 +261,7 @@ class TokenStore {
       capabilities: capabilities || defaultCapabilities,
       allowed_topics: allowedTopics || defaultTopics[tier] || ['chat'],
       allowed_goals: allowedGoals || defaultGoals[tier] || [],
+      timeout_ms: parsePositiveTimeoutMs(timeoutMs),
       tier_settings: tierSettings || {},  // Snapshot of settings at creation
       disclosure,
       notify,
@@ -327,6 +334,10 @@ class TokenStore {
       || TokenStore.DEFAULT_CAPABILITIES[tier]
       || ['context-read'];
 
+    const timeoutMs = parsePositiveTimeoutMs(record.timeout_ms)
+      || parsePositiveTimeoutMs(record.tier_settings?.timeout_ms)
+      || parsePositiveTimeoutMs(record.tier_settings?.timeoutMs);
+
     return {
       valid: true,
       id: record.id,
@@ -335,6 +346,7 @@ class TokenStore {
       capabilities,
       allowed_topics: record.allowed_topics || ['chat'],
       allowed_goals: record.allowed_goals || [],
+      timeout_ms: timeoutMs,
       tier_settings: record.tier_settings || {},
       disclosure: record.disclosure,
       notify: record.notify,

package/src/lib/turn-timeout.js

@@ -0,0 +1,52 @@
+const HARD_FALLBACK_TURN_TIMEOUT_MS = 300000;
+
+function parsePositiveInt(value) {
+  const parsed = Number.parseInt(String(value ?? ''), 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}
+
+function resolveTokenTimeoutMs(token) {
+  if (!token || typeof token !== 'object') {
+    return null;
+  }
+
+  const topLevel = parsePositiveInt(token.timeout_ms ?? token.timeoutMs);
+  if (topLevel) {
+    return topLevel;
+  }
+
+  const tierSettings = token.tier_settings || token.tierSettings;
+  if (!tierSettings || typeof tierSettings !== 'object') {
+    return null;
+  }
+  return parsePositiveInt(tierSettings.timeout_ms ?? tierSettings.timeoutMs);
+}
+
+function resolveTurnTimeoutMs(options = {}) {
+  const tokenTimeoutMs = parsePositiveInt(options.tokenTimeoutMs);
+  if (tokenTimeoutMs) {
+    return tokenTimeoutMs;
+  }
+
+  const envTimeoutMs = parsePositiveInt(
+    options.envTimeoutMs !== undefined ? options.envTimeoutMs : process.env.A2A_TURN_TIMEOUT
+  );
+  if (envTimeoutMs) {
+    return envTimeoutMs;
+  }
+
+  const configTimeoutMs = parsePositiveInt(options.configTimeoutMs);
+  if (configTimeoutMs) {
+    return configTimeoutMs;
+  }
+
+  const fallbackTimeoutMs = parsePositiveInt(options.hardFallbackMs);
+  return fallbackTimeoutMs || HARD_FALLBACK_TURN_TIMEOUT_MS;
+}
+
+module.exports = {
+  HARD_FALLBACK_TURN_TIMEOUT_MS,
+  parsePositiveInt,
+  resolveTokenTimeoutMs,
+  resolveTurnTimeoutMs
+};

package/src/routes/a2a.js

@@ -340,6 +340,7 @@ function createRoutes(options = {}) {
       tier: validation.tier,
       capabilities: validation.capabilities,
       allowed_topics: validation.allowed_topics,
+      timeout_ms: validation.timeout_ms,
       disclosure: validation.disclosure,
       caller: sanitizedCaller,
       conversation_id: conversation_id || `conv_${Date.now()}_${crypto.randomBytes(6).toString('hex')}`,

package/src/server.js

@@ -27,6 +27,7 @@ const { buildUnifiedSummaryPrompt } = require('./lib/summary-prompt');
 const { A2AConfig } = require('./lib/config');
 const { UpdateManager } = require('./lib/update-manager');
 const { spawn } = require('child_process');
+const { resolveTurnTimeoutMs } = require('./lib/turn-timeout');
 
 const DEFAULT_PORTS = [80, 3001, 8080, 8443, 9001];
 const requestedPort = process.env.PORT ? parseInt(process.env.PORT, 10)
@@ -120,6 +121,15 @@ function readPositiveIntEnv(name, fallback) {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 }
 
+function resolveConfiguredTurnTimeoutMs() {
+  try {
+    const defaults = config.getDefaults?.() || {};
+    return defaults.turnTimeoutMs ?? defaults.turn_timeout_ms ?? null;
+  } catch (err) {
+    return null;
+  }
+}
+
 function resolveCollabMode() {
   const raw = String(process.env.A2A_COLLAB_MODE || 'adaptive').trim().toLowerCase();
   if (raw === 'deep_dive' || raw === 'deep-dive') {
@@ -583,6 +593,10 @@ async function callAgent(message, a2aContext) {
     : buildConnectionPrompt(promptOptions);
 
   const sessionId = `a2a-${conversationId}`;
+  const claudeTurnTimeoutMs = resolveTurnTimeoutMs({
+    tokenTimeoutMs: a2aContext.timeout_ms,
+    configTimeoutMs: resolveConfiguredTurnTimeoutMs()
+  });
   
   try {
     callLogger.info('Handling inbound call turn', {
@@ -600,12 +614,13 @@ async function callAgent(message, a2aContext) {
         prompt,
         message,
         caller: a2aContext.caller || {},
-        timeoutMs: 65000,
+        timeoutMs: runtime.mode === 'claude' ? claudeTurnTimeoutMs : 65000,
         context: {
           conversationId,
           tier: tierInfo,
           ownerName: agentContext.owner,
           allowedTopics: a2aContext.allowed_topics || [],
+          timeoutMs: runtime.mode === 'claude' ? claudeTurnTimeoutMs : 65000,
           traceId,
           requestId
         }