@anyforge/control 0.2.1 → 0.2.3

package/dist/commands/init.js

@@ -1,4 +1,6 @@
 import { promises as fs } from 'fs';
+import { execFileSync } from 'child_process';
+import { homedir } from 'os';
 import { join } from 'path';
 import open from 'open';
 import prompts from 'prompts';
@@ -13,8 +15,18 @@ export async function runInit(opts) {
     console.log(bold('AnyForge Control — device authorisation'));
     // eslint-disable-next-line no-console
     console.log(dim(`  endpoint: ${endpoint}`));
-    // 1. Issue a one-time code.
-    const initRes = await fetch(`${endpoint}/api/cli/init`, { method: 'POST' });
+    // 1. Issue a one-time code. We detect the git remote up-front when
+    //    running in a repo so it can be attached to the API key later.
+    //    Detection happens before scope-pick so the server has it
+    //    regardless of which scope the operator chooses.
+    const cwd0 = process.cwd();
+    const gitRoot0 = findGitRoot(cwd0);
+    const earlyRepo = gitRoot0 ? detectGitRemoteRepo(gitRoot0) : null;
+    const initRes = await fetch(`${endpoint}/api/cli/init`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ repo: earlyRepo }),
+    });
     const init = (await initRes.json());
     if (!init.ok || !init.data) {
         throw new Error(`Could not start the authorisation flow: ${init.error ?? 'unknown error'}`);
@@ -49,7 +61,7 @@ export async function runInit(opts) {
     //    contract and avoids accidentally writing settings into a
     //    subdirectory the operator didn't mean to target.
     const cwd = process.cwd();
-    const repoRoot = (await isGitRepoRoot(cwd)) ? cwd : null;
+    const repoRoot = findGitRoot(cwd);
     const scope = await pickScope(repoRoot);
     // 6. Patch the chosen target. apiKey is inlined into the env map
     //    so Claude Code can read it without a shell restart.
@@ -65,13 +77,32 @@ export async function runInit(opts) {
         // eslint-disable-next-line no-console
         console.log(dim('  Set ANTHROPIC_BASE_URL=' + endpoint + '/v1/anthropic and'));
         // eslint-disable-next-line no-console
-        console.log(dim('  ANTHROPIC_API_KEY=<your AnyForge key> manually if needed.'));
+        console.log(dim('  ANTHROPIC_AUTH_TOKEN=<your AnyForge key> manually if needed.'));
     }
     else {
         summarisePatches(patches);
     }
     // eslint-disable-next-line no-console
     console.log();
+    if (await hasClaudeCodeLogin()) {
+        // Claude Code shows an "Auth conflict" warning when both a /login
+        // credential and an env-token are set — even though the token wins
+        // by precedence (#2 vs #6), the warning is cosmetic-but-loud. The
+        // only way to silence it is to stay logged out: /logout once, then
+        // skip the login prompt on the next launch.
+        // eslint-disable-next-line no-console
+        console.log(yellow('  ⚠ Existing Claude Code login detected (~/.claude/.credentials.json).'));
+        // eslint-disable-next-line no-console
+        console.log(dim('    Claude Code will work, but it will warn that both a token and a'));
+        // eslint-disable-next-line no-console
+        console.log(dim('    /login key are set. To silence the warning:'));
+        // eslint-disable-next-line no-console
+        console.log(dim('      1) run `claude /logout`,'));
+        // eslint-disable-next-line no-console
+        console.log(dim('      2) on the next launch, skip the login prompt (Esc / Ctrl+C).'));
+        // eslint-disable-next-line no-console
+        console.log(dim('    The AnyForge token in settings.local.json is enough on its own.'));
+    }
     if (scope === 'repo') {
         // eslint-disable-next-line no-console
         console.log(dim('  Re-run this command in another repo to patch it too,'));
@@ -112,17 +143,33 @@ async function pollForToken(args) {
     }
     throw new Error('Authorisation timed out (15 min). Re-run `anyforge init`.');
 }
-async function isGitRepoRoot(cwd) {
-    // git worktrees use a `.git` file pointing at the real gitdir, so
-    // accept either a directory or a regular file.
+async function hasClaudeCodeLogin() {
+    // Claude Code's docs document the credentials file at
+    // ~/.claude/.credentials.json (Linux/Windows) or the macOS Keychain.
+    // We can only see the file on Linux/Windows. On macOS the keychain
+    // is invisible to us, so this check is best-effort — false negatives
+    // are fine since the warning is just a hint.
     try {
-        const stat = await fs.stat(join(cwd, '.git'));
-        return stat.isDirectory() || stat.isFile();
+        await fs.access(join(homedir(), '.claude', '.credentials.json'));
+        return true;
     }
     catch {
         return false;
     }
 }
+function findGitRoot(cwd) {
+    // Works from any subdirectory — git walks up the tree to find the root.
+    try {
+        return execFileSync('git', ['rev-parse', '--show-toplevel'], {
+            cwd,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+    }
+    catch {
+        return null;
+    }
+}
 async function pickScope(repoRoot) {
     if (!repoRoot) {
         // eslint-disable-next-line no-console
@@ -152,6 +199,36 @@ function summarisePatches(patches) {
         console.log(`  ${dim('•')} ${p.label} ${dim('(' + p.path + ')')}`);
     }
 }
+/**
+ * Read the `origin` remote URL and normalise it to `owner/repo`.
+ * Handles both SSH (`git@github.com:owner/repo.git`) and HTTPS forms.
+ * Returns null when there is no remote, git is unavailable, or the
+ * URL can't be parsed into an owner/repo pair.
+ *
+ * Uses execFileSync (not exec/execSync) so no shell interpolation
+ * occurs — the args array is passed directly to the git binary.
+ */
+function detectGitRemoteRepo(repoRoot) {
+    try {
+        const raw = execFileSync('git', ['remote', 'get-url', 'origin'], {
+            cwd: repoRoot,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        // SSH: git@github.com:owner/repo.git
+        const sshMatch = raw.match(/^git@[\w.-]+:([\w.-]+\/[\w.-]+?)(?:\.git)?$/);
+        if (sshMatch)
+            return sshMatch[1];
+        // HTTPS: https://github.com/owner/repo[.git]
+        const httpsMatch = raw.match(/^https?:\/\/[\w.-]+\/([\w.-]+\/[\w.-]+?)(?:\.git)?$/);
+        if (httpsMatch)
+            return httpsMatch[1];
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 // Re-exported so future commands (e.g. status) can reuse the prompt
 // shape without duplicating the question text.
 export { prompts };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyforge/control",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "AnyForge Control CLI — governed LLM proxy for Claude Code, Cursor, Cline, and any agent that talks to OpenAI- or Anthropic-shape APIs.",
   "license": "Apache-2.0",
   "homepage": "https://anyforge.ai",