@controlvector/cv-agent 1.10.0 → 1.10.1

package/dist/bundle.cjs

@@ -3665,6 +3665,92 @@ async function validateToken(hubUrl, token) {
     return null;
   }
 }
+var DEVICE_CLIENT_ID = "cv-agent-cli";
+var DEVICE_SCOPES = "repo:read repo:write profile offline_access";
+var POLL_INTERVAL_MS = 5e3;
+var MAX_POLL_ATTEMPTS = 180;
+async function deviceAuthFlow(hubUrl, appUrl) {
+  const authRes = await fetch(`${hubUrl}/oauth/device/authorize`, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      client_id: DEVICE_CLIENT_ID,
+      scope: DEVICE_SCOPES
+    })
+  });
+  if (!authRes.ok) {
+    const err = await authRes.json().catch(() => ({}));
+    throw new Error(err.error_description || `Device auth failed: ${authRes.status}`);
+  }
+  const auth = await authRes.json();
+  console.log(source_default.bold("  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510"));
+  console.log(source_default.bold("  \u2502     CV-Hub Device Authorization          \u2502"));
+  console.log(source_default.bold("  \u251C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2524"));
+  console.log(source_default.bold("  \u2502                                          \u2502"));
+  console.log(source_default.bold("  \u2502  Open this URL in your browser:          \u2502"));
+  console.log(source_default.bold(`  \u2502  ${source_default.cyan(auth.verification_uri).padEnd(51)}\u2502`));
+  console.log(source_default.bold("  \u2502                                          \u2502"));
+  console.log(source_default.bold("  \u2502  Then enter this code:                   \u2502"));
+  console.log(source_default.bold(`  \u2502          ${source_default.white.bold(auth.user_code)}                       \u2502`));
+  console.log(source_default.bold("  \u2502                                          \u2502"));
+  console.log(source_default.bold(`  \u2502  ${source_default.gray(`Expires in ${Math.floor(auth.expires_in / 60)} minutes`).padEnd(51)}\u2502`));
+  console.log(source_default.bold("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"));
+  console.log();
+  try {
+    const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+    (0, import_node_child_process.execSync)(`${openCmd} "${auth.verification_uri_complete}" 2>/dev/null`, { timeout: 5e3 });
+    console.log(source_default.gray("  Browser opened. Waiting for authorization..."));
+  } catch {
+    console.log(source_default.gray("  Open the URL above in your browser."));
+  }
+  let interval = Math.max(auth.interval * 1e3, POLL_INTERVAL_MS);
+  const expireTime = Date.now() + auth.expires_in * 1e3;
+  for (let attempt = 0; attempt < MAX_POLL_ATTEMPTS; attempt++) {
+    await new Promise((r) => setTimeout(r, interval));
+    if (Date.now() > expireTime) {
+      throw new Error("Authorization timed out");
+    }
+    const remaining = Math.ceil((expireTime - Date.now()) / 1e3);
+    const mins = Math.floor(remaining / 60);
+    const secs = remaining % 60;
+    process.stdout.write(`\r  Waiting for authorization... (${mins}:${secs.toString().padStart(2, "0")} remaining) `);
+    const tokenRes = await fetch(`${hubUrl}/oauth/token`, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+        device_code: auth.device_code,
+        client_id: DEVICE_CLIENT_ID
+      })
+    });
+    const tokenData = await tokenRes.json();
+    if (tokenData.access_token) {
+      process.stdout.write("\r" + " ".repeat(60) + "\r");
+      let uname = "user";
+      try {
+        const userRes = await fetch(`${hubUrl}/oauth/userinfo`, {
+          headers: { Authorization: `Bearer ${tokenData.access_token}` }
+        });
+        if (userRes.ok) {
+          const userInfo = await userRes.json();
+          uname = userInfo.preferred_username || userInfo.name || "user";
+        }
+      } catch {
+      }
+      return { token: tokenData.access_token, username: uname };
+    }
+    if (tokenData.error === "slow_down") {
+      interval += 5e3;
+    } else if (tokenData.error === "access_denied") {
+      process.stdout.write("\r" + " ".repeat(60) + "\r");
+      throw new Error("Authorization denied by user");
+    } else if (tokenData.error === "expired_token") {
+      process.stdout.write("\r" + " ".repeat(60) + "\r");
+      throw new Error("Authorization expired");
+    }
+  }
+  throw new Error("Authorization timed out");
+}
 function checkBinary(cmd) {
   try {
     return (0, import_node_child_process.execSync)(`${cmd} 2>&1`, { encoding: "utf8", timeout: 5e3 }).trim().split("\n")[0];
@@ -3724,38 +3810,20 @@ async function runSetup() {
   if (!token) {
     console.log("  Let's connect you to CV-Hub.");
     console.log();
-    const autoName = `${(0, import_node_os2.hostname)()}-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}`;
-    const tokenUrl = `${appUrl}/settings/tokens/new?name=${encodeURIComponent(autoName)}&scopes=agent,repo`;
-    console.log(source_default.gray(`  Opening: ${tokenUrl}`));
     try {
-      const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-      (0, import_node_child_process.execSync)(`${openCmd} "${tokenUrl}" 2>/dev/null`, { timeout: 5e3 });
-    } catch {
-      console.log(source_default.gray("  (Could not open browser \u2014 copy the URL above)"));
-    }
-    console.log();
-    const readline = await import("node:readline");
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    token = await new Promise((resolve) => {
-      rl.question("  Paste your token here: ", (answer) => {
-        rl.close();
-        resolve(answer.trim());
-      });
-    });
-    if (!token) {
-      console.log(source_default.red("  No token provided. Run cva setup again."));
-      process.exit(1);
-    }
-    const user = await validateToken(hubUrl, token);
-    if (!user) {
-      console.log(source_default.red("  Token validation failed. Check your token and try again."));
+      const deviceResult = await deviceAuthFlow(hubUrl, appUrl);
+      token = deviceResult.token;
+      username = deviceResult.username;
+      console.log(source_default.green("  \u2713") + ` Authenticated as ${source_default.bold(username)}`);
+      writeSharedCreds({ hub_url: hubUrl, token, username, created_at: (/* @__PURE__ */ new Date()).toISOString() });
+      await writeCredentialField("CV_HUB_PAT", token);
+      await writeCredentialField("CV_HUB_API", hubUrl);
+    } catch (err) {
+      console.log(source_default.red(`  Authentication failed: ${err.message}`));
+      console.log(source_default.gray("  You can retry with: cva setup"));
+      console.log(source_default.gray("  Or manually: cva auth login --token <your-pat>"));
       process.exit(1);
     }
-    username = user;
-    console.log(source_default.green("  \u2713") + ` Authenticated as ${source_default.bold(user)}`);
-    writeSharedCreds({ hub_url: hubUrl, token, username, created_at: (/* @__PURE__ */ new Date()).toISOString() });
-    await writeCredentialField("CV_HUB_PAT", token);
-    await writeCredentialField("CV_HUB_API", hubUrl);
   }
   console.log();
   console.log("  Claude.ai MCP connector:");
@@ -3766,18 +3834,84 @@ async function runSetup() {
   console.log(source_default.gray('  Click "Add Integration" \u2192 "Allow" when prompted.'));
   console.log(source_default.gray("  (You can do this later \u2014 setup will continue.)"));
   console.log();
-  const cwd = process.cwd();
-  const isGitRepo = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, ".git"));
-  const hasCVDir = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, ".cv"));
-  const hasClaudeMd = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, "CLAUDE.md"));
-  const repoName = (0, import_node_path.basename)(cwd);
+  let cwd = process.cwd();
+  let isGitRepo = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, ".git"));
+  let repoName = (0, import_node_path.basename)(cwd);
   if (isGitRepo) {
     console.log(source_default.green("  \u2713") + ` Git repo found: ${repoName}`);
   } else {
-    console.log("  Initializing git repository...");
-    (0, import_node_child_process.execSync)("git init && git checkout -b main", { cwd, stdio: "pipe" });
-    console.log(source_default.green("  \u2713") + " Git repo initialized");
+    const readline = await import("node:readline");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    console.log("  No git repository found in this directory.");
+    console.log();
+    console.log(`    ${source_default.cyan("a")} \u2014 Initialize a new project here: ${cwd}`);
+    console.log(`    ${source_default.cyan("b")} \u2014 Clone an existing repo from CV-Hub`);
+    console.log();
+    const choice = await new Promise((resolve2) => {
+      rl.question("  Choose [a/b]: ", (answer) => {
+        rl.close();
+        resolve2(answer.trim().toLowerCase() || "a");
+      });
+    });
+    if (choice === "b" && token) {
+      try {
+        console.log(source_default.gray("  Fetching your repositories..."));
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), 15e3);
+        const res = await fetch(`${hubUrl}/api/v1/repos?limit=50`, {
+          headers: { Authorization: `Bearer ${token}` },
+          signal: controller.signal
+        });
+        clearTimeout(timeout);
+        if (res.ok) {
+          const data = await res.json();
+          const repos = data.repositories || [];
+          if (repos.length === 0) {
+            console.log(source_default.yellow("  No repos found on CV-Hub. Initializing a new project instead."));
+          } else {
+            console.log();
+            console.log("  Your CV-Hub repositories:");
+            const displayRepos = repos.slice(0, 20);
+            displayRepos.forEach((r, i) => {
+              const desc = r.description ? source_default.gray(` \u2014 ${r.description.substring(0, 40)}`) : "";
+              console.log(`    ${source_default.cyan(String(i + 1).padStart(2))}. ${r.slug || r.name}${desc}`);
+            });
+            console.log();
+            const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
+            const selection = await new Promise((resolve2) => {
+              rl2.question(`  Select a repo [1-${displayRepos.length}]: `, (answer) => {
+                rl2.close();
+                resolve2(answer.trim());
+              });
+            });
+            const idx = parseInt(selection, 10) - 1;
+            if (idx >= 0 && idx < displayRepos.length) {
+              const repo = displayRepos[idx];
+              const gitHost = "git.hub.controlvector.io";
+              const slug = repo.slug || repo.name;
+              const cloneUrl = `https://${username}:${token}@${gitHost}/${username}/${slug}.git`;
+              console.log(source_default.gray(`  Cloning ${username}/${slug}...`));
+              (0, import_node_child_process.execSync)(`git clone ${cloneUrl} ${slug}`, { cwd, stdio: "pipe", timeout: 6e4 });
+              cwd = (0, import_node_path.join)(cwd, slug);
+              process.chdir(cwd);
+              repoName = slug;
+              isGitRepo = true;
+              console.log(source_default.green("  \u2713") + ` Cloned ${username}/${slug}`);
+            }
+          }
+        }
+      } catch (err) {
+        console.log(source_default.yellow(`  Could not fetch repos: ${err.message}. Initializing instead.`));
+      }
+    }
+    if (!isGitRepo) {
+      console.log("  Initializing git repository...");
+      (0, import_node_child_process.execSync)("git init && git checkout -b main", { cwd, stdio: "pipe" });
+      console.log(source_default.green("  \u2713") + " Git repo initialized");
+    }
   }
