wattetheria 0.3.3 → 0.3.5

package/README.md

@@ -556,9 +556,11 @@ Agent commands such as `identity`, `wallet`, and `servicenet` are forwarded to t
 native `wattetheria-client-cli`; installed release packages should not require Rust on the user's
 machine. The JS wrapper resolves `WATTETHERIA_CLI_BIN` first, then the matching optional native
 package such as `@wattetheria/cli-win32-x64`, then `bin/native/<platform>-<arch>/`, then `PATH`.
-If no host native CLI is available but the local Wattetheria node deployment is installed, the
-wrapper runs the same command inside the `kernel` container using the node's
-`/var/lib/wattetheria` data directory.
+`identity` and `wallet` are lightweight local setup commands for ServiceNet publishing and wallet
+binding before a local Wattetheria node is installed. If a local node deployment is already
+installed, the wrapper refuses `identity` and `wallet` commands so users do not create or modify a
+separate local identity or wallet outside the node. ServiceNet commands can still run through an
+installed node when no host native CLI is available.
 
 NPM publish flow:
 
@@ -583,14 +585,16 @@ CLI saves the provider/card context locally:
 ```bash
 npx wattetheria servicenet agent-card init
 # or write the template into a specific directory:
-npx wattetheria servicenet agent-card init --out ./agents/hermes
+npx wattetheria servicenet agent-card init --out <output-directory>
 
-npx wattetheria servicenet provider register --card ./agent-card.json
+npx wattetheria servicenet register
+# If the card is not in the current directory:
+npx wattetheria servicenet register --card <path-to-agent-card.json>
 ```
 
 Then publish through the ServiceNet business command with the returned agent id. The publish
-command reads the saved provider id, ServiceNet URL, endpoint URL, and card path from local
-context instead of asking for repeated flags:
+command reads the saved provider id, endpoint URL, and card path from local context instead of
+asking for repeated flags:
 
 ```bash
 npx wattetheria servicenet publish <agent-id>

package/lib/cli.js

@@ -73,10 +73,25 @@ Commands:
   doctor      Check local prerequisites
   help        Show this help
 
-Agent subcommands (forwarded to the bundled native CLI when available):
-  identity    init | show | export-seed
-  wallet      manage wallet payment accounts
-  servicenet  agent-card init | provider register | publish <agent-id>
+Agent subcommands:
+  identity
+    init                         Initialize a lightweight local identity for ServiceNet publishing or wallet binding
+    show                         Show the local identity public DID and public key
+    export-seed                  Export the local identity seed; treat it like a password
+
+  wallet
+    create-payment-account       Create a local payment account for ServiceNet payment binding
+    import-payment-account       Import a local payment account for ServiceNet payment binding
+    watch-payment-account        Track a payment address without importing its private key
+    list-payment-accounts        List local payment accounts
+    bind-payment-account         Select the active local payment account
+    active-payment-account       Show the active local payment account
+
+  servicenet
+    agent-card init              Generate an editable agent-card.json template in the current directory
+    register --card <path-to-agent-card.json>
+                                 Register the agent card and local identity with ServiceNet; returns agent_id and provider_id
+    publish <agent-id>           Publish a registered ServiceNet agent using the agent_id returned by register
 
 Options:
   --version, -v          Alias for \`version\`
@@ -94,6 +109,15 @@ Options:
 `);
 }
 
