@driftless-sh/cli 0.1.32 → 0.1.34

package/dist/index.js

@@ -33,98 +33,133 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/git.ts
-var git_exports = {};
-__export(git_exports, {
-  getAuthorName: () => getAuthorName,
-  getChangedFilesFromDiff: () => getChangedFilesFromDiff,
-  getChangedFilesList: () => getChangedFilesList,
-  getGitRemote: () => getGitRemote,
-  getLastCommitHash: () => getLastCommitHash,
-  getStagedDiff: () => getStagedDiff,
-  getUncommittedDiff: () => getUncommittedDiff,
-  isGitRepo: () => isGitRepo
+// src/api-client.ts
+var api_client_exports = {};
+__export(api_client_exports, {
+  api: () => api,
+  formatError: () => formatError,
+  getApiKey: () => getApiKey,
+  getApiUrl: () => getApiUrl
 });
-function getGitRemote() {
+function loadApiKey() {
+  const envKey = process.env["DRIFTLESS_API_KEY"];
+  if (envKey) return envKey;
   try {
-    const url = (0, import_node_child_process.execSync)("git config --get remote.origin.url", {
-      encoding: "utf8",
-      cwd: process.cwd()
-    }).trim();
-    const match = url.match(/[:/]([^/]+)\/([^/]+?)(?:\.git)?$/);
-    if (match) {
-      return { org: match[1], repo: match[2] };
+    if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
+      const config = JSON.parse((0, import_node_fs.readFileSync)(CONFIG_PATH, "utf8"));
+      return config.api_key || null;
     }
-    return null;
   } catch {
-    return null;
   }
+  return null;
 }
-function isGitRepo() {
-  return (0, import_node_fs2.existsSync)((0, import_node_path2.resolve)(process.cwd(), ".git"));
-}
-function getUncommittedDiff() {
-  try {
-    return (0, import_node_child_process.execSync)("git diff", { encoding: "utf8", cwd: process.cwd() }).trim();
-  } catch {
-    return "";
+function getBaseUrl() {
+  const envUrl = process.env["DRIFTLESS_API_URL"];
+  if (envUrl) {
+    return envUrl.endsWith("/api/v1") ? envUrl : `${envUrl}/api/v1`;
   }
-}
-function getStagedDiff() {
   try {
-    return (0, import_node_child_process.execSync)("git diff --staged", { encoding: "utf8", cwd: process.cwd() }).trim();
+    if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
+      const config = JSON.parse((0, import_node_fs.readFileSync)(CONFIG_PATH, "utf8"));
+      return config.api_url || DEFAULT_URL;
+    }
   } catch {
-    return "";
   }
+  return DEFAULT_URL;
 }
-function getLastCommitHash() {
-  try {
-    return (0, import_node_child_process.execSync)("git rev-parse HEAD", { encoding: "utf8", cwd: process.cwd() }).trim();
-  } catch {
-    return "unknown";
+function parseError(e) {
+  const msg = e.message;
+  const jsonMatch = msg.match(/\{[\s\S]*\}/);
+  if (jsonMatch) {
+    try {
+      const parsed = JSON.parse(jsonMatch[0]);
+      const parts = [];
+      if (parsed.message) parts.push(parsed.message);
+      if (parsed.request_id) parts.push(`request_id: ${parsed.request_id}`);
+      if (parsed.retryable !== void 0) parts.push(`retryable: ${parsed.retryable ? "yes" : "no"}`);
+      if (parsed.endpoint) parts.push(`endpoint: ${parsed.endpoint}`);
+      if (parts.length > 0) return parts.join(" | ");
+    } catch {
+    }
+  }
+  const statusMatch = msg.match(/HTTP (\d+):/);
+  if (statusMatch) {
+    const code = parseInt(statusMatch[1], 10);
+    if (code === 500) return "Internal server error \u2014 the API encountered an unexpected issue";
+    if (code === 401) return "Authentication failed \u2014 check your API key";
+    if (code === 403) return "Access denied \u2014 your API key lacks permission";
+    if (code === 404) return "Not found \u2014 the resource does not exist";
+    if (code === 429) return "Rate limited \u2014 too many requests, try again later";
+    return `Server error (HTTP ${code})`;
   }
+  return msg;
 }
-function getChangedFilesFromDiff(diff) {
-  const text = diff ?? getUncommittedDiff();
-  if (!text) return [];
-  const files = /* @__PURE__ */ new Set();
-  for (const line of text.split("\n")) {
-    if (line.startsWith("+++ b/")) {
-      files.add(line.slice(6));
-    } else if (line.startsWith("--- a/")) {
-    } else if (line.startsWith("diff --git ")) {
-      const match = line.match(/diff --git a\/(.+?) b\/(.+)$/);
-      if (match) files.add(match[2]);
+function request(method, path, body) {
+  return new Promise((resolve8, reject) => {
+    const baseUrl = getBaseUrl();
+    const fullUrl = `${baseUrl}${path}`;
+    const url = new URL(fullUrl);
+    const isHttps = url.protocol === "https:";
+    const fn = isHttps ? import_node_https.request : import_node_http.request;
+    const headers = {
+      "Content-Type": "application/json",
+      Accept: "application/json"
+    };
+    const apiKey = loadApiKey();
+    if (apiKey) {
+      headers["X-API-Key"] = apiKey;
     }
-  }
-  return [...files];
+    const req = fn(
+      fullUrl,
+      { method, headers },
+      (res) => {
+        let data = "";
+        res.on("data", (chunk) => data += chunk.toString());
+        res.on("end", () => {
+          if (res.statusCode && res.statusCode >= 400) {
+            reject(new Error(`HTTP ${res.statusCode}: ${data}`));
+            return;
+          }
+          try {
+            resolve8(JSON.parse(data));
+          } catch {
+            resolve8(data);
+          }
+        });
+      }
+    );
+    req.on("error", (e) => reject(new Error(`Connection failed: ${e.message}`)));
+    if (body) req.write(JSON.stringify(body));
+    req.end();
+  });
 }
-function getChangedFilesList() {
-  try {
-    const unstaged = (0, import_node_child_process.execSync)("git diff --name-only HEAD", { encoding: "utf8", cwd: process.cwd() }).trim();
-    const staged = (0, import_node_child_process.execSync)("git diff --staged --name-only", { encoding: "utf8", cwd: process.cwd() }).trim();
-    const files = /* @__PURE__ */ new Set();
-    if (unstaged) unstaged.split("\n").forEach((f) => files.add(f));
-    if (staged) staged.split("\n").forEach((f) => files.add(f));
-    return [...files].filter(Boolean);
-  } catch {
-    return [];
-  }
+function getApiUrl() {
+  return getBaseUrl();
 }
-function getAuthorName() {
-  try {
-    return (0, import_node_child_process.execSync)("git config user.name", { encoding: "utf8", cwd: process.cwd() }).trim();
-  } catch {
-    return "unknown";
-  }
+function getApiKey() {
+  return loadApiKey();
+}
+function formatError(e) {
+  return parseError(e);
 }
-var import_node_child_process, import_node_fs2, import_node_path2;
-var init_git = __esm({
-  "src/git.ts"() {
+var import_node_http, import_node_https, import_node_fs, import_node_path, import_node_os, CONFIG_PATH, DEFAULT_URL, api;
+var init_api_client = __esm({
+  "src/api-client.ts"() {
     "use strict";
-    import_node_child_process = require("node:child_process");
-    import_node_fs2 = require("node:fs");
-    import_node_path2 = require("node:path");
+    import_node_http = require("node:http");
+    import_node_https = require("node:https");
+    import_node_fs = require("node:fs");
+    import_node_path = require("node:path");
+    import_node_os = require("node:os");
+    CONFIG_PATH = (0, import_node_path.resolve)((0, import_node_os.homedir)(), ".driftless", "config.json");
+    DEFAULT_URL = "http://localhost:3000/api/v1";
+    api = {
+      get: (path) => request("GET", path),
+      post: (path, body) => request("POST", path, body),
+      put: (path, body) => request("PUT", path, body),
+      patch: (path, body) => request("PATCH", path, body),
+      delete: (path) => request("DELETE", path)
+    };
   }
 });
 
@@ -126242,7 +126277,7 @@ ${lanes.join("\n")}
           }
         }
         function createImportCallExpressionAMD(arg, containsLexicalThis) {
-          const resolve9 = factory2.createUniqueName("resolve");
+          const resolve8 = factory2.createUniqueName("resolve");
           const reject = factory2.createUniqueName("reject");
           const parameters = [
             factory2.createParameterDeclaration(
@@ -126251,7 +126286,7 @@ ${lanes.join("\n")}
               /*dotDotDotToken*/
               void 0,
               /*name*/
-              resolve9
+              resolve8
             ),
             factory2.createParameterDeclaration(
               /*modifiers*/
@@ -126268,7 +126303,7 @@ ${lanes.join("\n")}
                 factory2.createIdentifier("require"),
                 /*typeArguments*/
                 void 0,
-                [factory2.createArrayLiteralExpression([arg || factory2.createOmittedExpression()]), resolve9, reject]
+                [factory2.createArrayLiteralExpression([arg || factory2.createOmittedExpression()]), resolve8, reject]
               )
             )
           ]);
@@ -212986,8 +213021,8 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
         installPackage(options) {
           this.packageInstallId++;
           const request2 = { kind: "installPackage", ...options, id: this.packageInstallId };
-          const promise = new Promise((resolve9, reject) => {
-            (this.packageInstalledPromise ?? (this.packageInstalledPromise = /* @__PURE__ */ new Map())).set(this.packageInstallId, { resolve: resolve9, reject });
+          const promise = new Promise((resolve8, reject) => {
+            (this.packageInstalledPromise ?? (this.packageInstalledPromise = /* @__PURE__ */ new Map())).set(this.packageInstallId, { resolve: resolve8, reject });
           });
           this.installer.send(request2);
           return promise;
@@ -214311,128 +214346,112 @@ var require_dist = __commonJS({
   }
 });
 
-// src/api-client.ts
-var import_node_http = require("node:http");
-var import_node_https = require("node:https");
-var import_node_fs = require("node:fs");
-var import_node_path = require("node:path");
-var import_node_os = require("node:os");
-var CONFIG_PATH = (0, import_node_path.resolve)((0, import_node_os.homedir)(), ".driftless", "config.json");
-function loadApiKey() {
-  const envKey = process.env["DRIFTLESS_API_KEY"];
-  if (envKey) return envKey;
+// src/analytics.ts
+var analytics_exports = {};
+__export(analytics_exports, {
+  analyticsEvent: () => analyticsEvent
+});
+function analyticsEvent(event, distinctId, props = {}) {
+  if (!KEY) return;
+  fetch(`${HOST}/capture/`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      api_key: KEY,
+      event,
+      distinct_id: `workspace:${distinctId}`,
+      properties: { ...props, source: "cli", $lib: "driftless-cli" }
+    })
+  }).catch(() => void 0);
+}
+var KEY, HOST;
+var init_analytics = __esm({
+  "src/analytics.ts"() {
+    "use strict";
+    KEY = "";
+    HOST = "https://us.i.posthog.com";
+  }
+});
+
+// src/commands/init.ts
+init_api_client();
+
+// src/git.ts
+var import_node_child_process = require("node:child_process");
+var import_node_fs2 = require("node:fs");
+var import_node_path2 = require("node:path");
+function isGitInstalled() {
   try {
-    if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
-      const config = JSON.parse((0, import_node_fs.readFileSync)(CONFIG_PATH, "utf8"));
-      return config.api_key || null;
-    }
+    (0, import_node_child_process.execSync)("git --version", { stdio: "ignore" });
+    return true;
   } catch {
+    return false;
   }
-  return null;
 }
-var DEFAULT_URL = "http://localhost:3000/api/v1";
-function getBaseUrl() {
-  const envUrl = process.env["DRIFTLESS_API_URL"];
-  if (envUrl) {
-    return envUrl.endsWith("/api/v1") ? envUrl : `${envUrl}/api/v1`;
-  }
+function getGitRemote() {
   try {
-    if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
-      const config = JSON.parse((0, import_node_fs.readFileSync)(CONFIG_PATH, "utf8"));
-      return config.api_url || DEFAULT_URL;
+    const url = (0, import_node_child_process.execSync)("git config --get remote.origin.url", {
+      encoding: "utf8",
+      cwd: process.cwd()
+    }).trim();
+    const match = url.match(/[:/]([^/]+)\/([^/]+?)(?:\.git)?$/);
+    if (match) {
+      return { org: match[1], repo: match[2] };
     }
+    return null;
   } catch {
+    return null;
   }
-  return DEFAULT_URL;
 }
-function parseError(e) {
-  const msg = e.message;
-  const jsonMatch = msg.match(/\{[\s\S]*\}/);
-  if (jsonMatch) {
-    try {
-      const parsed = JSON.parse(jsonMatch[0]);
-      const parts = [];
-      if (parsed.message) parts.push(parsed.message);
-      if (parsed.request_id) parts.push(`request_id: ${parsed.request_id}`);
-      if (parsed.retryable !== void 0) parts.push(`retryable: ${parsed.retryable ? "yes" : "no"}`);
-      if (parsed.endpoint) parts.push(`endpoint: ${parsed.endpoint}`);
-      if (parts.length > 0) return parts.join(" | ");
-    } catch {
-    }
-  }
-  const statusMatch = msg.match(/HTTP (\d+):/);
-  if (statusMatch) {
-    const code = parseInt(statusMatch[1], 10);
-    if (code === 500) return "Internal server error \u2014 the API encountered an unexpected issue";
-    if (code === 401) return "Authentication failed \u2014 check your API key";
-    if (code === 403) return "Access denied \u2014 your API key lacks permission";
-    if (code === 404) return "Not found \u2014 the resource does not exist";
-    if (code === 429) return "Rate limited \u2014 too many requests, try again later";
-    return `Server error (HTTP ${code})`;
+function isGitRepo() {
+  return (0, import_node_fs2.existsSync)((0, import_node_path2.resolve)(process.cwd(), ".git"));
+}
+function getUncommittedDiff() {
+  try {
+    return (0, import_node_child_process.execSync)("git diff", { encoding: "utf8", cwd: process.cwd() }).trim();
+  } catch {
+    return "";
   }
-  return msg;
 }
-function request(method, path, body) {
-  return new Promise((resolve9, reject) => {
-    const baseUrl = getBaseUrl();
-    const fullUrl = `${baseUrl}${path}`;
-    const url = new URL(fullUrl);
-    const isHttps = url.protocol === "https:";
-    const fn = isHttps ? import_node_https.request : import_node_http.request;
-    const headers = {
-      "Content-Type": "application/json",
-      Accept: "application/json"
-    };
-    const apiKey = loadApiKey();
-    if (apiKey) {
-      headers["X-API-Key"] = apiKey;
-    }
-    const req = fn(
-      fullUrl,
-      { method, headers },
-      (res) => {
-        let data = "";
-        res.on("data", (chunk) => data += chunk.toString());
-        res.on("end", () => {
-          if (res.statusCode && res.statusCode >= 400) {
-            reject(new Error(`HTTP ${res.statusCode}: ${data}`));
-            return;
-          }
-          try {
-            resolve9(JSON.parse(data));
-          } catch {
-            resolve9(data);
-          }
-        });
-      }
-    );
-    req.on("error", (e) => reject(new Error(`Connection failed: ${e.message}`)));
-    if (body) req.write(JSON.stringify(body));
-    req.end();
-  });
+function getStagedDiff() {
+  try {
+    return (0, import_node_child_process.execSync)("git diff --staged", { encoding: "utf8", cwd: process.cwd() }).trim();
+  } catch {
+    return "";
+  }
 }
-var api = {
-  get: (path) => request("GET", path),
-  post: (path, body) => request("POST", path, body),
-  put: (path, body) => request("PUT", path, body),
-  patch: (path, body) => request("PATCH", path, body),
-  delete: (path) => request("DELETE", path)
-};
-function getApiUrl() {
-  return getBaseUrl();
+function getLastCommitHash() {
+  try {
+    return (0, import_node_child_process.execSync)("git rev-parse HEAD", { encoding: "utf8", cwd: process.cwd() }).trim();
+  } catch {
+    return "unknown";
+  }
 }
-function getApiKey() {
-  return loadApiKey();
+function getChangedFilesList() {
+  try {
+    const unstaged = (0, import_node_child_process.execSync)("git diff --name-only HEAD", { encoding: "utf8", cwd: process.cwd() }).trim();
+    const staged = (0, import_node_child_process.execSync)("git diff --staged --name-only", { encoding: "utf8", cwd: process.cwd() }).trim();
+    const files = /* @__PURE__ */ new Set();
+    if (unstaged) unstaged.split("\n").forEach((f) => files.add(f));
+    if (staged) staged.split("\n").forEach((f) => files.add(f));
+    return [...files].filter(Boolean);
+  } catch {
+    return [];
+  }
 }
-function formatError(e) {
-  return parseError(e);
+function getAuthorName() {
+  try {
+    return (0, import_node_child_process.execSync)("git config user.name", { encoding: "utf8", cwd: process.cwd() }).trim();
+  } catch {
+    return "unknown";
+  }
 }
 
 // src/commands/init.ts
-init_git();
 var import_scanner = __toESM(require_dist());
 var import_node_fs4 = require("node:fs");
 var import_node_path4 = require("node:path");
+init_analytics();
 
 // src/commands/install-skill.ts
 var import_node_fs3 = require("node:fs");
@@ -214533,13 +214552,22 @@ async function installSkillCommand() {
   const icon = (s) => s === "created" ? "created \u2713" : s === "updated" ? "updated \u2713" : "already configured \u2713";
   console.log(`  CLAUDE.md   ${icon(result.claudeMd)}`);
   console.log(`  AGENTS.md   ${icon(result.agentsMd)}`);
+  try {
+    const { api: api2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+    const me = await api2.get("/me");
+    if (me?.slug) {
+      const { analyticsEvent: analyticsEvent2 } = await Promise.resolve().then(() => (init_analytics(), analytics_exports));
+      analyticsEvent2("cli_install_skill", me.slug, { claude_md: result.claudeMd, agents_md: result.agentsMd });
+    }
+  } catch {
+  }
   return result;
 }
 
 // src/commands/init.ts
 function getVersion() {
   try {
-    return "0.1.32";
+    return "0.1.34";
   } catch {
     return "0.0.0";
   }
@@ -214846,13 +214874,17 @@ async function initCommand(args) {
   console.log("");
   console.log(DIVIDER);
   console.log("");
+  if (!isGitInstalled()) {
+    console.error("Error: git is not installed. Install git and try again.");
+    process.exit(1);
+  }
   if (!isGitRepo()) {
-    console.error("Error: not a git repository.");
+    console.error("Error: not a git repository. Run `git init` first.");
     process.exit(1);
   }
   const remote = getGitRemote();
   if (!remote) {
-    console.error("Error: no git remote found.");
+    console.error("Error: no git remote configured. Run `git remote add origin <url>` first.");
     process.exit(1);
   }
   let workspace;
@@ -214975,7 +215007,8 @@ async function initCommand(args) {
         gotchas: watcher.gotchas,
         ownership: watcher.ownership,
         where_repos: [repo.id],
-        created_by: "driftless-init"
+        created_by: "driftless-init",
+        suggested: true
       });
       watchersCreated++;
     } catch {
@@ -215006,11 +215039,18 @@ async function initCommand(args) {
   console.log("  next       \u2192  driftless context list");
   console.log("");
   console.log(DIVIDER);
+  analyticsEvent("cli_init_run", workspaceSlug, {
+    framework: summary.framework,
+    endpoints: summary.endpoints ?? components.filter((c) => c.type === "controller").length,
+    components: components.length,
+    watchers_created: watchersCreated
+  });
   process.exit(0);
 }
 
 // src/commands/scan.ts
-init_git();
+init_api_client();
+init_analytics();
 function emitJSON(data) {
   console.log(JSON.stringify(data, null, 2));
 }
@@ -215086,6 +215126,7 @@ async function scanCommand(args) {
   });
   const rulesEvaluated = result.rules_evaluated || 0;
   if (result.status === "clean") {
+    analyticsEvent("cli_scan_run", workspace.slug, { violations_found: false, count: 0 });
     if (isJSON) {
       emitJSON({ status: "clean", files: changedFiles, rules_evaluated: rulesEvaluated, violations: [] });
     } else {
@@ -215094,6 +215135,7 @@ async function scanCommand(args) {
     process.exit(0);
   }
   if (!result.violations || result.violations.length === 0) {
+    analyticsEvent("cli_scan_run", workspace.slug, { violations_found: false, count: 0 });
     if (isJSON) {
       emitJSON({ status: "clean", files: changedFiles, rules_evaluated: rulesEvaluated, violations: [] });
     } else {
@@ -215101,6 +215143,7 @@ async function scanCommand(args) {
     }
     process.exit(0);
   }
+  analyticsEvent("cli_scan_run", workspace.slug, { violations_found: true, count: result.violations.length });
   if (isJSON) {
     emitJSON({ status: "violated", files: changedFiles, rules_evaluated: rulesEvaluated, violations: result.violations });
   } else {
@@ -215121,9 +215164,10 @@ ${result.violations.length} violation(s) found (${rulesEvaluated} rule(s) evalua
 }
 
 // src/commands/context.ts
-init_git();
+init_api_client();
 var import_node_fs5 = require("node:fs");
 var import_node_path5 = require("node:path");
+init_analytics();
 function parseArgs(args) {
   const flags = {};
   const positional = [];
@@ -215314,14 +215358,20 @@ async function contextCommand(args) {
     if (flags["auto"]) query.push("auto=true");
     if (flags["manual"]) query.push("manual=true");
     if (flags["repo"]) query.push(`repo=${encodeURIComponent(flags["repo"])}`);
+    if (flags["suggested"]) query.push("suggested=true");
+    else query.push("suggested=false");
     const qs = query.length > 0 ? `?${query.join("&")}` : "";
     try {
       const summaries = await api.get(`/workspaces/${workspaceSlug}/watchers${qs}`);
       if (summaries.length === 0 && !isJSON) {
-        console.log("No context topics yet.");
-        console.log("\nNext:");
-        console.log('  driftless context add "auth-boundaries" --what "..." --how "..." --pattern "src/auth/**"');
-        console.log("  driftless init  # auto-generate topics from your codebase");
+        if (flags["suggested"]) {
+          console.log("No suggested topics. Run `driftless init` to generate suggestions.");
+        } else {
+          console.log("No context topics yet.");
+          console.log("\nNext:");
+          console.log('  driftless context add "auth-boundaries" --what "..." --how "..." --pattern "src/auth/**"');
+          console.log("  driftless init  # generate topic suggestions from your codebase");
+        }
       }
       if (isJSON) {
         emitJSON2(summaries);
@@ -215388,6 +215438,7 @@ async function contextCommand(args) {
     }
     try {
       const ctx = await api.get(`/workspaces/${workspaceSlug}/watchers/${slug}`);
+      analyticsEvent("cli_context_get", workspaceSlug, { topic: slug });
       if (isJSON) {
         const sanitized = JSON.parse(JSON.stringify(ctx, (_key, value) => {
           if (typeof value === "string" && value.length > 500) return value.slice(0, 500) + "\u2026";
@@ -215461,6 +215512,7 @@ async function contextCommand(args) {
         ownership: flags["ownership"],
         file_content: fileContent
       });
+      analyticsEvent("context_created", workspaceSlug, { topic: name, has_pattern: !!pattern, has_what: !!flags["what"] });
       if (isJSON) {
         emitJSON2(result);
       } else {
@@ -215514,12 +215566,22 @@ async function contextCommand(args) {
       console.error('PR 3: --gotcha, --invariant, --check, --enforce "<rule-description>"');
       process.exit(1);
     }
+    const currentRemote = getGitRemote();
+    if (currentRemote) {
+      try {
+        const repos = await api.get(`/workspaces/${workspaceSlug}/repos`);
+        const match = repos.find((r) => r.github_org === currentRemote.org && r.github_repo === currentRemote.repo);
+        if (match) updates._add_repo = match.id;
+      } catch {
+      }
+    }
     if (flags["dry-run"]) {
       console.log(`Would update topic '${slug}':`);
       for (const [key, value] of Object.entries(updates)) {
         if (key.startsWith("_")) continue;
         console.log(`  ${key}: ${value}`);
       }
+      if (updates._add_repo) console.log(`  _add_repo: ${updates._add_repo} (${currentRemote?.org}/${currentRemote?.repo})`);
       if (!isJSON) {
         console.log("\n(Dry run \u2014 no changes written to Driftless Cloud)");
       }
@@ -215533,6 +215595,7 @@ async function contextCommand(args) {
         `/workspaces/${workspaceSlug}/watchers/${slug}`,
         updates
       );
+      analyticsEvent("cli_context_update", workspaceSlug, { topic: slug });
       if (isJSON) {
         emitJSON2(result);
       } else {
@@ -215887,13 +215950,10 @@ Done: ${created} created, ${updated} updated.`);
 Run 'driftless help context' for full reference.`);
 }
 
-// src/commands/session.ts
-init_git();
-var import_node_fs6 = require("node:fs");
-var import_node_path6 = require("node:path");
+// src/commands/sync.ts
+init_api_client();
 function parseArgs2(args) {
   const flags = {};
-  const positional = [];
   for (let i = 0; i < args.length; i++) {
     if (args[i].startsWith("--")) {
       const key = args[i].slice(2);
@@ -215901,14 +215961,10 @@ function parseArgs2(args) {
       if (next && !next.startsWith("--")) {
         flags[key] = next;
         i++;
-      } else {
-        flags[key] = true;
-      }
-    } else {
-      positional.push(args[i]);
+      } else flags[key] = true;
     }
   }
-  return { flags, positional };
+  return { flags };
 }
 function emitJSON3(data) {
   console.log(JSON.stringify(data, null, 2));
@@ -215926,250 +215982,115 @@ async function resolveWorkspaceSlug2() {
   }
   return remote.org;
 }
-async function sessionCommand(args) {
+async function syncCommand(args) {
   if (!isGitRepo()) {
     console.error("Error: not a git repository.");
     process.exit(1);
   }
-  const workspaceSlug = await resolveWorkspaceSlug2();
-  const { flags, positional } = parseArgs2(args);
-  const subCommand = positional[0];
+  const { flags } = parseArgs2(args);
   const isJSON = !!flags["json"];
-  if (subCommand === "start") {
-    const filesFlag = flags["files"];
-    let files = [];
-    if (filesFlag) {
-      files = filesFlag.split(",").map((f) => f.trim()).filter(Boolean);
+  const remote = getGitRemote();
+  if (!remote) {
+    console.error("Error: no git remote configured.");
+    process.exit(1);
+  }
+  const workspaceSlug = await resolveWorkspaceSlug2();
+  let repoId = null;
+  try {
+    const repos = await api.get(`/workspaces/${workspaceSlug}/repos`);
+    const match = repos.find((r) => r.github_org === remote.org && r.github_repo === remote.repo);
+    if (match) repoId = match.id;
+  } catch {
+  }
+  if (!repoId) {
+    if (!isJSON) {
+      console.log(`Repo '${remote.org}/${remote.repo}' not found in workspace.`);
+      console.log("Run driftless init to register this repo first.");
     } else {
-      files = getChangedFilesList();
+      emitJSON3({ error: "repo_not_found", repo: `${remote.org}/${remote.repo}` });
     }
-    if (files.length === 0) {
-      if (!isJSON) {
-        console.log("No files specified and no local changes detected.");
-        console.log('Usage: driftless session start --files "src/auth/**"');
-      } else {
-        emitJSON3({ files: [], topics: [], docs: [], rules: [], gotchas: [] });
-      }
-      process.exit(0);
-    }
-    const missingFiles = files.filter((f) => !(0, import_node_fs6.existsSync)((0, import_node_path6.resolve)(process.cwd(), f)));
-    if (missingFiles.length > 0 && !isJSON) {
-      console.error(`Warning: ${missingFiles.length} file(s) not found locally \u2014 matching by pattern only.`);
-    }
-    try {
-      const results = await api.post(
-        `/workspaces/${workspaceSlug}/watchers/match-files`,
-        { files }
-      );
-      const topics = [];
-      const docs = [];
-      const rules = [];
-      const gotchas = [];
-      const allWhat = [];
-      const allHow = [];
-      for (const r of results) {
-        const ctx = r.context;
-        topics.push(ctx.topic);
-        if (ctx.description.what) allWhat.push(ctx.description.what);
-        if (ctx.description.how) allHow.push(ctx.description.how);
-        if (ctx.description.gotchas) gotchas.push(...ctx.description.gotchas);
-        if (ctx.anchors.docs) {
-          for (const d of ctx.anchors.docs) {
-            if (d.path) docs.push(d.path);
-          }
-        }
-        if (ctx.rules) {
-          for (const rule of ctx.rules) {
-            rules.push(rule.name);
-          }
-        }
-      }
-      if (isJSON) {
-        emitJSON3({
-          files,
-          missing_files: missingFiles,
-          topics,
-          docs: [...new Set(docs)],
-          rules,
-          gotchas,
-          context_summary: {
-            what: allWhat,
-            how: allHow
-          }
-        });
-      } else {
-        console.log(`Session started for ${files.length} file(s):
+    process.exit(0);
+  }
+  const [eventsRes, staleTopics, violations, suggestedTopics] = await Promise.allSettled([
+    api.get(`/workspaces/${workspaceSlug}/watchers/events?repo_id=${repoId}&limit=20`),
+    api.get(`/workspaces/${workspaceSlug}/watchers?stale=true&repo=${repoId}`),
+    api.get(`/workspaces/${workspaceSlug}/violations?repo_id=${repoId}&status=open&limit=20`),
+    api.get(`/workspaces/${workspaceSlug}/watchers?suggested=true`)
+  ]);
+  const events = eventsRes.status === "fulfilled" ? eventsRes.value.events ?? [] : [];
+  const stale = staleTopics.status === "fulfilled" ? staleTopics.value : [];
+  const rawViolations = violations.status === "fulfilled" ? violations.value : [];
+  const openViolations = Array.isArray(rawViolations) ? rawViolations : rawViolations.violations ?? rawViolations.items ?? [];
+  const suggested = suggestedTopics.status === "fulfilled" ? suggestedTopics.value : [];
+  if (isJSON) {
+    emitJSON3({
+      repo: `${remote.org}/${remote.repo}`,
+      stale_topics: stale.map((t) => ({ topic: t.topic, reason: t.stale?.reason ?? null })),
+      recent_events: events.slice(0, 10).map((e) => ({
+        type: e.event_type,
+        topic: e.watcher_slug,
+        detail: e.detail,
+        created_at: e.created_at
+      })),
+      open_violations: openViolations.map((v) => ({
+        id: v.id,
+        rule_id: v.rule_id,
+        status: v.status,
+        author: v.author
+      })),
+      suggested_pending: suggested.length
+    });
+    process.exit(0);
+  }
+  console.log(`\u258C ${remote.org}/${remote.repo}
 `);
-        for (const f of files) {
-          const exists = (0, import_node_fs6.existsSync)((0, import_node_path6.resolve)(process.cwd(), f));
-          console.log(`  ${exists ? "\u2713" : "\u2717"} ${f}`);
-        }
-        if (missingFiles.length > 0) {
-          console.log(`
-Warning: ${missingFiles.length} file(s) not found locally.`);
-        }
-        if (topics.length > 0) {
-          console.log(`
-Matched ${topics.length} context topic(s):`);
-          for (const r of results) {
-            console.log(`  \u258C ${r.context.topic}  (${r.match_reason})`);
-            if (r.context.description.what) {
-              console.log(`    ${r.context.description.what}`);
-            }
-          }
-        } else {
-          console.log("\nNo context topics match these files.");
-        }
-        if (docs.length > 0) {
-          console.log(`
-Anchored docs:`);
-          for (const d of [...new Set(docs)]) {
-            console.log(`  \u{1F4C4} ${d}`);
-          }
-        }
-        if (gotchas.length > 0) {
-          console.log(`
-Gotchas:`);
-          for (const g of gotchas) {
-            console.log(`  ! ${g}`);
-          }
-        }
-        if (rules.length > 0) {
-          console.log(`
-Rules that will be evaluated:`);
-          for (const r of rules) {
-            console.log(`  \u2713 ${r}`);
-          }
-        }
-        console.log("\nBefore finishing:");
-        console.log("  driftless scan --diff");
-        console.log("  driftless session end");
-      }
-    } catch (e) {
-      console.error(`Session start failed: ${formatError(e)}`);
-      process.exit(1);
+  if (stale.length > 0) {
+    console.log(`\u26A0  ${stale.length} stale topic${stale.length === 1 ? "" : "s"} \u2014 code changed, context not updated:`);
+    for (const t of stale) {
+      console.log(`   ${t.topic}`);
+      if (t.stale?.reason) console.log(`     reason: ${t.stale.reason}`);
+      console.log(`     \u2192 driftless context update ${t.topic} --what "..." --how "..."`);
     }
-    return;
+    console.log("");
   }
-  if (subCommand === "end") {
-    const files = getChangedFilesList();
-    if (files.length === 0 && !isJSON) {
-      console.log("No local changes detected. Session clean.");
-      process.exit(0);
+  if (events.length > 0) {
+    console.log(`Recent activity (${events.length}):`);
+    for (const e of events.slice(0, 10)) {
+      const topic = e.watcher_slug ? `[${e.watcher_slug}]` : "";
+      const detail = e.detail ? `  ${e.detail.slice(0, 80)}` : "";
+      console.log(`  ${e.event_type.padEnd(14)} ${topic}${detail}`);
     }
-    try {
-      const remote = getGitRemote();
-      if (!remote) {
-        console.error("Error: no git remote found.");
-        process.exit(1);
-      }
-      const me = await api.get("/me");
-      const repos = await api.get(`/workspaces/${me.slug}/repos`);
-      const repo = repos.find((r) => r.github_org === remote.org && r.github_repo === remote.repo);
-      if (!repo) {
-        console.error(`Repo '${remote.repo}' not found. Run 'driftless init' first.`);
-        process.exit(1);
-      }
-      const { getUncommittedDiff: getUncommittedDiff2, getStagedDiff: getStagedDiff2, getLastCommitHash: getLastCommitHash2, getAuthorName: getAuthorName2 } = await Promise.resolve().then(() => (init_git(), git_exports));
-      const staged = getStagedDiff2();
-      const unstaged = getUncommittedDiff2();
-      const diff = [staged, unstaged].filter(Boolean).join("\n");
-      if (!diff && !isJSON) {
-        console.log("No changes to scan. Session clean.");
-        process.exit(0);
-      }
-      const scanResult = await api.post("/scan", {
-        workspace_id: me.workspace_id,
-        repo_id: repo.id,
-        diff,
-        commit_hash: getLastCommitHash2(),
-        author: getAuthorName2()
-      });
-      const rulesEvaluated = scanResult.rules_evaluated || 0;
-      const violations = scanResult.violations || [];
-      const contextResults = files.length > 0 ? await api.post(
-        `/workspaces/${me.slug}/watchers/match-files`,
-        { files }
-      ) : [];
-      const staleTopics = contextResults.filter((r) => r.context.stale?.is_stale);
-      if (isJSON) {
-        emitJSON3({
-          files,
-          rules_evaluated: rulesEvaluated,
-          violations,
-          stale_topics: staleTopics.map((r) => ({ topic: r.context.topic, reason: r.context.stale.reason })),
-          context_matched: contextResults.map((r) => r.context.topic)
-        });
-      } else {
-        console.log(`Session end \u2014 ${files.length} file(s) changed:
-`);
-        for (const f of files) {
-          console.log(`  \u270E ${f}`);
-        }
-        console.log(`
-${rulesEvaluated} rule(s) evaluated.`);
-        if (violations.length > 0) {
-          console.log(`
-${violations.length} violation(s) found:`);
-          for (const v of violations) {
-            console.log(`  \u2717 [${v.severity.toUpperCase()}] ${v.rule_name}`);
-            console.log(`    ${v.file_path}:${v.line_number} \u2014 ${v.explanation}`);
-          }
-          console.log("\nFix violations before pushing.");
-        } else {
-          console.log("No violations.");
-        }
-        if (staleTopics.length > 0) {
-          console.log(`
-\u26A0 ${staleTopics.length} stale context topic(s):`);
-          for (const s of staleTopics) {
-            console.log(`  ${s.context.topic} \u2014 ${s.context.stale.reason}`);
-            console.log(`    \u2192 driftless context update ${s.context.topic} --what "..." --how "..."`);
-          }
-        }
-        if (contextResults.length > 0) {
-          console.log(`
-Context touched:`);
-          for (const r of contextResults) {
-            console.log(`  \u258C ${r.context.topic}`);
-          }
-        }
-        console.log("\nLearned something? Update context:");
-        console.log('  driftless context update <topic> --gotchas "..."');
-        console.log('  driftless context add <new-topic> --what "..." --pattern "..."');
-      }
-      if (violations.length > 0) {
-        process.exit(1);
-      }
-    } catch (e) {
-      console.error(`Session end failed: ${formatError(e)}`);
-      process.exit(1);
+    console.log("");
+  }
+  if (openViolations.length > 0) {
+    console.log(`\u2717  ${openViolations.length} open violation${openViolations.length === 1 ? "" : "s"}:`);
+    for (const v of openViolations.slice(0, 5)) {
+      console.log(`   ${v.rule_id}  ${v.author ? `(${v.author})` : ""}`);
     }
-    return;
+    if (openViolations.length > 5) console.log(`   ... and ${openViolations.length - 5} more`);
+    console.log("");
   }
-  console.log(`Usage: driftless session <start|end> [args]
-
-start \u2014 Show relevant context before editing
-  --files "path1,path2"  Files to check (default: local changes)
-  --json                 Output as JSON
-
-end   \u2014 Scan changes, check violations, suggest context updates
-  --json                 Output as JSON
-
-Examples:
-  driftless session start --files "src/auth/**"
-  driftless session start          # uses local changes
-  driftless session end            # scan + context report`);
+  if (suggested.length > 0) {
+    console.log(`${suggested.length} suggested topic${suggested.length === 1 ? "" : "s"} from init \u2014 review and confirm:`);
+    console.log(`  driftless context list --suggested`);
+    console.log("");
+  }
+  if (stale.length === 0 && events.length === 0 && openViolations.length === 0 && suggested.length === 0) {
+    console.log("Cloud context is up to date. Nothing to sync.");
+  } else {
+    console.log("Review stale topics, then update context before touching code.");
+  }
+  process.exit(0);
 }
 
 // src/commands/login.ts
-var import_node_fs7 = require("node:fs");
-var import_node_path7 = require("node:path");
+var import_node_fs6 = require("node:fs");
+var import_node_path6 = require("node:path");
 var import_node_readline = require("node:readline");
 var import_node_child_process2 = require("node:child_process");
 var import_node_os2 = require("node:os");
-var CONFIG_DIR = (0, import_node_path7.resolve)((0, import_node_os2.homedir)(), ".driftless");
-var CONFIG_PATH2 = (0, import_node_path7.resolve)(CONFIG_DIR, "config.json");
+var CONFIG_DIR = (0, import_node_path6.resolve)((0, import_node_os2.homedir)(), ".driftless");
+var CONFIG_PATH2 = (0, import_node_path6.resolve)(CONFIG_DIR, "config.json");
 function openBrowser(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   const child = (0, import_node_child_process2.spawn)(cmd, [url], { stdio: "ignore", detached: true });
@@ -216199,10 +216120,10 @@ async function loginCommand(args) {
     input: process.stdin,
     output: process.stdout
   });
-  const apiKey = await new Promise((resolve9) => {
+  const apiKey = await new Promise((resolve8) => {
     rl.question("Paste your API key: ", (answer) => {
       rl.close();
-      resolve9(answer.trim());
+      resolve8(answer.trim());
     });
   });
   if (!apiKey.startsWith("drift_")) {
@@ -216215,10 +216136,10 @@ async function loginCommand(args) {
 function saveConfig(apiKey, apiUrl) {
   const url = apiUrl || "https://api.driftless.icu/api/v1";
   try {
-    if (!(0, import_node_fs7.existsSync)(CONFIG_DIR)) {
-      (0, import_node_fs7.mkdirSync)(CONFIG_DIR, { recursive: true });
+    if (!(0, import_node_fs6.existsSync)(CONFIG_DIR)) {
+      (0, import_node_fs6.mkdirSync)(CONFIG_DIR, { recursive: true });
     }
-    (0, import_node_fs7.writeFileSync)(
+    (0, import_node_fs6.writeFileSync)(
       CONFIG_PATH2,
       JSON.stringify({ api_key: apiKey, api_url: url }, null, 2) + "\n"
     );
@@ -216235,9 +216156,9 @@ function saveConfig(apiKey, apiUrl) {
 }
 
 // src/commands/doctor.ts
-init_git();
-var import_node_fs8 = require("node:fs");
-var import_node_path8 = require("node:path");
+init_api_client();
+var import_node_fs7 = require("node:fs");
+var import_node_path7 = require("node:path");
 async function doctorCommand() {
   const checks = [];
   const apiKey = getApiKey();
@@ -216323,9 +216244,9 @@ async function doctorCommand() {
   } else {
     checks.push({ name: "Baseline", status: "warn", detail: "Skipped (no git remote)" });
   }
-  const agentsPath = (0, import_node_path8.resolve)(process.cwd(), "AGENTS.md");
-  if ((0, import_node_fs8.existsSync)(agentsPath)) {
-    const content = (0, import_node_fs8.readFileSync)(agentsPath, "utf-8");
+  const agentsPath = (0, import_node_path7.resolve)(process.cwd(), "AGENTS.md");
+  if ((0, import_node_fs7.existsSync)(agentsPath)) {
+    const content = (0, import_node_fs7.readFileSync)(agentsPath, "utf-8");
     if (content.includes("driftless")) {
       checks.push({ name: "AGENTS.md", status: "ok", detail: "Driftless skill installed" });
     } else {
@@ -216381,7 +216302,7 @@ function pad2(s, n) {
 }
 
 // src/index.ts
-var VERSION = "0.1.32";
+var VERSION = "0.1.34";
 var HELP_TEXT = `Driftless CLI v${VERSION} \u2014 Living repo context for humans and coding agents
 
 Install:  npm install -g @driftless-sh/cli
@@ -216389,8 +216310,7 @@ Docs:     https://driftless.icu/docs
 API:      https://api.driftless.icu/api/v1
 
 Agent loop:
-  driftless session start             Show context before editing
-  driftless session end               Scan changes + context report
+  driftless sync                      Load context + scan changes in one shot
   driftless context list              List all context topics
   driftless context get <topic>       Live view of one topic before editing
   driftless context get --diff        What context matters for my local changes?
@@ -216405,9 +216325,9 @@ Setup:
 Commands:
   login             Authenticate with API key
   init              Smart init: scan \u2192 detect patterns \u2192 create topics + rules + anchor docs
+  sync              Load context for current changes + scan in one shot
   scan              Evaluate staged + uncommitted changes against rules
   scan --diff       Evaluate uncommitted changes only
-  session           Agent session: start (context) \u2192 end (scan + report)
   context           Live repo context (topics, search, anchors)
   install-skill     Install AGENTS.md into current repo
   doctor            Check environment health (auth, API, git, workspace, repo, baseline)
@@ -216429,10 +216349,6 @@ Context subcommands:
   delete <topic>                Delete a topic
   load --files "p1,p2"          Match topics by file paths
 
-Session subcommands:
-  start [--files "p1,p2"]       Show relevant context before editing
-  end                           Scan changes, check violations, suggest updates
-
 Flags:
   --json      Output as JSON (default is human-readable)
   --dry-run   Preview changes without writing to Driftless Cloud
@@ -216450,8 +216366,8 @@ Output format:
   Use --json flag for machine-readable output (agents, CI).
 
 Examples:
-  driftless session start --files "src/auth/**"
-  driftless session end
+  driftless sync                       # context + scan for current changes
+  driftless sync --json                # machine-readable output
 
   driftless context add "b2b-guard" \\
     --what "Guard que protege endpoints B2B" \\
@@ -216597,8 +216513,8 @@ async function main() {
     case "context":
       await contextCommand(args.slice(1));
       break;
-    case "session":
-      await sessionCommand(args.slice(1));
+    case "sync":
+      await syncCommand(args.slice(1));
       break;
     case "install-skill":
       await installSkillCommand();