+  const hasClaudeMd = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, "CLAUDE.md"));
+  const hasCVDir = (0, import_node_fs.existsSync)((0, import_node_path.join)(cwd, ".cv"));
   if (!hasClaudeMd) {
     const template = `# ${repoName}
 
@@ -3795,6 +3929,41 @@ async function runSetup() {
   } else {
     console.log(source_default.green("  \u2713") + " CLAUDE.md present");
   }
+  const gitignorePath = (0, import_node_path.join)(cwd, ".gitignore");
+  const CREDENTIAL_PATTERNS = [
+    "# Credentials and secrets (auto-added by cv-agent)",
+    ".env",
+    ".env.*",
+    ".claude/",
+    ".claude.json",
+    ".credentials*",
+    "*.pem",
+    "*.key",
+    ".ssh/",
+    ".gnupg/",
+    ".npm/",
+    ".config/",
+    ".zsh_history",
+    ".bash_history",
+    ".zsh_sessions/",
+    "node_modules/",
+    ".DS_Store"
+  ];
+  try {
+    let gitignoreContent = "";
+    if ((0, import_node_fs.existsSync)(gitignorePath)) {
+      gitignoreContent = (0, import_node_fs.readFileSync)(gitignorePath, "utf-8");
+    }
+    const missing = CREDENTIAL_PATTERNS.filter((p) => !gitignoreContent.includes(p));
+    if (missing.length > 0) {
+      const addition = (gitignoreContent && !gitignoreContent.endsWith("\n") ? "\n" : "") + missing.join("\n") + "\n";
+      (0, import_node_fs.writeFileSync)(gitignorePath, gitignoreContent + addition);
+      console.log(source_default.green("  \u2713") + " .gitignore updated with credential protection");
+    } else {
+      console.log(source_default.green("  \u2713") + " .gitignore has credential protection");
+    }
+  } catch {
+  }
   if (!hasCVDir) {
     (0, import_node_fs.mkdirSync)((0, import_node_path.join)(cwd, ".cv"), { recursive: true });
   }
@@ -3804,6 +3973,22 @@ async function runSetup() {
     try {
       const existingRemote = (0, import_node_child_process.execSync)('git remote get-url cv-hub 2>/dev/null || echo ""', { cwd, encoding: "utf8" }).trim();
       if (!existingRemote) {
+        try {
+          const controller = new AbortController();
+          const timeout = setTimeout(() => controller.abort(), 15e3);
+          await fetch(`${hubUrl}/api/v1/user/repos`, {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${token}`,
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({ name: repoName, auto_init: false }),
+            signal: controller.signal
+          });
+          clearTimeout(timeout);
+          console.log(source_default.green("  \u2713") + ` Repo created on CV-Hub: ${username}/${repoName}`);
+        } catch {
+        }
         (0, import_node_child_process.execSync)(`git remote add cv-hub ${remoteUrl}`, { cwd, stdio: "pipe" });
         console.log(source_default.green("  \u2713") + ` Remote added: cv-hub \u2192 ${remoteUrl}`);
       } else {
@@ -3811,6 +3996,99 @@ async function runSetup() {
       }
     } catch {
     }
