clawdentity 0.0.5 → 0.0.6

package/dist/bin.js

@@ -20617,7 +20617,7 @@ async function persistRedeemConfig(registryUrl, apiKeyToken, dependencies = {})
 }
 var createInviteCommand = (dependencies = {}) => {
   const inviteCommand = new Command6("invite").description(
-    "Manage registry onboarding invites (not OpenClaw peer relay invites)"
+    "Manage registry onboarding invites"
   );
   inviteCommand.command("create").description("Create a registry invite code (admin only)").option("--expires-at <timestamp>", "Optional invite expiry (ISO-8601)").option("--registry-url <url>", "Override registry URL").action(
     withErrorHandling(
@@ -20660,6 +20660,7 @@ var createInviteCommand = (dependencies = {}) => {
           dependencies
         );
         writeStdoutLine("API key saved to local config");
+        writeStdoutLine("Onboarding auth complete");
       }
     )
   );
@@ -20704,6 +20705,9 @@ var INVITE_CODE_PREFIX = "clawd1_";
 var PEER_ALIAS_PATTERN = /^[a-zA-Z0-9._-]+$/;
 var FILE_MODE3 = 384;
 var OPENCLAW_HOOK_TOKEN_BYTES = 32;
+var OPENCLAW_SETUP_COMMAND_HINT = "Run: clawdentity openclaw setup <agentName> --peer-alias <alias> --peer-did <did> --peer-proxy-url <proxy-url>";
+var OPENCLAW_SETUP_RESTART_COMMAND_HINT = `${OPENCLAW_SETUP_COMMAND_HINT} and restart OpenClaw`;
+var OPENCLAW_SETUP_WITH_BASE_URL_HINT = `${OPENCLAW_SETUP_COMMAND_HINT} --openclaw-base-url <url>`;
 var textEncoder2 = new TextEncoder();
 var textDecoder = new TextDecoder();
 function isRecord7(value) {
@@ -21006,10 +21010,6 @@ async function ensureLocalAgentCredentials(homeDir, agentName) {
     }
   }
 }
-function encodeInvitePayload(payload) {
-  const encoded = encodeBase64url(textEncoder2.encode(JSON.stringify(payload)));
-  return `${INVITE_CODE_PREFIX}${encoded}`;
-}
 function decodeInvitePayload(code) {
   const rawCode = parseNonEmptyString7(code, "invite code");
   if (!rawCode.startsWith(INVITE_CODE_PREFIX)) {
@@ -21512,7 +21512,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "Selected agent marker",
         status: "fail",
         message: missing ? `missing ${selectedAgentPath}` : "selected agent marker is invalid",
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+        remediationHint: OPENCLAW_SETUP_COMMAND_HINT
       })
     );
   }
@@ -21523,7 +21523,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "Local agent credentials",
         status: "fail",
         message: "cannot validate credentials without selected agent marker",
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+        remediationHint: OPENCLAW_SETUP_COMMAND_HINT
       })
     );
   } else {
@@ -21565,7 +21565,7 @@ async function runOpenclawDoctor(options = {}) {
             label: "Peers map",
             status: "fail",
             message: `peer alias is missing: ${peerAlias}`,
-            remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> --peer-alias <alias>",
+            remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
             details: { peersPath, peerAlias }
           })
         );
@@ -21587,7 +21587,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "Peers map",
           status: "fail",
           message: "no peers are configured",
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>",
+          remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
           details: { peersPath }
         })
       );
@@ -21690,7 +21690,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook mapping",
           status: "fail",
           message: `missing send-to-peer mapping in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>",
+          remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21712,7 +21712,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook auth",
           status: "fail",
           message: `hooks.enabled is not true in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> and restart OpenClaw",
