nanobazaar-cli 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to `nanobazaar-cli` are documented in this file.
 
 This project follows Semantic Versioning.
 
+## [2.0.3] - 2026-02-09
+
+### Changed
+- `nanobazaar watch` now wakes only on relay wake events; removed the safety interval.
+
+## [2.0.2] - 2026-02-08
+
+### Fixed
+- `job mark-paid` now defaults to an idempotency key derived from the request payload (prevents `409 idempotency collision` when retrying with updated evidence).
+
+### Added
+- `NBR_IDEMPOTENCY_KEY` env override for commands that accept `--idempotency-key` (`job charge|mark-paid|deliver|reissue-charge`).
+
 ## [2.0.1] - 2026-02-08
 
 ### Changed

package/bin/nanobazaar

@@ -74,6 +74,35 @@ function sha256Hex(buffer) {
   return crypto.createHash('sha256').update(buffer).digest('hex');
 }
 
+function stableJsonNormalize(value) {
+  if (value === undefined) {
+    return null;
+  }
+  if (value === null || typeof value !== 'object') {
+    return value;
+  }
+  if (typeof value.toJSON === 'function') {
+    return stableJsonNormalize(value.toJSON());
+  }
+  if (Array.isArray(value)) {
+    return value.map((entry) => stableJsonNormalize(entry));
+  }
+  const out = {};
+  for (const key of Object.keys(value).sort()) {
+    const entry = value[key];
+    // Match JSON.stringify: omit undefined values in objects.
+    if (entry === undefined) {
+      continue;
+    }
+    out[key] = stableJsonNormalize(entry);
+  }
+  return out;
+}
+
+function stableJsonStringify(value) {
+  return JSON.stringify(stableJsonNormalize(value));
+}
+
 function loadState(filePath) {
   try {
     const raw = fs.readFileSync(filePath, 'utf8');
@@ -289,6 +318,17 @@ function getEnvValue(name) {
   return value && value.trim() ? value.trim() : '';
 }
 
+function resolveIdempotencyKey(flags, fallback) {
+  if (flags && flags.idempotencyKey) {
+    return String(flags.idempotencyKey);
+  }
+  const envKey = getEnvValue('NBR_IDEMPOTENCY_KEY');
+  if (envKey) {
+    return envKey;
+  }
+  return fallback ? String(fallback) : '';
+}
+
 function expandHomePath(value) {
   if (!value) {
     return value;
@@ -1235,10 +1275,10 @@ Commands:
                              Poll events and optionally ack
   poll ack --up-to-event-id <id>
                              Advance the server-side poll cursor (used for 410 resync)
-  watch [--stream-path /v0/stream] [--safety-wake-interval <seconds>]
+  watch [--stream-path /v0/stream]
         [--state-path <path>] [--openclaw-bin <bin>] [--event-text <text>]
         [--mode now|next] [--no-openclaw]
-                             Maintain SSE connection; wake OpenClaw on relay wake events + on a safety interval.
+                             Maintain SSE connection; wake OpenClaw on relay wake events.
                              Does not poll or ack (OpenClaw should run /nanobazaar poll).
 
 Global flags:
@@ -1990,7 +2030,7 @@ async function runJobCharge(argv) {
     method: 'POST',
     path: `/v0/jobs/${jobId}/charge`,
     body: payload,
-    idempotencyKey: String(flags.idempotencyKey || chargeId),
+    idempotencyKey: resolveIdempotencyKey(flags, chargeId),
     relayUrl: config.relay_url,
     keys,
     identity,
@@ -2060,11 +2100,15 @@ async function runJobMarkPaid(argv) {
   const {keys} = requireKeys(state);
   const identity = deriveIdentity(keys);
 
+  const requestBody = payload && Object.keys(payload).length > 0 ? payload : undefined;
+  const bodyHash = sha256Hex(stableJsonStringify(requestBody)).slice(0, 16);
+  const defaultIdempotencyKey = `mark_paid:${jobId}:${bodyHash}`;
+
   const result = await signedRequest({
     method: 'POST',
     path: `/v0/jobs/${jobId}/mark_paid`,
-    body: payload && Object.keys(payload).length > 0 ? payload : undefined,
-    idempotencyKey: String(flags.idempotencyKey || `mark_paid:${jobId}`),
+    body: requestBody,
+    idempotencyKey: resolveIdempotencyKey(flags, defaultIdempotencyKey),
     relayUrl: config.relay_url,
     keys,
     identity,
@@ -2144,7 +2188,7 @@ async function runJobDeliver(argv) {
     method: 'POST',
     path: `/v0/jobs/${jobId}/deliver`,
     body: {payload: built.envelope},
-    idempotencyKey: String(flags.idempotencyKey || payloadId),
+    idempotencyKey: resolveIdempotencyKey(flags, payloadId),
     relayUrl: config.relay_url,
     keys,
     identity,
@@ -2272,7 +2316,7 @@ async function runJobReissueCharge(argv) {
     method: 'POST',
     path: `/v0/jobs/${jobId}/charge/reissue`,
     body: payload,
-    idempotencyKey: String(flags.idempotencyKey || payload.charge_id),
+    idempotencyKey: resolveIdempotencyKey(flags, payload.charge_id),
     relayUrl: config.relay_url,
     keys,
     identity,
@@ -2991,11 +3035,9 @@ async function runWatch(argv) {
     throw new Error('watch no longer polls. Remove polling flags (--no-ack/--no-fetch-payloads/--limit/--types/--print-polls/--output) and retry.');
   }
 
-  const safetyIntervalSeconds = flags.safetyWakeInterval
-    ? parsePositiveInt(flags.safetyWakeInterval, '--safety-wake-interval')
-    : flags.safetyPollInterval
-      ? parsePositiveInt(flags.safetyPollInterval, '--safety-poll-interval')
-      : 180;
+  if (flags.safetyWakeInterval !== undefined || flags.safetyPollInterval !== undefined) {
+    throw new Error('Safety wake interval has been removed. Remove --safety-wake-interval/--safety-poll-interval and retry.');
+  }
 
   const openclawBin = String(flags.openclawBin || 'openclaw');
   const mode = String(flags.mode || 'now');
@@ -3006,7 +3048,6 @@ async function runWatch(argv) {
     relay_url: config.relay_url,
     state_path: statePath,
     stream_path: streamPath,
-    safety_wake_interval_seconds: safetyIntervalSeconds,
     openclaw_enabled: openclawEnabled,
   });
 
@@ -3047,7 +3088,7 @@ async function runWatch(argv) {
         const label = queuedReason || reason;
         queuedReason = null;
 
-        // Best-effort: waking OpenClaw can be retried on the next wake/safety interval.
+        // Best-effort: waking OpenClaw can be retried on the next wake event.
         const didWake = triggerOpenclawWake(label);
         console.error(`[watch] wake ${didWake ? 'ok' : 'skipped'} (${label})`);
       }
@@ -3070,17 +3111,6 @@ async function runWatch(argv) {
   console.error(`[watch] relay=${config.relay_url}`);
   console.error(`[watch] state_path=${statePath}`);
   console.error(`[watch] stream_path=${streamPath}`);
-  console.error(`[watch] safety_wake_interval_seconds=${safetyIntervalSeconds}`);
-
-  const safetyTimer = setInterval(() => {
-    if (signal.aborted) {
-      return;
-    }
-    void runWakeLoop('safety');
-  }, safetyIntervalSeconds * 1000);
-
-  // Kick off an initial wake so the agent can poll even if wakeups are missed.
-  void runWakeLoop('startup');
 
   let attempt = 0;
   function isWakeEvent(evt) {
@@ -3157,7 +3187,6 @@ async function runWatch(argv) {
     }
   }
 
-  clearInterval(safetyTimer);
 }
 
 const DISPATCH_BOOL_FLAGS = new Set([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nanobazaar-cli",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "NanoBazaar CLI for the NanoBazaar Relay and OpenClaw skill.",
   "homepage": "https://github.com/nanobazaar/nanobazaar/tree/main/packages/nanobazaar-cli#readme",
   "license": "UNLICENSED",