+    try {
+      const credStorePath = (0, import_node_path.join)((0, import_node_os2.homedir)(), ".git-credentials");
+      const credLine = `https://${username}:${token}@${gitHost}`;
+      let existing = "";
+      try {
+        existing = (0, import_node_fs.readFileSync)(credStorePath, "utf-8");
+      } catch {
+      }
+      if (!existing.includes(gitHost)) {
+        (0, import_node_fs.writeFileSync)(credStorePath, existing + credLine + "\n", { mode: 384 });
+      }
+      (0, import_node_child_process.execSync)(`git config --global credential.helper store`, { stdio: "pipe" });
+    } catch {
+    }
+    try {
+      (0, import_node_child_process.execSync)("git log --oneline -1", { cwd, stdio: "pipe" });
+      const status = (0, import_node_child_process.execSync)("git status --porcelain", { cwd, encoding: "utf8" }).trim();
+      if (status) {
+        (0, import_node_child_process.execSync)("git add -A", { cwd, stdio: "pipe" });
+        (0, import_node_child_process.execSync)('git commit -m "chore: cv-agent setup"', { cwd, stdio: "pipe" });
+        console.log(source_default.green("  \u2713") + " Changes committed");
+      }
+    } catch {
+      try {
+        (0, import_node_child_process.execSync)("git add -A", { cwd, stdio: "pipe" });
+        (0, import_node_child_process.execSync)('git commit -m "Initial commit via cv-agent"', { cwd, stdio: "pipe" });
+        console.log(source_default.green("  \u2713") + " Initial commit created");
+      } catch {
+      }
+    }
+    try {
+      (0, import_node_child_process.execSync)("git push -u cv-hub main 2>&1", { cwd, stdio: "pipe", timeout: 3e4 });
+      console.log(source_default.green("  \u2713") + " Pushed to CV-Hub");
+    } catch {
+      console.log(source_default.gray("  (Push skipped \u2014 you can push later with: git push cv-hub main)"));
+    }
+  }
+  console.log();
+  let agentStatus = "";
+  const pidFile = (0, import_node_path.join)((0, import_node_os2.homedir)(), ".config", "controlvector", "agent.pid");
+  let agentRunning = false;
+  try {
+    const pid = parseInt((0, import_node_fs.readFileSync)(pidFile, "utf-8").trim(), 10);
+    if (pid > 0) {
+      process.kill(pid, 0);
+      agentRunning = true;
+      agentStatus = `running (PID ${pid})`;
+      console.log(source_default.green("  \u2713") + ` Agent already running (PID ${pid})`);
+    }
+  } catch {
+  }
+  if (!agentRunning) {
+    const readline = await import("node:readline");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await new Promise((resolve2) => {
+      rl.question("  Start the CV-Agent daemon? (Y/n): ", (a) => {
+        rl.close();
+        resolve2(a.trim().toLowerCase() || "y");
+      });
+    });
+    if (answer === "y" || answer === "yes" || answer === "") {
+      const machName = (0, import_node_os2.hostname)().toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-");
+      console.log(source_default.gray(`  Starting agent as "${machName}"...`));
+      try {
+        const { spawn: spawnChild } = await import("node:child_process");
+        const child = spawnChild("cva", [
+          "agent",
+          "--auto-approve",
+          "--machine",
+          machName,
+          "--working-dir",
+          cwd
+        ], {
+          detached: true,
+          stdio: "ignore",
+          env: { ...process.env }
+        });
+        child.unref();
+        if (child.pid) {
+          (0, import_node_fs.mkdirSync)((0, import_node_path.join)((0, import_node_os2.homedir)(), ".config", "controlvector"), { recursive: true });
+          (0, import_node_fs.writeFileSync)(pidFile, String(child.pid), { mode: 384 });
+          agentStatus = `running (PID ${child.pid})`;
+          console.log(source_default.green("  \u2713") + ` Agent started (PID ${child.pid}) \u2014 executor "${machName}"`);
+        }
+      } catch (err) {
+        console.log(source_default.yellow(`  Could not start agent: ${err.message}`));
+        console.log(source_default.gray("  Start manually with: cva agent --auto-approve"));
+        agentStatus = "not started";
+      }
+    } else {
+      agentStatus = "not started";
+      console.log(source_default.gray("  Start anytime with: cva agent --auto-approve"));
+    }
   }
   console.log();
   console.log(source_default.bold("  Setup Complete"));