+          remediationHint: OPENCLAW_SETUP_RESTART_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21723,7 +21723,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook auth",
           status: "fail",
           message: `hooks.token is missing in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> and restart OpenClaw",
+          remediationHint: OPENCLAW_SETUP_RESTART_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21780,7 +21780,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "OpenClaw base URL",
         status: "fail",
         message: `unable to resolve OpenClaw base URL from ${relayRuntimeConfigPath}`,
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> --openclaw-base-url <url>"
+        remediationHint: OPENCLAW_SETUP_WITH_BASE_URL_HINT
       })
     );
   }
@@ -21796,13 +21796,13 @@ function parseRelayProbeFailure(input) {
   if (input.status === 404) {
     return {
       message: "OpenClaw send-to-peer hook is unavailable",
-      remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+      remediationHint: OPENCLAW_SETUP_COMMAND_HINT
     };
   }
   if (input.status === 405) {
     return {
       message: "OpenClaw send-to-peer hook is not enabled for POST requests",
-      remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>, then restart OpenClaw"
+      remediationHint: `${OPENCLAW_SETUP_COMMAND_HINT}, then restart OpenClaw`
     };
   }
   if (input.status === 500) {
@@ -21929,29 +21929,38 @@ async function runOpenclawRelayTest(options) {
     preflight
   };
 }
-function createOpenclawInviteCode(options) {
-  const did = parseAgentDid2(options.did, "invite did");
-  const proxyUrl = parseProxyUrl(options.proxyUrl);
-  const peerAlias = options.peerAlias === void 0 ? void 0 : parsePeerAlias(options.peerAlias);
-  const name = parseOptionalName(options.name);
-  const payload = parseInvitePayload({
-    v: 1,
-    issuedAt: nowIso(),
-    did,
-    proxyUrl,
-    alias: peerAlias,
-    name
-  });
-  const result = {
-    code: encodeInvitePayload(payload),
-    did: payload.did,
-    proxyUrl: payload.proxyUrl,
-    peerAlias: payload.alias,
-    name: payload.name
+function resolveOpenclawSetupPeerInput(options) {
+  const inviteCode = options.inviteCode?.trim();
+  const invite = inviteCode !== void 0 && inviteCode.length > 0 ? decodeInvitePayload(inviteCode) : void 0;
+  const peerAliasCandidate = options.peerAlias ?? invite?.alias;
+  const peerDidCandidate = options.peerDid ?? invite?.did;
+  const peerProxyUrlCandidate = options.peerProxyUrl ?? invite?.proxyUrl;
+  const peerNameCandidate = options.peerName ?? invite?.name;
+  const missingFields = [];
+  if (peerAliasCandidate === void 0 || peerAliasCandidate.trim().length === 0) {
+    missingFields.push("peerAlias");
+  }
+  if (peerDidCandidate === void 0 || peerDidCandidate.trim().length === 0) {
+    missingFields.push("peerDid");
+  }
+  if (peerProxyUrlCandidate === void 0 || peerProxyUrlCandidate.trim().length === 0) {
+    missingFields.push("peerProxyUrl");
+  }
+  if (missingFields.length > 0) {
+    throw createCliError5(
+      "CLI_OPENCLAW_PEER_INPUT_REQUIRED",
+      "Peer routing details are required. Provide --peer-alias, --peer-did, and --peer-proxy-url.",
+      { missingFields }
+    );
+  }
+  return {
+    peerAlias: parsePeerAlias(peerAliasCandidate),
+    peerDid: parseAgentDid2(peerDidCandidate, "peer DID"),
+    peerProxyUrl: parseProxyUrl(peerProxyUrlCandidate),
+    peerName: parseOptionalName(peerNameCandidate)
   };
-  return result;
 }
-async function setupOpenclawRelayFromInvite(agentName, options) {
+async function setupOpenclawRelay(agentName, options) {
   const normalizedAgentName = assertValidAgentName(agentName);
   const homeDir = resolveHomeDir(options.homeDir);
   const openclawDir = resolveOpenclawDir(options.openclawDir, homeDir);
@@ -21966,15 +21975,7 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
     optionValue: options.openclawBaseUrl,
     relayRuntimeConfigPath
   });
-  const invite = decodeInvitePayload(options.inviteCode);
-  const peerAliasCandidate = options.peerAlias ?? invite.alias;
-  if (!peerAliasCandidate) {
-    throw createCliError5(
-      "CLI_OPENCLAW_PEER_ALIAS_REQUIRED",
-      "Peer alias is required. Include alias in invite code or pass --peer-alias."
-    );
-  }
-  const peerAlias = parsePeerAlias(peerAliasCandidate);
+  const peerInput = resolveOpenclawSetupPeerInput(options);
   await ensureLocalAgentCredentials(homeDir, normalizedAgentName);
   await mkdir5(dirname4(transformTargetPath), { recursive: true });
   try {
@@ -21995,7 +21996,11 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
   );
   const peersPath = resolvePeersPath(homeDir);
   const peers = await loadPeersConfig(peersPath);
-  peers.peers[peerAlias] = invite.name === void 0 ? { did: invite.did, proxyUrl: invite.proxyUrl } : { did: invite.did, proxyUrl: invite.proxyUrl, name: invite.name };
+  peers.peers[peerInput.peerAlias] = peerInput.peerName === void 0 ? { did: peerInput.peerDid, proxyUrl: peerInput.peerProxyUrl } : {
+    did: peerInput.peerDid,
+    proxyUrl: peerInput.peerProxyUrl,
+    name: peerInput.peerName
+  };
   await savePeersConfig(peersPath, peers);
   const relayTransformPeersPath = resolveTransformPeersPath(openclawDir);
   await writeSecureFile3(
@@ -22050,8 +22055,9 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
   );
   logger8.info("cli.openclaw_setup_completed", {
     agentName: normalizedAgentName,
-    peerAlias,
-    peerDid: invite.did,
+    peerAlias: peerInput.peerAlias,
+    peerDid: peerInput.peerDid,
+    peerProxyUrl: peerInput.peerProxyUrl,
     openclawConfigPath,
     transformTargetPath,
     relayTransformRuntimePath,
@@ -22061,9 +22067,9 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
     relayRuntimeConfigPath
   });
   return {
-    peerAlias,
-    peerDid: invite.did,
-    peerProxyUrl: invite.proxyUrl,
+    peerAlias: peerInput.peerAlias,
+    peerDid: peerInput.peerDid,
+    peerProxyUrl: peerInput.peerProxyUrl,
     openclawConfigPath,
     transformTargetPath,
     relayTransformRuntimePath,
@@ -22075,29 +22081,12 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
 }
 var createOpenclawCommand = () => {
   const openclawCommand = new Command7("openclaw").description(
-    "Manage OpenClaw invite codes and relay setup"
-  );
-  openclawCommand.command("invite").description("Create an invite code for peer relay onboarding").requiredOption("--did <did>", "Peer agent DID (did:claw:agent:...)").requiredOption(
-    "--proxy-url <url>",
-    "Public proxy URL ending in /hooks/agent"
-  ).option("--peer-alias <alias>", "Suggested peer alias for the receiver").option("--name <displayName>", "Human-friendly peer display name").action(
-    withErrorHandling(
-      "openclaw invite",
-      async (options) => {
-        const invite = createOpenclawInviteCode(options);
-        writeStdoutLine(`Invite code: ${invite.code}`);
-        writeStdoutLine(`Agent DID: ${invite.did}`);
-        writeStdoutLine(`Proxy URL: ${invite.proxyUrl}`);
-        if (invite.peerAlias) {
-          writeStdoutLine(`Suggested Alias: ${invite.peerAlias}`);
-        }
-      }
-    )
+    "Manage OpenClaw relay setup"
   );
-  openclawCommand.command("setup <agentName>").description("Apply OpenClaw relay setup using an invite code").requiredOption(
-    "--invite-code <code>",
-    "Invite code shared by peer operator"
-  ).option("--peer-alias <alias>", "Override peer alias for local routing").option(
+  openclawCommand.command("setup <agentName>").description("Apply OpenClaw relay setup using peer routing details").requiredOption("--peer-alias <alias>", "Peer alias for local routing").requiredOption("--peer-did <did>", "Peer agent DID (did:claw:agent:...)").requiredOption(
+    "--peer-proxy-url <url>",
+    "Peer proxy URL ending in /hooks/agent"
+  ).option("--peer-name <displayName>", "Human-friendly peer display name").option(
     "--openclaw-dir <path>",
     "OpenClaw state directory (default ~/.openclaw)"
   ).option(
@@ -22110,7 +22099,7 @@ var createOpenclawCommand = () => {
     withErrorHandling(
       "openclaw setup",
       async (agentName, options) => {
-        const result = await setupOpenclawRelayFromInvite(agentName, options);
+        const result = await setupOpenclawRelay(agentName, options);
         writeStdoutLine(`Peer alias configured: ${result.peerAlias}`);
         writeStdoutLine(`Peer DID: ${result.peerDid}`);
         writeStdoutLine(`Peer proxy URL: ${result.peerProxyUrl}`);

package/dist/index.js

@@ -20617,7 +20617,7 @@ async function persistRedeemConfig(registryUrl, apiKeyToken, dependencies = {})
 }
 var createInviteCommand = (dependencies = {}) => {
   const inviteCommand = new Command6("invite").description(
-    "Manage registry onboarding invites (not OpenClaw peer relay invites)"
+    "Manage registry onboarding invites"
   );
   inviteCommand.command("create").description("Create a registry invite code (admin only)").option("--expires-at <timestamp>", "Optional invite expiry (ISO-8601)").option("--registry-url <url>", "Override registry URL").action(
     withErrorHandling(
@@ -20660,6 +20660,7 @@ var createInviteCommand = (dependencies = {}) => {
           dependencies
         );
         writeStdoutLine("API key saved to local config");
+        writeStdoutLine("Onboarding auth complete");
       }
     )
   );
@@ -20704,6 +20705,9 @@ var INVITE_CODE_PREFIX = "clawd1_";
 var PEER_ALIAS_PATTERN = /^[a-zA-Z0-9._-]+$/;
 var FILE_MODE3 = 384;
 var OPENCLAW_HOOK_TOKEN_BYTES = 32;
+var OPENCLAW_SETUP_COMMAND_HINT = "Run: clawdentity openclaw setup <agentName> --peer-alias <alias> --peer-did <did> --peer-proxy-url <proxy-url>";
+var OPENCLAW_SETUP_RESTART_COMMAND_HINT = `${OPENCLAW_SETUP_COMMAND_HINT} and restart OpenClaw`;
+var OPENCLAW_SETUP_WITH_BASE_URL_HINT = `${OPENCLAW_SETUP_COMMAND_HINT} --openclaw-base-url <url>`;
 var textEncoder2 = new TextEncoder();
 var textDecoder = new TextDecoder();
 function isRecord7(value) {
@@ -21006,10 +21010,6 @@ async function ensureLocalAgentCredentials(homeDir, agentName) {
     }
   }
 }
-function encodeInvitePayload(payload) {
-  const encoded = encodeBase64url(textEncoder2.encode(JSON.stringify(payload)));
-  return `${INVITE_CODE_PREFIX}${encoded}`;
-}
 function decodeInvitePayload(code) {
   const rawCode = parseNonEmptyString7(code, "invite code");
   if (!rawCode.startsWith(INVITE_CODE_PREFIX)) {
@@ -21512,7 +21512,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "Selected agent marker",
         status: "fail",
         message: missing ? `missing ${selectedAgentPath}` : "selected agent marker is invalid",
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+        remediationHint: OPENCLAW_SETUP_COMMAND_HINT
       })
     );
   }
@@ -21523,7 +21523,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "Local agent credentials",
         status: "fail",
         message: "cannot validate credentials without selected agent marker",
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+        remediationHint: OPENCLAW_SETUP_COMMAND_HINT
       })
     );
   } else {
@@ -21565,7 +21565,7 @@ async function runOpenclawDoctor(options = {}) {
             label: "Peers map",
             status: "fail",
             message: `peer alias is missing: ${peerAlias}`,
-            remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> --peer-alias <alias>",
+            remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
             details: { peersPath, peerAlias }
           })
         );
@@ -21587,7 +21587,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "Peers map",
           status: "fail",
           message: "no peers are configured",
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>",
+          remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
           details: { peersPath }
         })
       );
@@ -21690,7 +21690,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook mapping",
           status: "fail",
           message: `missing send-to-peer mapping in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>",
