mnemospark 0.2.3 → 0.4.0

package/dist/cli.js

@@ -2784,6 +2784,7 @@ async function createCloudDatastore(homeDir) {
     const nextDb = new DatabaseSyncCtor(dbPath);
     nextDb.exec("PRAGMA journal_mode=WAL;");
     nextDb.exec("PRAGMA foreign_keys=ON;");
+    nextDb.exec("PRAGMA busy_timeout=5000;");
     nextDb.exec(`
       CREATE TABLE IF NOT EXISTS schema_migrations (
         version INTEGER PRIMARY KEY,
@@ -2832,6 +2833,7 @@ async function createCloudDatastore(homeDir) {
         updated_at TEXT NOT NULL
       );
       CREATE INDEX IF NOT EXISTS idx_cron_jobs_object_key ON cron_jobs(object_key);
+      CREATE INDEX IF NOT EXISTS idx_cron_jobs_quote_id ON cron_jobs(quote_id);
 
       CREATE TABLE IF NOT EXISTS operations (
         operation_id TEXT PRIMARY KEY,
@@ -3032,6 +3034,38 @@ async function createCloudDatastore(homeDir) {
       if (!row) return null;
       return { cronId: row.cron_id, objectId: row.object_id };
     }, null),
+    findCronByQuoteId: async (quoteId) => safe(() => {
+      const row = db.prepare(
+        `SELECT cron_id, object_id, object_key, quote_id, schedule, command, status
+             FROM cron_jobs WHERE quote_id = ? ORDER BY updated_at DESC LIMIT 1`
+      ).get(quoteId);
+      if (!row) return null;
+      return {
+        cron_id: row.cron_id,
+        object_id: row.object_id,
+        object_key: row.object_key,
+        quote_id: row.quote_id,
+        schedule: row.schedule,
+        command: row.command,
+        status: row.status
+      };
+    }, null),
+    findPaymentByQuoteId: async (quoteId) => safe(() => {
+      const row = db.prepare(
+        `SELECT quote_id, wallet_address, trans_id, amount, network, status, settled_at
+             FROM payments WHERE quote_id = ? LIMIT 1`
+      ).get(quoteId);
+      if (!row) return null;
+      return {
+        quote_id: row.quote_id,
+        wallet_address: row.wallet_address,
+        trans_id: row.trans_id,
+        amount: row.amount,
+        network: row.network,
+        status: row.status,
+        settled_at: row.settled_at
+      };
+    }, null),
     upsertOperation: async (row) => {
       await safe(() => {
         const ts = nowIso();
@@ -3178,7 +3212,15 @@ var CRON_LOG_ROW_PREFIX = "cron";
 var TAR_OVERHEAD_BYTES = 10 * 1024 * 1024;
 var REQUIRED_PRICE_STORAGE = "--wallet-address, --object-id, --object-id-hash, --gb, --provider, --region";
 var REQUIRED_UPLOAD = "--quote-id, --wallet-address, --object-id, --object-id-hash";
+var REQUIRED_PAYMENT_SETTLE = "--quote-id and --wallet-address";
 var REQUIRED_STORAGE_OBJECT = "--wallet-address and one of (--object-key | --name [--latest|--at])";
+var PAYMENT_SETTLE_FLAG_NAMES = /* @__PURE__ */ new Set([
+  "quote-id",
+  "wallet-address",
+  "object-id",
+  "object-key",
+  "storage-price"
+]);
 var BOOLEAN_SELECTOR_FLAGS = /* @__PURE__ */ new Set(["latest"]);
 var BOOLEAN_ASYNC_FLAGS = /* @__PURE__ */ new Set(["async"]);
 var BOOLEAN_OP_STATUS_FLAGS = /* @__PURE__ */ new Set(["cancel"]);
@@ -3211,6 +3253,10 @@ var CLOUD_HELP_TEXT = [
   "  Purpose: upload an encrypted object using a valid quote-id.",
   "  Required: " + REQUIRED_UPLOAD,
   "",
+  "\u2022 `/mnemospark_cloud payment-settle --quote-id <quote-id> --wallet-address <addr> [--object-id <id>] [--object-key <key>] [--storage-price <n>]`",
+  "  Purpose: settle storage payment for a quote (e.g. monthly cron). Uses the same proxy + x402 path as upload pre-settlement.",
+  "  Required: --quote-id, --wallet-address (wallet private key must match the address).",
+  "",
   "\u2022 `/mnemospark_cloud ls --wallet-address <addr> [--object-key <object-key> | --name <friendly-name>] [--latest|--at <timestamp>]`",
   "  Purpose: look up remote object metadata.",
   "  Required: " + REQUIRED_STORAGE_OBJECT,
@@ -3245,7 +3291,7 @@ var CLOUD_HELP_TEXT = [
   "\u2022 `/mnemospark_cloud op-status --operation-id <id>`",
   "\u2022 `/mnemospark_cloud op-status --operation-id <id> --cancel`",
   "",
-  "Backup creates a tar+gzip object in ~/.openclaw/mnemospark/backup and appends object metadata to ~/.openclaw/mnemospark/object.log. Upload appends storage rows and cron-tracking rows to object.log, and keeps job entries in ~/.openclaw/mnemospark/crontab.txt. All storage commands (price-storage, upload, ls, download, delete) require --wallet-address."
+  "Backup creates a tar+gzip object in ~/.openclaw/mnemospark/backup and appends object metadata to ~/.openclaw/mnemospark/object.log. Upload appends storage rows and cron-tracking rows to object.log, and keeps job entries in ~/.openclaw/mnemospark/crontab.txt. Commands price-storage, upload, ls, download, delete, and payment-settle require --wallet-address."
 ].join("\n");
 var UnsupportedBackupPlatformError = class extends Error {
   constructor(platform) {
@@ -3486,6 +3532,41 @@ function parseCloudArgs(args) {
       }
     };
   }
+  if (subcommand === "payment-settle") {
+    const flags = parseNamedFlags(rest);
+    if (!flags) {
+      return { mode: "payment-settle-invalid" };
+    }
+    for (const key of Object.keys(flags)) {
+      if (!PAYMENT_SETTLE_FLAG_NAMES.has(key)) {
+        return { mode: "payment-settle-invalid" };
+      }
+    }
+    const quoteId = flags["quote-id"]?.trim();
+    const walletAddress = flags["wallet-address"]?.trim();
+    if (!quoteId || !walletAddress) {
+      return { mode: "payment-settle-invalid" };
+    }
+    let storagePrice;
+    if (flags["storage-price"] !== void 0 && flags["storage-price"] !== "") {
+      const raw = flags["storage-price"]?.trim() ?? "";
+      const n = Number.parseFloat(raw);
+      if (!Number.isFinite(n) || n < 0) {
+        return { mode: "payment-settle-invalid" };
+      }
+      storagePrice = n;
+    }
+    return {
+      mode: "payment-settle",
+      paymentSettleRequest: {
+        quote_id: quoteId,
+        wallet_address: walletAddress,
+        object_id: flags["object-id"]?.trim() || void 0,
+        object_key: flags["object-key"]?.trim() || void 0,
+        storage_price: storagePrice
+      }
+    };
+  }
   if (subcommand === "ls") {
     const flags = parseNamedFlags(rest, BOOLEAN_SELECTOR_FLAGS);
     if (!flags) {
@@ -3846,7 +3927,8 @@ function quoteCronArgument(value) {
 }
 function buildStoragePaymentCronCommand(job) {
   return [
-    "mnemospark-pay-storage",
+    "/mnemospark_cloud",
+    "payment-settle",
     "--quote-id",
     quoteCronArgument(job.quoteId),
     "--wallet-address",
@@ -4268,10 +4350,12 @@ function createCloudCommand(options = {}) {
           requestStorageLsFn: options.requestStorageLsFn ?? requestStorageLsViaProxy,
           requestStorageDownloadFn: options.requestStorageDownloadFn ?? requestStorageDownloadViaProxy,
           requestStorageDeleteFn: options.requestStorageDeleteFn ?? requestStorageDeleteViaProxy,
+          requestPaymentSettleViaProxyFn: options.requestPaymentSettleViaProxyFn ?? requestPaymentSettleViaProxy,
           objectLogHomeDir: options.objectLogHomeDir ?? options.backupOptions?.homeDir,
           backupOptions: options.backupOptions,
           proxyQuoteOptions: options.proxyQuoteOptions,
           proxyUploadOptions: options.proxyUploadOptions,
+          proxySettleOptions: options.proxySettleOptions,
           proxyUploadConfirmOptions: options.proxyUploadConfirmOptions,
           subagentOrchestrator,
           proxyStorageOptions: options.proxyStorageOptions
@@ -4435,6 +4519,117 @@ function buildRequestCorrelation(forcedOperationId, forcedTraceId) {
   const traceId = forcedTraceId?.trim() || randomUUID3();
   return { operationId, traceId };
 }
+function parseTransIdFromPaymentSettleBody(bodyText) {
+  const trimmed = bodyText.trim();
+  if (!trimmed.startsWith("{")) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(trimmed);
+    const tid = parsed.trans_id;
+    return typeof tid === "string" && tid.trim() ? tid.trim() : null;
+  } catch {
+    return null;
+  }
+}
+async function resolveAmountForPaymentSettle(quoteId, storagePriceFromFlag, datastore, homeDir) {
+  if (storagePriceFromFlag !== void 0 && Number.isFinite(storagePriceFromFlag)) {
+    return storagePriceFromFlag;
+  }
+  const quoteLookup = await datastore.findQuoteById(quoteId);
+  if (quoteLookup && Number.isFinite(quoteLookup.storagePrice)) {
+    return quoteLookup.storagePrice;
+  }
+  const logged = await findLoggedPriceStorageQuote(quoteId, homeDir);
+  if (logged && Number.isFinite(logged.storagePrice)) {
+    return logged.storagePrice;
+  }
+  const payment = await datastore.findPaymentByQuoteId(quoteId);
+  if (payment && Number.isFinite(payment.amount)) {
+    return payment.amount;
+  }
+  return 0;
+}
+async function emitPaymentSettleClientObservationBestEffort(params) {
+  try {
+    const {
+      phase,
+      correlation,
+      quoteId,
+      walletAddress,
+      objectId,
+      objectKey,
+      httpStatus,
+      outcomeStatus,
+      homeDir
+    } = params;
+    const ts = (/* @__PURE__ */ new Date()).toISOString();
+    if (phase === "start") {
+      await emitCloudEventBestEffort(
+        "payment-settle.started",
+        {
+          operation_id: correlation.operationId,
+          trace_id: correlation.traceId,
+          quote_id: quoteId,
+          wallet_address: walletAddress,
+          object_id: objectId,
+          object_key: objectKey,
+          status: "running"
+        },
+        homeDir
+      );
+      await appendJsonlEvent(
+        "proxy-events.jsonl",
+        {
+          ts,
+          event_type: "payment.settle",
+          status: "start",
+          trace_id: correlation.traceId,
+          operation_id: correlation.operationId,
+          quote_id: quoteId,
+          wallet_address: walletAddress,
+          object_id: objectId ?? null,
+          object_key: objectKey ?? null,
+          details: { source: "client" }
+        },
+        homeDir
+      );
+      return;
+    }
+    const terminal = outcomeStatus ?? "failed";
+    await emitCloudEventBestEffort(
+      "payment-settle.completed",
+      {
+        operation_id: correlation.operationId,
+        trace_id: correlation.traceId,
+        quote_id: quoteId,
+        wallet_address: walletAddress,
+        object_id: objectId,
+        object_key: objectKey,
+        status: terminal === "succeeded" ? "succeeded" : "failed",
+        http_status: httpStatus
+      },
+      homeDir
+    );
+    await appendJsonlEvent(
+      "proxy-events.jsonl",
+      {
+        ts,
+        event_type: "payment.settle",
+        status: "result",
+        trace_id: correlation.traceId,
+        operation_id: correlation.operationId,
+        quote_id: quoteId,
+        wallet_address: walletAddress,
+        object_id: objectId ?? null,
+        object_key: objectKey ?? null,
+        details: { http_status: httpStatus ?? null, source: "client" }
+      },
+      homeDir
+    );
+  } catch {
+  }
+}
 async function runCloudCommandHandler(ctx, options, executionContext = {}) {
   const parsed = parseCloudArgs(ctx.args);
   const objectLogHomeDir = options.objectLogHomeDir;
@@ -4450,6 +4645,7 @@ async function runCloudCommandHandler(ctx, options, executionContext = {}) {
   const requestStorageLs = options.requestStorageLsFn;
   const requestStorageDownload = options.requestStorageDownloadFn;
   const requestStorageDelete = options.requestStorageDeleteFn;
+  const requestPaymentSettleViaProxy2 = options.requestPaymentSettleViaProxyFn;
   const subagentOrchestrator = options.subagentOrchestrator;
   if (parsed.mode === "help" || parsed.mode === "unknown") {
     return {
@@ -4487,6 +4683,12 @@ async function runCloudCommandHandler(ctx, options, executionContext = {}) {
       isError: true
     };
   }
+  if (parsed.mode === "payment-settle-invalid") {
+    return {
+      text: `Cannot settle payment: required arguments are ${REQUIRED_PAYMENT_SETTLE}. Optional: --object-id, --object-key, --storage-price.`,
+      isError: true
+    };
+  }
   if (parsed.mode === "ls-invalid") {
     return {
       text: `Cannot list storage object: required arguments are ${REQUIRED_STORAGE_OBJECT}.`,
@@ -4631,6 +4833,142 @@ async function runCloudCommandHandler(ctx, options, executionContext = {}) {
     }
     return formatOperationStatus(operation);
   }
+  if (parsed.mode === "payment-settle") {
+    const req = parsed.paymentSettleRequest;
+    let walletKey;
+    try {
+      walletKey = await resolveWalletKey(objectLogHomeDir);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return { text: message.trim() || "Cannot resolve wallet key.", isError: true };
+    }
+    const walletAccount = privateKeyToAccount5(walletKey);
+    if (walletAccount.address.toLowerCase() !== req.wallet_address.toLowerCase()) {
+      return {
+        text: `Cannot settle payment: wallet key address ${walletAccount.address} does not match --wallet-address ${req.wallet_address}.`,
+        isError: true
+      };
+    }
+    const correlation = buildRequestCorrelation();
+    const settleFetch = createPayment(walletKey).fetch;
+    const objectId = req.object_id;
+    const objectKey = req.object_key;
+    await emitPaymentSettleClientObservationBestEffort({
+      phase: "start",
+      correlation,
+      quoteId: req.quote_id,
+      walletAddress: req.wallet_address,
+      objectId,
+      objectKey,
+      homeDir: objectLogHomeDir
+    });
+    let settleResult;
+    try {
+      settleResult = await requestPaymentSettleViaProxy2(req.quote_id, req.wallet_address, {
+        ...options.proxySettleOptions,
+        correlation,
+        fetchImpl: (input, init) => settleFetch(input, init)
+      });
+    } catch (err) {
+      const amountErr = await resolveAmountForPaymentSettle(
+        req.quote_id,
+        req.storage_price,
+        datastore,
+        objectLogHomeDir
+      );
+      await datastore.upsertPayment({
+        quote_id: req.quote_id,
+        wallet_address: req.wallet_address,
+        trans_id: null,
+        amount: amountErr,
+        network: null,
+        status: "settle_failed",
+        settled_at: null
+      });
+      const cronErr = await datastore.findCronByQuoteId(req.quote_id);
+      if (cronErr) {
+        await datastore.upsertCronJob({ ...cronErr, status: "active" });
+      }
+      const msg = err instanceof Error ? err.message : String(err);
+      await emitPaymentSettleClientObservationBestEffort({
+        phase: "result",
+        correlation,
+        quoteId: req.quote_id,
+        walletAddress: req.wallet_address,
+        objectId,
+        objectKey,
+        outcomeStatus: "failed",
+        homeDir: objectLogHomeDir
+      });
+      return { text: `Payment settle failed: ${msg}`, isError: true };
+    }
+    const amount = await resolveAmountForPaymentSettle(
+      req.quote_id,
+      req.storage_price,
+      datastore,
+      objectLogHomeDir
+    );
+    const transId = settleResult.status === 200 ? parseTransIdFromPaymentSettleBody(settleResult.bodyText ?? "") : null;
+    if (settleResult.status === 200) {
+      await datastore.upsertPayment({
+        quote_id: req.quote_id,
+        wallet_address: req.wallet_address,
+        trans_id: transId,
+        amount,
+        network: null,
+        status: "settled",
+        settled_at: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      const cronRow = await datastore.findCronByQuoteId(req.quote_id);
+      if (cronRow) {
+        await datastore.upsertCronJob({ ...cronRow, status: "active" });
+      }
+      await emitPaymentSettleClientObservationBestEffort({
+        phase: "result",
+        correlation,
+        quoteId: req.quote_id,
+        walletAddress: req.wallet_address,
+        objectId,
+        objectKey,
+        httpStatus: settleResult.status,
+        outcomeStatus: "succeeded",
+        homeDir: objectLogHomeDir
+      });
+      return {
+        text: transId ? `Payment settled for quote ${req.quote_id} (trans_id: ${transId}).` : `Payment settled for quote ${req.quote_id}.`
+      };
+    }
+    await datastore.upsertPayment({
+      quote_id: req.quote_id,
+      wallet_address: req.wallet_address,
+      trans_id: transId,
+      amount,
+      network: null,
+      status: "settle_failed",
+      settled_at: null
+    });
+    const cronRowFailed = await datastore.findCronByQuoteId(req.quote_id);
+    if (cronRowFailed) {
+      await datastore.upsertCronJob({ ...cronRowFailed, status: "active" });
+    }
+    await emitPaymentSettleClientObservationBestEffort({
+      phase: "result",
+      correlation,
+      quoteId: req.quote_id,
+      walletAddress: req.wallet_address,
+      objectId,
+      objectKey,
+      httpStatus: settleResult.status,
+      outcomeStatus: "failed",
+      homeDir: objectLogHomeDir
+    });
+    const bodySnippet = settleResult.bodyText?.trim();
+    const detail = bodySnippet && bodySnippet.length > 500 ? `${bodySnippet.slice(0, 500)}\u2026` : bodySnippet;
+    return {
+      text: detail ? `Payment settle failed (HTTP ${settleResult.status}): ${detail}` : `Payment settle failed with HTTP ${settleResult.status}.`,
+      isError: true
+    };
+  }
   if ((parsed.mode === "backup" || parsed.mode === "upload" || parsed.mode === "download") && parsed.async) {
     const asyncCorrelation = buildRequestCorrelation();
     const operationId = asyncCorrelation.operationId;
@@ -5141,7 +5479,7 @@ operation-id: ${operationId}`,
       const shouldSettleBeforeUpload = requestStorageUpload !== requestStorageUploadViaProxy;
       if (shouldSettleBeforeUpload) {
         const paymentFetch = createPayment(walletKey).fetch;
-        const settleResult = await requestPaymentSettleViaProxy(
+        const settleResult = await requestPaymentSettleViaProxy2(
           parsed.uploadRequest.quote_id,
           parsed.uploadRequest.wallet_address,
           {