@bububuger/spanory 0.1.21 → 0.1.26

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // dist/index.js
 import { existsSync, readFileSync, realpathSync } from "node:fs";
-import { chmod, copyFile, mkdir as mkdir4, readdir as readdir5, readFile as readFile8, rm, stat as stat4, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir4, readdir as readdir5, readFile as readFile8, rm, stat as stat4, writeFile as writeFile4 } from "node:fs/promises";
 import path8 from "node:path";
 import { createHash as createHash4 } from "node:crypto";
 import { spawnSync } from "node:child_process";
@@ -4473,6 +4473,14 @@ async function backupIfExists(filePath) {
   await copyFile(filePath, backupPath);
   return backupPath;
 }
+function isSpanoryCodexNotifyConfigured(configText) {
+  return /notify\s*=\s*\[[^\]]*spanory-codex-notify\.sh[^\]]*\]/m.test(String(configText ?? ""));
+}
+function stripSpanoryCodexNotifyConfig(configText) {
+  const next = String(configText ?? "").replace(/^notify\s*=\s*\[[^\]]*spanory-codex-notify\.sh[^\]]*\]\s*$/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+  return next ? `${next}
+` : "";
+}
 function isSpanoryHookCommand(command) {
   const text = String(command ?? "");
   return /\bspanory\b/.test(text) && /\bhook\b/.test(text);
@@ -4525,76 +4533,10 @@ async function applyClaudeSetup({ homeRoot, spanoryBin, dryRun }) {
     backup
   };
 }
