a2acalling 0.6.48 → 0.6.50

package/src/dashboard/public/app.js

@@ -1,6 +1,7 @@
 const state = {
   settings: null,
   dashboardStatus: null,
+  autoUpdate: null,
   callbookDevices: [],
   contacts: [],
   selectedContactId: null,
@@ -63,6 +64,20 @@ function esc(text) {
     .replaceAll("'", ''');
 }
 
+function formatUpdaterState(stateValue) {
+  const state = String(stateValue || '').trim() || 'unknown';
+  return state.replaceAll('_', ' ');
+}
+
+function updaterPillClass(stateValue) {
+  const state = String(stateValue || '').trim();
+  if (state === 'failed') return 'err';
+  if (state === 'waiting_for_safe_restart' || state === 'checking' || state === 'downloading' || state === 'applying' || state === 'restarting') {
+    return 'warn';
+  }
+  return 'ok';
+}
+
 async function copyText(value) {
   const text = String(value || '');
   if (!text) return false;
@@ -284,7 +299,7 @@ function bindContactsActions() {
     if (!urlEl || !serverNameEl) return;
     if (mineEl && !mineEl.checked) return;
     if (serverNameEl.value.trim()) return;
-    const match = String(urlEl.value || '').trim().match(/^(?:a2a|oclaw):\\/\\/([^/]+)\\//);
+    const match = String(urlEl.value || '').trim().match(/^(?:a2a|oclaw):\/\/([^/]+)\//);
     if (match && match[1]) {
       serverNameEl.value = match[1];
     }
@@ -1035,14 +1050,59 @@ function renderCallbookStatus() {
   `;
 }
 
+function renderAutoUpdateStatus() {
+  const el = document.getElementById('auto-update-status');
+  const toggleBtn = document.getElementById('auto-update-toggle');
+  if (!el) return;
+
+  const au = state.autoUpdate;
+  if (!au) {
+    el.textContent = 'Loading…';
+    if (toggleBtn) toggleBtn.disabled = true;
+    return;
+  }
+
+  const stateText = formatUpdaterState(au.state);
+  const pillClass = updaterPillClass(au.state);
+  const enabled = Boolean(au.enabled);
+  const intervalSec = Number.isFinite(au.interval_ms) ? Math.floor(au.interval_ms / 1000) : null;
+
+  el.innerHTML = `
+    <div><strong>Status:</strong> <span class="status-pill ${pillClass}">${esc(stateText)}</span></div>
+    <div><strong>Enabled:</strong> ${enabled ? 'yes' : 'no'}</div>
+    <div><strong>Current version:</strong> <span class="mono">${esc(au.current_version || '-')}</span></div>
+    <div><strong>Latest version:</strong> <span class="mono">${esc(au.latest_version || '-')}</span></div>
+    <div><strong>Target version:</strong> <span class="mono">${esc(au.target_version || '-')}</span></div>
+    <div><strong>Active calls:</strong> ${esc(String(au.active_calls || 0))}</div>
+    <div><strong>Interval:</strong> ${intervalSec === null ? '-' : `${intervalSec}s`}</div>
+    <div><strong>Last checked:</strong> ${esc(fmtDate(au.last_checked_at))}</div>
+    <div><strong>Last success:</strong> ${esc(fmtDate(au.last_success_at))}</div>
+    ${au.defer_reason ? `<div><strong>Deferred:</strong> ${esc(au.defer_reason)}</div>` : ''}
+    ${au.last_error ? `<div><strong>Error:</strong> <span class="mono">${esc(au.last_error)}</span></div>` : ''}
+  `;
+
+  if (toggleBtn) {
+    toggleBtn.disabled = false;
+    toggleBtn.textContent = enabled ? 'Disable auto-update' : 'Enable auto-update';
+  }
+}
+
 async function loadDashboardStatus(refreshIp = false) {
   const payload = await request(`/status${refreshIp ? '?refresh_ip=true' : ''}`);
   state.dashboardStatus = payload;
+  state.autoUpdate = payload.auto_update || state.autoUpdate;
   renderCallbookStatus();
+  renderAutoUpdateStatus();
   renderContacts();
   renderContactDetail();
 }
 
+async function loadAutoUpdateStatus() {
+  const payload = await request('/update/status');
+  state.autoUpdate = payload.auto_update || null;
+  renderAutoUpdateStatus();
+}
+
 function renderCallbookDevices() {
   const tbody = document.querySelector('#callbook-devices-table tbody');
   if (!tbody) return;
@@ -1154,6 +1214,47 @@ function bindCallbookActions() {
   });
 }
 
+function bindAutoUpdateActions() {
+  document.getElementById('auto-update-refresh')?.addEventListener('click', () => {
+    loadAutoUpdateStatus().catch(err => showNotice(err.message));
+  });
+
+  document.getElementById('auto-update-check')?.addEventListener('click', async () => {
+    try {
+      await request('/update/check', { method: 'POST', body: JSON.stringify({}) });
+      await loadAutoUpdateStatus();
+      showNotice('Update check complete');
+    } catch (err) {
+      showNotice(err.message);
+    }
+  });
+
+  document.getElementById('auto-update-now')?.addEventListener('click', async () => {
+    try {
+      await request('/update/now', { method: 'POST', body: JSON.stringify({}) });
+      await loadAutoUpdateStatus();
+      showNotice('Update triggered');
+    } catch (err) {
+      showNotice(err.message);
+    }
+  });
+
+  document.getElementById('auto-update-toggle')?.addEventListener('click', async () => {
+    const au = state.autoUpdate || {};
+    const nextEnabled = !Boolean(au.enabled);
+    try {
+      await request('/update/config', {
+        method: 'PUT',
+        body: JSON.stringify({ enabled: nextEnabled })
+      });
+      await loadAutoUpdateStatus();
+      showNotice(nextEnabled ? 'Auto-update enabled' : 'Auto-update disabled');
+    } catch (err) {
+      showNotice(err.message);
+    }
+  });
+}
+
 function renderInvites() {
   const tbody = document.querySelector('#invites-table tbody');
   tbody.innerHTML = '';
@@ -1247,6 +1348,7 @@ async function bootstrap() {
   bindContactsActions();
   bindSettingsActions();
   bindCallbookActions();
+  bindAutoUpdateActions();
   bindInviteActions();
   bindRefreshButtons();
 
@@ -1254,6 +1356,7 @@ async function bootstrap() {
     await Promise.all([
       loadSettings(),
       loadDashboardStatus(),
+      loadAutoUpdateStatus(),
       loadCallbookDevices(),
       loadContacts(),
       loadCalls(),
@@ -1262,6 +1365,10 @@ async function bootstrap() {
       loadLogs()
     ]);
     showNotice('Dashboard loaded');
+
+    setInterval(() => {
+      loadAutoUpdateStatus().catch(() => {});
+    }, 10000);
   } catch (err) {
     showNotice(err.message);
   }

package/src/dashboard/public/index.html

@@ -171,6 +171,15 @@
       <h3>Remote Callbook</h3>
       <div id="callbook-status" class="card"></div>
 
+      <h3>Auto Update</h3>
+      <div id="auto-update-status" class="card">Loading…</div>
+      <div class="row">
+        <button id="auto-update-refresh" type="button">Refresh</button>
+        <button id="auto-update-check" type="button">Check now</button>
+        <button id="auto-update-now" type="button">Update now</button>
+        <button id="auto-update-toggle" type="button">Disable auto-update</button>
+      </div>
+
       <form id="callbook-provision-form" class="card">
         <div class="row">
           <button type="submit">Create Install Link (24h)</button>

package/src/dashboard/public/style.css

@@ -202,6 +202,33 @@ tr[data-selected="1"] td {
   display: none;
 }
 
+.status-pill {
+  display: inline-block;
+  padding: 0.15rem 0.45rem;
+  border-radius: 999px;
+  border: 1px solid var(--line);
+  font-size: 0.78rem;
+  font-weight: 600;
+}
+
+.status-pill.ok {
+  background: #ecfdf3;
+  border-color: #9bd8b8;
+  color: #125934;
+}
+
+.status-pill.warn {
+  background: #fff7e8;
+  border-color: #f1d08e;
+  color: #8a5a00;
+}
+
+.status-pill.err {
+  background: #fff0f1;
+  border-color: #efb1b6;
+  color: #8c1d26;
+}
+
 @media (max-width: 720px) {
   nav {
     overflow-x: auto;

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
   },
   
@@ -233,6 +234,14 @@ const DEFAULT_CONFIG = {
     description: '',
     hostname: ''
   },
+
+  // Auto-updater
+  auto_update: {
+    enabled: true,
+    intervalMs: 60 * 60 * 1000,
+    allowMajor: false,
+    lastGoodVersion: null
+  },
   
   // Timestamps
   createdAt: null,
@@ -381,6 +390,39 @@ class A2AConfig {
     return this.config;
   }
 
+  getAutoUpdate() {
+    const current = (this.config && typeof this.config.auto_update === 'object' && this.config.auto_update)
+      ? this.config.auto_update
+      : {};
+    return {
+      enabled: current.enabled !== false,
+      intervalMs: Number.isFinite(current.intervalMs) && current.intervalMs > 0
+        ? current.intervalMs
+        : DEFAULT_CONFIG.auto_update.intervalMs,
+      allowMajor: Boolean(current.allowMajor),
+      lastGoodVersion: current.lastGoodVersion || null
+    };
+  }
+
+  setAutoUpdate(patch = {}) {
+    const current = this.getAutoUpdate();
+    const next = { ...current };
+    if (patch.enabled !== undefined) next.enabled = Boolean(patch.enabled);
+    if (patch.intervalMs !== undefined) {
+      const parsed = Number.parseInt(String(patch.intervalMs), 10);
+      if (Number.isFinite(parsed) && parsed > 0) {
+        next.intervalMs = parsed;
+      }
+    }
+    if (patch.allowMajor !== undefined) next.allowMajor = Boolean(patch.allowMajor);
+    if (patch.lastGoodVersion !== undefined) {
+      next.lastGoodVersion = patch.lastGoodVersion ? String(patch.lastGoodVersion).trim() : null;
+    }
+    this.config.auto_update = next;
+    this._save();
+    return next;
+  }
+
   // Export for sharing
   export() {
     return {

package/src/lib/conversation-driver.js

@@ -21,6 +21,8 @@ const {
 } = require('./prompt-template');
 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' });
 
@@ -129,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 });
   }
 
@@ -143,37 +152,75 @@ class ConversationDriver {
   _buildSummarizer() {
     const runtime = this.runtime;
     const agentContext = this.agentContext;
+    const caller = this.caller;
+    const tier = this.tier;
 
     return async (messages, ownerContext) => {
       if (!messages || messages.length === 0) {
         return { summary: null };
       }
 
-      // Build the summary prompt (same structure as server.js generateSummary)
-      const messageText = messages.map(m => {
-        const role = m.direction === 'inbound' ? '[Them]' : '[You]';
-        return `${role}: ${m.content}`;
-      }).join('\n');
-
-      const prompt = `Summarize this A2A call for the owner. Write from the owner's perspective.
+      // Build transcript in unified format
+      const transcript = messages.map(m => ({
+        direction: m.direction,
+        content: m.content
+      }));
 
-You initiated this call.
-
-Conversation:
-${messageText}
+      // Load disclosure manifest for the tier
+      let disclosure = null;
+      try {
+        const tierTopics = getTopicsForTier(tier);
+        if (tierTopics) {
+          disclosure = {
+            topics: tierTopics.topics || [],
+            objectives: tierTopics.objectives || [],
+            doNotDiscuss: tierTopics.do_not_discuss || [],
+            neverDisclose: tierTopics.never_disclose || []
+          };
+        }
+      } catch (e) {
+        // Disclosure is optional — continue without it
+      }
 
-Structure your summary with these sections:
+      // Look up collaboration state from convStore if available
+      let collaborationState = null;
+      if (this.convStore) {
+        try {
+          const dbState = this.convStore.loadCollabState(this.lastConversationId || '');
+          if (dbState) {
+            collaborationState = {
+              phase: dbState.phase,
+              overlapScore: dbState.overlapScore,
+              turnCount: dbState.turnCount,
+              activeThreads: dbState.activeThreads,
+              candidateCollaborations: dbState.candidateCollaborations,
+              closeSignal: dbState.closeSignal
+            };
+          }
+        } catch (e) {
+          // Best effort
+        }
+      }
 
-**Who:** Who you called, who they represent, key facts about them.
-**Key Discoveries:** What was learned about the other side — capabilities, interests, blind spots.
-**Collaboration Potential:** Rate HIGH/MEDIUM/LOW. List specific opportunities identified.
-**What We Learned vs Shared:** Brief information exchange audit — what did we get, what did we give.
-**Recommended Follow-Up:**
-- [ ] Actionable item 1
-- [ ] Actionable item 2
-**Assessment:** One-sentence strategic value judgment.
+      // Map ownerContext into unified format
+      const unifiedOwnerContext = {
+        agentName: agentContext.name,
+        ownerName: agentContext.owner,
+        goals: ownerContext?.goals || []
+      };
 
-Be concise but specific. No filler.`;
+      const prompt = buildUnifiedSummaryPrompt({
+        transcript,
+        callerInfo: {
+          name: caller.name || null,
+          owner: caller.owner || null,
+          context: caller.context || null
+        },
+        conversationObjective: 'You initiated this call.',
+        disclosure,
+        collaborationState,
+        ownerContext: unifiedOwnerContext
+      });
 
       // Try runtime.summarize if available (OpenClaw path)
       if (typeof runtime.summarize === 'function') {
@@ -182,7 +229,8 @@ Be concise but specific. No filler.`;
             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', {
@@ -505,6 +553,8 @@ Be concise but specific. No filler.`;
     }
 
     // Conclude locally with summarizer
+    // Store conversationId so _buildSummarizer can look up collab state
+    this.lastConversationId = conversationId;
     let summary = null;
     if (this.convStore) {
       try {

package/src/lib/openclaw-integration.js

@@ -7,6 +7,7 @@
 const fs = require('fs');
 const path = require('path');
 const { createLogger } = require('./logger');
+const { buildUnifiedSummaryPrompt } = require('./summary-prompt');
 
 const logger = createLogger({ component: 'a2a.openclaw-integration' });
 
@@ -89,73 +90,28 @@ function loadOwnerContext(workspaceDir = process.cwd(), options = {}) {
  * Track the exchange balance AND surface partnership opportunities.
  */
 function buildSummaryPrompt(messages, ownerContext, callerInfo = {}) {
-  const messageText = messages.map(m => {
-    const role = m.direction === 'inbound' ? `[Caller${callerInfo.name ? ` - ${callerInfo.name}` : ''}]` : '[You]';
-    return `${role}: ${m.content}`;
-  }).join('\n\n');
-
-  const goalsSection = ownerContext.goals?.length ? `### Current Goals\n- ${ownerContext.goals.join('\n- ')}` : '';
-  const interestsSection = ownerContext.interests?.length ? `### Interests\n- ${ownerContext.interests.join('\n- ')}` : '';
-
-  return `You just finished an A2A agent-to-agent call. Analyze it strategically for your owner.
-
-## Philosophy
-A2A is cooperative AND adversarial. Each agent maximizes value for their own owner — but the best outcomes are mutual wins. Your job:
-
-1. **Track the exchange** — what did we get vs give?
-2. **Find mutual value** — what can BOTH parties gain?
-3. **Surface alignment** — does this connect to owner's goals?
-4. **Advise strategically** — protect interests while building relationships
-
-## Your Owner's Context
-${ownerContext.user ? `### From USER.md\n${ownerContext.user.slice(0, 2000)}` : ''}
-
-${goalsSection}
-
-${interestsSection}
-
-## The Conversation
-${messageText}
-
-## Caller Context
-${callerInfo.name ? `Name: ${callerInfo.name}` : 'Unknown caller'}
-${callerInfo.context ? `Context: ${callerInfo.context}` : ''}
-
-## Your Task
-Analyze as a strategic advisor. Return JSON:
-
-{
-  "who": "Who called, who they represent, key facts about them",
-
-  "keyDiscoveries": ["What was learned about the other side — capabilities, interests, blind spots"],
-
-  "collaborationPotential": {
-    "rating": "HIGH | MEDIUM | LOW",
-    "opportunities": ["specific opportunities identified"]
-  },
-
-  "exchange": {
-    "weGot": ["info, commitments, or value we extracted"],
-    "weGave": ["info, compute, or commitments we provided"],
-    "balance": "favorable | even | unfavorable"
-  },
-
-  "recommendedFollowUp": ["actionable items with specifics"],
-
-  "assessment": "One-sentence strategic value judgment",
-
-  "trust": {
-    "assessment": "appropriate | too_high | too_low",
-    "recommendation": "maintain | increase | decrease | revoke",
-    "pattern": "What's their angle? Genuine partner or extractive?"
-  },
-
-  "ownerBrief": "2-3 sentences: the strategic takeaway for your owner"
-}
-
-Think like a strategic advisor: protect your owner's interests AND find mutual wins.
+  // Build transcript in unified format
+  const transcript = messages.map(m => ({
+    direction: m.direction,
+    content: m.content
+  }));
+
+  // Map ownerContext (which has .user, .goals, .interests from USER.md) into unified format
+  const unifiedOwnerContext = {
+    agentName: null,
+    ownerName: null,
+    goals: ownerContext?.goals || []
+  };
 
-JSON:`;
+  return buildUnifiedSummaryPrompt({
+    transcript,
+    callerInfo: {
+      name: callerInfo.name || null,
+      owner: callerInfo.owner || null,
+      context: callerInfo.context || null
+    },
+    ownerContext: unifiedOwnerContext
+  });
 }
 
 /**

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;
         }