+          remediationHint: OPENCLAW_SETUP_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21712,7 +21712,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook auth",
           status: "fail",
           message: `hooks.enabled is not true in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> and restart OpenClaw",
+          remediationHint: OPENCLAW_SETUP_RESTART_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21723,7 +21723,7 @@ async function runOpenclawDoctor(options = {}) {
           label: "OpenClaw hook auth",
           status: "fail",
           message: `hooks.token is missing in ${openclawConfigPath}`,
-          remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> and restart OpenClaw",
+          remediationHint: OPENCLAW_SETUP_RESTART_COMMAND_HINT,
           details: { openclawConfigPath }
         })
       );
@@ -21780,7 +21780,7 @@ async function runOpenclawDoctor(options = {}) {
         label: "OpenClaw base URL",
         status: "fail",
         message: `unable to resolve OpenClaw base URL from ${relayRuntimeConfigPath}`,
-        remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code> --openclaw-base-url <url>"
+        remediationHint: OPENCLAW_SETUP_WITH_BASE_URL_HINT
       })
     );
   }
@@ -21796,13 +21796,13 @@ function parseRelayProbeFailure(input) {
   if (input.status === 404) {
     return {
       message: "OpenClaw send-to-peer hook is unavailable",
-      remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>"
+      remediationHint: OPENCLAW_SETUP_COMMAND_HINT
     };
   }
   if (input.status === 405) {
     return {
       message: "OpenClaw send-to-peer hook is not enabled for POST requests",
-      remediationHint: "Run: clawdentity openclaw setup <agentName> --invite-code <code>, then restart OpenClaw"
+      remediationHint: `${OPENCLAW_SETUP_COMMAND_HINT}, then restart OpenClaw`
     };
   }
   if (input.status === 500) {
@@ -21929,29 +21929,38 @@ async function runOpenclawRelayTest(options) {
     preflight
   };
 }
-function createOpenclawInviteCode(options) {
-  const did = parseAgentDid2(options.did, "invite did");
-  const proxyUrl = parseProxyUrl(options.proxyUrl);
-  const peerAlias = options.peerAlias === void 0 ? void 0 : parsePeerAlias(options.peerAlias);
-  const name = parseOptionalName(options.name);
-  const payload = parseInvitePayload({
-    v: 1,
-    issuedAt: nowIso(),
-    did,
-    proxyUrl,
-    alias: peerAlias,
-    name
-  });
-  const result = {
-    code: encodeInvitePayload(payload),
-    did: payload.did,
-    proxyUrl: payload.proxyUrl,
-    peerAlias: payload.alias,
-    name: payload.name
+function resolveOpenclawSetupPeerInput(options) {
+  const inviteCode = options.inviteCode?.trim();
+  const invite = inviteCode !== void 0 && inviteCode.length > 0 ? decodeInvitePayload(inviteCode) : void 0;
+  const peerAliasCandidate = options.peerAlias ?? invite?.alias;
+  const peerDidCandidate = options.peerDid ?? invite?.did;
+  const peerProxyUrlCandidate = options.peerProxyUrl ?? invite?.proxyUrl;
+  const peerNameCandidate = options.peerName ?? invite?.name;
+  const missingFields = [];
+  if (peerAliasCandidate === void 0 || peerAliasCandidate.trim().length === 0) {
+    missingFields.push("peerAlias");
+  }
+  if (peerDidCandidate === void 0 || peerDidCandidate.trim().length === 0) {
+    missingFields.push("peerDid");
+  }
+  if (peerProxyUrlCandidate === void 0 || peerProxyUrlCandidate.trim().length === 0) {
+    missingFields.push("peerProxyUrl");
+  }
+  if (missingFields.length > 0) {
+    throw createCliError5(
+      "CLI_OPENCLAW_PEER_INPUT_REQUIRED",
+      "Peer routing details are required. Provide --peer-alias, --peer-did, and --peer-proxy-url.",
+      { missingFields }
+    );
+  }
+  return {
+    peerAlias: parsePeerAlias(peerAliasCandidate),
+    peerDid: parseAgentDid2(peerDidCandidate, "peer DID"),
+    peerProxyUrl: parseProxyUrl(peerProxyUrlCandidate),
+    peerName: parseOptionalName(peerNameCandidate)
   };
-  return result;
 }
-async function setupOpenclawRelayFromInvite(agentName, options) {
+async function setupOpenclawRelay(agentName, options) {
   const normalizedAgentName = assertValidAgentName(agentName);
   const homeDir = resolveHomeDir(options.homeDir);
   const openclawDir = resolveOpenclawDir(options.openclawDir, homeDir);
@@ -21966,15 +21975,7 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
     optionValue: options.openclawBaseUrl,
     relayRuntimeConfigPath
   });
-  const invite = decodeInvitePayload(options.inviteCode);
-  const peerAliasCandidate = options.peerAlias ?? invite.alias;
-  if (!peerAliasCandidate) {
-    throw createCliError5(
-      "CLI_OPENCLAW_PEER_ALIAS_REQUIRED",
-      "Peer alias is required. Include alias in invite code or pass --peer-alias."
-    );
-  }
-  const peerAlias = parsePeerAlias(peerAliasCandidate);
+  const peerInput = resolveOpenclawSetupPeerInput(options);
   await ensureLocalAgentCredentials(homeDir, normalizedAgentName);
   await mkdir5(dirname4(transformTargetPath), { recursive: true });
   try {
@@ -21995,7 +21996,11 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
   );
   const peersPath = resolvePeersPath(homeDir);
   const peers = await loadPeersConfig(peersPath);
-  peers.peers[peerAlias] = invite.name === void 0 ? { did: invite.did, proxyUrl: invite.proxyUrl } : { did: invite.did, proxyUrl: invite.proxyUrl, name: invite.name };
+  peers.peers[peerInput.peerAlias] = peerInput.peerName === void 0 ? { did: peerInput.peerDid, proxyUrl: peerInput.peerProxyUrl } : {
+    did: peerInput.peerDid,
+    proxyUrl: peerInput.peerProxyUrl,
+    name: peerInput.peerName
+  };
   await savePeersConfig(peersPath, peers);
   const relayTransformPeersPath = resolveTransformPeersPath(openclawDir);
   await writeSecureFile3(
@@ -22050,8 +22055,9 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
   );
   logger8.info("cli.openclaw_setup_completed", {
     agentName: normalizedAgentName,
-    peerAlias,
-    peerDid: invite.did,
+    peerAlias: peerInput.peerAlias,
+    peerDid: peerInput.peerDid,
+    peerProxyUrl: peerInput.peerProxyUrl,
     openclawConfigPath,
     transformTargetPath,
     relayTransformRuntimePath,
@@ -22061,9 +22067,9 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
     relayRuntimeConfigPath
   });
   return {
-    peerAlias,
-    peerDid: invite.did,
-    peerProxyUrl: invite.proxyUrl,
+    peerAlias: peerInput.peerAlias,
+    peerDid: peerInput.peerDid,
+    peerProxyUrl: peerInput.peerProxyUrl,
     openclawConfigPath,
     transformTargetPath,
     relayTransformRuntimePath,
@@ -22075,29 +22081,12 @@ async function setupOpenclawRelayFromInvite(agentName, options) {
 }
 var createOpenclawCommand = () => {
   const openclawCommand = new Command7("openclaw").description(
-    "Manage OpenClaw invite codes and relay setup"
-  );
-  openclawCommand.command("invite").description("Create an invite code for peer relay onboarding").requiredOption("--did <did>", "Peer agent DID (did:claw:agent:...)").requiredOption(
-    "--proxy-url <url>",
-    "Public proxy URL ending in /hooks/agent"
-  ).option("--peer-alias <alias>", "Suggested peer alias for the receiver").option("--name <displayName>", "Human-friendly peer display name").action(
-    withErrorHandling(
-      "openclaw invite",
-      async (options) => {
-        const invite = createOpenclawInviteCode(options);
-        writeStdoutLine(`Invite code: ${invite.code}`);
-        writeStdoutLine(`Agent DID: ${invite.did}`);
-        writeStdoutLine(`Proxy URL: ${invite.proxyUrl}`);
-        if (invite.peerAlias) {
-          writeStdoutLine(`Suggested Alias: ${invite.peerAlias}`);
-        }
-      }
-    )
+    "Manage OpenClaw relay setup"
   );
-  openclawCommand.command("setup <agentName>").description("Apply OpenClaw relay setup using an invite code").requiredOption(
-    "--invite-code <code>",
-    "Invite code shared by peer operator"
-  ).option("--peer-alias <alias>", "Override peer alias for local routing").option(
+  openclawCommand.command("setup <agentName>").description("Apply OpenClaw relay setup using peer routing details").requiredOption("--peer-alias <alias>", "Peer alias for local routing").requiredOption("--peer-did <did>", "Peer agent DID (did:claw:agent:...)").requiredOption(
+    "--peer-proxy-url <url>",
+    "Peer proxy URL ending in /hooks/agent"
+  ).option("--peer-name <displayName>", "Human-friendly peer display name").option(
     "--openclaw-dir <path>",
     "OpenClaw state directory (default ~/.openclaw)"
   ).option(
@@ -22110,7 +22099,7 @@ var createOpenclawCommand = () => {
     withErrorHandling(
       "openclaw setup",
       async (agentName, options) => {
-        const result = await setupOpenclawRelayFromInvite(agentName, options);
+        const result = await setupOpenclawRelay(agentName, options);
         writeStdoutLine(`Peer alias configured: ${result.peerAlias}`);
         writeStdoutLine(`Peer DID: ${result.peerDid}`);
         writeStdoutLine(`Peer proxy URL: ${result.peerProxyUrl}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawdentity",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -21,17 +21,6 @@
     "postinstall.mjs",
     "skill-bundle"
   ],
