agentapprove 0.1.13 → 0.1.20

package/dist/cli.js

@@ -2430,10 +2430,28 @@ function getOpenClawPluginTargets(openclawConfigPath) {
     legacyPath ? createRemovalTarget(legacyPath, "plugin_artifact", true) : null
   ].filter((target) => target !== null);
 }
-function getOpenCodePluginTargets(opencodeConfigDir) {
+function getOpenCodePluginTargets(opencodeConfigDir, opencodeCacheDir) {
   const pluginPath = safeJoinWithinBase(opencodeConfigDir, "node_modules", "@agentapprove", "opencode");
+  const cacheNodeModulesPath = opencodeCacheDir ? safeJoinWithinBase(opencodeCacheDir, "node_modules", "@agentapprove", "opencode") : null;
+  const packageCacheTargets = [];
+  if (opencodeCacheDir) {
+    const scopedPackageCacheDir = safeJoinWithinBase(opencodeCacheDir, "packages", "@agentapprove");
+    if (scopedPackageCacheDir && existsSync(scopedPackageCacheDir)) {
+      for (const entry of readdirSync(scopedPackageCacheDir)) {
+        if (!entry.startsWith("opencode@")) {
+          continue;
+        }
+        const packageCachePath = safeJoinWithinBase(scopedPackageCacheDir, entry);
+        if (packageCachePath) {
+          packageCacheTargets.push(createRemovalTarget(packageCachePath, "plugin_artifact", true));
+        }
+      }
+    }
+  }
   return [
-    pluginPath ? createRemovalTarget(pluginPath, "plugin_artifact", true) : null
+    pluginPath ? createRemovalTarget(pluginPath, "plugin_artifact", true) : null,
+    cacheNodeModulesPath ? createRemovalTarget(cacheNodeModulesPath, "plugin_artifact", true) : null,
+    ...packageCacheTargets
   ].filter((target) => target !== null);
 }
 function collectBackupTargets(configPaths) {
@@ -2613,7 +2631,7 @@ function shouldCreateFreshPairing(connectionMethod) {
 }
 
 // src/cli.ts
-var VERSION = "0.1.13";
+var VERSION = "0.1.20";
 function getApiUrl() {
   return process.env.AGENTAPPROVE_API || "https://api.agentapprove.com";
 }
@@ -2626,6 +2644,12 @@ function getOpenCodeConfigDir() {
 function getOpenCodeConfigPath() {
   return join(getOpenCodeConfigDir(), "opencode.json");
 }
+function getXdgCacheHome() {
+  return process.env.XDG_CACHE_HOME || join(homedir(), ".cache");
+}
+function getOpenCodeCacheDir() {
+  return join(getXdgCacheHome(), "opencode");
+}
 var API_URL = getApiUrl();
 var API_VERSION = process.env.AGENTAPPROVE_API_VERSION || "v001";
 function hasFlag2(flag) {
@@ -2633,18 +2657,36 @@ function hasFlag2(flag) {
 }
 function updateEnvValue(key, value) {
   const envPath = join(getAgentApproveDir(), "env");
-  if (!existsSync2(envPath))
-    return;
-  let content = readFileSync(envPath, "utf-8");
-  const pattern = new RegExp(`^${key}=.*$`, "m");
-  if (pattern.test(content)) {
-    content = content.replace(pattern, `${key}=${value}`);
-  } else {
-    content = content.trimEnd() + `
-${key}=${value}
-`;
+  let content;
+  try {
+    content = readFileSync(envPath, "utf-8");
+  } catch (err) {
+    if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") {
+      return;
+    }
+    throw err;
   }
-  writeFileSync(envPath, content, { mode: 384 });
+  const lines = content.endsWith(`
+`) ? content.slice(0, -1).split(`
+`) : content.split(`
+`);
+  let seenKey = false;
+  const updatedLines = lines.flatMap((line) => {
+    const trimmed = line.replace(/^export\s+/, "").trim();
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx <= 0 || trimmed.slice(0, eqIdx) !== key)
+      return [line];
+    if (seenKey)
+      return [];
+    seenKey = true;
+    return [`${key}=${value}`];
+  });
+  if (!seenKey) {
+    updatedLines.push(`${key}=${value}`);
+  }
+  writeFileSync(envPath, `${updatedLines.join(`
+`)}
+`, { mode: 384 });
 }
 function getCommand() {
   const args = process.argv.slice(2);
@@ -2661,10 +2703,11 @@ function getCommand() {
   }
   return filtered[0] || "install";
 }
-var OPENCODE_PLUGIN_VERSION = "0.1.9";
-var OPENCLAW_PLUGIN_VERSION = "0.2.8";
+var OPENCODE_PLUGIN_VERSION = "0.1.16";
+var OPENCODE_PLUGIN_SPEC = `@agentapprove/opencode@${OPENCODE_PLUGIN_VERSION}`;
+var OPENCLAW_PLUGIN_VERSION = "0.2.10";
 var OPENCLAW_PLUGIN_SPEC = `@agentapprove/openclaw@${OPENCLAW_PLUGIN_VERSION}`;
-var PI_PLUGIN_VERSION = "0.1.0";
+var PI_PLUGIN_VERSION = "0.1.5";
 var PI_PLUGIN_SPEC = `npm:@agentapprove/pi@${PI_PLUGIN_VERSION}`;
 var PI_STATUS_TIMEOUT_MS = 5000;
 var AGENTS = {
@@ -3208,7 +3251,7 @@ function buildUninstallPlan() {
   const configuredAgents = detectInstalledAgents();
   const pluginArtifactTargets = uniqueRemovalTargets([
     ...getOpenClawPluginTargets(AGENTS.openclaw.configPath),
-    ...getOpenCodePluginTargets(getOpenCodeConfigDir())
+    ...getOpenCodePluginTargets(getOpenCodeConfigDir(), getOpenCodeCacheDir())
   ]);
   return {
     configuredAgents,
@@ -3335,6 +3378,13 @@ function readExistingConfig() {
         case "AGENTAPPROVE_RETENTION_DAYS":
           config.retentionDays = value === "forever" ? 365 : parseInt(value, 10);
           break;
+        case "AGENTAPPROVE_CONFIG_SET_AT": {
+          const parsed = parseInt(value, 10);
+          if (Number.isFinite(parsed) && parsed > 0) {
+            config.configSetAt = parsed;
+          }
+          break;
+        }
         case "AGENTAPPROVE_DEBUG_LOG":
           config.debugLog = value === "true";
           break;
@@ -3904,32 +3954,41 @@ async function installHooksForAgent(agentId, hooksDir, mode = "approval") {
     return { success: true, backupPath, hooks: installedHooks };
   }
   if (agentId === "opencode") {
-    if (!Array.isArray(config.plugin)) {
-      config.plugin = [];
+    const installResult = installOpenCodePluginViaCli();
+    if (!installResult.success) {
+      return { success: false, backupPath, hooks: [], error: installResult.error };
     }
-    const pluginArray = config.plugin;
-    if (!pluginArray.includes("@agentapprove/opencode")) {
-      pluginArray.push("@agentapprove/opencode");
+    const opencodeConfig = readJsonConfig(agent.configPath);
+    if (!Array.isArray(opencodeConfig.plugin)) {
+      opencodeConfig.plugin = [];
     }
-    writeJsonConfig(agent.configPath, config);
+    const pluginArray = opencodeConfig.plugin.filter((entry) => typeof entry === "string").filter((entry) => entry !== "@agentapprove/opencode" && !entry.startsWith("@agentapprove/opencode@"));
+    if (!pluginArray.includes(OPENCODE_PLUGIN_SPEC)) {
+      pluginArray.push(OPENCODE_PLUGIN_SPEC);
+    }
+    opencodeConfig.plugin = pluginArray;
+    writeJsonConfig(agent.configPath, opencodeConfig);
     const opencodePkgPath = join(getOpenCodeConfigDir(), "package.json");
     try {
-      let pkgJson = {};
-      if (existsSync2(opencodePkgPath)) {
-        pkgJson = JSON.parse(readFileSync(opencodePkgPath, "utf-8"));
-      }
-      if (!pkgJson.dependencies) {
-        pkgJson.dependencies = {};
-      }
-      pkgJson.dependencies["@agentapprove/opencode"] = OPENCODE_PLUGIN_VERSION;
-      writeFileSync(opencodePkgPath, JSON.stringify(pkgJson, null, 2) + `
+      const pkgJson = JSON.parse(readFileSync(opencodePkgPath, "utf-8"));
+      const deps = pkgJson.dependencies;
+      if (deps?.["@agentapprove/opencode"]) {
+        delete deps["@agentapprove/opencode"];
+        if (Object.keys(deps).length === 0) {
+          delete pkgJson.dependencies;
+        }
+        writeFileSync(opencodePkgPath, JSON.stringify(pkgJson, null, 2) + `
 `);
+      }
     } catch (err) {
+      if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") {
+        return { success: true, backupPath, hooks: [...installedHooks, installResult.label] };
+      }
       if (err instanceof Error) {
         console.warn(`Warning: Could not update package.json: ${err.message}`);
       }
     }
-    installedHooks.push("Agent Approve plugin");
+    installedHooks.push(installResult.label);
     return { success: true, backupPath, hooks: installedHooks };
   }
   const hooksToInstall = mode === "observe" ? agent.hooks.filter((h2) => !h2.isApprovalHook) : agent.hooks;
@@ -4338,19 +4397,21 @@ codex_hooks = true`;
 `);
   } else if (agentId === "opencode") {
     const configJson = JSON.stringify({
-      plugin: ["@agentapprove/opencode"]
+      plugin: [OPENCODE_PLUGIN_SPEC]
     }, null, 2);
     const opencodeConfigPath = process.env.XDG_CONFIG_HOME ? `${process.env.XDG_CONFIG_HOME}/opencode/opencode.json` : "~/.config/opencode/opencode.json";
     return [
-      `Add the Agent Approve plugin to your OpenCode config (${opencodeConfigPath}):`,
+      "Install the Agent Approve plugin for OpenCode:",
       "",
-      configJson,
+      `  opencode plugin ${OPENCODE_PLUGIN_SPEC} --global --force`,
       "",
-      "Then add the dependency to your OpenCode package.json (same directory):",
+      `This command installs the npm plugin and updates your global OpenCode config (${opencodeConfigPath}).`,
       "",
-      `  { "dependencies": { "@agentapprove/opencode": "${OPENCODE_PLUGIN_VERSION}" } }`,
+      "If you need to edit the config manually, ensure it contains:",
       "",
-      "OpenCode will auto-install the plugin on next start."
+      configJson,
+      "",
+      "Restart OpenCode to activate the plugin."
     ].join(`
 `);
   } else if (agentId === "pi") {
@@ -4436,6 +4497,89 @@ function installOpenClawPluginViaCli() {
     return { success: false, error: message, label: "Agent Approve plugin" };
   }
 }
+function readJsonPackageVersion(packagePath) {
+  if (!existsSync2(packagePath)) {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync(packagePath, "utf-8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+function readOpenCodeInstalledVersion() {
+  const cacheDir = getOpenCodeCacheDir();
+  const candidates = [
+    join(cacheDir, "packages", "@agentapprove", `opencode@${OPENCODE_PLUGIN_VERSION}`, "node_modules", "@agentapprove", "opencode", "package.json"),
+    join(cacheDir, "packages", "@agentapprove", "opencode@latest", "node_modules", "@agentapprove", "opencode", "package.json"),
+    join(cacheDir, "node_modules", "@agentapprove", "opencode", "package.json"),
+    join(getOpenCodeConfigDir(), "node_modules", "@agentapprove", "opencode", "package.json")
+  ];
+  for (const candidate of candidates) {
+    const version = readJsonPackageVersion(candidate);
+    if (version === OPENCODE_PLUGIN_VERSION) {
+      return version;
+    }
+  }
+  for (const candidate of candidates) {
+    const version = readJsonPackageVersion(candidate);
+    if (version) {
+      return version;
+    }
+  }
+  return null;
+}
+function installOpenCodePluginViaCli() {
+  try {
+    const result = spawnSync("opencode", ["plugin", OPENCODE_PLUGIN_SPEC, "--global", "--force"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    if (result.error) {
+      return {
+        success: false,
+        label: "Agent Approve plugin",
+        error: `Could not run opencode plugin installer: ${result.error.message}`
+      };
+    }
+    if (result.status !== 0) {
+      const detail = [result.stdout, result.stderr].filter(Boolean).join(`
+`).trim();
+      return {
+        success: false,
+        label: "Agent Approve plugin",
+        error: detail || `opencode plugin installer exited with code ${result.status}`
+      };
+    }
+    const installedVersion = readOpenCodeInstalledVersion();
+    if (!installedVersion) {
+      return {
+        success: false,
+        label: "Agent Approve plugin",
+        error: `OpenCode installed ${OPENCODE_PLUGIN_SPEC}, but the installer could not verify the package version. Re-run manually with: opencode plugin ${OPENCODE_PLUGIN_SPEC} --global --force`
+      };
+    }
+    if (installedVersion !== OPENCODE_PLUGIN_VERSION) {
+      return {
+        success: false,
+        label: "Agent Approve plugin",
+        error: `OpenCode installed ${installedVersion}, expected ${OPENCODE_PLUGIN_VERSION}. Re-run after the npm registry exposes the latest package.`
+      };
+    }
+    return {
+      success: true,
+      version: installedVersion,
+      label: `Agent Approve plugin v${installedVersion}`
+    };
+  } catch (err) {
+    return {
+      success: false,
+      label: "Agent Approve plugin",
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 function installPiPluginViaCli() {
   try {
     execSync(`pi install ${PI_PLUGIN_SPEC}`, { stdio: "pipe" });
@@ -4730,7 +4874,7 @@ Installs hooks and extensions for Cursor, Claude, Gemini, Pi, OpenCode, OpenClaw
   let failBehavior = selectedInstallConfig.failBehavior;
   let installMode = selectedInstallConfig.installMode;
   let useE2E = selectedInstallConfig.e2eEnabled;
-  let configSetAt = Math.floor(Date.now() / 1000);
+  let configSetAt = setupProfile === "existing-config" && existingConfig?.configSetAt ? existingConfig.configSetAt : Math.floor(Date.now() / 1000);
   if (setupProfile === "customize") {
     const modeChoice = await le({
       message: "Choose your security mode:",
@@ -4898,6 +5042,9 @@ Installs hooks and extensions for Cursor, Claude, Gemini, Pi, OpenCode, OpenClaw
   if (connectionMethod === "existing") {
     token = existingConfig.token;
     apiUrl = existingConfig.apiUrl || API_URL;
+    if (setupProfile === "existing-config" && existingConfig?.configSetAt) {
+      configSetAt = existingConfig.configSetAt;
+    }
     const e2eKeyExists = existsSync2(existingKeyPath);
     useE2E = e2eKeyExists;
     e2eUserKey = null;
@@ -5062,7 +5209,10 @@ AGENTAPPROVE_E2E_MODE=${installMode}
         filesToModify.push(join(homedir(), ".codex", "config.toml"));
       }
       if (agentId === "opencode") {
-        filesToModify.push(join(getOpenCodeConfigDir(), "package.json"));
+        filesToModify.push(`OpenCode plugin cache (via \`opencode plugin ${OPENCODE_PLUGIN_SPEC} --global --force\`)`);
+      }
+      if (agentId === "openclaw") {
+        filesToModify.push(`OpenClaw plugin registry (via \`openclaw plugins install ${OPENCLAW_PLUGIN_SPEC}\`)`);
       }
       if (agentId === "pi") {
         filesToModify.push("Pi package registry (via `pi install`)");
@@ -5094,8 +5244,8 @@ Backups will be created with timestamp`, "Files to be modified");
       if (result.success) {
         const installedHookNames = result.hooks.join(", ");
         const backupMsg = result.backupPath ? source_default.dim(` (backup created)`) : "";
-        const modeLabel = installMode === "observe" ? source_default.cyan(" [observe]") : source_default.green(" [approval]");
-        spinner.stop(`${agent.name}${modeLabel}: ${installedHookNames}${backupMsg}`);
+        const agentName = source_default.cyan(agent.name);
+        spinner.stop(`${agentName}: ${installedHookNames}${backupMsg}`);
         if (agentId === "vscode-agent") {
           const vsCodeSpinner = _2();
           vsCodeSpinner.start("Registering hook path in VS Code settings");
@@ -5566,7 +5716,7 @@ but if unused for 30 days they expire. Get a new one below.`, "Token Expired");
   } else {
     v2.info('Refresh updates the token only. Use "npx agentapprove pair" if you need to repair or change E2E pairing.');
   }
-  const configSetAt = Math.floor(Date.now() / 1000);
+  const configSetAt = existingConfig.configSetAt || Math.floor(Date.now() / 1000);
   const privacy = existingConfig.privacy || "full";
   const retentionDays = existingConfig.retentionDays ?? 30;
   const failBehavior = existingConfig.failBehavior || "ask";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentapprove",
-  "version": "0.1.13",
+  "version": "0.1.20",
   "description": "Approve AI agent actions from your iPhone or Apple Watch",
   "type": "module",
   "bin": {