@clawtrail/init 2.5.2 → 2.6.0

package/dist/index.js

@@ -100,18 +100,9 @@ async function downloadSkillFiles(targetDir, staging = false) {
 async function installContextGraph(staging, agentId, apiKey) {
   const spinner = ora("Setting up context-graph provenance...").start();
   const openclawDir = path.join(os.homedir(), ".openclaw");
-  const pluginDir = path.join(openclawDir, "plugins", "context-graph");
-  await ensureDirectory(pluginDir);
+  const extensionsDir = path.join(openclawDir, "extensions", "context-graph");
+  await ensureDirectory(extensionsDir);
   const apiUrl = staging ? "https://sapi.clawtrail.ai/ct/api" : "https://api.clawtrail.ai/ct/api";
-  const cgConfig = {
-    submitUrl: `${apiUrl}/context-graph/submit`,
-    agentId: agentId || null,
-    apiKey: apiKey || null,
-    autoSubmit: true,
-    environment: staging ? "staging" : "production"
-  };
-  const configPath = path.join(pluginDir, "config.json");
-  await fs.writeFile(configPath, JSON.stringify(cgConfig, null, 2), "utf-8");
   const openclawConfigPath = path.join(openclawDir, "openclaw.json");
   try {
     let config = {};
@@ -120,11 +111,20 @@ async function installContextGraph(staging, agentId, apiKey) {
       config = JSON5.parse(existing);
     } catch {
     }
+    if (config.plugins?.["context-graph"]) {
+      delete config.plugins["context-graph"];
+    }
     config.plugins ??= {};
-    config.plugins["context-graph"] = {
+    config.plugins.entries ??= {};
+    config.plugins.entries["context-graph"] = {
       enabled: true,
-      configPath: "~/.openclaw/plugins/context-graph/config.json",
-      autoSubmit: true
+      config: {
+        submitUrl: `${apiUrl}/context-graph/submit`,
+        agentId: agentId || void 0,
+        apiKey: apiKey || void 0,
+        autoSubmit: true,
+        environment: staging ? "staging" : "production"
+      }
     };
     await fs.writeFile(
       openclawConfigPath,
@@ -136,38 +136,55 @@ async function installContextGraph(staging, agentId, apiKey) {
   let packagesInstalled = false;
   let installError = "";
   try {
-    execSync(
-      `npm install --prefix "${pluginDir}" @clawtrail/context-graph @clawtrail/context-graph-openclaw`,
-      { stdio: "pipe", timeout: 12e4 }
-    );
-    packagesInstalled = true;
-  } catch (err) {
-    const localErr = err.stderr?.toString().trim() || err.stdout?.toString().trim() || err.message || "Unknown error";
+    execSync("openclaw --version", { stdio: "pipe", timeout: 5e3 });
     try {
       execSync(
-        "npm install -g @clawtrail/context-graph @clawtrail/context-graph-openclaw",
+        "openclaw plugins install @clawtrail/context-graph-openclaw",
         { stdio: "pipe", timeout: 12e4 }
       );
       packagesInstalled = true;
-    } catch (err2) {
-      const globalErr = err2.stderr?.toString().trim() || err2.stdout?.toString().trim() || err2.message || "Unknown error";
-      installError = `Local install failed:
+    } catch (err) {
+      installError = err.stderr?.toString().trim() || err.stdout?.toString().trim() || err.message || "Unknown error";
+    }
+  } catch {
+  }
+  if (!packagesInstalled) {
+    try {
+      execSync(
+        `npm install --prefix "${extensionsDir}" @clawtrail/context-graph @clawtrail/context-graph-openclaw`,
+        { stdio: "pipe", timeout: 12e4 }
+      );
+      packagesInstalled = true;
+      installError = "";
+    } catch (err) {
+      const localErr = err.stderr?.toString().trim() || err.stdout?.toString().trim() || err.message || "Unknown error";
+      try {
+        execSync(
+          "npm install -g @clawtrail/context-graph @clawtrail/context-graph-openclaw",
+          { stdio: "pipe", timeout: 12e4 }
+        );
+        packagesInstalled = true;
+        installError = "";
+      } catch (err2) {
+        const globalErr = err2.stderr?.toString().trim() || err2.stdout?.toString().trim() || err2.message || "Unknown error";
+        installError = `Local install failed:
   ${localErr.split("\n").slice(-3).join("\n  ")}
 Global install failed:
   ${globalErr.split("\n").slice(-3).join("\n  ")}`;
+      }
     }
   }
   if (packagesInstalled) {
     spinner.succeed(
       chalk.green(
-        `Context-graph configured \u2192 auto-submit to ${staging ? "staging" : "production"}`
+        `Context-graph plugin installed \u2192 auto-submit to ${staging ? "staging" : "production"}`
       )
     );
   } else {
     spinner.warn(
       chalk.yellow(
         `Context-graph configured but packages not installed \u2014 run manually:
-  npm install -g @clawtrail/context-graph @clawtrail/context-graph-openclaw`
+  openclaw plugins install @clawtrail/context-graph-openclaw`
       )
     );
     if (installError) {
@@ -179,7 +196,7 @@ Global install failed:
   }
   return {
     installed: true,
-    configPath: "~/.openclaw/plugins/context-graph/config.json",
+    configPath: 'plugins.entries["context-graph"] in ~/.openclaw/openclaw.json',
     packagesInstalled
   };
 }
@@ -368,6 +385,12 @@ async function handleUninstall(staging) {
   }
   const spinner2a = ora("Removing context-graph...").start();
   let cgRemoved = false;
+  try {
+    const cgExtDir = path.join(openclawDir, "extensions", "context-graph");
+    await fs.rm(cgExtDir, { recursive: true, force: true });
+    cgRemoved = true;
+  } catch {
+  }
   try {
     const cgPluginDir = path.join(openclawDir, "plugins", "context-graph");
     await fs.rm(cgPluginDir, { recursive: true, force: true });
@@ -410,6 +433,12 @@ async function handleUninstall(staging) {
         delete config.skills.entries;
       if (Object.keys(config.skills).length === 0) delete config.skills;
     }
+    if (config.plugins?.entries?.["context-graph"]) {
+      delete config.plugins.entries["context-graph"];
+      if (Object.keys(config.plugins.entries).length === 0)
+        delete config.plugins.entries;
+      if (Object.keys(config.plugins).length === 0) delete config.plugins;
+    }
     if (config.plugins?.["context-graph"]) {
       delete config.plugins["context-graph"];
       if (Object.keys(config.plugins).length === 0) delete config.plugins;
@@ -464,7 +493,7 @@ async function handleUninstall(staging) {
   }
   if (cgRemoved) {
     console.log(
-      chalk.white("  Removed:  ") + chalk.red("~/.openclaw/plugins/context-graph/")
+      chalk.white("  Removed:  ") + chalk.red("~/.openclaw/extensions/context-graph/")
     );
   }
   if (configCleaned) {
@@ -487,7 +516,7 @@ async function main() {
   const program = new Command();
   program.name("clawtrail-init").description(
     "Install ClawTrail skill files, configure heartbeat, and optionally register an agent"
-  ).version("2.5.2").option(
+  ).version("2.6.0").option(
     "-d, --dir <path>",
     "Download directory for skill files",
     "./clawtrail-skills"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawtrail/init",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "CLI installer for ClawTrail AI agent skill files",
   "main": "dist/index.js",
   "bin": {