mnemospark 0.8.0 → 0.8.1

package/dist/cli.js

@@ -2974,7 +2974,7 @@ import {
   randomUUID as randomUUID3
 } from "crypto";
 import { createReadStream as createReadStream2, statfsSync } from "fs";
-import { appendFile as appendFile2, lstat, mkdir as mkdir5, readFile as readFile3, readdir as readdir2, rm, stat as stat2, writeFile as writeFile3 } from "fs/promises";
+import { lstat, mkdir as mkdir5, readFile as readFile3, readdir as readdir2, rm, stat as stat2, writeFile as writeFile3 } from "fs/promises";
 import { homedir as homedir6 } from "os";
 import { basename as basename2, dirname as dirname5, join as join8, resolve as resolve2 } from "path";
 import { privateKeyToAccount as privateKeyToAccount5 } from "viem/accounts";
@@ -3760,7 +3760,6 @@ async function createCloudDatastore(homeDir) {
 var SUPPORTED_BACKUP_PLATFORMS = /* @__PURE__ */ new Set(["darwin", "linux"]);
 var BACKUP_DIR_SUBPATH = join8(".openclaw", "mnemospark", "backup");
 var DEFAULT_BACKUP_DIR = join8(homedir6(), BACKUP_DIR_SUBPATH);
-var CRON_TABLE_SUBPATH = join8(".openclaw", "mnemospark", "crontab.txt");
 var BLOCKRUN_WALLET_KEY_SUBPATH = join8(".openclaw", "blockrun", "wallet.key");
 var MNEMOSPARK_WALLET_KEY_SUBPATH = join8(".openclaw", "mnemospark", "wallet", "wallet.key");
 var INLINE_UPLOAD_MAX_BYTES = 45e5;
@@ -3768,7 +3767,7 @@ var PAYMENT_CRON_SCHEDULE = "0 0 1 * *";
 var TAR_OVERHEAD_BYTES = 10 * 1024 * 1024;
 var QUOTE_VALIDITY_USER_NOTE = "Quotes are valid for one hour. Please run price-storage again if you need a new quote.";
 var MNEMOSPARK_SUPPORT_EMAIL = "pluggedin@mnemospark.ai";
-var CLOUD_HELP_FOOTER_STATE = "Local state: mnemospark records quotes, objects, payments, cron jobs, friendly names, and operation metadata in ~/.openclaw/mnemospark/state.db (SQLite). For troubleshooting and correlation, commands and the HTTP proxy append structured JSON lines to ~/.openclaw/mnemospark/events.jsonl. Monthly storage billing jobs are listed in ~/.openclaw/mnemospark/crontab.txt for your system scheduler.";
+var CLOUD_HELP_FOOTER_STATE = "Local state: mnemospark records quotes, objects, payments, cron jobs, friendly names, and operation metadata in ~/.openclaw/mnemospark/state.db (SQLite). For troubleshooting and correlation, commands and the HTTP proxy append structured JSON lines to ~/.openclaw/mnemospark/events.jsonl. Monthly storage billing jobs are listed in ~/.openclaw/cron/jobs.json for OpenClaw scheduling.";
 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_BACKUP = "<file|directory> and --name <friendly-name>";
@@ -4248,9 +4247,6 @@ function parseCloudArgs(args) {
   }
   return { mode: "unknown" };
 }