@@ -3818,11 +4096,14 @@ async function runSetup() {
   console.log(`  ${source_default.green("\u2713")} Authenticated as: ${source_default.cyan(username)}`);
   console.log(`  ${source_default.green("\u2713")} Repository: ${source_default.cyan(repoName)}`);
   console.log(`  ${source_default.green("\u2713")} CLAUDE.md: present`);
+  if (agentStatus.startsWith("running")) {
+    console.log(`  ${source_default.green("\u2713")} Agent daemon: ${source_default.cyan(agentStatus)}`);
+  }
   console.log(source_default.gray("  " + "\u2500".repeat(40)));
   console.log();
   console.log("  What's next:");
-  console.log(`    ${source_default.cyan("cva agent --auto-approve")}  \u2014 Start listening for tasks`);
-  console.log(`    Or open Claude.ai and dispatch a task to this repo.`);
+  console.log("    Open Claude.ai and try:");
+  console.log(source_default.cyan(`    "Create a task in ${repoName} to add a hello world index.html"`));
   console.log();
   console.log(source_default.gray(`  Dashboard: ${appUrl}`));
   console.log();
@@ -3978,7 +4259,7 @@ async function apiCall(creds, method, path3, body) {
     body: body ? JSON.stringify(body) : void 0
   });
 }