-function upsertCodexNotifyConfig(configText, notifyScriptRef) {
-  const notifyLine = `notify = ["${escapeTomlBasicString(notifyScriptRef)}"]`;
-  if (/^notify\s*=.*$/m.test(configText)) {
-    return configText.replace(/^notify\s*=.*$/m, notifyLine);
-  }
-  const withNewline = configText.trimEnd();
-  if (!withNewline)
-    return `${notifyLine}
-`;
-  return `${withNewline}
-
-${notifyLine}
-`;
-}
-function escapeTomlBasicString(value) {
-  return String(value).replaceAll("\\", "\\\\").replaceAll('"', '\\"');
-}
-function isSpanoryCodexNotifyConfigured(configText) {
-  return /notify\s*=\s*\[[^\]]*spanory-codex-notify\.sh[^\]]*\]/m.test(String(configText ?? ""));
-}
-function stripSpanoryCodexNotifyConfig(configText) {
-  const next = String(configText ?? "").replace(/^notify\s*=\s*\[[^\]]*spanory-codex-notify\.sh[^\]]*\]\s*$/gm, "").replace(/\n{3,}/g, "\n\n").trim();
-  return next ? `${next}
-` : "";
-}
-function codexNotifyScriptContent({ spanoryBin, codexHome, exportDir, logFile }) {
-  return `#!/usr/bin/env bash
-set -euo pipefail
-payload="\${1:-}"
-if [[ -z "$payload" ]] && [[ ! -t 0 ]]; then
-  IFS= read -r -t 0 payload || true
-fi
-if [[ -z "\${payload//[$'\\t\\r\\n ']/}" ]]; then
-  echo "skip=empty-payload source=codex-notify args=$#" >> "${logFile}"
-  exit 0
-fi
-payload_file="$(mktemp "\${TMPDIR:-/tmp}/spanory-codex-notify.XXXXXX")"
-printf '%s' "$payload" > "$payload_file"
-echo "$payload" | "${spanoryBin}" runtime codex hook \\
-  --last-turn-only \\
-  --runtime-home "${codexHome}" \\
-  --export-json-dir "${exportDir}" \\
-  >> "${logFile}" 2>&1 || true
-(
-  sleep 2
-  cat "$payload_file" | "${spanoryBin}" runtime codex hook \\
-    --last-turn-only \\
-    --force \\
-    --runtime-home "${codexHome}" \\
-    --export-json-dir "${exportDir}" \\
-    >> "${logFile}" 2>&1 || true
-  rm -f "$payload_file"
-) >/dev/null 2>&1 &
-`;
-}
-async function applyCodexSetup({ homeRoot, spanoryBin, dryRun }) {
+async function applyCodexWatchSetup({ homeRoot, dryRun }) {
   const codexHome = path8.join(homeRoot, ".codex");
-  const spanoryHome = process.env.SPANORY_HOME ?? path8.join(homeRoot, ".spanory");
-  const binDir = path8.join(codexHome, "bin");
-  const stateDir = path8.join(codexHome, "state", "spanory");
-  const scriptPath = path8.join(binDir, "spanory-codex-notify.sh");
-  const logFile = path8.join(spanoryHome, "logs", "codex-notify.log");
+  const scriptPath = path8.join(codexHome, "bin", "spanory-codex-notify.sh");
   const configPath = path8.join(codexHome, "config.toml");
-  const notifyScriptRef = scriptPath;
-  const scriptContent = codexNotifyScriptContent({
-    spanoryBin,
-    codexHome,
-    exportDir: stateDir,
-    logFile
-  });
   let currentConfig = "";
   try {
     currentConfig = await readFile8(configPath, "utf-8");
@@ -4602,29 +4544,24 @@ async function applyCodexSetup({ homeRoot, spanoryBin, dryRun }) {
     if (error?.code !== "ENOENT")
       throw error;
   }
-  const nextConfig = upsertCodexNotifyConfig(currentConfig, notifyScriptRef);
+  const nextConfig = stripSpanoryCodexNotifyConfig(currentConfig);
   const configChanged = currentConfig !== nextConfig;
-  let currentScript = "";
+  let scriptPresent = false;
   try {
-    currentScript = await readFile8(scriptPath, "utf-8");
-  } catch (error) {
-    if (error?.code !== "ENOENT")
-      throw error;
+    await stat4(scriptPath);
+    scriptPresent = true;
+  } catch {
   }
-  const scriptChanged = currentScript !== scriptContent;
-  const changed = configChanged || scriptChanged;
+  const changed = configChanged || scriptPresent;
   let configBackup = null;
   if (changed && !dryRun) {
-    await mkdir4(binDir, { recursive: true });
-    await mkdir4(stateDir, { recursive: true });
-    await mkdir4(path8.dirname(logFile), { recursive: true });
     if (configChanged) {
+      await mkdir4(path8.dirname(configPath), { recursive: true });
       configBackup = await backupIfExists(configPath);
       await writeFile4(configPath, nextConfig, "utf-8");
     }
-    if (scriptChanged) {
-      await writeFile4(scriptPath, scriptContent, "utf-8");
-      await chmod(scriptPath, 493);
+    if (scriptPresent) {
+      await rm(scriptPath, { force: true });
     }
   }
   return {
@@ -4632,15 +4569,58 @@ async function applyCodexSetup({ homeRoot, spanoryBin, dryRun }) {
     ok: true,
     changed,
     dryRun,
+    mode: "watch",
     configPath,
     scriptPath,
-    configBackup
+    configBackup,
+    notifyConfigured: isSpanoryCodexNotifyConfigured(nextConfig),
+    scriptPresent: false
   };
 }
-async function applyCodexWatchSetup({ homeRoot, dryRun }) {
+function removeClaudeHooks(settings) {
+  if (!settings.hooks || typeof settings.hooks !== "object")
+    return;
+  for (const eventName of Object.keys(settings.hooks)) {
+    const groups = settings.hooks[eventName];
+    if (!Array.isArray(groups))
+      continue;
+    for (const group of groups) {
+      if (!group || !Array.isArray(group.hooks))
+        continue;
+      group.hooks = group.hooks.filter((hook) => !(hook && typeof hook === "object" && isSpanoryHookCommand(hook.command)));
+    }
+    settings.hooks[eventName] = groups.filter((group) => !group || !Array.isArray(group.hooks) || group.hooks.length > 0);
+    if (settings.hooks[eventName].length === 0)
+      delete settings.hooks[eventName];
+  }
+  if (Object.keys(settings.hooks).length === 0)
+    delete settings.hooks;
+}
+async function teardownClaudeSetup({ homeRoot, dryRun }) {
+  const settingsPath = path8.join(homeRoot, ".claude", "settings.json");
+  let settings = {};
+  try {
+    settings = JSON.parse(await readFile8(settingsPath, "utf-8"));
+  } catch (error) {
+    if (error?.code !== "ENOENT")
+      throw new Error(`failed to parse Claude settings: ${error.message ?? String(error)}`);
+    return { runtime: "claude-code", ok: true, changed: false, dryRun, settingsPath, backup: null };
+  }
+  const before = JSON.stringify(settings);
+  removeClaudeHooks(settings);
+  const after = JSON.stringify(settings);
+  const changed = before !== after;
+  let backup = null;
+  if (changed && !dryRun) {
+    backup = await backupIfExists(settingsPath);
+    await writeFile4(settingsPath, JSON.stringify(settings, null, 2), "utf-8");
+  }
+  return { runtime: "claude-code", ok: true, changed, dryRun, settingsPath, backup };
+}
+async function teardownCodexSetup({ homeRoot, dryRun }) {
   const codexHome = path8.join(homeRoot, ".codex");
-  const scriptPath = path8.join(codexHome, "bin", "spanory-codex-notify.sh");
   const configPath = path8.join(codexHome, "config.toml");
+  const scriptPath = path8.join(codexHome, "bin", "spanory-codex-notify.sh");
   let currentConfig = "";
   try {
     currentConfig = await readFile8(configPath, "utf-8");
@@ -4660,26 +4640,75 @@ async function applyCodexWatchSetup({ homeRoot, dryRun }) {
   let configBackup = null;
   if (changed && !dryRun) {
     if (configChanged) {
-      await mkdir4(path8.dirname(configPath), { recursive: true });
       configBackup = await backupIfExists(configPath);
       await writeFile4(configPath, nextConfig, "utf-8");
     }
-    if (scriptPresent) {
+    if (scriptPresent)
       await rm(scriptPath, { force: true });
+  }
+  return { runtime: "codex", ok: true, changed, dryRun, configPath, scriptPath, configBackup, scriptRemoved: scriptPresent };
+}
+async function teardownOpenclawSetup({ homeRoot, openclawRuntimeHome, dryRun }) {
+  if (!commandExists("openclaw")) {
+    return { runtime: "openclaw", ok: true, skipped: true, detail: "openclaw command not found in PATH" };
+  }
+  const runtimeHome = openclawRuntimeHomeForSetup(homeRoot, openclawRuntimeHome);
+  if (dryRun)
+    return { runtime: "openclaw", ok: true, changed: true, dryRun };
+  const result = runSystemCommand("openclaw", ["plugins", "uninstall", OPENCLAW_SPANORY_PLUGIN_ID], {
+    env: { ...process.env, ...runtimeHome ? { OPENCLAW_STATE_DIR: resolveRuntimeHome3("openclaw", runtimeHome) } : {} }
+  });
+  if (result.code !== 0)
+    throw new Error(result.stderr || result.error || "openclaw plugins uninstall failed");
+  return { runtime: "openclaw", ok: true, changed: true, dryRun };
+}
+async function teardownOpencodeSetup({ homeRoot, opencodeRuntimeHome, dryRun }) {
+  const runtimeHome = opencodeRuntimeHomeForSetup(homeRoot, opencodeRuntimeHome);
+  const loaderFile = opencodePluginLoaderPath(runtimeHome);
+  let present = false;
+  try {
+    await stat4(loaderFile);
+    present = true;
+  } catch {
+  }
+  if (present && !dryRun)
+    await rm(loaderFile, { force: true });
+  return { runtime: "opencode", ok: true, changed: present, dryRun, loaderFile };
+}
+async function runSetupTeardown(options) {
+  const homeRoot = setupHomeRoot(options.home);
+  const selected = parseSetupRuntimes(options.runtimes);
+  const dryRun = Boolean(options.dryRun);
+  const results = [];
+  if (selected.includes("claude-code")) {
+    try {
+      results.push(await teardownClaudeSetup({ homeRoot, dryRun }));
+    } catch (error) {
+      results.push({ runtime: "claude-code", ok: false, error: String(error?.message ?? error) });
     }
   }
-  return {
-    runtime: "codex",
-    ok: true,
-    changed,
-    dryRun,
-    mode: "watch",
-    configPath,
-    scriptPath,
-    configBackup,
-    notifyConfigured: isSpanoryCodexNotifyConfigured(nextConfig),
-    scriptPresent: false
-  };
+  if (selected.includes("codex")) {
+    try {
+      results.push(await teardownCodexSetup({ homeRoot, dryRun }));
+    } catch (error) {
+      results.push({ runtime: "codex", ok: false, error: String(error?.message ?? error) });
+    }
+  }
+  if (selected.includes("openclaw")) {
+    try {
+      results.push(await teardownOpenclawSetup({ homeRoot, openclawRuntimeHome: options.openclawRuntimeHome, dryRun }));
+    } catch (error) {
+      results.push({ runtime: "openclaw", ok: false, error: String(error?.message ?? error) });
+    }
+  }
+  if (selected.includes("opencode")) {
+    try {
+      results.push(await teardownOpencodeSetup({ homeRoot, opencodeRuntimeHome: options.opencodeRuntimeHome, dryRun }));
+    } catch (error) {
+      results.push({ runtime: "opencode", ok: false, error: String(error?.message ?? error) });
+    }
+  }
+  return { ok: results.every((r) => r.ok), results };
 }
 function commandExists(command) {
   const result = runSystemCommand("which", [command], { env: process.env });
@@ -5034,7 +5063,6 @@ async function runSetupApply(options) {
   const selected = parseSetupRuntimes(options.runtimes);
   const spanoryBin = options.spanoryBin ?? "spanory";
   const dryRun = Boolean(options.dryRun);
-  const codexMode = options.codexMode ?? process.env.SPANORY_CODEX_MODE ?? "watch";
   const results = [];
   if (selected.includes("claude-code")) {
     try {
@@ -5049,35 +5077,11 @@ async function runSetupApply(options) {
     }
   }
   if (selected.includes("codex")) {
-    if (codexMode === "notify") {
-      try {
-        const result = await applyCodexSetup({ homeRoot, spanoryBin, dryRun });
-        results.push(result);
-      } catch (error) {
-        results.push({
-          runtime: "codex",
-          ok: false,
-          error: String(error?.message ?? error)
-        });
-      }
-    } else if (codexMode === "watch") {
-      try {
-        const result = await applyCodexWatchSetup({ homeRoot, dryRun });
-        results.push(result);
-      } catch (error) {
-        results.push({
-          runtime: "codex",
-          ok: false,
-          error: String(error?.message ?? error)
-        });
-      }
-    } else {
-      results.push({
-        runtime: "codex",
-        ok: true,
-        skipped: true,
-        detail: `codex mode "${codexMode}" has no setup action`
-      });
+    try {
+      const result = await applyCodexWatchSetup({ homeRoot, dryRun });
+      results.push(result);
+    } catch (error) {
+      results.push({ runtime: "codex", ok: false, error: String(error?.message ?? error) });
     }
   }
   if (selected.includes("openclaw")) {
@@ -5460,6 +5464,12 @@ setup.command("doctor").description("Run setup diagnostics for selected runtimes
   if (!report2.ok)
     process.exitCode = 2;
 });
+setup.command("teardown").description("Remove all Spanory integration from local runtimes").option("--runtimes <csv>", `Comma-separated runtimes (default: ${DEFAULT_SETUP_RUNTIMES.join(",")})`, DEFAULT_SETUP_RUNTIMES.join(",")).option("--home <path>", "Home directory root override (default: $HOME)").option("--openclaw-runtime-home <path>", "Override OpenClaw runtime home (default: ~/.openclaw)").option("--opencode-runtime-home <path>", "Override OpenCode runtime home (default: ~/.config/opencode)").option("--dry-run", "Only print planned changes without writing files", false).action(async (options) => {
+  const report2 = await runSetupTeardown(options);
+  console.log(JSON.stringify(report2, null, 2));
+  if (!report2.ok)
+    process.exitCode = 2;
+});
 program.command("upgrade").description("Upgrade spanory CLI from npm registry").option("--dry-run", "Print upgrade command without executing", false).option("--manager <name>", "Package manager override: npm|tnpm").option("--scope <scope>", "Install scope override: global|local").action(async (options) => {
   const manager = options.manager === "tnpm" ? "tnpm" : detectUpgradePackageManager();
   const scope = options.scope === "local" ? "local" : options.scope === "global" ? "global" : detectUpgradeScope();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bububuger/spanory",
-  "version": "0.1.21",
+  "version": "0.1.26",
   "description": "Spanory CLI for cross-runtime agent observability",
   "license": "MIT",
   "type": "module",