-  "scripts": {
-    "build": "pnpm -F @clawdentity/openclaw-skill build && pnpm run sync:skill-bundle && pnpm run verify:skill-bundle && tsup",
-    "format": "biome format .",
-    "lint": "biome lint .",
-    "prepack": "pnpm run build",
-    "postinstall": "node ./postinstall.mjs",
-    "sync:skill-bundle": "node ./scripts/sync-skill-bundle.mjs",
-    "verify:skill-bundle": "node ./scripts/verify-skill-bundle.mjs",
-    "test": "vitest run",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "commander": "^13.1.0",
     "jsqr": "^1.4.0",
@@ -40,11 +29,21 @@
     "ws": "^8.19.0"
   },
   "devDependencies": {
-    "@clawdentity/connector": "workspace:*",
-    "@clawdentity/protocol": "workspace:*",
-    "@clawdentity/sdk": "workspace:*",
     "@types/node": "^22.18.11",
     "@types/pngjs": "^6.0.5",
-    "@types/qrcode": "^1.5.6"
+    "@types/qrcode": "^1.5.6",
+    "@clawdentity/protocol": "0.0.0",
+    "@clawdentity/connector": "0.0.0",
+    "@clawdentity/sdk": "0.0.0"
+  },
+  "scripts": {
+    "build": "pnpm -F @clawdentity/openclaw-skill build && pnpm run sync:skill-bundle && pnpm run verify:skill-bundle && tsup",
+    "format": "biome format .",
+    "lint": "biome lint .",
+    "postinstall": "node ./postinstall.mjs",
+    "sync:skill-bundle": "node ./scripts/sync-skill-bundle.mjs",
+    "verify:skill-bundle": "node ./scripts/verify-skill-bundle.mjs",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
   }
