@anyforge/control 0.2.4 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anyforge/control",
-  "version": "0.2.4",
-  "description": "AnyForge Control CLI — governed LLM proxy for Claude Code, Cursor, Cline, and any agent that talks to OpenAI- or Anthropic-shape APIs.",
+  "version": "0.4.0",
+  "description": "AnyForge Control CLI \u2014 governed LLM proxy for any agent, and a scriptable client for AnyForge approvals, crews, work items and workflows.",
   "license": "Apache-2.0",
   "homepage": "https://anyforge.ai",
   "repository": {
@@ -23,14 +23,16 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsc && chmod +x dist/cli.js",
+    "build": "esbuild src/cli.ts --bundle --minify --platform=node --format=esm --outfile=dist/cli.js --packages=external && chmod +x dist/cli.js",
+    "type-check": "tsc --noEmit",
+    "test": "tsx --test src/commands/*.test.ts",
     "dev": "tsx src/cli.ts",
     "prepublishOnly": "npm run build",
     "publish:beta": "npm publish --access public --tag beta",
     "publish:stable": "npm publish --access public"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "dependencies": {
     "kleur": "^4.1.5",
@@ -38,9 +40,10 @@
     "prompts": "^2.4.2"
   },
   "devDependencies": {
-    "@types/node": "^20.11.0",
+    "@types/node": "^22.20.0",
     "@types/prompts": "^2.4.9",
+    "esbuild": "^0.25.0",
     "tsx": "^4.7.0",
-    "typescript": "^5.5.3"
+    "typescript": "^7.0.2"
   }
 }

package/dist/commands/applyPatch.js

@@ -1,92 +0,0 @@
-import { spawn } from 'node:child_process';
-import { readFile } from 'node:fs/promises';
-import { red, green, yellow, dim, bold } from 'kleur/colors';
-export async function runApplyPatch(opts) {
-    const patchContent = await loadPatch(opts.patchFile);
-    if (!patchContent.trim()) {
-        process.stderr.write(red('Empty patch — nothing to apply.\n'));
-        process.exit(1);
-    }
-    const stats = parseDiffStats(patchContent);
-    process.stderr.write(dim(`Patch: ${stats.files} ${stats.files === 1 ? 'file' : 'files'}, `) +
-        green(`+${stats.added}`) + ' ' + red(`-${stats.removed}`) + '\n');
-    // git apply --check first — never make a partial mess
-    const check = await runGit(['apply', '--check'], patchContent);
-    if (check.code !== 0) {
-        if (opts.threeWay) {
-            const three = await runGit(['apply', '--3way'], patchContent);
-            if (three.code !== 0) {
-                process.stderr.write(red('3-way apply failed:\n') + three.stderr + '\n');
-                process.exit(1);
-            }
-            process.stderr.write(yellow('✓ Applied via 3-way merge — review conflicts before committing.\n'));
-            return;
-        }
-        process.stderr.write(red('Patch does not apply cleanly:\n') + check.stderr + '\n');
-        process.stderr.write(dim('Try ') + bold('--3way') + dim(' to attempt a 3-way merge against the index.\n'));
-        process.exit(1);
-    }
-    if (opts.dryRun) {
-        process.stderr.write(green('✓ Patch would apply cleanly.\n'));
-        return;
-    }
-    const apply = await runGit(['apply'], patchContent);
-    if (apply.code !== 0) {
-        process.stderr.write(red('git apply failed:\n') + apply.stderr + '\n');
-        process.exit(1);
-    }
-    process.stderr.write(green('✓ Applied.\n'));
-    if (stats.files > 0) {
-        process.stderr.write(dim('  Run ') + bold('git diff --stat') + dim(' to review.\n'));
-    }
-}
-async function loadPatch(filePath) {
-    if (filePath) {
-        return await readFile(filePath, 'utf8');
-    }
-    // Read stdin to a single string
-    const chunks = [];
-    for await (const chunk of process.stdin) {
-        chunks.push(chunk);
-    }
-    return Buffer.concat(chunks).toString('utf8');
-}
-/** Spawn `git <args>`, pipe `stdinData` to its stdin, return code +
- *  captured streams. No shell — args are passed as a list to spawn. */
-function runGit(args, stdinData) {
-    return new Promise((resolve, reject) => {
-        const child = spawn('git', args, { stdio: ['pipe', 'pipe', 'pipe'] });
-        let stdout = '';
-        let stderr = '';
-        child.stdout.on('data', d => { stdout += d.toString(); });
-        child.stderr.on('data', d => { stderr += d.toString(); });
-        child.on('error', reject);
-        child.on('close', code => resolve({ code: code ?? 0, stdout, stderr }));
-        child.stdin.write(stdinData);
-        child.stdin.end();
-    });
-}
-/** Quick stats parse off a unified diff — counts file headers and
- *  +/- lines. Skips diff metadata lines (+++, ---) so the report
- *  matches `git apply --stat` shape close enough for an inline note. */
-function parseDiffStats(patch) {
-    let files = 0;
-    let added = 0;
-    let removed = 0;
-    for (const line of patch.split('\n')) {
-        if (line.startsWith('diff --git'))
-            files += 1;
-        else if (line.startsWith('+++') || line.startsWith('---'))
-            continue;
-        else if (line.startsWith('+'))
-            added += 1;
-        else if (line.startsWith('-'))
-            removed += 1;
-    }
-    if (files === 0 && (added > 0 || removed > 0)) {
-        // Patch had no `diff --git` headers (a hand-rolled fragment);
-        // count filename headers instead.
-        files = (patch.match(/^\+\+\+ /gm) ?? []).length;
-    }
-    return { files, added, removed };
-}

