a2acalling 0.6.52 → 0.6.54

package/native/macos/package-lock.json

@@ -0,0 +1,232 @@
+{
+  "name": "a2a-callbook-macos",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "a2a-callbook-macos",
+      "version": "0.1.0",
+      "devDependencies": {
+        "@tauri-apps/cli": "^2.10.0"
+      }
+    },
+    "node_modules/@tauri-apps/cli": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.10.0.tgz",
+      "integrity": "sha512-ZwT0T+7bw4+DPCSWzmviwq5XbXlM0cNoleDKOYPFYqcZqeKY31KlpoMW/MOON/tOFBPgi31a2v3w9gliqwL2+Q==",
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "bin": {
+        "tauri": "tauri.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/tauri"
+      },
+      "optionalDependencies": {
+        "@tauri-apps/cli-darwin-arm64": "2.10.0",
+        "@tauri-apps/cli-darwin-x64": "2.10.0",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "2.10.0",
+        "@tauri-apps/cli-linux-arm64-gnu": "2.10.0",
+        "@tauri-apps/cli-linux-arm64-musl": "2.10.0",
+        "@tauri-apps/cli-linux-riscv64-gnu": "2.10.0",
+        "@tauri-apps/cli-linux-x64-gnu": "2.10.0",
+        "@tauri-apps/cli-linux-x64-musl": "2.10.0",
+        "@tauri-apps/cli-win32-arm64-msvc": "2.10.0",
+        "@tauri-apps/cli-win32-ia32-msvc": "2.10.0",
+        "@tauri-apps/cli-win32-x64-msvc": "2.10.0"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-arm64": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.10.0.tgz",
+      "integrity": "sha512-avqHD4HRjrMamE/7R/kzJPcAJnZs0IIS+1nkDP5b+TNBn3py7N2aIo9LIpy+VQq0AkN8G5dDpZtOOBkmWt/zjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-x64": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.10.0.tgz",
+      "integrity": "sha512-keDmlvJRStzVFjZTd0xYkBONLtgBC9eMTpmXnBXzsHuawV2q9PvDo2x6D5mhuoMVrJ9QWjgaPKBBCFks4dK71Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.10.0.tgz",
+      "integrity": "sha512-e5u0VfLZsMAC9iHaOEANumgl6lfnJx0Dtjkd8IJpysZ8jp0tJ6wrIkto2OzQgzcYyRCKgX72aKE0PFgZputA8g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.10.0.tgz",
+      "integrity": "sha512-YrYYk2dfmBs5m+OIMCrb+JH/oo+4FtlpcrTCgiFYc7vcs6m3QDd1TTyWu0u01ewsCtK2kOdluhr/zKku+KP7HA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-musl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.10.0.tgz",
+      "integrity": "sha512-GUoPdVJmrJRIXFfW3Rkt+eGK9ygOdyISACZfC/bCSfOnGt8kNdQIQr5WRH9QUaTVFIwxMlQyV3m+yXYP+xhSVA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-riscv64-gnu": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.10.0.tgz",
+      "integrity": "sha512-JO7s3TlSxshwsoKNCDkyvsx5gw2QAs/Y2GbR5UE2d5kkU138ATKoPOtxn8G1fFT1aDW4LH0rYAAfBpGkDyJJnw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-gnu": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.10.0.tgz",
+      "integrity": "sha512-Uvh4SUUp4A6DVRSMWjelww0GnZI3PlVy7VS+DRF5napKuIehVjGl9XD0uKoCoxwAQBLctvipyEK+pDXpJeoHng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-musl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.10.0.tgz",
+      "integrity": "sha512-AP0KRK6bJuTpQ8kMNWvhIpKUkQJfcPFeba7QshOQZjJ8wOS6emwTN4K5g/d3AbCMo0RRdnZWwu67MlmtJyxC1Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.10.0.tgz",
+      "integrity": "sha512-97DXVU3dJystrq7W41IX+82JEorLNY+3+ECYxvXWqkq7DBN6FsA08x/EFGE8N/b0LTOui9X2dvpGGoeZKKV08g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.10.0.tgz",
+      "integrity": "sha512-EHyQ1iwrWy1CwMalEm9z2a6L5isQ121pe7FcA2xe4VWMJp+GHSDDGvbTv/OPdkt2Lyr7DAZBpZHM6nvlHXEc4A==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-x64-msvc": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.10.0.tgz",
+      "integrity": "sha512-NTpyQxkpzGmU6ceWBTY2xRIEaS0ZLbVx1HE1zTA3TY/pV3+cPoPPOs+7YScr4IMzXMtOw7tLw5LEXo5oIG3qaQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    }
+  }
+}