+function throwCommandSuggestion(argv) {
+  if (argv[0] === "provider" && argv[1] === "register") {
+    throw new Error("Unknown command: provider register. Use `wattetheria servicenet register`.");
+  }
+  if (argv[0] === "register") {
+    throw new Error("Unknown command: register. Use `wattetheria servicenet register`.");
+  }
+}
+
 function parseArgs(argv) {
   let command = DEFAULT_COMMAND;
   let index = 0;
@@ -1291,11 +1315,25 @@ function bundledRustBinaryPath() {
 
 function missingNativeCliError(commandName) {
   const platformKey = nativePlatformKey() || `${process.platform}-${process.arch}`;
+  if (commandName === "identity" || commandName === "wallet") {
+    return new Error(
+      [
+        `Cannot run '${commandName}' because the Wattetheria native CLI for ${platformKey} was not found.`,
+        "",
+        "`wattetheria identity` and `wattetheria wallet` are lightweight local setup commands",
+        "for ServiceNet publishing and wallet binding. They do not require a local Wattetheria",
+        "node, but they do require the native CLI package for this system.",
+        "",
+        "Install the matching Wattetheria native CLI package, then retry."
+      ].join("\n")
+    );
+  }
+
   const deployment = deploymentState();
   if (deployment.installed) {
     return new Error(
       `Wattetheria node deployment was found at ${deployment.dir}, but this npm package does not include ` +
-        `the native publisher CLI for ${platformKey}. ` +
+        `the native CLI for ${platformKey}. ` +
         `Run 'npx wattetheria status' to check the installed node, or update the local node image.`
     );
   }
@@ -1306,6 +1344,59 @@ function missingNativeCliError(commandName) {
   );
 }
 
+function installedNodeArtifacts(deployment = deploymentState()) {
+  return {
+    identityPath: path.join(deployment.stateDir, "identity.json"),
+    walletMetadataPath: path.join(deployment.stateDir, ".watt-wallet", "metadata.json"),
+    walletKeystorePath: path.join(deployment.stateDir, ".watt-wallet", "keystore.json")
+  };
+}
+
+function isLightweightLocalCommand(commandName) {
+  return commandName === "identity" || commandName === "wallet";
+}
+
+function ensureLightweightCommandAllowed(commandName) {
+  if (!isLightweightLocalCommand(commandName)) {
+    return;
+  }
+  const deployment = deploymentState();
+  if (!deployment.installed) {
+    return;
+  }
+  const artifacts = installedNodeArtifacts(deployment);
+  if (commandName === "identity") {
+    throw new Error(
+      [
+        "Refusing to run a separate local identity command.",
+        "",
+        fs.existsSync(artifacts.identityPath)
+          ? "A local Wattetheria node is already installed and has an identity at:"
+          : "A local Wattetheria node is already installed at:",
+        deployment.stateDir,
+        "",
+        "`wattetheria identity` is only for lightweight local setup when no Wattetheria",
+        "node is installed. Use the installed node's identity instead."
+      ].join("\n")
+    );
+  }
+  if (commandName === "wallet") {
+    throw new Error(
+      [
+        "Refusing to run a separate local wallet command.",
+        "",
+        fs.existsSync(artifacts.walletMetadataPath) && fs.existsSync(artifacts.walletKeystorePath)
+          ? "A local Wattetheria node is already installed and has wallet state at:"
+          : "A local Wattetheria node is already installed at:",
+        deployment.stateDir,
+        "",
+        "`wattetheria wallet` is only for lightweight local setup when no Wattetheria",
+        "node is installed. Use the installed node's wallet instead."
+      ].join("\n")
+    );
+  }
+}
+
 function forwardedArgsForInstalledNode(commandName, rawArgv) {
   const args = [commandName];
   if (!rawArgv.some((arg) => arg === "--data-dir" || arg.startsWith("--data-dir="))) {
@@ -1321,10 +1412,9 @@ function isServicenetAgentCardInit(commandName, rawArgv) {
     && rawArgv[2] === "init";
 }
 
-function isServicenetProviderRegister(commandName, rawArgv) {
+function isServicenetRegister(commandName, rawArgv) {
   return commandName === "servicenet"
-    && rawArgv[1] === "provider"
-    && rawArgv[2] === "register";
+    && rawArgv[1] === "register";
 }
 
 function isServicenetPublish(commandName, rawArgv) {
@@ -1334,7 +1424,7 @@ function isServicenetPublish(commandName, rawArgv) {
 
 function usesWorkspaceMount(commandName, rawArgv) {
   return isServicenetAgentCardInit(commandName, rawArgv)
-    || isServicenetProviderRegister(commandName, rawArgv)
+    || isServicenetRegister(commandName, rawArgv)
     || isServicenetPublish(commandName, rawArgv);
 }
 
@@ -1416,8 +1506,8 @@ function dockerWorkspaceInvocation(commandName, rawArgv) {
     };
   }
 
-  if (isServicenetProviderRegister(commandName, rawArgv)) {
-    const cardArg = parsePathOption(rawArgv, "--card", 3);
+  if (isServicenetRegister(commandName, rawArgv)) {
+    const cardArg = parsePathOption(rawArgv, "--card", 2);
     if (!cardArg) {
       return {
         args: forwardedArgsForInstalledNode(commandName, rawArgv),
@@ -1536,6 +1626,8 @@ function runInstalledNodeCli(commandName, rawArgv, deployment) {
 }
 
 function forwardToRustBinary(commandName, rawArgv) {
+  ensureLightweightCommandAllowed(commandName);
+
   // Only the Rust binary name is allowed here. The bare `wattetheria` name
   // resolves to this JS shim on most user PATHs (via the npm bin link), so
   // including it would create an infinite spawn loop.
@@ -1562,6 +1654,9 @@ function forwardToRustBinary(commandName, rawArgv) {
   }
 
   const deployment = deploymentState();
+  if (commandName === "identity" || commandName === "wallet") {
+    throw missingNativeCliError(commandName);
+  }
   if (deployment.runnable) {
     runInstalledNodeCli(commandName, rawArgv, deployment);
     return;
@@ -1571,6 +1666,8 @@ function forwardToRustBinary(commandName, rawArgv) {
 }
 
 async function run(argv) {
+  throwCommandSuggestion(argv);
+
   if (argv[0] && FORWARDED_SUBCOMMANDS.has(argv[0])) {
     forwardToRustBinary(argv[0], argv);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Wattetheria deployment CLI",
   "license": "Apache-2.0",
   "type": "commonjs",