agendex-cli 0.16.0 → 0.17.0

package/README.md

@@ -57,6 +57,16 @@ AGENDEX_DEV=1 agendex sync
 
 In dev mode the default OAuth site (when you do not pass `--url` and do not set `AGENDEX_SITE_URL`) points at the local EE app URL used for development.
 
+## Sync Provenance
+
+`agendex sync` and the daemon include sync provenance in cloud payload metadata so the web app can show where a plan was synced from. This includes the device ID, hostname, and the host machine's local IP address when one is available.
+
+You can disable local IP address collection from Account settings in the cloud app. Managed or non-interactive environments can also omit the local IP address from sync payloads by setting:
+
+```bash
+AGENDEX_DISABLE_LOCAL_IP=1 agendex sync
+```
+
 ## Daemon Cleanup
 
 `agendex cleanup` manages registered daemon devices in the cloud.

package/dist/cli.js

@@ -2797,12 +2797,14 @@ function normalizeStoredConfig(raw) {
   const cloudToken = typeof raw.cloudToken === "string" && raw.cloudToken.trim() ? raw.cloudToken : undefined;
   const convexUrl = typeof raw.convexUrl === "string" && raw.convexUrl.trim() ? raw.convexUrl : undefined;
   const deviceId = typeof raw.deviceId === "string" && raw.deviceId.trim() ? raw.deviceId : undefined;
+  const collectLocalIpAddress = typeof raw.collectLocalIpAddress === "boolean" ? raw.collectLocalIpAddress : undefined;
   return {
     configVersion: 3,
     token,
     cloudToken,
     convexUrl,
     deviceId,
+    collectLocalIpAddress,
     enabledAdapters: normalizeAdapterIds(raw.enabledAdapters),
     customPlanDirs: normalizeCustomPlanDirs(raw.customPlanDirs)
   };
@@ -2818,6 +2820,7 @@ function saveConfig(config) {
     cloudToken: config.cloudToken,
     convexUrl: config.convexUrl,
     deviceId: config.deviceId,
+    collectLocalIpAddress: config.collectLocalIpAddress,
     enabledAdapters: sanitizeEnabledAdapterIds(config.enabledAdapters),
     customPlanDirs: normalizeCustomPlanDirs(config.customPlanDirs)
   };
@@ -3150,7 +3153,7 @@ function looksLikeExecutionReport(normalized) {
   const hasPastCompletion = /\b(?:fixed|pushed|committed|completed|done|implemented|updated|changed|patched|merged|deployed|passed|failed|resolved|reverted)\b/i.test(normalized);
   const hasReportSection = /^\s*(?:summary|result|results|changes|verification|status)\s*:/im.test(normalized);
   const hasReviewReportMarker = /\b(?:review findings?|review issues?|review comments?)\b/i.test(normalized);
-  const hasCommandMarker = /::[a-z0-9_-]+(?:\{|\[|\s*$)/im.test(normalized) || /`[^`]*(?:bun|npm|pnpm|yarn|git|tsc|biome)[^`]*`/i.test(normalized) || /\b(?:git\s+(?:stage|commit|push|status)|bunx?\s+|npm\s+|pnpm\s+|yarn\s+)\b/i.test(normalized);
+  const hasCommandMarker = /::[a-z0-9_-]+(?:\{|\[|\s*$)/im.test(normalized) || /`[^`]*(?:bun|npm|pnpm|yarn|git|tsc|oxfmt|oxlint|biome)[^`]*`/i.test(normalized) || /\b(?:git\s+(?:stage|commit|push|status)|bunx?\s+|npm\s+|pnpm\s+|yarn\s+)\b/i.test(normalized);
   return hasPastCompletion && (hasReportSection || hasCommandMarker || hasReviewReportMarker);
 }
 function lowValueAssessment(reasons, signals) {
@@ -3882,7 +3885,7 @@ async function refreshStoredToken(currentToken, convexUrl) {
   }
   return refreshed.token;
 }
-async function sendHeartbeat() {
+async function sendHeartbeat(ipAddress) {
   try {
     const { token, convexUrl } = getCloudConfig();
     const pidInfo = readPidInfo();
@@ -3891,7 +3894,8 @@ async function sendHeartbeat() {
       deviceId: cachedDeviceId,
       hostname: pidInfo?.hostname ?? osHostname(),
       startedAtMs: pidInfo?.startedAtMs,
-      pid: pidInfo?.pid
+      pid: pidInfo?.pid,
+      ipAddress: ipAddress ?? null
     });
     let activeToken = token;
     let res = await requestText(`${convexUrl}/api/cli/heartbeat`, {
@@ -3946,6 +3950,41 @@ async function refreshToken(currentToken, convexUrl) {
     return null;
   return { token: body.token, expiresAt: body.expiresAt ?? 0 };
 }
+async function fetchCliPreferences() {
+  try {
+    const { token, convexUrl } = getCloudConfig();
+    let activeToken = token;
+    let res = await requestText(`${convexUrl}/api/cli/preferences`, {
+      method: "GET",
+      headers: authHeaders(activeToken)
+    });
+    if (res.status === 401) {
+      const refreshed = await refreshStoredToken(activeToken, convexUrl);
+      if (refreshed) {
+        activeToken = refreshed;
+        res = await requestText(`${convexUrl}/api/cli/preferences`, {
+          method: "GET",
+          headers: authHeaders(activeToken)
+        });
+      }
+    }
+    if (res.status < 200 || res.status >= 300)
+      return null;
+    const body = JSON.parse(res.body);
+    if (typeof body.collectLocalIpAddress !== "boolean")
+      return null;
+    const config = loadConfig();
+    if (config) {
+      saveConfig({
+        ...config,
+        collectLocalIpAddress: body.collectLocalIpAddress
+      });
+    }
+    return { collectLocalIpAddress: body.collectLocalIpAddress };
+  } catch {
+    return null;
+  }
+}
 var REQUEST_TIMEOUT_MS2 = Number.parseInt(process.env.AGENDEX_HTTP_TIMEOUT_MS ?? "", 10) || 1e4;
 function requestText(urlString, options) {
   const url = new URL(urlString);
@@ -4112,7 +4151,7 @@ async function deleteDaemons(deviceIds) {
 import { spawn } from "node:child_process";
 import { createServer } from "node:http";
 var PROD_SITE_URL = "https://app.agendex.dev";
-var DEV_SITE_URL = "http://app.agendex.local:5174";
+var DEV_SITE_URL = "http://app.agendex.localhost:5174";
 function getDefaultSiteUrl() {
   if (process.env.AGENDEX_SITE_URL)
     return process.env.AGENDEX_SITE_URL;
@@ -4311,6 +4350,7 @@ function spawnBrowser(command, args, options = {}) {
 
 // src/daemon.ts
 import { spawn as spawn2 } from "node:child_process";
+import { hostname as osHostname2 } from "node:os";
 import { resolve as resolve6 } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -4340,24 +4380,141 @@ function resolveCliAdapterIds(config) {
   return ids;
 }
 
+// src/network.ts
+import { execFileSync } from "node:child_process";
+import { networkInterfaces } from "node:os";
+import { platform } from "node:process";
+var DISABLE_LOCAL_IP_ENV = "AGENDEX_DISABLE_LOCAL_IP";
+function shouldCollectLocalIpAddress(env = process.env) {
+  const value = env[DISABLE_LOCAL_IP_ENV]?.trim().toLowerCase();
+  return !["1", "true", "yes", "on"].includes(value ?? "");
+}
+function getLocalIpAddress(options = {}) {
+  const interfaces = options.interfaces ?? networkInterfaces();
+  const route = options.defaultRoute === undefined ? getDefaultIpv4Route() : options.defaultRoute;
+  const routedAddress = route ? getAddressForRoute(interfaces, route) : undefined;
+  return routedAddress ?? findFirstAddress(interfaces, "IPv4") ?? findFirstAddress(interfaces, "IPv6");
+}
+function getAddressForRoute(interfaces, route) {
+  if (route.sourceAddress && isUsableIpv4Address(route.sourceAddress))
+    return route.sourceAddress;
+  if (route.interfaceName)
+    return findFirstAddress(interfaces, "IPv4", route.interfaceName);
+  return;
+}
+function findFirstAddress(interfaces, family, interfaceName) {
+  const entries = interfaceName ? [[interfaceName, interfaces[interfaceName]]] : Object.entries(interfaces).sort(([left], [right]) => left.localeCompare(right));
+  for (const [, addrs] of entries) {
+    if (!addrs)
+      continue;
+    for (const addr of addrs) {
+      if (addr.internal)
+        continue;
+      if (addr.family === family)
+        return addr.address;
+    }
+  }
+  return;
+}
+function getDefaultIpv4Route() {
+  switch (platform) {
+    case "linux":
+      return parseLinuxRoute(readRouteCommand("ip", ["route", "get", "1.1.1.1"]));
+    case "darwin":
+    case "freebsd":
+    case "netbsd":
+    case "openbsd":
+      return parseBsdRoute(readRouteCommand("route", ["-n", "get", "1.1.1.1"]));
+    case "win32":
+      return getWindowsDefaultRouteAddress();
+    default:
+      return;
+  }
+}
+function readRouteCommand(command, args) {
+  try {
+    return execFileSync(command, args, {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 1000
+    });
+  } catch {
+    return;
+  }
+}
+function parseLinuxRoute(output) {
+  if (!output)
+    return;
+  return buildRoute({
+    interfaceName: output.match(/\bdev\s+(\S+)/)?.[1],
+    sourceAddress: output.match(/\bsrc\s+(\d{1,3}(?:\.\d{1,3}){3})\b/)?.[1]
+  });
+}
+function parseBsdRoute(output) {
+  if (!output)
+    return;
+  return buildRoute({
+    interfaceName: output.match(/^\s*interface:\s+(\S+)/m)?.[1]
+  });
+}
+function getWindowsDefaultRouteAddress() {
+  const script = [
+    "$route = Get-NetRoute -DestinationPrefix '0.0.0.0/0'",
+    "| Sort-Object -Property @{ Expression = { $_.RouteMetric + $_.InterfaceMetric } }",
+    "| Select-Object -First 1;",
+    "if ($route) {",
+    "Get-NetIPAddress -AddressFamily IPv4 -InterfaceIndex $route.InterfaceIndex",
+    "| Where-Object { $_.IPAddress -notlike '169.254.*' }",
+    "| Select-Object -First 1 -ExpandProperty IPAddress",
+    "}"
+  ].join(" ");
+  const output = readRouteCommand("powershell.exe", [
+    "-NoProfile",
+    "-NonInteractive",
+    "-Command",
+    script
+  ]);
+  const sourceAddress = output?.split(/\r?\n/).map((line) => line.trim()).find(isUsableIpv4Address);
+  return buildRoute({ sourceAddress });
+}
+function buildRoute(route) {
+  return route.interfaceName || route.sourceAddress ? route : undefined;
+}
+function isUsableIpv4Address(address) {
+  if (!isIpv4Address(address))
+    return false;
+  return address !== "0.0.0.0" && !address.startsWith("127.");
+}
+function isIpv4Address(address) {
+  const octets = address.split(".");
+  return octets.length === 4 && octets.every((octet) => {
+    if (!/^\d+$/.test(octet))
+      return false;
+    const value = Number(octet);
+    return value >= 0 && value <= 255;
+  });
+}
+
 // src/payload.ts
 var SYNC_METADATA_KEY = "agendexSync";
 function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
-function withSyncDeviceMetadata(metadata, deviceId) {
-  if (!deviceId)
+function withSyncDeviceMetadata(metadata, deviceId, hostname2, ipAddress) {
+  if (!deviceId && !hostname2 && !ipAddress)
     return metadata;
   const existing = isRecord4(metadata[SYNC_METADATA_KEY]) ? metadata[SYNC_METADATA_KEY] : {};
   return {
     ...metadata,
     [SYNC_METADATA_KEY]: {
       ...existing,
-      deviceId
+      ...deviceId !== undefined && { deviceId },
+      ...hostname2 !== undefined && { hostname: hostname2 },
+      ...ipAddress !== undefined && { ipAddress }
     }
   };
 }
-function planToSyncPayload(plan, deviceId) {
+function planToSyncPayload(plan, deviceId, hostname2, ipAddress) {
   return {
     localPlanId: plan.id,
     agent: plan.agent,
@@ -4366,7 +4523,7 @@ function planToSyncPayload(plan, deviceId) {
     format: plan.format,
     filePath: plan.filePath,
     workspace: plan.workspace,
-    metadata: withSyncDeviceMetadata(plan.metadata, deviceId),
+    metadata: withSyncDeviceMetadata(plan.metadata, deviceId, hostname2, ipAddress),
     createdAt: plan.createdAt.getTime(),
     updatedAt: plan.updatedAt.getTime()
   };
@@ -4420,6 +4577,16 @@ function computePayloadHash(payload) {
   return createHash2("sha256").update(canonical).digest("hex").slice(0, 20);
 }
 
+// src/sync-privacy.ts
+async function shouldIncludeLocalIpAddressInSync() {
+  if (!shouldCollectLocalIpAddress())
+    return false;
+  const prefs = await fetchCliPreferences();
+  if (prefs)
+    return prefs.collectLocalIpAddress;
+  return loadConfig()?.collectLocalIpAddress ?? true;
+}
+
 // src/writeback-delivery-cache.ts
 import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join13 } from "node:path";
@@ -4477,15 +4644,25 @@ var PLANNOTATOR_WRITEBACK_EXPIRED_ERROR = "Write-back expired before delivery.";
 var PLANNOTATOR_WRITEBACK_FAILED_ERROR = "No live Plannotator session accepted the request-changes payload.";
 async function runWorker() {
   const config = await loadOrInitConfig();
+  const hostname2 = osHostname2();
   const adapterIds = resolveCliAdapterIds(config);
   const adapters = resolveAdapters(adapterIds);
   setActiveAdapters(adapters);
-  console.log(`[agendex] daemon starting with ${adapterIds.length} adapters`);
-  await sendHeartbeat();
   const syncCache = loadSyncCache();
   const syncQueue = [];
   const pendingWritebackReports = loadPendingWritebackReports();
   let syncing = false;
+  let cachedIpAddress;
+  async function getSyncIpAddress() {
+    if (!await shouldIncludeLocalIpAddressInSync()) {
+      cachedIpAddress = undefined;
+      return;
+    }
+    cachedIpAddress ??= getLocalIpAddress();
+    return cachedIpAddress;
+  }
+  console.log(`[agendex] daemon starting with ${adapterIds.length} adapters`);
+  await sendHeartbeat(await getSyncIpAddress());
   async function tryRefreshToken() {
     const cfg = loadConfig();
     if (!cfg?.cloudToken || !cfg.convexUrl)
@@ -4600,8 +4777,9 @@ async function runWorker() {
     });
     if (ok) {
       const updatedPlan = getById(job.localPlanId);
-      if (updatedPlan)
-        syncQueue.push(planToSyncPayload(updatedPlan, config.deviceId));
+      if (updatedPlan) {
+        syncQueue.push(planToSyncPayload(updatedPlan, config.deviceId, hostname2, await getSyncIpAddress()));
+      }
       pendingWritebackReports.set(job._id, "sent");
       persistPendingWritebackReports();
       await reportPendingWriteback(job._id);
@@ -4641,8 +4819,9 @@ async function runWorker() {
   let initialSkipped = 0;
   let initialQueuedSyncable = 0;
   let initialQueuedLowValue = 0;
+  const initialIpAddress = await getSyncIpAddress();
   for (const plan of plans) {
-    const payload = planToSyncPayload(plan, config.deviceId);
+    const payload = planToSyncPayload(plan, config.deviceId, hostname2, initialIpAddress);
     const hash = computePayloadHash(payload);
     if (syncCache[plan.id] === hash) {
       initialSkipped++;
@@ -4664,16 +4843,25 @@ async function runWorker() {
   const lowValueSuffix = lowValuePlanCount > 0 ? `, ${lowValuePlanCount} low-value hidden/pruned` : "";
   console.log(`[agendex] syncing ${initialQueuedSyncable} plans${lowValueSuffix} (${initialQueuedLowValue} low-value queued, ${initialSkipped} unchanged)...`);
   await processSyncQueue();
-  setInterval(() => void sendHeartbeat(), CLI_DAEMON_HEARTBEAT_INTERVAL_MS);
+  setInterval(() => {
+    (async () => {
+      await sendHeartbeat(await getSyncIpAddress());
+    })().catch(() => {});
+  }, CLI_DAEMON_HEARTBEAT_INTERVAL_MS);
   if (shouldEnablePlannotatorSync(config)) {
     setInterval(() => void pollPlannotatorWritebacks(), PLANNOTATOR_WRITEBACK_POLL_INTERVAL_MS);
     pollPlannotatorWritebacks();
   }
   startWatching((changedPlans) => {
-    for (const plan of changedPlans) {
-      syncQueue.push(planToSyncPayload(plan, config.deviceId));
-    }
-    processSyncQueue();
+    (async () => {
+      const ipAddress = await getSyncIpAddress();
+      for (const plan of changedPlans) {
+        syncQueue.push(planToSyncPayload(plan, config.deviceId, hostname2, ipAddress));
+      }
+      processSyncQueue();
+    })().catch((err) => {
+      console.error("[agendex] failed to queue changed plans:", err);
+    });
   });
   console.log(`[agendex] daemon running. Watching for file changes...`);
   async function gracefulShutdown() {
@@ -4734,8 +4922,11 @@ async function startSupervisor() {
 }
 
 // src/sync.ts
+import { hostname as osHostname3 } from "node:os";
 async function syncAll(force = false) {
   const config = await loadOrInitConfig();
+  const hostname2 = osHostname3();
+  const ipAddress = await shouldIncludeLocalIpAddressInSync() ? getLocalIpAddress() : undefined;
   const adapterIds = resolveCliAdapterIds(config);
   const adapters = resolveAdapters(adapterIds);
   setActiveAdapters(adapters);
@@ -4755,7 +4946,7 @@ async function syncAll(force = false) {
   let failed = 0;
   for (const plan of [...syncablePlans, ...lowValuePlans]) {
     activePlanIds.add(plan.id);
-    const payload = planToSyncPayload(plan, config.deviceId);
+    const payload = planToSyncPayload(plan, config.deviceId, hostname2, ipAddress);
     const hash = computePayloadHash(payload);
     if (!force && cache[plan.id] === hash) {
       skipped++;
@@ -4798,19 +4989,18 @@ import { join as join14 } from "node:path";
 // package.json
 var package_default = {
   name: "agendex-cli",
-  version: "0.16.0",
+  version: "0.17.0",
   description: "Agendex CLI for login, sync, and daemon workflows",
   homepage: "https://github.com/Tyru5/Agendex#readme",
+  bugs: {
+    url: "https://github.com/Tyru5/Agendex/issues"
+  },
+  license: "AGPL-3.0-only",
   repository: {
     type: "git",
     url: "git+https://github.com/Tyru5/Agendex.git",
     directory: "packages/cli"
   },
-  bugs: {
-    url: "https://github.com/Tyru5/Agendex/issues"
-  },
-  type: "module",
-  license: "AGPL-3.0-only",
   bin: {
     agendex: "./dist/cli.js"
   },
@@ -4819,12 +5009,10 @@ var package_default = {
     "README.md",
     "LICENSE"
   ],
+  type: "module",
   publishConfig: {
     access: "public"
   },
-  engines: {
-    node: ">=20"
-  },
   scripts: {
     build: "node ./scripts/build-release.mjs --dist-only",
     "build:release": "node ./scripts/build-release.mjs",
@@ -4837,6 +5025,9 @@ var package_default = {
   devDependencies: {
     "@agendex/shared": "workspace:*",
     "@types/bun": "^1.3.9"
+  },
+  engines: {
+    node: ">=20"
   }
 };
 
@@ -5485,8 +5676,10 @@ async function main() {
               const uptimeStr = device.startedAtMs != null ? formatDuration(now - device.startedAtMs) : "~";
               const pidStr = device.pid != null ? String(device.pid) : "~";
               const hostnameStr = device.hostname ?? "~";
+              const ipStr = device.ipAddress ?? "~";
               const isLocal = localDeviceId && device.deviceId === localDeviceId;
               writeStdout(`- hostname: ${hostnameStr}${isLocal ? " (this machine)" : ""}
+  ip: ${ipStr}
   pid: ${pidStr}
   uptime: ${uptimeStr}
   status: ${status}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agendex-cli",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Agendex CLI for login, sync, and daemon workflows",
   "homepage": "https://github.com/Tyru5/Agendex#readme",
   "repository": {