a2acalling 0.6.19 → 0.6.20

package/bin/cli.js

@@ -336,23 +336,10 @@ async function handleDisclosureSubmit(args, commandLabel = 'onboard') {
   // Sync tier config from manifest
   const manifest = result.manifest;
   
-  // Helper to extract topic names from both new and legacy formats
+  // Helper to extract topic names
   function getTierTopics(tierData) {
-    if (!tierData) return [];
-    // New format: topics array
-    if (Array.isArray(tierData.topics)) {
-      return tierData.topics.map(t => String(t && t.topic || '').trim()).filter(Boolean);
-    }
-    // Legacy format: lead_with + discuss_freely + deflect
-    const out = [];
-    for (const section of [tierData.lead_with, tierData.discuss_freely, tierData.deflect]) {
-      if (!Array.isArray(section)) continue;
-      for (const item of section) {
-        const t = String(item && item.topic || '').trim();
-        if (t && !out.includes(t)) out.push(t);
-      }
-    }
-    return out;
+    if (!tierData || !Array.isArray(tierData.topics)) return [];
+    return tierData.topics.map(t => String(t && t.topic || '').trim()).filter(Boolean);
   }
 
   // Get tiers data (support both new 'tiers' key and legacy 'topics' key)

package/package.json

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

package/src/lib/disclosure.js

@@ -172,24 +172,9 @@ function getTopicsForTier(tier) {
 
   for (const t of tiersToMerge) {
     const tierData = tiers[t] || {};
-    // Support both new format (topics/objectives/do_not_discuss) and legacy (lead_with/discuss_freely/deflect)
-    if (tierData.topics) {
-      merged.topics.push(...tierData.topics);
-    } else {
-      // Legacy format fallback
-      if (tierData.lead_with) merged.topics.push(...tierData.lead_with);
-      if (tierData.discuss_freely) merged.topics.push(...tierData.discuss_freely);
-    }
+    if (tierData.topics) merged.topics.push(...tierData.topics);
     if (tierData.objectives) merged.objectives.push(...tierData.objectives);
-    if (tierData.do_not_discuss) {
-      merged.do_not_discuss.push(...tierData.do_not_discuss);
-    } else if (tierData.deflect) {
-      // Legacy format fallback
-      merged.do_not_discuss.push(...tierData.deflect.map(d => ({
-        topic: d.topic,
-        reason: d.detail || d.reason
-      })));
-    }
+    if (tierData.do_not_discuss) merged.do_not_discuss.push(...tierData.do_not_discuss);
   }
 
   // Remove do_not_discuss items that appear in topics (higher tiers promote them)
@@ -229,11 +214,7 @@ function formatTopicsForPrompt(tierTopics) {
     doNotDiscuss: formatDoNotDiscuss(tierTopics.do_not_discuss),
     neverDisclose: tierTopics.never_disclose?.length
       ? tierTopics.never_disclose.map(item => `  - ${item}`).join('\n')
-      : '  (none specified)',
-    // Legacy compatibility
-    leadWithTopics: formatTopicList(tierTopics.topics?.slice(0, 3) || tierTopics.lead_with),
-    discussFreelyTopics: formatTopicList(tierTopics.topics?.slice(3) || tierTopics.discuss_freely),
-    deflectTopics: formatDoNotDiscuss(tierTopics.do_not_discuss || tierTopics.deflect)
+      : '  (none specified)'
   };
 }
 
@@ -405,102 +386,72 @@ function validateDisclosureSubmission(data) {
     errors.push(`Unknown tiers: ${extraTiers.join(', ')} — only public, friends, family are allowed`);
   }
 
-  // Detect format: new (topics/objectives/do_not_discuss) or legacy (lead_with/discuss_freely/deflect)
-  const isNewFormat = tiersData.public && (
-    Array.isArray(tiersData.public.topics) ||
-    Array.isArray(tiersData.public.objectives) ||
-    Array.isArray(tiersData.public.do_not_discuss)
-  );
-
   const LIST_LIMITS = { topics: 15, objectives: 8, do_not_discuss: 10 };
 
   for (const tier of TIER_HIERARCHY) {
     const tierData = tiersData[tier];
 
-    if (isNewFormat) {
-      // Validate new format: topics, objectives, do_not_discuss
-      if (tierData.topics !== undefined) {
-        if (!Array.isArray(tierData.topics)) {
-          errors.push(`tiers.${tier}.topics must be an array`);
-        } else {
-          if (tierData.topics.length > LIST_LIMITS.topics) {
-            errors.push(`tiers.${tier}.topics has ${tierData.topics.length} items — max ${LIST_LIMITS.topics}`);
+    // Validate topics array
+    if (tierData.topics !== undefined) {
+      if (!Array.isArray(tierData.topics)) {
+        errors.push(`tiers.${tier}.topics must be an array`);
+      } else {
+        if (tierData.topics.length > LIST_LIMITS.topics) {
+          errors.push(`tiers.${tier}.topics has ${tierData.topics.length} items — max ${LIST_LIMITS.topics}`);
+        }
+        for (let i = 0; i < tierData.topics.length; i++) {
+          const item = tierData.topics[i];
+          if (!item || typeof item !== 'object' || typeof item.topic !== 'string') {
+            errors.push(`tiers.${tier}.topics[${i}]: must have "topic" (string) and "description" (string)`);
+            continue;
           }
-          for (let i = 0; i < tierData.topics.length; i++) {
-            const item = tierData.topics[i];
-            if (!item || typeof item !== 'object' || typeof item.topic !== 'string') {
-              errors.push(`tiers.${tier}.topics[${i}]: must have "topic" (string) and "description" (string)`);
-              continue;
-            }
-            if (item.topic.trim().length === 0) {
-              errors.push(`tiers.${tier}.topics[${i}].topic must not be empty`);
-            }
-            if (item.topic.length > 160) {
-              errors.push(`tiers.${tier}.topics[${i}]: topic exceeds 160 chars`);
-            }
-            const desc = item.description || '';
-            if (desc.length > 500) {
-              errors.push(`tiers.${tier}.topics[${i}]: description exceeds 500 chars`);
-            }
+          if (item.topic.trim().length === 0) {
+            errors.push(`tiers.${tier}.topics[${i}].topic must not be empty`);
           }
-        }
-      }
-
-      if (tierData.objectives !== undefined) {
-        if (!Array.isArray(tierData.objectives)) {
-          errors.push(`tiers.${tier}.objectives must be an array`);
-        } else {
-          if (tierData.objectives.length > LIST_LIMITS.objectives) {
-            errors.push(`tiers.${tier}.objectives has ${tierData.objectives.length} items — max ${LIST_LIMITS.objectives}`);
+          if (item.topic.length > 160) {
+            errors.push(`tiers.${tier}.topics[${i}]: topic exceeds 160 chars`);
           }
-          for (let i = 0; i < tierData.objectives.length; i++) {
-            const item = tierData.objectives[i];
-            if (!item || typeof item !== 'object' || typeof item.objective !== 'string') {
-              errors.push(`tiers.${tier}.objectives[${i}]: must have "objective" (string) and "description" (string)`);
-              continue;
-            }
-            if (item.objective.trim().length === 0) {
-              errors.push(`tiers.${tier}.objectives[${i}].objective must not be empty`);
-            }
+          const desc = item.description || '';
+          if (desc.length > 500) {
+            errors.push(`tiers.${tier}.topics[${i}]: description exceeds 500 chars`);
           }
         }
       }
+    }
 
-      if (tierData.do_not_discuss !== undefined) {
-        if (!Array.isArray(tierData.do_not_discuss)) {
-          errors.push(`tiers.${tier}.do_not_discuss must be an array`);
-        } else {
-          if (tierData.do_not_discuss.length > LIST_LIMITS.do_not_discuss) {
-            errors.push(`tiers.${tier}.do_not_discuss has ${tierData.do_not_discuss.length} items — max ${LIST_LIMITS.do_not_discuss}`);
+    // Validate objectives array
+    if (tierData.objectives !== undefined) {
+      if (!Array.isArray(tierData.objectives)) {
+        errors.push(`tiers.${tier}.objectives must be an array`);
+      } else {
+        if (tierData.objectives.length > LIST_LIMITS.objectives) {
+          errors.push(`tiers.${tier}.objectives has ${tierData.objectives.length} items — max ${LIST_LIMITS.objectives}`);
+        }
+        for (let i = 0; i < tierData.objectives.length; i++) {
+          const item = tierData.objectives[i];
+          if (!item || typeof item !== 'object' || typeof item.objective !== 'string') {
+            errors.push(`tiers.${tier}.objectives[${i}]: must have "objective" (string) and "description" (string)`);
+            continue;
           }
-          for (let i = 0; i < tierData.do_not_discuss.length; i++) {
-            const item = tierData.do_not_discuss[i];
-            if (!item || typeof item !== 'object' || typeof item.topic !== 'string') {
-              errors.push(`tiers.${tier}.do_not_discuss[${i}]: must have "topic" (string) and "reason" (string)`);
-            }
+          if (item.objective.trim().length === 0) {
+            errors.push(`tiers.${tier}.objectives[${i}].objective must not be empty`);
           }
         }
       }
-    } else {
-      // Validate legacy format: lead_with, discuss_freely, deflect
-      const requiredLists = ['lead_with', 'discuss_freely', 'deflect'];
-      const LEGACY_LIMITS = { lead_with: 10, discuss_freely: 20, deflect: 10 };
-      for (const cat of requiredLists) {
-        if (!Array.isArray(tierData[cat])) {
-          errors.push(`topics.${tier}.${cat} must be an array`);
-          continue;
-        }
-        if (tierData[cat].length > LEGACY_LIMITS[cat]) {
-          errors.push(`topics.${tier}.${cat} has ${tierData[cat].length} items — max ${LEGACY_LIMITS[cat]}`);
+    }
+
+    // Validate do_not_discuss array
+    if (tierData.do_not_discuss !== undefined) {
+      if (!Array.isArray(tierData.do_not_discuss)) {
+        errors.push(`tiers.${tier}.do_not_discuss must be an array`);
+      } else {
+        if (tierData.do_not_discuss.length > LIST_LIMITS.do_not_discuss) {
+          errors.push(`tiers.${tier}.do_not_discuss has ${tierData.do_not_discuss.length} items — max ${LIST_LIMITS.do_not_discuss}`);
         }
-        for (let i = 0; i < tierData[cat].length; i++) {
-          const item = tierData[cat][i];
+        for (let i = 0; i < tierData.do_not_discuss.length; i++) {
+          const item = tierData.do_not_discuss[i];
           if (!item || typeof item !== 'object' || typeof item.topic !== 'string') {
-            errors.push(`topics.${tier}.${cat}[${i}]: must have "topic" (string) and "detail" (string)`);
-            continue;
-          }
-          if (item.topic.trim().length === 0) {
-            errors.push(`topics.${tier}.${cat}[${i}].topic must not be empty`);
+            errors.push(`tiers.${tier}.do_not_discuss[${i}]: must have "topic" (string) and "reason" (string)`);
           }
         }
       }
@@ -538,63 +489,38 @@ function validateDisclosureSubmission(data) {
     return { valid: false, manifest: null, errors };
   }
 
-  // Rebuild clean structure (isNewFormat already set above)
+  // Rebuild clean structure
   const now = new Date().toISOString();
 
-  if (isNewFormat) {
-    // New format: tiers with topics/objectives/do_not_discuss
-    const cleanTiers = {};
-    for (const tier of TIER_HIERARCHY) {
-      cleanTiers[tier] = {
-        topics: (tiersData[tier].topics || []).map(item => ({
-          topic: item.topic,
-          description: item.description || ''
-        })),
-        objectives: (tiersData[tier].objectives || []).map(item => ({
-          objective: item.objective,
-          description: item.description || ''
-        })),
-        do_not_discuss: (tiersData[tier].do_not_discuss || []).map(item => ({
-          topic: item.topic,
-          reason: item.reason || ''
-        }))
-      };
-    }
-
-    const manifest = {
-      version: 2,
-      generated_at: now,
-      updated_at: now,
-      tiers: cleanTiers,
-      never_disclose: data.never_disclose || ['API keys', 'Other users\' data', 'Financial figures'],
-      personality_notes: data.personality_notes || ''
+  // Build clean manifest with new format only
+  const cleanTiers = {};
+  for (const tier of TIER_HIERARCHY) {
+    cleanTiers[tier] = {
+      topics: (tiersData[tier].topics || []).map(item => ({
+        topic: item.topic,
+        description: item.description || ''
+      })),
+      objectives: (tiersData[tier].objectives || []).map(item => ({
+        objective: item.objective,
+        description: item.description || ''
+      })),
+      do_not_discuss: (tiersData[tier].do_not_discuss || []).map(item => ({
+        topic: item.topic,
+        reason: item.reason || ''
+      }))
     };
+  }
 
-    return { valid: true, manifest, errors: [] };
-  } else {
-    // Legacy format: topics with lead_with/discuss_freely/deflect
-    const cleanTopics = {};
-    for (const tier of TIER_HIERARCHY) {
-      cleanTopics[tier] = {};
-      for (const cat of ['lead_with', 'discuss_freely', 'deflect']) {
-        cleanTopics[tier][cat] = (tiersData[tier][cat] || []).map(item => ({
-          topic: item.topic,
-          detail: item.detail || ''
-        }));
-      }
-    }
-
-    const manifest = {
-      version: 1,
-      generated_at: now,
-      updated_at: now,
-      topics: cleanTopics,
-      never_disclose: data.never_disclose || ['API keys', 'Other users\' data', 'Financial figures'],
-      personality_notes: data.personality_notes || ''
-    };
+  const manifest = {
+    version: 2,
+    generated_at: now,
+    updated_at: now,
+    tiers: cleanTiers,
+    never_disclose: data.never_disclose || ['API keys', 'Other users\' data', 'Financial figures'],
+    personality_notes: data.personality_notes || ''
+  };
 
-    return { valid: true, manifest, errors: [] };
-  }
+  return { valid: true, manifest, errors: [] };
 }
 
 /**

package/src/lib/prompt-template.js

@@ -49,9 +49,9 @@ function buildConnectionPrompt(options) {
   } = options;
 
   const {
-    leadWithTopics = '  (none specified)',
-    discussFreelyTopics = '  (none specified)',
-    deflectTopics = '  (none specified)',
+    topics = '  (none specified)',
+    objectives = '  (none specified)',
+    doNotDiscuss = '  (none specified)',
     neverDisclose = '  (none specified)'
   } = tierTopics || {};
 
@@ -62,17 +62,16 @@ Your job is NOT to answer questions and hang up. Your job is to have a real conv
 
 == WHAT YOU BRING TO THE TABLE ==
 
-${ownerName} is currently focused on:
-${leadWithTopics}
+${ownerName}'s topics of interest:
+${topics}
 
-Other areas of active interest:
-${discussFreelyTopics}
+== OBJECTIVES FOR THIS CALL ==
 
-== STRATEGIC GOALS FOR THIS CALL ==
-
-${tierGoals && tierGoals.length > 0
-    ? `At the ${accessTier} access level, ${ownerName}'s objectives are:\n${formatList(tierGoals)}\n\nPursue these goals naturally during conversation. Surface opportunities that align with them.`
-    : `No specific goals configured for this tier. Focus on general discovery and relationship building.`}
+${objectives !== '  (none specified)'
+    ? `What ${ownerName} wants to achieve:\n${objectives}`
+    : (tierGoals && tierGoals.length > 0
+      ? `At the ${accessTier} access level, ${ownerName}'s objectives are:\n${formatList(tierGoals)}`
+      : `No specific objectives configured. Focus on general discovery and relationship building.`)}
 
 == WHAT THEY SHARED WITH YOU ==
 
@@ -123,16 +122,13 @@ PACING RULES:
 
 Access level for this call: ${accessTier}
 
-LEAD WITH (proactively share):
-${leadWithTopics}
-
-DISCUSS FREELY (share when relevant):
-${discussFreelyTopics}
+TOPICS (discuss openly):
+${topics}
 
-DEFLECT (acknowledge but redirect):
-${deflectTopics}
+DO NOT DISCUSS (redirect):
+${doNotDiscuss}
 
-When deflecting, don't say "I can't discuss that." Instead redirect naturally, acknowledge without detail, or suggest the owners connect directly.
+When redirecting, don't say "I can't discuss that." Instead redirect naturally, acknowledge without detail, or suggest the owners connect directly.
 
 NEVER disclose:
 ${neverDisclose}
@@ -178,9 +174,9 @@ function buildAdaptiveConnectionPrompt(options) {
   } = options;
 
   const {
-    leadWithTopics = '  (none specified)',
-    discussFreelyTopics = '  (none specified)',
-    deflectTopics = '  (none specified)',
+    topics = '  (none specified)',
+    objectives = '  (none specified)',
+    doNotDiscuss = '  (none specified)',
     neverDisclose = '  (none specified)'
   } = tierTopics || {};
 
@@ -217,17 +213,16 @@ ${openQuestions}
 
 == WHAT YOU BRING TO THE TABLE ==
 
-${ownerName} is currently focused on:
-${leadWithTopics}
+${ownerName}'s topics of interest:
+${topics}
 
-Other areas of active interest:
-${discussFreelyTopics}
+== OBJECTIVES FOR THIS CALL ==
 
-== STRATEGIC GOALS FOR THIS CALL ==
-
-${tierGoals && tierGoals.length > 0
-    ? `At the ${accessTier} access level, ${ownerName}'s objectives are:\n${formatList(tierGoals)}\n\nPursue these goals naturally during conversation. Surface opportunities that align with them.`
-    : `No specific goals configured for this tier. Focus on general discovery and relationship building.`}
+${objectives !== '  (none specified)'
+    ? `What ${ownerName} wants to achieve:\n${objectives}`
+    : (tierGoals && tierGoals.length > 0
+      ? `At the ${accessTier} access level, ${ownerName}'s objectives are:\n${formatList(tierGoals)}`
+      : `No specific objectives configured. Focus on general discovery and relationship building.`)}
 
 == WHAT THEY SHARED WITH YOU ==
 
@@ -265,16 +260,13 @@ Pacing:
 
 Access level for this call: ${accessTier}
 
-LEAD WITH (proactively share):
-${leadWithTopics}
-
-DISCUSS FREELY (share when relevant):
-${discussFreelyTopics}
+TOPICS (discuss openly):
+${topics}
 
-DEFLECT (acknowledge but redirect):
-${deflectTopics}
+DO NOT DISCUSS (redirect):
+${doNotDiscuss}
 
-When deflecting, do not mention policy mechanics. Redirect naturally and suggest direct owner follow-up when needed.
+When redirecting, do not mention policy mechanics. Redirect naturally and suggest direct owner follow-up when needed.
 
 NEVER disclose:
 ${neverDisclose}

package/src/routes/dashboard.js

@@ -1032,14 +1032,9 @@ function createDashboardApiRouter(options = {}) {
         disclosure: configTier.disclosure || 'minimal',
         examples: sanitizeStringArray(configTier.examples || [], 20, 120),
         manifest: {
-          // Support both new format (topics/objectives/do_not_discuss) and legacy
-          topics: manifestTier.topics || manifestTier.lead_with || [],
+          topics: manifestTier.topics || [],
           objectives: manifestTier.objectives || [],
-          do_not_discuss: manifestTier.do_not_discuss || manifestTier.deflect || [],
-          // Legacy fields for backwards compatibility
-          lead_with: manifestTier.lead_with || manifestTier.topics?.slice(0, 3) || [],
-          discuss_freely: manifestTier.discuss_freely || manifestTier.topics?.slice(3) || [],
-          deflect: manifestTier.deflect || manifestTier.do_not_discuss || []
+          do_not_discuss: manifestTier.do_not_discuss || []
         }
       };
     });
@@ -1087,11 +1082,11 @@ function createDashboardApiRouter(options = {}) {
 
     if (body.manifest) {
       const manifest = loadManifest();
-      manifest.topics = manifest.topics || {};
-      manifest.topics[tierId] = {
-        lead_with: parseTopicObjects(body.manifest.lead_with),
-        discuss_freely: parseTopicObjects(body.manifest.discuss_freely),
-        deflect: parseTopicObjects(body.manifest.deflect)
+      manifest.tiers = manifest.tiers || {};
+      manifest.tiers[tierId] = {
+        topics: parseTopicObjects(body.manifest.topics),
+        objectives: parseTopicObjects(body.manifest.objectives),
+        do_not_discuss: parseTopicObjects(body.manifest.do_not_discuss)
       };
       saveManifest(manifest);
     }

package/src/server.js

@@ -185,11 +185,7 @@ function extractSignalPhrases(text, pattern, maxItems = 3) {
 function collectTopicKeywords(tierTopics) {
   const keywords = new Set();
   
-  // Support both new format (topics) and legacy format (lead_with/discuss_freely)
-  const topicsList = tierTopics?.topics || [
-    ...(tierTopics?.lead_with || []),
-    ...(tierTopics?.discuss_freely || [])
-  ];
+  const topicsList = tierTopics?.topics || [];
   const objectivesList = tierTopics?.objectives || [];
 
   for (const item of topicsList) {