package/dist/commands/init.js

@@ -1,296 +0,0 @@
-import { execFileSync } from 'child_process';
-import open from 'open';
-import prompts from 'prompts';
-import { green, dim, bold, yellow, cyan } from 'kleur/colors';
-import { saveCredentials } from '../lib/credentials.js';
-import { detectAndPatchConfigs, detectClaudeSubscription, patchClaudeTelemetry, } from '../lib/configPatch.js';
-const POLL_INTERVAL_MS = 2_000;
-const POLL_TIMEOUT_MS = 15 * 60 * 1000;
-export async function runInit(opts) {
-    const { endpoint } = opts;
-    // eslint-disable-next-line no-console
-    console.log(bold('AnyForge Control — device authorisation'));
-    // eslint-disable-next-line no-console
-    console.log(dim(`  endpoint: ${endpoint}`));
-    // 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'}`);
-    }
-    const { code, authUrl, pollUrl } = init.data;
-    // 2. Open the browser. Some shells (CI, headless) can't open one;
-    //    the URL also prints so the user can copy it manually.
-    // eslint-disable-next-line no-console
-    console.log();
-    // eslint-disable-next-line no-console
-    console.log(`Open this URL in your browser to authorise:`);
-    // eslint-disable-next-line no-console
-    console.log(`  ${cyan(authUrl)}`);
-    // eslint-disable-next-line no-console
-    console.log(dim(`  Code: ${code}`));
-    // eslint-disable-next-line no-console
-    console.log();
-    try {
-        await open(authUrl);
-    }
-    catch {
-        // Headless / CI — the printed URL is fine.
-    }
-    // 3. Poll. Keep the message live so the user sees we're alive.
-    const credentials = await pollForToken({ pollUrl, endpoint });
-    // 4. Save credentials with restrictive perms.
-    await saveCredentials(credentials);
-    // eslint-disable-next-line no-console
-    console.log(green('✔') + ' API key saved to ' + dim('~/.anyforge/credentials'));
-    // 4b. A Claude Pro/Max subscription login is mutually exclusive with
-    //     the BYOK inference proxy: the ANTHROPIC_AUTH_TOKEN we'd patch
-    //     out-ranks (and thereby disables) the subscription login, and the
-    //     proxy has no upstream Anthropic key for a subscription user. So
-    //     we skip patching and steer them to the MCP server instead — which
-    //     keeps their subscription for inference and adds AnyForge control
-    //     on top. `--force` overrides for users who really do want a
-    //     BYOK-keyed metered proxy.
-    const sub = await detectClaudeSubscription();
-    if (sub.isSubscription && !opts.force) {
-        await guideSubscriptionUser(sub, endpoint, credentials.apiKey);
-        return;
-    }
-    // 5. Pick a scope. The repo option only shows when we're sitting
-    //    in a git working tree root — that matches the documented
-    //    contract and avoids accidentally writing settings into a
-    //    subdirectory the operator didn't mean to target.
-    const cwd = process.cwd();
-    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.
-    const patches = await detectAndPatchConfigs({
-        endpoint,
-        apiKey: credentials.apiKey,
-        scope,
-        repoRoot,
-    });
-    if (patches.length === 0) {
-        // eslint-disable-next-line no-console
-        console.log(yellow('No agent configs were patched.'));
-        // 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_AUTH_TOKEN=<your AnyForge key> manually if needed.'));
-    }
-    else {
-        summarisePatches(patches);
-    }
-    // eslint-disable-next-line no-console
-    console.log();
-    if (sub.isSubscription && opts.force) {
-        // They overrode the subscription guard. Be explicit about the
-        // trade-off and the one-command way back.
-        // eslint-disable-next-line no-console
-        console.log(yellow(`  ⚠ --force: your Claude ${sub.plan ?? ''} subscription login is now shadowed`));
-        // eslint-disable-next-line no-console
-        console.log(yellow('    by the AnyForge token — Claude Code will use the BYOK proxy, which'));
-        // eslint-disable-next-line no-console
-        console.log(yellow('    needs an Anthropic API key on your company. Run ') + bold('anyforge logout'));
-        // eslint-disable-next-line no-console
-        console.log(yellow('    to revert and restore your subscription.'));
-    }
-    if (scope === 'repo') {
-        // eslint-disable-next-line no-console
-        console.log(dim('  Re-run this command in another repo to patch it too,'));
-        // eslint-disable-next-line no-console
-        console.log(dim('  or run from any directory and choose "global" to install system-wide.'));
-    }
-    // eslint-disable-next-line no-console
-    console.log(bold('Done.') + ' Visit ' + cyan(`${endpoint}/usage`) + ' to see your traffic.');
-}
-async function pollForToken(args) {
-    const start = Date.now();
-    // eslint-disable-next-line no-console
-    process.stdout.write('Waiting for browser authorisation… ');
-    let dotCount = 0;
-    while (Date.now() - start < POLL_TIMEOUT_MS) {
-        await new Promise(r => setTimeout(r, POLL_INTERVAL_MS));
-        process.stdout.write('.');
-        dotCount += 1;
-        if (dotCount > 40) {
-            process.stdout.write('\n');
-            dotCount = 0;
-        }
-        const res = await fetch(args.pollUrl);
-        const body = (await res.json());
-        if (body.status === 'authorized' && body.data) {
-            process.stdout.write(' ' + green('done') + '\n');
-            return {
-                apiKey: body.data.apiKey,
-                companyId: body.data.companyId,
-                endpoint: args.endpoint,
-                savedAt: new Date().toISOString(),
-            };
-        }
-        if (body.status === 'expired' || body.status === 'not_found') {
-            process.stdout.write('\n');
-            throw new Error(`Authorisation ${body.status}. Re-run \`anyforge init\`.`);
-        }
-    }
-    throw new Error('Authorisation timed out (15 min). Re-run `anyforge init`.');
-}
-/**
- * Steer a subscription user to the MCP server instead of patching the
- * BYOK proxy. The MCP server keeps their Claude Pro/Max login for
- * inference and adds AnyForge control (HIL approvals, work items, crews)
- * on top, with no auth conflict. Offers to run `claude mcp add` for them,
- * and to enable OpenTelemetry usage metrics so their spend is still
- * visible on the AnyForge dashboard even though the proxy isn't in path.
- */
-async function guideSubscriptionUser(sub, endpoint, apiKey) {
-    const who = sub.email ? ` (${sub.email})` : '';
-    /* eslint-disable no-console */
-    console.log();
-    console.log(yellow(`  ⚠ Claude ${sub.plan ?? ''} subscription login detected${who}.`));
-    console.log();
-    console.log('  AnyForge Control’s inference proxy is ' + bold('BYOK-only') + ' — it routes');
-    console.log('  Claude Code through your own Anthropic API key for metering and');
-    console.log('  governance. Pointing Claude Code at the proxy would ' + bold('override and'));
-    console.log('  ' + bold('disable your subscription login') + ', so we did NOT patch your config.');
-    console.log();
-    console.log('  Instead, use your subscription for inference and add the ' + bold('AnyForge'));
-    console.log('  ' + bold('MCP server') + ' for control (HIL approvals, work items, crews):');
-    console.log();
-    const mcpCmd = `claude mcp add anyforge --env ANYFORGE_API_KEY=${apiKey} -- npx -y @anyforge/mcp-server`;
-    const add = await prompts({
-        type: 'confirm',
-        name: 'go',
-        message: 'Add the AnyForge MCP server to Claude Code now?',
-        initial: true,
-    });
-    if (add.go) {
-        try {
-            execFileSync('claude', ['mcp', 'add', 'anyforge', '--env', `ANYFORGE_API_KEY=${apiKey}`, '--', 'npx', '-y', '@anyforge/mcp-server'], { stdio: 'inherit' });
-            console.log(green('  ✔') + ' AnyForge MCP server added to Claude Code.');
-        }
-        catch {
-            console.log(yellow('  Could not run `claude mcp add` automatically (is the `claude` CLI on PATH?).'));
-            console.log(dim('  Add it manually:'));
-            console.log('    ' + mcpCmd);
-        }
-    }
-    else {
-        console.log(dim('  Add it later with:'));
-        console.log('    ' + mcpCmd);
-    }
-    // Spend visibility without the proxy: Claude Code exports OpenTelemetry
-    // usage metrics (token counts + estimated cost — no prompt content) that
-    // AnyForge can ingest. Safe alongside the subscription login (no auth
-    // env touched).
-    console.log();
-    const tel = await prompts({
-        type: 'confirm',
-        name: 'go',
-        message: 'Send Claude Code usage to your AnyForge dashboard? (token counts only — no prompt content)',
-        initial: true,
-    });
-    if (tel.go) {
-        const sum = await patchClaudeTelemetry({ endpoint, apiKey });
-        if (sum) {
-            console.log(green('  ✔') + ' Usage telemetry enabled — view it at ' + cyan(`${endpoint}/usage`));
-            console.log(dim('    (written to ' + sum.path + '; `anyforge logout` removes it)'));
-        }
-    }
-    else {
-        console.log(dim('  Skipped — your subscription usage stays local to Claude Code.'));
-    }
-    console.log();
-    console.log(dim('  Want the metered BYOK proxy instead? Re-run with ') + bold('--force') + dim(' using an'));
-    console.log(dim('  Anthropic API key on your company (this disables your subscription in'));
-    console.log(dim('  Claude Code; ') + bold('anyforge logout') + dim(' reverts it).'));
-    console.log();
-    console.log(bold('Done.') + ' Visit ' + cyan(`${endpoint}/usage`) + ' to see your traffic.');
-    /* eslint-enable no-console */
-}
-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
-        console.log(dim('  Not a git repo root — installing globally.'));
-        // eslint-disable-next-line no-console
-        console.log(dim('  Run this from a repo root if you want a per-repo install instead.'));
-        return 'global';
-    }
-    const choice = await prompts({
-        type: 'select',
-        name: 'scope',
-        message: 'Where should AnyForge patch Claude Code?',
-        choices: [
-            { title: `This repo only (${repoRoot}/.claude/settings.local.json + .env)`, value: 'repo' },
-            { title: 'Globally (~/.claude/settings.json)', value: 'global' },
-        ],
-        initial: 0,
-    });
-    // prompts returns {} on cancel — default to repo since they were given the choice.
-    return choice.scope ?? 'repo';
-}
-function summarisePatches(patches) {
-    // eslint-disable-next-line no-console
-    console.log(green('✔') + ' Patched ' + patches.length + ' agent config' + (patches.length === 1 ? '' : 's') + ':');
-    for (const p of patches) {
-        // eslint-disable-next-line no-console
-        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/dist/commands/logout.js

@@ -1,34 +0,0 @@
-import { green, dim, yellow } from 'kleur/colors';
-import { clearCredentials, loadCredentials } from '../lib/credentials.js';
-import { revertClaudeCodeConfigs } from '../lib/configPatch.js';
-/**
- * `npx @anyforge/control logout` — wipe the local credential file AND
- * revert the config patches `init` wrote (so a previously-shadowed
- * Claude subscription login is restored). Does NOT revoke the key on
- * the server side — that's a separate action on /settings → API keys.
- */
-export async function runLogout() {
-    // Load before clearing so we know which proxy host we patched in
-    // (matters when the user ran `init --endpoint <staging>`).
-    const creds = await loadCredentials();
-    const removed = await clearCredentials();
-    const { reverted } = await revertClaudeCodeConfigs({ endpoint: creds?.endpoint ?? null });
-    /* eslint-disable no-console */
-    if (removed) {
-        console.log(green('✔') + ' Local credentials cleared.');
-    }
-    else {
-        console.log(yellow('No credentials were saved on this machine.'));
-    }
-    if (reverted.length) {
-        console.log(green('✔') + ' Reverted patched configs:');
-        for (const p of reverted)
-            console.log(`  ${dim('•')} ${p}`);
-        console.log(dim('  Your previous Claude Code login (if any) is restored.'));
-    }
-    else {
-        console.log(dim('  No AnyForge config patches found to revert.'));
-    }
-    console.log(dim('  Revoke the key server-side at /settings → API keys.'));
-    /* eslint-enable no-console */
-}

package/dist/commands/status.js

@@ -1,58 +0,0 @@
-import { green, red, yellow, dim } from 'kleur/colors';
-import { loadCredentials } from '../lib/credentials.js';
-export async function runStatus(opts) {
-    const c = await loadCredentials();
-    if (!c) {
-        // eslint-disable-next-line no-console
-        console.log(yellow('Not logged in.') + ' Run ' + dim('npx @anyforge/control init') + ' first.');
-        return;
-    }
-    const endpoint = opts.endpoint || c.endpoint;
-    // eslint-disable-next-line no-console
-    console.log(`Endpoint:  ${endpoint}`);
-    // eslint-disable-next-line no-console
-    console.log(`Company:   ${c.companyId}`);
-    // We don't have a dedicated /v1/health endpoint yet — the cheapest
-    // probe is a 1-token Anthropic Messages call. Costs ~$0.0001, fine.
-    const probeBody = {
-        model: 'claude-3-5-haiku-20241022',
-        max_tokens: 1,
-        messages: [{ role: 'user', content: 'Hi' }],
-    };
-    let res;
-    try {
-        res = await fetch(`${endpoint}/v1/anthropic/messages`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'anthropic-version': '2023-06-01',
-                Authorization: `Bearer ${c.apiKey}`,
-            },
-            body: JSON.stringify(probeBody),
-        });
-    }
-    catch (err) {
-        // eslint-disable-next-line no-console
-        console.log(red('✗ Proxy unreachable: ') + err.message);
-        process.exit(1);
-    }
-    if (res.status === 401) {
-        // eslint-disable-next-line no-console
-        console.log(red('✗ API key rejected.') + ' Re-run ' + dim('npx @anyforge/control init') + '.');
-        process.exit(1);
-    }
-    if (res.status === 502) {
-        // eslint-disable-next-line no-console
-        console.log(red('✗ No BYOK Anthropic key configured for your company.'));
-        // eslint-disable-next-line no-console
-        console.log(dim('  Add one at ') + endpoint + dim('/settings → API keys.'));
-        process.exit(1);
-    }
-    if (!res.ok) {
-        // eslint-disable-next-line no-console
-        console.log(red(`✗ Proxy returned ${res.status}: `) + (await res.text()).slice(0, 200));
-        process.exit(1);
-    }
-    // eslint-disable-next-line no-console
-    console.log(green('✔ Proxy reachable, key valid, BYOK configured.'));
-}

package/dist/commands/whoami.js

@@ -1,23 +0,0 @@
-import { dim, yellow } from 'kleur/colors';
-import { loadCredentials } from '../lib/credentials.js';
-/**
- * `npx @anyforge/control whoami` — show the company id tied to the
- * currently saved credential. Useful for verifying the right device
- * is configured before running long agent sessions.
- */
-export async function runWhoami() {
-    const c = await loadCredentials();
-    if (!c) {
-        // eslint-disable-next-line no-console
-        console.log(yellow('Not logged in.') + ' Run ' + dim('npx @anyforge/control init') + ' first.');
-        return;
-    }
-    // eslint-disable-next-line no-console
-    console.log(`Company:  ${c.companyId}`);
-    // eslint-disable-next-line no-console
-    console.log(`Endpoint: ${c.endpoint}`);
-    // eslint-disable-next-line no-console
-    console.log(`Saved:    ${new Date(c.savedAt).toLocaleString()}`);
-    // eslint-disable-next-line no-console
-    console.log(`Key tail: ${dim('…' + c.apiKey.slice(-4))}`);
-}