-}
+}

package/skill-bundle/openclaw-skill/skill/SKILL.md

@@ -1,20 +1,18 @@
 ---
 name: clawdentity_openclaw_relay
-description: This skill should be used when the user asks to "install clawdentity relay skill", "set up agent-to-agent relay from invite code", "connect OpenClaw agents with invite code", or needs OpenClaw peer communication through the local Clawdentity connector runtime.
-version: 0.1.0
+description: This skill should be used when the user asks to install or configure Clawdentity relay for OpenClaw agents and prepare them for pairing and message delivery.
+version: 0.2.0
 ---
 
 # Clawdentity OpenClaw Relay Skill
 
-This skill configures an OpenClaw agent to relay selected webhook payloads to a peer through the local Clawdentity connector runtime using a single invite code.
+This skill prepares a local OpenClaw agent in a strict sequence:
+1. finish registry onboarding and generate/store API key
+2. create local agent identity
+3. configure relay runtime
+4. become ready to start or accept pairing
 
-## Trigger Conditions
-
-Use this skill when any of the following are requested:
-- Install relay support for OpenClaw peer communication.
-- Complete first-time setup from an invite code.
-- Repair broken relay setup after config drift.
-- Verify invite-code onboarding and peer mapping.
+Relay invite codes are not part of this flow.
 
 ## Filesystem Truth (must be used exactly)
 