package/native/macos/src-tauri/src/discovery.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::time::Duration;
 
-const DEFAULT_PORTS: &[u16] = &[3001, 80, 8080, 8443, 9001];
+const DEFAULT_PORTS: &[u16] = &[80, 3001, 8080, 8443, 9001];
 const PROBE_TIMEOUT: Duration = Duration::from_millis(800);
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -14,15 +14,57 @@ pub struct DiscoveryResult {
 #[derive(Debug, Deserialize)]
 struct A2AConfig {
     onboarding: Option<OnboardingConfig>,
+    agent: Option<AgentConfig>,
 }
 
 #[derive(Debug, Deserialize)]
 struct OnboardingConfig {
+    #[serde(alias = "serverPort")]
     server_port: Option<u16>,
 }
 
-/// Read port from ~/.config/openclaw/a2a-config.json
-pub fn read_config_port() -> Option<u16> {
+#[derive(Debug, Deserialize)]
+struct AgentConfig {
+    hostname: Option<String>,
+}
+
+fn parse_port_from_hostname(hostname: &str) -> Option<u16> {
+    let trimmed = hostname.trim();
+    if trimmed.is_empty() {
+        return None;
+    }
+
+    // Allow values like:
+    // - 149.28.213.47:3007
+    // - localhost:3007
+    // - http://localhost:3007
+    // - [::1]:3007
+    let without_scheme = trimmed.split("://").nth(1).unwrap_or(trimmed);
+    let host_segment = without_scheme.split('/').next().unwrap_or(without_scheme);
+
+    if host_segment.starts_with('[') {
+        let end = host_segment.find(']')?;
+        let remainder = &host_segment[end + 1..];
+        let port_str = remainder.strip_prefix(':')?;
+        return port_str.parse::<u16>().ok();
+    }
+
+    // Bare IPv6 literals contain multiple colons and no explicit port delimiter.
+    if host_segment.matches(':').count() > 1 {
+        return None;
+    }
+
+    let (_, port_str) = host_segment.rsplit_once(':')?;
+    if !port_str.chars().all(|ch| ch.is_ascii_digit()) {
+        return None;
+    }
+
+    port_str.parse::<u16>().ok()
+}
+
+/// Read likely server ports from ~/.config/openclaw/a2a-config.json.
+/// We prefer explicit onboarding server_port, then agent.hostname port.
+pub fn read_config_ports() -> Vec<u16> {
     let config_dir = std::env::var("A2A_CONFIG_DIR")
         .or_else(|_| std::env::var("OPENCLAW_CONFIG_DIR"))
         .map(PathBuf::from)
@@ -34,14 +76,36 @@ pub fn read_config_port() -> Option<u16> {
         });
 
     let config_path = config_dir.join("a2a-config.json");
-    let content = std::fs::read_to_string(config_path).ok()?;
-    let config: A2AConfig = serde_json::from_str(&content).ok()?;
-    config.onboarding?.server_port
+    let content = match std::fs::read_to_string(config_path) {
+        Ok(data) => data,
+        Err(_) => return vec![],
+    };
+    let config: A2AConfig = match serde_json::from_str(&content) {
+        Ok(parsed) => parsed,
+        Err(_) => return vec![],
+    };
+
+    let mut ports = Vec::new();
+
+    if let Some(port) = config.onboarding.and_then(|ob| ob.server_port) {
+        ports.push(port);
+    }
+
+    if let Some(port) = config
+        .agent
+        .and_then(|agent| agent.hostname)
+        .and_then(|hostname| parse_port_from_hostname(&hostname))
+    {
+        if !ports.contains(&port) {
+            ports.push(port);
+        }
+    }
+
+    ports
 }
 
 /// Probe a single port — returns true if a2a server responds
 async fn probe_port(port: u16) -> bool {
-    let url = format!("http://127.0.0.1:{}/api/a2a/ping", port);
     let client = reqwest::Client::builder()
         .timeout(PROBE_TIMEOUT)
         .build();
@@ -51,16 +115,36 @@ async fn probe_port(port: u16) -> bool {
         Err(_) => return false,
     };
 
-    match client.get(&url).send().await {
-        Ok(resp) => resp.status().is_success(),
-        Err(_) => false,
+    for host in ["127.0.0.1", "localhost"] {
+        let url = format!("http://{}:{}/api/a2a/ping", host, port);
+        let ok = match client.get(&url).send().await {
+            Ok(resp) => {
+                if !resp.status().is_success() {
+                    false
+                } else {
+                    match resp.text().await {
+                        Ok(body) => body.contains("\"pong\":true"),
+                        Err(_) => false,
+                    }
+                }
+            }
+            Err(_) => false,
+        };
+
+        if ok {
+            return true;
+        }
     }
+
+    false
 }
 
 /// Discover the running a2a server
 pub async fn discover_server() -> DiscoveryResult {
-    // 1. Try config port first
-    if let Some(port) = read_config_port() {
+    let config_ports = read_config_ports();
+
+    // 1. Try config-derived ports first
+    for &port in &config_ports {
         if probe_port(port).await {
             return DiscoveryResult {
                 port: Some(port),
@@ -69,8 +153,11 @@ pub async fn discover_server() -> DiscoveryResult {
         }
     }
 
-    // 2. Scan default ports
+    // 2. Scan default ports (skip those already checked from config)
     for &port in DEFAULT_PORTS {
+        if config_ports.contains(&port) {
+            continue;
+        }
         if probe_port(port).await {
             return DiscoveryResult {
                 port: Some(port),

package/native/macos/src-tauri/src/server.rs

@@ -44,7 +44,10 @@ pub fn start_server() -> StartResult {
         }
     };
 
-    let port = crate::discovery::read_config_port().unwrap_or(3001);
+    let port = crate::discovery::read_config_ports()
+        .first()
+        .copied()
+        .unwrap_or(3001);
     let port_str = port.to_string();
 
     let result = Command::new(&binary)

package/package.json

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

package/scripts/install-skills.js

@@ -1,8 +1,13 @@
 /**
  * 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.
+ * Copies Claude Code commands, CLAUDE.md context, and Codex AGENTS.md into a
+ * target project directory. Idempotent: skips files that already exist with
+ * identical content.
+ *
+ * CLAUDE.md is the key file — Claude Code reads it automatically, giving the
+ * agent full context about the a2a CLI, native app, and onboarding flow
+ * immediately after npm install.
  */
 
 const fs = require('fs');
@@ -11,11 +16,15 @@ const path = require('path');
 const PACKAGE_ROOT = path.join(__dirname, '..');
 
 const SKILL_FILES = [
+  // CLAUDE.md — gives Claude Code instant context about the a2a CLI
+  { src: 'CLAUDE-INSTALL.md', dest: 'CLAUDE.md', mergeKey: '# A2A Calling' },
+  // Claude Code slash commands
   { 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' },
+  // Codex agent instructions
   { src: '.codex/AGENTS.md', dest: '.codex/AGENTS.md' }
 ];
 
@@ -34,10 +43,36 @@ function installSkills(targetDir, options = {}) {
 
       const srcContent = fs.readFileSync(srcPath, 'utf8');
 
-      // Check if identical file already exists
-      if (!options.force && fs.existsSync(destPath)) {
+      if (fs.existsSync(destPath)) {
         const existing = fs.readFileSync(destPath, 'utf8');
-        if (existing === srcContent) {
+
+        // Merge mode: if the file has a mergeKey, append/replace the A2A section
+        // in an existing file rather than overwriting it entirely.
+        if (file.mergeKey) {
+          if (existing.includes(file.mergeKey)) {
+            // A2A section already present — extract and compare
+            const sectionStart = existing.indexOf(file.mergeKey);
+            const existingSection = existing.slice(sectionStart);
+            if (!options.force && existingSection.trim() === srcContent.trim()) {
+              result.skipped.push(file.dest);
+              continue;
+            }
+            // Replace the A2A section with updated content
+            const before = existing.slice(0, sectionStart).trimEnd();
+            const merged = before ? before + '\n\n' + srcContent : srcContent;
+            fs.writeFileSync(destPath, merged);
+            result.installed.push(file.dest + ' (updated A2A section)');
+          } else {
+            // Existing CLAUDE.md without A2A section — append
+            const merged = existing.trimEnd() + '\n\n' + srcContent;
+            fs.writeFileSync(destPath, merged);
+            result.installed.push(file.dest + ' (appended A2A section)');
+          }
+          continue;
+        }
+
+        // Standard mode: skip if identical
+        if (!options.force && existing === srcContent) {
           result.skipped.push(file.dest);
           continue;
         }