-async function registerExecutor(creds, machineName, workingDir, repositoryId, metadata) {
+async function registerExecutor(creds, machineName, workingDir, repositoryId, metadata, repoOwnerSlug) {
   const body = {
     name: `cva:${machineName}`,
     machine_name: machineName,
@@ -3997,7 +4278,23 @@ async function registerExecutor(creds, machineName, workingDir, repositoryId, me
   if (metadata?.tags) body.tags = metadata.tags;
   if (metadata?.owner_project) body.owner_project = metadata.owner_project;
   if (metadata?.integration) body.integration = metadata.integration;
-  const res = await apiCall(creds, "POST", "/api/v1/executors", body);
+  let res = await apiCall(creds, "POST", "/api/v1/executors", body);
+  if (res.status === 400 && repoOwnerSlug) {
+    try {
+      const errData = await res.json();
+      const orgs = errData.error?.organizations;
+      if (orgs && orgs.length > 0) {
+        const match = orgs.find(
+          (o) => o.slug.toLowerCase() === repoOwnerSlug.toLowerCase()
+        );
+        if (match) {
+          body.organization_id = match.id;
+          res = await apiCall(creds, "POST", "/api/v1/executors", body);
+        }
+      }
+    } catch {
+    }
+  }
   if (!res.ok) {
     const err = await res.text();
     throw new Error(`Failed to register executor: ${res.status} ${err}`);
@@ -4440,11 +4737,78 @@ async function writeConfig(config) {
 
 // src/commands/git-safety.ts
 var import_node_child_process3 = require("node:child_process");
+var import_node_fs3 = require("node:fs");
+var import_node_path2 = require("node:path");
+var import_node_os3 = require("node:os");
+var DANGEROUS_PATTERNS = [
+  ".claude/",
+  ".claude.json",
+  ".credentials",
+  ".zsh_history",
+  ".bash_history",
+  ".zsh_sessions/",
+  ".ssh/",
+  ".gnupg/",
+  ".npm/",
+  ".config/",
+  ".CFUserTextEncoding",
+  "Library/",
+  "Applications/",
+  ".Trash/",
+  ".DS_Store",
+  "node_modules/",
+  ".env",
+  ".env.local",
+  ".env.production"
+];
 function git(cmd, cwd) {
   return (0, import_node_child_process3.execSync)(cmd, { cwd, encoding: "utf8", timeout: 3e4 }).trim();
 }
+function checkWorkspaceSafety(workspaceRoot) {
+  const resolved = (0, import_node_path2.resolve)(workspaceRoot);
+  const home = (0, import_node_path2.resolve)((0, import_node_os3.homedir)());
+  if (resolved === home) {
+    return `Workspace is user HOME directory (${home}). Refusing to auto-commit to prevent indexing personal files.`;
+  }
+  if (home.startsWith(resolved + "/")) {
+    return `Workspace (${resolved}) is a parent of HOME. Refusing to auto-commit.`;
+  }
+  if (!(0, import_node_fs3.existsSync)((0, import_node_path2.join)(resolved, ".git"))) {
+    return `No .git directory in ${resolved}. Not a git repository.`;
+  }
+  return null;
+}
+function filterDangerousFiles(statusLines) {
+  const safe = [];
+  const blocked = [];
+  for (const line of statusLines) {
+    const filePath = line.substring(3).trim();
+    const isDangerous = DANGEROUS_PATTERNS.some(
+      (pattern) => filePath.startsWith(pattern) || filePath.includes("/" + pattern)
+    );
+    if (isDangerous) {
+      blocked.push(filePath);
+    } else {
+      safe.push(line);
+    }
+  }
+  return { safe, blocked };
+}
 function gitSafetyNet(workspaceRoot, taskTitle, taskId, branch) {
   const targetBranch = branch || "main";
+  const safetyError = checkWorkspaceSafety(workspaceRoot);
+  if (safetyError) {
+    console.log(`  [git-safety] BLOCKED: ${safetyError}`);
+    return {
+      hadChanges: false,
+      filesAdded: 0,
+      filesModified: 0,
+      filesDeleted: 0,
+      pushed: false,
+      skipped: true,
+      skipReason: safetyError
+    };
+  }
   try {
     let statusOutput;
     try {
@@ -4452,8 +4816,8 @@ function gitSafetyNet(workspaceRoot, taskTitle, taskId, branch) {
     } catch {
       return { hadChanges: false, filesAdded: 0, filesModified: 0, filesDeleted: 0, pushed: false, error: "git status failed" };
     }
-    const lines = statusOutput.split("\n").filter(Boolean);
-    if (lines.length === 0) {
+    const allLines = statusOutput.split("\n").filter(Boolean);
+    if (allLines.length === 0) {
       try {
         const unpushed = git(`git log origin/${targetBranch}..HEAD --oneline 2>/dev/null`, workspaceRoot);
         if (unpushed) {
@@ -4465,8 +4829,16 @@ function gitSafetyNet(workspaceRoot, taskTitle, taskId, branch) {
       }
       return { hadChanges: false, filesAdded: 0, filesModified: 0, filesDeleted: 0, pushed: false };
     }
+    const { safe: safeLines, blocked } = filterDangerousFiles(allLines);
+    if (blocked.length > 0) {
+      console.log(`  [git-safety] Blocked ${blocked.length} sensitive file(s) from staging: ${blocked.slice(0, 5).join(", ")}${blocked.length > 5 ? "..." : ""}`);
+    }
+    if (safeLines.length === 0) {
+      console.log(`  [git-safety] All ${allLines.length} changed files were blocked by safety filter`);
+      return { hadChanges: false, filesAdded: 0, filesModified: 0, filesDeleted: 0, pushed: false };
+    }
     let added = 0, modified = 0, deleted = 0;
-    for (const line of lines) {
+    for (const line of safeLines) {
       const code = line.substring(0, 2);
       if (code.includes("?")) added++;
       else if (code.includes("D")) deleted++;
@@ -4474,9 +4846,15 @@ function gitSafetyNet(workspaceRoot, taskTitle, taskId, branch) {
       else added++;
     }
     console.log(
-      `  [git-safety] ${lines.length} uncommitted changes (${added} new, ${modified} modified, ${deleted} deleted) \u2014 committing now`
+      `  [git-safety] ${safeLines.length} safe changes (${added} new, ${modified} modified, ${deleted} deleted) \u2014 committing now`
     );
-    git("git add -A", workspaceRoot);
+    for (const line of safeLines) {
+      const filePath = line.substring(3).trim();
+      try {
+        git(`git add -- ${JSON.stringify(filePath)}`, workspaceRoot);
+      } catch {
+      }
+    }
     const shortId = taskId.substring(0, 8);
     const commitMsg = `task: ${taskTitle} [${shortId}]
 
@@ -4537,8 +4915,8 @@ Files: ${added} added, ${modified} modified, ${deleted} deleted`;
 
 // src/commands/deploy-manifest.ts
 var import_node_child_process4 = require("node:child_process");
-var import_node_fs3 = require("node:fs");
-var import_node_path2 = require("node:path");
+var import_node_fs4 = require("node:fs");
+var import_node_path3 = require("node:path");
 function exec(cmd, cwd, timeoutMs = 3e5, env2) {
   try {
     const stdout = (0, import_node_child_process4.execSync)(cmd, {
@@ -4581,10 +4959,10 @@ function getHeadCommit(cwd) {
   }
 }
 function loadDeployManifest(workspaceRoot) {
-  const manifestPath = (0, import_node_path2.join)(workspaceRoot, ".cva", "deploy.json");
-  if (!(0, import_node_fs3.existsSync)(manifestPath)) return null;
+  const manifestPath = (0, import_node_path3.join)(workspaceRoot, ".cva", "deploy.json");
+  if (!(0, import_node_fs4.existsSync)(manifestPath)) return null;
   try {
-    const raw = (0, import_node_fs3.readFileSync)(manifestPath, "utf8");
+    const raw = (0, import_node_fs4.readFileSync)(manifestPath, "utf8");
     const manifest = JSON.parse(raw);
     if (!manifest.version || manifest.version < 1) {
       console.log("  [deploy] Invalid manifest version");
@@ -4609,7 +4987,7 @@ async function postTaskDeploy(workspaceRoot, taskId, log) {
       console.log(`  [deploy] Building: ${buildStep.name}`);
       log("lifecycle", `Building: ${buildStep.name}`);
       const start = Date.now();
-      const cwd = (0, import_node_path2.join)(workspaceRoot, buildStep.working_dir || ".");
+      const cwd = (0, import_node_path3.join)(workspaceRoot, buildStep.working_dir || ".");
       const timeoutMs = (buildStep.timeout_seconds || 300) * 1e3;
       const result = exec(buildStep.command, cwd, timeoutMs);
       if (!result.ok) {
@@ -4700,7 +5078,7 @@ async function rollback(workspaceRoot, targetCommit, manifest, log) {
   }
   if (manifest.build?.steps) {
     for (const step of manifest.build.steps) {
-      exec(step.command, (0, import_node_path2.join)(workspaceRoot, step.working_dir || "."), (step.timeout_seconds || 300) * 1e3);
+      exec(step.command, (0, import_node_path3.join)(workspaceRoot, step.working_dir || "."), (step.timeout_seconds || 300) * 1e3);
     }
   }
   if (manifest.service?.restart_command) {
@@ -4858,6 +5236,22 @@ Target repository: ${task.owner}/${task.repo}
 `;
   prompt += `
 
+## Security \u2014 NEVER Commit Secrets
+`;
+  prompt += `Do NOT add, commit, or push any of the following:
+`;
+  prompt += `- API keys, tokens, passwords, or credentials
+`;
+  prompt += `- .env files, .credentials files, .claude/ directory
+`;
+  prompt += `- SSH keys (.ssh/), GPG keys (.gnupg/)
+`;
+  prompt += `- Shell history (.zsh_history, .bash_history)
+`;
+  prompt += `If you need to reference an API key, use an environment variable placeholder.
+`;
+  prompt += `
+
 ---
 `;
   prompt += `When complete, provide a brief summary of what you accomplished.
@@ -4937,7 +5331,7 @@ async function launchAutoApproveMode(prompt, options) {
   let lastProgressBytes = 0;
   let totalBytesStreamed = 0;
   const runOnce = (inputPrompt, isContinue) => {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const args = isContinue ? ["-p", inputPrompt, "--continue", "--allowedTools", ...ALLOWED_TOOLS] : ["-p", inputPrompt, "--allowedTools", ...ALLOWED_TOOLS];
       if (sessionId && !isContinue) {
         args.push("--session-id", sessionId);
@@ -5047,7 +5441,7 @@ ${source_default.red("!")} Claude Code auth failure (stderr): "${authError}"`);
       });
       child.on("close", (code, signal) => {
         _activeChild = null;
-        resolve({
+        resolve2({
           exitCode: signal === "SIGKILL" ? 137 : code ?? 1,
           stderr,
           output: fullOutput,
@@ -5086,7 +5480,7 @@ ${source_default.red("!")} Claude Code auth failure (stderr): "${authError}"`);
   return result;
 }
 async function launchRelayMode(prompt, options) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const child = (0, import_node_child_process5.spawn)("claude", [], {
       cwd: options.cwd,
       stdio: ["pipe", "pipe", "pipe"],
@@ -5291,9 +5685,9 @@ ${source_default.red("!")} Claude Code auth failure (stderr): "${authError}"`);
     child.on("close", (code, signal) => {
       _activeChild = null;
       if (signal === "SIGKILL") {
-        resolve({ exitCode: 137, stderr, output: fullOutput, authFailure });
+        resolve2({ exitCode: 137, stderr, output: fullOutput, authFailure });
       } else {
-        resolve({ exitCode: code ?? 1, stderr, output: fullOutput, authFailure });
+        resolve2({ exitCode: code ?? 1, stderr, output: fullOutput, authFailure });
       }
     });
     child.on("error", (err) => {
@@ -5394,14 +5788,45 @@ async function runAgent(options) {
     console.log();
     process.exit(1);
   }
+  if (process.env.CV_DEBUG) {
+    console.log(source_default.gray(`   PATH: ${process.env.PATH}`));
+    console.log(source_default.gray(`   HOME: ${process.env.HOME}`));
+    console.log(source_default.gray(`   SHELL: ${process.env.SHELL}`));
+  }
+  let claudeBinary = "claude";
   try {
     (0, import_node_child_process5.execSync)("claude --version", { stdio: "pipe", timeout: 5e3 });
   } catch {
-    console.log();
-    console.log(source_default.red("Claude Code CLI not found.") + " Install it first:");
-    console.log(`   ${source_default.cyan("npm install -g @anthropic-ai/claude-code")}`);
-    console.log();
-    process.exit(1);
+    const candidates = [
+      "/usr/local/bin/claude",
+      "/opt/homebrew/bin/claude",
+      `${process.env.HOME}/.npm-global/bin/claude`,
+      `${process.env.HOME}/.nvm/versions/node/*/bin/claude`
+    ];
+    let found = false;
+    for (const candidate of candidates) {
+      try {
+        const resolved = (0, import_node_child_process5.execSync)(`ls ${candidate} 2>/dev/null | head -1`, { encoding: "utf8", timeout: 3e3 }).trim();
+        if (resolved) {
+          (0, import_node_child_process5.execSync)(`${resolved} --version`, { stdio: "pipe", timeout: 5e3 });
+          claudeBinary = resolved;
+          found = true;
+          console.log(source_default.yellow("!") + ` Claude Code found at ${resolved} (not on PATH)`);
+          break;
+        }
+      } catch {
+      }
+    }
+    if (!found) {
+      console.log();
+      console.log(source_default.red("Claude Code CLI not found.") + " Install it first:");
+      console.log(`   ${source_default.cyan("npm install -g @anthropic-ai/claude-code")}`);
+      console.log();
+      console.log(source_default.gray(`   Current PATH: ${process.env.PATH}`));
+      console.log(source_default.gray("   If running via Launch Agent, ensure PATH includes the directory where claude is installed."));
+      console.log();
+      process.exit(1);
+    }
   }
   const { env: claudeEnv, usingApiKey } = await getClaudeEnv();
   const authCheck = await checkClaudeAuth();
@@ -5442,7 +5867,82 @@ async function runAgent(options) {
       console.log();
     }
   }
+  {
+    const isGitRepo = require("fs").existsSync(require("path").join(workingDir, ".git"));
+    if (!isGitRepo) {
+      console.log(source_default.gray("   Bootstrap: initializing git repo..."));
+      try {
+        (0, import_node_child_process5.execSync)("git init && git checkout -b main", { cwd: workingDir, stdio: "pipe" });
+      } catch {
+      }
+    }
+    const claudeMdPath = require("path").join(workingDir, "CLAUDE.md");
+    if (!require("fs").existsSync(claudeMdPath)) {
+      const name = require("path").basename(workingDir);
+      const template = `# ${name}
+
+## Overview
+[Describe your project here]
+
+## Build & Run
+[How to build and run this project]
+`;
+      try {
+        require("fs").writeFileSync(claudeMdPath, template);
+        console.log(source_default.gray("   Bootstrap: created CLAUDE.md"));
+      } catch {
+      }
+    }
+    const gitignorePath = require("path").join(workingDir, ".gitignore");
+    try {
+      const fs4 = require("fs");
+      const credPatterns = ".env\n.env.*\n.claude/\n.claude.json\n.credentials*\n*.pem\n*.key\n.ssh/\n.gnupg/\n.npm/\n.config/\n.zsh_history\n.bash_history\nnode_modules/\n.DS_Store\n";
+      let existing = "";
+      try {
+        existing = fs4.readFileSync(gitignorePath, "utf-8");
+      } catch {
+      }
+      if (!existing.includes(".claude/")) {
+        const prefix = existing && !existing.endsWith("\n") ? "\n" : "";
+        fs4.writeFileSync(gitignorePath, existing + prefix + "# Credentials (auto-added by cv-agent)\n" + credPatterns);
+        console.log(source_default.gray("   Bootstrap: .gitignore credential protection added"));
+      }
+    } catch {
+    }
+    const cvDir = require("path").join(workingDir, ".cv");
+    if (!require("fs").existsSync(cvDir)) {
+      try {
+        require("fs").mkdirSync(cvDir, { recursive: true });
+      } catch {
+      }
+    }
+    if (creds.CV_HUB_PAT) {
+      try {
+        const existing = (0, import_node_child_process5.execSync)('git remote get-url cv-hub 2>/dev/null || echo ""', {
+          cwd: workingDir,
+          encoding: "utf8",
+          timeout: 5e3
+        }).trim();
+        if (!existing) {
+          const name = require("path").basename(workingDir);
+          const gitHost = "git.hub.controlvector.io";
+          let user = "user";
+          try {
+            const sharedPath = require("path").join(require("os").homedir(), ".config", "controlvector", "credentials.json");
+            const shared = JSON.parse(require("fs").readFileSync(sharedPath, "utf-8"));
+            if (shared.username) user = shared.username;
+          } catch {
+          }
+          const remoteUrl = `https://${gitHost}/${user}/${name}.git`;
+          (0, import_node_child_process5.execSync)(`git remote add cv-hub ${remoteUrl}`, { cwd: workingDir, stdio: "pipe" });
+          console.log(source_default.gray(`   Bootstrap: remote cv-hub \u2192 ${remoteUrl}`));
+        }
+      } catch {
+      }
+    }
+  }
   let detectedRepoId;
+  let detectedOwnerSlug;
   try {
     const remoteUrl = (0, import_node_child_process5.execSync)("git remote get-url origin 2>/dev/null", {
       cwd: workingDir,
@@ -5454,6 +5954,7 @@ async function runAgent(options) {
     );
     if (cvHubMatch) {
       const [, repoOwner, repoSlug] = cvHubMatch;
+      detectedOwnerSlug = repoOwner;
       try {
         const repoData = await resolveRepoId(creds, repoOwner, repoSlug);
         if (repoData?.id) {
@@ -5465,6 +5966,9 @@ async function runAgent(options) {
     }
   } catch {
   }
+  if (options.org) {
+    detectedOwnerSlug = options.org;
+  }
   const wsConfig = await readWorkspaceConfig(workingDir);
   const globalConfig = await readConfig();
   const role = options.role || wsConfig.role || globalConfig.role || "development";
@@ -5505,7 +6009,7 @@ async function runAgent(options) {
     console.log(source_default.yellow(`   Guard:    ${guardIcon} ${dispatchGuard}`));
   }
   const executor = await withRetry(
-    () => registerExecutor(creds, machineName, workingDir, detectedRepoId, executorMeta),
+    () => registerExecutor(creds, machineName, workingDir, detectedRepoId, executorMeta, detectedOwnerSlug),
     "Executor registration"
   );
   const mode = options.autoApprove ? "auto-approve" : "relay";
@@ -5873,6 +6377,7 @@ function agentCommand() {
   cmd.option("--dispatch-guard <guard>", "Dispatch guard: open, confirm, locked (default: open)");
   cmd.option("--tags <tags>", "Comma-separated tags for this executor");
   cmd.option("--owner-project <project>", "Project this executor belongs to");
+  cmd.option("--org <slug>", "Organization slug (auto-detected from repo owner if omitted)");
   cmd.action(async (opts) => {
     await runAgent(opts);
   });
@@ -5909,7 +6414,7 @@ async function promptForToken() {
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     rl.question("Enter your CV-Hub PAT token: ", (answer) => {
       rl.close();
       const token = answer.trim();
@@ -5917,7 +6422,7 @@ async function promptForToken() {
         console.log(source_default.red("No token provided."));
         process.exit(1);
       }
-      resolve(token);
+      resolve2(token);
     });
   });
 }
@@ -6196,7 +6701,7 @@ function statusCommand() {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("cva").description('CV-Hub Agent \u2014 bridges Claude Code with CV-Hub task dispatch.\n\nRun "cva setup" to get started.').version(true ? "1.10.0" : "1.6.0");
+program2.name("cva").description('CV-Hub Agent \u2014 bridges Claude Code with CV-Hub task dispatch.\n\nRun "cva setup" to get started.').version(true ? "1.10.1" : "1.6.0");
 program2.addCommand(setupCommand());
 program2.addCommand(agentCommand());
 program2.addCommand(authCommand());