@@ -23,7 +21,7 @@ Use this skill when any of the following are requested:
 - OpenClaw config: `<resolved-openclaw-state>/openclaw.json` (legacy names may exist: `clawdbot.json`, `moldbot.json`, `moltbot.json`)
 - OpenClaw config env overrides: `OPENCLAW_CONFIG_PATH`, legacy `CLAWDBOT_CONFIG_PATH`
 - OpenClaw state env overrides: `OPENCLAW_STATE_DIR`, legacy `CLAWDBOT_STATE_DIR`
-- OpenClaw home override (used when config/state overrides are unset): `OPENCLAW_HOME`
+- OpenClaw home override: `OPENCLAW_HOME`
 - Transform target path: `~/.openclaw/hooks/transforms/relay-to-peer.mjs`
 - Transform runtime snapshot: `~/.openclaw/hooks/transforms/clawdentity-relay.json`
 - Transform peers snapshot: `~/.openclaw/hooks/transforms/clawdentity-peers.json`
@@ -42,166 +40,123 @@ Use this skill when any of the following are requested:
 - Relay runtime config: `~/.clawdentity/openclaw-relay.json`
 - Connector assignment map: `~/.clawdentity/openclaw-connectors.json`
 
-## Invite Input Assumption
+## Inputs
 
-Invite creation is outside this skill scope. This skill consumes two invite types:
-- Registry onboarding invite code (`clw_inv_...`) to obtain PAT when local API key is missing.
-- OpenClaw peer relay invite code (`clawd1_...`) for `openclaw setup`.
+Required for onboarding:
+- Registry onboarding invite code: `clw_inv_...` (or existing local API key)
+- Local agent name
 
-## Human + Agent Flow (strict user-style)
+Required for relay setup (after onboarding + agent create):
+- Peer alias
+- Peer DID
+- Peer proxy URL (`.../hooks/agent`)
+- Optional peer display name
 
-Follow this order. Do not skip steps.
+Required for pairing phase (after setup):
+- Initiator proxy URL
+- Responder proxy URL
 
 ## Tool Execution Contract (Agent)
 
-This skill is operational. The agent must execute side effects via tools.
-- Use the `exec` tool for npm/CLI/filesystem actions needed by onboarding.
-- Do not ask the human to run shell commands that the agent can run itself.
-- Ask the human only for missing secrets/inputs (for example API key or invite code).
-- Report final status with concrete outputs (local DID, peer alias, written paths).
-
-## CLI Command Utilization (required)
-
-Use these commands as the default execution path for skill utilization:
-
-- Initialize local CLI config:
-  - `clawdentity config init`
-  - `clawdentity config init --registry-url <registry-url>` (supports first-run registry URL override)
-  - or set env before init: `CLAWDENTITY_REGISTRY_URL=<registry-url>` (primary global override)
-  - compatible alias: `CLAWDENTITY_REGISTRY=<registry-url>`
-- Configure registry URL and API key when missing:
-  - `clawdentity config set registryUrl <registry-url>`
-- Complete registry onboarding when API key is missing:
-  - `clawdentity invite redeem <registry-invite-code>`
-  - `clawdentity invite redeem <registry-invite-code> --registry-url <registry-url>`
-- Configure API key only for non-invite fallback:
-  - `clawdentity config set apiKey <api-key>`
-- Create and inspect local OpenClaw agent identity:
-  - `clawdentity agent create <agent-name> --framework openclaw`
-  - `clawdentity agent inspect <agent-name>`
-- Apply OpenClaw invite setup:
-  - `clawdentity openclaw setup <agent-name> --invite-code <peer-relay-invite-code>`
-- Start connector runtime for relay handoff:
-  - `clawdentity connector start <agent-name>`
-- Optional persistent connector autostart:
-  - `clawdentity connector service install <agent-name>`
-- Validate health and delivery:
-  - `clawdentity openclaw doctor`
-  - `clawdentity openclaw relay test --peer <alias>`
-
-Pairing bootstrap uses CLI commands in the current release:
-
-- Owner/initiator starts pairing on initiator proxy:
-  - `clawdentity pair start <initiator-agent-name> --proxy-url <initiator-proxy-url> --qr`
-  - Optionally pass explicit owner PAT: `--owner-pat <token>`
-- Responder confirms on responder proxy:
-  - `clawdentity pair confirm <responder-agent-name> --qr-file <ticket-qr-file> --proxy-url <responder-proxy-url>`
-  - optional global proxy URL env fallback: `CLAWDENTITY_PROXY_URL=<proxy-url>`
-
-Successful confirm establishes mutual trust for the two agent DIDs. After confirm, both directions are allowed for trusted delivery.
-
-1. Confirm prerequisites with the human.
-- Confirm `clawdentity` CLI is installed and runnable.
+- Execute side effects directly with tools/CLI.
+- Do not ask humans to run commands that the agent can run.
+- Ask humans only for missing secrets or missing peer/proxy inputs.
+- Keep status output concrete: created agent DID, generated API key status, written files.
+
+## Command Utilization (required)
+
+- `clawdentity config init`
+- `clawdentity config init --registry-url <registry-url>`
+- `clawdentity config set registryUrl <registry-url>`
+- `clawdentity invite redeem <registry-invite-code>`
+- `clawdentity invite redeem <registry-invite-code> --registry-url <registry-url>`
+- `clawdentity config set apiKey <api-key>` (fallback only when invite is unavailable)
+- `clawdentity agent create <agent-name> --framework openclaw`
+- `clawdentity agent inspect <agent-name>`
+- `clawdentity openclaw setup <agent-name> --peer-alias <alias> --peer-did <did> --peer-proxy-url <url>`
+- `clawdentity connector start <agent-name>`
+- `clawdentity connector service install <agent-name>` (optional)
+- `clawdentity openclaw doctor`
+- `clawdentity openclaw relay test --peer <alias>`
+- `clawdentity pair start <agent-name> --proxy-url <initiator-proxy-url> --qr`
+- `clawdentity pair confirm <agent-name> --qr-file <path> --proxy-url <responder-proxy-url>`
+
+## Journey (strict order)
+
+1. Validate prerequisites.
+- Confirm CLI is installed.
 - Confirm local agent name.