-function resolveCronTablePath(homeDir) {
-  return join8(homeDir ?? homedir6(), CRON_TABLE_SUBPATH);
-}
 async function calculateInputSizeBytes(targetPath) {
   const targetStats = await lstat(targetPath);
   if (targetStats.isFile() || targetStats.isSymbolicLink()) {
@@ -4408,84 +4404,126 @@ async function buildBackupObject(targetPathArg, options = {}) {
     throw error;
   }
 }
-function formatTimestamp(date) {
-  const pad = (value) => value.toString().padStart(2, "0");
-  return [
-    date.getFullYear().toString(),
-    "-",
-    pad(date.getMonth() + 1),
-    "-",
-    pad(date.getDate()),
-    " ",
-    pad(date.getHours()),
-    ":",
-    pad(date.getMinutes()),
-    ":",
-    pad(date.getSeconds())
-  ].join("");
-}
-function parseStoragePaymentCronJobLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) {
-    return null;
-  }
-  let payload;
-  try {
-    payload = JSON.parse(trimmed);
-  } catch {
+function normalizeOpenClawCronJobForLookup(value) {
+  if (!value || typeof value !== "object") {
     return null;
   }
-  if (!payload || typeof payload !== "object") {
+  const record = value;
+  const jobIdRaw = typeof record.jobId === "string" ? record.jobId : record.id;
+  const jobId = typeof jobIdRaw === "string" ? jobIdRaw.trim() : "";
+  const payloadRaw = record.payload;
+  if (!jobId || !payloadRaw || typeof payloadRaw !== "object") {
     return null;
   }
-  const record = payload;
-  const cronId = typeof record.cronId === "string" ? record.cronId.trim() : "";
-  const createdAt = typeof record.createdAt === "string" ? record.createdAt.trim() : "";
-  const schedule = typeof record.schedule === "string" ? record.schedule.trim() : "";
-  const command = typeof record.command === "string" ? record.command.trim() : "";
-  const quoteId = typeof record.quoteId === "string" ? record.quoteId.trim() : "";
-  const storagePrice = typeof record.storagePrice === "number" ? record.storagePrice : Number.NaN;
-  const walletAddress = typeof record.walletAddress === "string" ? record.walletAddress.trim() : "";
-  const objectId = typeof record.objectId === "string" ? record.objectId.trim() : "";
-  const objectKey = typeof record.objectKey === "string" ? record.objectKey.trim() : "";
-  const provider = typeof record.provider === "string" ? record.provider.trim() : "";
-  const bucketName = typeof record.bucketName === "string" ? record.bucketName.trim() : "";
-  const location = typeof record.location === "string" ? record.location.trim() : "";
-  if (!cronId || !createdAt || !schedule || !command || !quoteId || !Number.isFinite(storagePrice) || storagePrice <= 0 || !walletAddress || !objectId || !objectKey || !provider || !bucketName || !location) {
+  const payloadRecord = payloadRaw;
+  const payloadKind = payloadRecord.kind;
+  const payloadMessage = typeof payloadRecord.message === "string" ? payloadRecord.message.trim() : "";
+  if (payloadKind !== "agentTurn" || !payloadMessage) {
     return null;
   }
   return {
-    cronId,
-    createdAt,
-    schedule,
-    command,
-    quoteId,
-    storagePrice,
-    walletAddress,
-    objectId,
-    objectKey,
-    provider,
-    bucketName,
-    location
+    jobId,
+    message: payloadMessage
   };
 }
-async function findCronJobInCrontabByObjectKey(objectKey, homeDir) {
-  const cronTablePath = resolveCronTablePath(homeDir);
-  let content;
+async function runOpenClawCli(args, homeDir) {
+  return await new Promise((resolvePromise, rejectPromise) => {
+    let stdout = "";
+    let stderr = "";
+    const child = spawn("openclaw", args, {
+      stdio: ["ignore", "pipe", "pipe"],
+      env: {
+        ...process.env,
+        HOME: homeDir ?? process.env.HOME
+      }
+    });
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", rejectPromise);
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolvePromise({ stdout, stderr });
+        return;
+      }
+      rejectPromise(
+        new Error(
+          stderr.trim() || stdout.trim() || `openclaw ${args.join(" ")} exited with code ${code ?? "unknown"}`
+        )
+      );
+    });
+  });
+}
+function parseOpenClawCliJson(stdout, commandLabel) {
+  const trimmed = stdout.trim();
+  if (!trimmed) {
+    throw new Error(`openclaw ${commandLabel} returned empty JSON output`);
+  }
   try {
-    content = await readFile3(cronTablePath, "utf-8");
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      return null;
-    }
-    throw error;
+    return JSON.parse(trimmed);
+  } catch {
+    throw new Error(`openclaw ${commandLabel} returned invalid JSON output`);
   }
-  const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
-  for (let idx = lines.length - 1; idx >= 0; idx -= 1) {
-    const parsed = parseStoragePaymentCronJobLine(lines[idx]);
+}
+function createOpenClawCliCronAdapter(homeDir) {
+  return {
+    add: async (job) => {
+      const { stdout } = await runOpenClawCli(
+        [
+          "cron",
+          "add",
+          "--name",
+          job.name,
+          "--cron",
+          job.schedule.expr,
+          "--tz",
+          job.schedule.tz,
+          "--session",
+          job.sessionTarget,
+          "--message",
+          job.payload.message,
+          "--announce",
+          "--description",
+          job.delivery.text,
+          "--json"
+        ],
+        homeDir
+      );
+      const payload = parseOpenClawCliJson(stdout, "cron add");
+      const createdIdRaw = typeof payload.id === "string" ? payload.id : payload.jobId;
+      const createdId = typeof createdIdRaw === "string" ? createdIdRaw.trim() : "";
+      if (!createdId) {
+        throw new Error("openclaw cron add did not return a job id");
+      }
+      return { jobId: createdId };
+    },
+    remove: async (jobId) => {
+      const { stdout } = await runOpenClawCli(["cron", "rm", jobId, "--json"], homeDir);
+      const payload = parseOpenClawCliJson(stdout, "cron rm");
+      if (typeof payload.removed === "boolean") {
+        return payload.removed;
+      }
+      return true;
+    },
+    list: async () => {
+      const { stdout } = await runOpenClawCli(["cron", "list", "--all", "--json"], homeDir);
+      const payload = parseOpenClawCliJson(stdout, "cron list");
+      const jobsRaw = Array.isArray(payload.jobs) ? payload.jobs : [];
+      return jobsRaw.map((entry) => normalizeOpenClawCronJobForLookup(entry)).filter((entry) => entry !== null);
+    }
+  };
+}
+async function findCronJobInOpenClawCronJobsByObjectKey(objectKey, adapter) {
+  const cronJobs = await adapter.list();
+  for (let idx = cronJobs.length - 1; idx >= 0; idx -= 1) {
+    const cronJob = cronJobs[idx];
+    const parsed = parseStoragePaymentCronCommand(cronJob.message);
     if (parsed && parsed.objectKey === objectKey) {
       return {
-        cronId: parsed.cronId,
+        cronId: cronJob.jobId,
         objectId: parsed.objectId,
         objectKey: parsed.objectKey
       };
@@ -4511,54 +4549,65 @@ function buildStoragePaymentCronCommand(job) {
     quoteCronArgument(job.storagePrice)
   ].join(" ");
 }
-async function appendStoragePaymentCronJob(cronJob, homeDir) {
-  const cronTablePath = resolveCronTablePath(homeDir);
-  await mkdir5(dirname5(cronTablePath), { recursive: true });
-  await appendFile2(cronTablePath, `${JSON.stringify(cronJob)}
-`, "utf-8");
-  return cronTablePath;
-}
-async function removeStoragePaymentCronJob(cronId, homeDir) {
-  const cronTablePath = resolveCronTablePath(homeDir);
-  let content;
-  try {
-    content = await readFile3(cronTablePath, "utf-8");
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      return false;
-    }
-    throw error;
+function parseStoragePaymentCronCommand(command) {
+  const objectIdMatch = command.match(/--object-id\s+("([^"\\]|\\.)*"|'([^'\\]|\\.)*'|\S+)/);
+  const objectKeyMatch = command.match(/--object-key\s+("([^"\\]|\\.)*"|'([^'\\]|\\.)*'|\S+)/);
+  if (!objectIdMatch || !objectKeyMatch) {
+    return null;
   }
-  const lines = content.split(/\r?\n/);
-  let removed = false;
-  const keptLines = [];
-  for (const line of lines) {
-    const trimmed = line.trim();
+  const parseToken = (token) => {
+    const trimmed = token.trim();
     if (!trimmed) {
-      continue;
+      return null;
     }
-    const parsed = parseStoragePaymentCronJobLine(trimmed);
-    if (parsed && parsed.cronId === cronId) {
-      removed = true;
-      continue;
+    if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+      try {
+        return JSON.parse(trimmed);
+      } catch {
+        return trimmed.slice(1, -1);
+      }
     }
-    keptLines.push(trimmed);
-  }
-  if (!removed) {
-    return false;
+    if (trimmed.startsWith("'") && trimmed.endsWith("'")) {
+      return trimmed.slice(1, -1);
+    }
+    return trimmed;
+  };
+  const objectId = parseToken(objectIdMatch[1] ?? "");
+  const objectKey = parseToken(objectKeyMatch[1] ?? "");
+  if (!objectId || !objectKey) {
+    return null;
   }
-  await mkdir5(dirname5(cronTablePath), { recursive: true });
-  const nextContent = keptLines.length > 0 ? `${keptLines.join("\n")}
-` : "";
-  await writeFile3(cronTablePath, nextContent, "utf-8");
-  return true;
+  return { objectId, objectKey };
 }
-async function createStoragePaymentCronJob(upload, storagePrice, homeDir, nowDateFn = () => /* @__PURE__ */ new Date()) {
-  const cronId = randomUUID3();
-  const createdAt = formatTimestamp(nowDateFn());
+async function appendStoragePaymentCronJob(cronJob, adapter) {
+  const openClawJob = {
+    jobId: cronJob.cronId,
+    name: "Mnemospark Monthly Renewal",
+    schedule: {
+      kind: "cron",
+      expr: PAYMENT_CRON_SCHEDULE,
+      tz: "UTC"
+    },
+    payload: {
+      kind: "agentTurn",
+      message: cronJob.command
+    },
+    sessionTarget: "isolated",
+    delivery: {
+      mode: "announce",
+      text: "Thank you for using mnemospark cloud storage. Your renewal has been processed."
+    }
+  };
+  return adapter.add(openClawJob);
+}
+async function removeStoragePaymentCronJob(cronId, adapter) {
+  return adapter.remove(cronId);
+}
+async function createStoragePaymentCronJob(upload, storagePrice, openClawCronAdapter, nowDateFn = () => /* @__PURE__ */ new Date()) {
+  const provisionalCronId = randomUUID3();
   const cronJob = {
-    cronId,
-    createdAt,
+    cronId: provisionalCronId,
+    createdAt: nowDateFn().toISOString(),
     schedule: PAYMENT_CRON_SCHEDULE,
     command: buildStoragePaymentCronCommand({
       walletAddress: upload.addr,
@@ -4575,7 +4624,10 @@ async function createStoragePaymentCronJob(upload, storagePrice, homeDir, nowDat
     bucketName: upload.bucket_name,
     location: upload.location
   };
-  await appendStoragePaymentCronJob(cronJob, homeDir);
+  const created = await appendStoragePaymentCronJob(cronJob, openClawCronAdapter);
+  if (created.jobId?.trim()) {
+    cronJob.cronId = created.jobId.trim();
+  }
   return cronJob;
 }
 async function readWalletKeyIfPresent(walletPath) {
@@ -4965,6 +5017,9 @@ function createCloudCommand(options = {}) {
           requestStorageDeleteFn: options.requestStorageDeleteFn ?? requestStorageDeleteViaProxy,
           requestPaymentSettleViaProxyFn: options.requestPaymentSettleViaProxyFn ?? requestPaymentSettleViaProxy,
           mnemosparkHomeDir: options.mnemosparkHomeDir ?? options.backupOptions?.homeDir,
+          openClawCronAdapter: options.openClawCronAdapter ?? createOpenClawCliCronAdapter(
+            options.mnemosparkHomeDir ?? options.backupOptions?.homeDir
+          ),
           backupOptions: options.backupOptions,
           proxyQuoteOptions: options.proxyQuoteOptions,
           proxyUploadOptions: options.proxyUploadOptions,
@@ -5260,6 +5315,7 @@ async function runCloudCommandHandler(ctx, options, executionContext = {}) {
   const requestStorageDownload = options.requestStorageDownloadFn;
   const requestStorageDelete = options.requestStorageDeleteFn;
   const requestPaymentSettleViaProxy2 = options.requestPaymentSettleViaProxyFn;
+  const openClawCronAdapter = options.openClawCronAdapter;
   const subagentOrchestrator = options.subagentOrchestrator;
   if (parsed.mode === "help" || parsed.mode === "unknown") {
     return {
@@ -6232,7 +6288,7 @@ operation-id: ${operationId}`,
       const cronJob = await createStoragePaymentCronJob(
         finalizedUploadResponse,
         cronStoragePrice,
-        mnemosparkHomeDir,
+        openClawCronAdapter,
         nowDateFn
       );
       await datastore.upsertObject({
@@ -6596,15 +6652,15 @@ operation-id: ${operationId}`,
         };
       }
       if (!cronEntry) {
-        cronEntry = await findCronJobInCrontabByObjectKey(
+        cronEntry = await findCronJobInOpenClawCronJobsByObjectKey(
           resolvedRequest.object_key,
-          mnemosparkHomeDir
+          openClawCronAdapter
         );
       }
       if (cronEntry) {
         const fileCronDeleted = await removeStoragePaymentCronJob(
           cronEntry.cronId,
-          mnemosparkHomeDir
+          openClawCronAdapter
         );
         const dbCronDeleted = await datastore.removeCronJob(cronEntry.cronId);
         cronDeleted = fileCronDeleted || dbCronDeleted;