-- Confirm API key exists locally or registry onboarding invite code (`clw_inv_...`) is available.
-- Confirm OpenClaw peer relay invite code (`clawd1_...`) is available for setup.
-- Do not request API key and registry invite code in the same prompt.
-- Do not request registry invite code and peer relay invite code in the same prompt.
-- Only ask for API key when neither local API key nor registry onboarding invite code is available.
-- Confirm OpenClaw state directory path if non-default.
-- Confirm OpenClaw base URL if local endpoint is non-default.
-- Confirm each side proxy URL for pairing command execution.
-
-2. Confirm skill artifact exists in workspace skills directory.
-- Ensure `~/.openclaw/workspace/skills/clawdentity-openclaw-relay/relay-to-peer.mjs` exists.
-- If missing, install/update skill package contents before setup.
-
-3. Initialize local Clawdentity config.
+- Confirm either existing API key or `clw_inv_...`.
+- Confirm OpenClaw path/base URL only if non-default.
+- Do not ask for pairing inputs before onboarding is complete.
+
+2. Ensure skill artifact exists.
+- Ensure `relay-to-peer.mjs` exists in workspace skill path.
+- If missing, install/update skill package contents first.
+
+3. Initialize local CLI config.
 - Run `clawdentity config init`.
-- Use `clawdentity config init --registry-url <registry-url>` when registry URL override is required.
-
-4. Complete registry onboarding auth before agent creation.
-- If API key already exists, continue.
-- Else redeem registry onboarding invite:
-  - `clawdentity invite redeem <registry-invite-code>`
-  - optional: `--registry-url <registry-url>`
-- If registry invite code is unavailable, fallback to API key path:
-  - ask human for API key
-  - run `clawdentity config set apiKey <api-key>`
-
-5. Configure local Clawdentity identity for this OpenClaw agent.
-- Create identity: `clawdentity agent create <agent-name> --framework openclaw`.
-- Verify identity: `clawdentity agent inspect <agent-name>`.
-
-6. Run automated setup from peer relay invite code.
-- Execute:
-  `clawdentity openclaw setup <agent-name> --invite-code <peer-relay-invite-code>`
-- Use `--openclaw-dir <path>` when state directory is non-default.
-- Use `--openclaw-base-url <url>` when local OpenClaw HTTP endpoint is non-default.
-- Use `--peer-alias <alias>` only when alias override is required.
-- Setup now provisions OpenClaw hook auth automatically:
-  - ensures `hooks.enabled=true`
-  - preserves existing `hooks.token` or generates one when missing
-  - mirrors token into `~/.clawdentity/openclaw-relay.json` as `openclawHookToken`
-
-7. Verify setup outputs.
-- Confirm setup reports:
-  - peer alias
-  - peer DID
-  - updated OpenClaw config path
-  - installed transform path
-  - OpenClaw base URL
-  - relay runtime config path
-- Confirm `~/.clawdentity/openclaw-agent-name` is set to the local agent name.
-
-8. Start connector runtime for local relay handoff.
+- If needed, run with `--registry-url`.
+
+4. Finish onboarding and generate API key.
+- If API key already exists locally, continue.
+- Else run `clawdentity invite redeem <clw_inv_...>`.
+- Confirm output shows:
+  - `Invite redeemed`
+  - API key token printed once
+  - `API key saved to local config`
+- Stop and fix if this step fails. Do not proceed to pairing.
+
+5. Create local OpenClaw agent identity.
+- Run `clawdentity agent create <agent-name> --framework openclaw`.
+- Run `clawdentity agent inspect <agent-name>`.
+
+6. Configure relay setup.
+- Run:
+  `clawdentity openclaw setup <agent-name> --peer-alias <alias> --peer-did <did> --peer-proxy-url <url>`
+- Add optional:
+  - `--peer-name <displayName>`
+  - `--openclaw-dir <path>`
+  - `--openclaw-base-url <url>`
+- Verify output contains peer alias, peer DID, peer proxy URL, OpenClaw config path, and relay runtime path.
+
+7. Start connector runtime.
 - Run `clawdentity connector start <agent-name>`.
-- Connector startup auto-loads `openclawHookToken` from `~/.clawdentity/openclaw-relay.json` when `--openclaw-hook-token` is not provided.
-- Connector startup auto-resolves outbound bind URL from `~/.clawdentity/openclaw-connectors.json` when `CLAWDENTITY_CONNECTOR_BASE_URL` is not set.
-- Optional: run `clawdentity connector service install <agent-name>` for persistent autostart.
-
-9. Complete trust pairing bootstrap.
-- Run pairing start from owner/initiator side:
-  - `clawdentity pair start <initiator-agent-name> --proxy-url <initiator-proxy-url> --qr`
-- Share the one-time QR image with responder side.
-- Run pairing confirm from responder side:
-  - `clawdentity pair confirm <responder-agent-name> --qr-file <ticket-qr-file> --proxy-url <responder-proxy-url>`
-- Confirm pairing success before relay test.
-
-10. Validate with user-style relay test.
-- Run `clawdentity openclaw doctor` to verify setup health and remediation hints.
-- Run `clawdentity openclaw relay test --peer <alias>` to execute a probe.
-- Confirm probe success and connector-mediated delivery logs.
-- Human asks Alpha to send a real request with `peer: "beta"` and verifies peer delivery.
-
-## Required question policy
-
-Ask the human only when required inputs are missing:
-- Missing local agent name.
-- Missing peer relay invite code (`clawd1_...`).
-- Missing registry onboarding invite code (`clw_inv_...`) when API key is absent.
-- Missing Clawdentity API key only when registry onboarding invite code is unavailable.
-- Missing initiator/responder proxy URLs for pairing commands.
-- Unclear OpenClaw state directory.
-- Non-default OpenClaw base URL.
-- Local connector runtime or peer network route is unknown or unreachable from agent runtime.
+- Optional persistent mode: `clawdentity connector service install <agent-name>`.
+
+8. Validate readiness.
+- Run `clawdentity openclaw doctor`.
+- Run `clawdentity openclaw relay test --peer <alias>`.
+- At this point the agent is ready to start pairing or accept pairing.
+
+9. Pairing phase (separate from onboarding).
+- Initiator: `clawdentity pair start <agent-name> --proxy-url <initiator-proxy-url> --qr`
+- Responder: `clawdentity pair confirm <agent-name> --qr-file <path> --proxy-url <responder-proxy-url>`
+- Confirm pairing success before first real peer message.
+
+## Required Question Policy
+
+Ask only when missing:
+- local agent name
+- onboarding invite (`clw_inv_...`) when API key is absent
+- peer alias/DID/proxy URL for setup
+- initiator/responder proxy URLs for pairing
+- non-default OpenClaw path/base URL
+
+Do not ask for relay invite codes.
 
 ## Failure Handling
 
-If setup or relay fails:
-- Report precise missing file/path/value.
-- Fix only the failing config/input.
-- Ensure connector runtime is active (`clawdentity connector start <agent-name>`).
-- If relay failures show `405 Method Not Allowed`, rerun setup and restart OpenClaw so hook config is reloaded.
-- Re-run `clawdentity openclaw doctor`.
-- Re-run `clawdentity openclaw relay test --peer <alias>`.
-- Re-run the same user-style flow from step 6 onward only after health checks pass.
+- Report exact missing file/value.
+- Fix only failing input/config.
+- Keep connector running while testing relay delivery.
+- If `405 Method Not Allowed` appears on hook path, rerun setup and restart OpenClaw.
+- Re-run `openclaw doctor`, then `openclaw relay test`.
 
 ## Bundled Resources
 
-### References
 | File | Purpose |
 |------|---------|
-| `references/clawdentity-protocol.md` | Invite format, peer map schema, connector handoff envelope, and runtime failure mapping |
+| `references/clawdentity-protocol.md` | Peer-map schema, pairing contract, connector handoff envelope, runtime failure mapping |
 
 Directive: read the reference file before troubleshooting relay contract or connector handoff failures.

package/skill-bundle/openclaw-skill/skill/references/clawdentity-protocol.md

@@ -26,27 +26,19 @@ Define the exact runtime contract used by `relay-to-peer.mjs`.
 - `~/.clawdentity/openclaw-relay.json`
 - `~/.clawdentity/openclaw-connectors.json`
 
-## Invite Code Contract
+## Setup Input Contract
 
-Invite codes are prefixed with `clawd1_` and contain base64url JSON:
+`clawdentity openclaw setup` is configured with explicit peer routing fields:
 
-```json
-{
-  "v": 1,
-  "issuedAt": "2026-02-15T20:00:00.000Z",
-  "did": "did:claw:agent:01H...",
-  "proxyUrl": "https://beta-proxy.example.com/hooks/agent",
-  "alias": "beta",
-  "name": "Beta Agent"
-}
-```
+- `--peer-alias <alias>`
+- `--peer-did <did:claw:agent:...>`
+- `--peer-proxy-url <http(s)://.../hooks/agent>`
+- optional `--peer-name <display-name>`
 
 Rules:
-- `v` must be `1`.
-- `issuedAt` is ISO-8601 UTC timestamp.
-- `did` must be an agent DID.
-- `proxyUrl` must be absolute `http` or `https`.
-- `alias` is optional but preferred for zero-question setup.
+- peer alias uses `[a-zA-Z0-9._-]`
+- peer DID must be a valid agent DID
+- peer proxy URL must be absolute `http` or `https`
 
 ## Peer Map Schema