@falkenslab/agent-kit 0.31.0 → 0.33.0

package/dist/tui/claudeAuth.d.ts

@@ -1,21 +1,16 @@
-import { type ClaudeAuthConfig } from "../core/claudeAuth.js";
 /**
- * The terminal-facing counterpart to `resolveClaudeAuth()` (core/claudeAuth.ts), which only
- * *looks up* a token. This one also gets you one: if `resolveClaudeAuth(config)` comes back
- * empty, it prints why, offers to run "claude setup-token" interactively, and sets the
- * result on `process.env.CLAUDE_CODE_OAUTH_TOKEN` for this run. Exits the process if the
- * user declines or cancels — there's no agent to run without a token.
+ * Makes sure the agent can reach Claude before a terminal chat starts: returns at once when
+ * `claudeSignedIn()` says so (an API key or the person's own token in the environment, or a
+ * Claude Code sign-in). Otherwise it says why, asks whether to sign in, and runs Claude Code's
+ * own `claude auth login` (the binary the Agent SDK ships) on this terminal: Anthropic's page in
+ * the browser, the code it shows pasted here. The binary keeps the credentials; nothing is
+ * returned or stored (ADR-009: Anthropic's terms forbid an agent collecting them). Exits the
+ * process when the person declines or the sign-in doesn't complete: there's no agent to run
+ * without Claude.
  *
- * Persisting a freshly-generated token across runs is *not* this function's job — unlike an
- * earlier version, this kit owns no config-file storage of its own (see git history). When
- * the interactive flow does generate one, it's returned so the caller can save it wherever
- * it wants (a file, an OS keychain, ...) and pass it back in as `config.claudeCodeOAuthToken`
- * next time; returns `undefined` when auth was already resolved (an env var, or the `config`
- * passed in) and nothing new was generated.
- *
- * Only makes sense with a real terminal in front of a human (a `runWizard()` confirm, colored console
- * output), which is why it lives here rather than in the non-interactive core.
+ * Only makes sense with a terminal in front of a person (a `runWizard()` confirm, colored
+ * output); a host without one uses `startClaudeSignIn()` from the core.
  */
-export declare function ensureClaudeAuth(config?: ClaudeAuthConfig, options?: {
+export declare function ensureClaudeAuth(options?: {
     language?: string;
-}): Promise<string | undefined>;
+}): Promise<void>;

package/dist/tui/claudeAuth.js

@@ -1,78 +1,47 @@
 import { spawn } from "node:child_process";
-import { resolveClaudeAuth } from "../core/claudeAuth.js";
+import { claudeCommand, claudeExecutable, claudeSignedIn } from "../core/claudeAuth.js";
 import { isExitPromptError } from "./promptErrors.js";
 import * as ui from "./ui.js";
 import { runWizard } from "./ink/wizard.js";
 import { applyLanguage } from "./language.js";
 import { t } from "../core/messages/index.js";
-// The real format of "claude setup-token" tokens ("sk-ant-oat01-...", seen in the
-// installed @anthropic-ai/claude-code binary) — used to extract the token from its output.
-const TOKEN_PATTERN = /sk-ant-oat\d{2}-[A-Za-z0-9_-]+/;
-/**
- * Launches "claude setup-token" as an interactive child process: it opens a browser and
- * asks the user to authenticate, with instructions it prints itself. stdin/stderr are
- * inherited as-is so the interaction (pasting the authorization code, etc.) is identical
- * to running the command by hand; stdout is duplicated live and also buffered to extract
- * the token it prints at the end ("Your OAuth token (...): sk-ant-oat01-...").
- */
-function runSetupToken() {
-    return new Promise((resolve, reject) => {
-        // On Windows npx is npx.cmd, which only runs through a shell. The command is passed as
-        // one fixed string there (nothing user-supplied in it): an args array with
-        // `shell: true` triggers Node's DEP0190 warning, since args are concatenated unescaped.
-        const stdio = ["inherit", "pipe", "inherit"];
-        const child = process.platform === "win32"
-            ? spawn("npx @anthropic-ai/claude-code setup-token", { stdio, shell: true })
-            : spawn("npx", ["@anthropic-ai/claude-code", "setup-token"], { stdio });
-        let output = "";
-        child.stdout.on("data", (chunk) => {
-            const text = chunk.toString("utf-8");
-            output += text;
-            process.stdout.write(text);
-        });
-        child.on("error", reject);
-        child.on("exit", (code) => {
-            if (code !== 0) {
-                reject(new Error(`"claude setup-token" exited with code ${code}.`));
-                return;
-            }
-            const match = output.match(TOKEN_PATTERN);
-            if (!match) {
-                reject(new Error('"claude setup-token" exited without errors, but no token was found in its ' +
-                    "output (sk-ant-oat...). Copy it by hand into CLAUDE_CODE_OAUTH_TOKEN if you see it above."));
-                return;
-            }
-            resolve(match[0]);
-        });
+/** Runs Claude Code's own `auth login` on this terminal: it opens the browser, and the person pastes the code here. */
+function runLogin(executable) {
+    const command = claudeCommand(executable, ["auth", "login"]);
+    return new Promise((resolve) => {
+        const child = spawn(command.file, command.args, { stdio: "inherit" });
+        child.on("error", () => resolve());
+        child.on("close", () => resolve());
     });
 }
 /**
- * The terminal-facing counterpart to `resolveClaudeAuth()` (core/claudeAuth.ts), which only
- * *looks up* a token. This one also gets you one: if `resolveClaudeAuth(config)` comes back
- * empty, it prints why, offers to run "claude setup-token" interactively, and sets the
- * result on `process.env.CLAUDE_CODE_OAUTH_TOKEN` for this run. Exits the process if the
- * user declines or cancels — there's no agent to run without a token.
- *
- * Persisting a freshly-generated token across runs is *not* this function's job — unlike an
- * earlier version, this kit owns no config-file storage of its own (see git history). When
- * the interactive flow does generate one, it's returned so the caller can save it wherever
- * it wants (a file, an OS keychain, ...) and pass it back in as `config.claudeCodeOAuthToken`
- * next time; returns `undefined` when auth was already resolved (an env var, or the `config`
- * passed in) and nothing new was generated.
+ * Makes sure the agent can reach Claude before a terminal chat starts: returns at once when
+ * `claudeSignedIn()` says so (an API key or the person's own token in the environment, or a
+ * Claude Code sign-in). Otherwise it says why, asks whether to sign in, and runs Claude Code's
+ * own `claude auth login` (the binary the Agent SDK ships) on this terminal: Anthropic's page in
+ * the browser, the code it shows pasted here. The binary keeps the credentials; nothing is
+ * returned or stored (ADR-009: Anthropic's terms forbid an agent collecting them). Exits the
+ * process when the person declines or the sign-in doesn't complete: there's no agent to run
+ * without Claude.
  *
- * Only makes sense with a real terminal in front of a human (a `runWizard()` confirm, colored console
- * output), which is why it lives here rather than in the non-interactive core.
+ * Only makes sense with a terminal in front of a person (a `runWizard()` confirm, colored
+ * output); a host without one uses `startClaudeSignIn()` from the core.
  */
-export async function ensureClaudeAuth(config = {}, options = {}) {
-    if (resolveClaudeAuth(config))
-        return undefined;
+export async function ensureClaudeAuth(options = {}) {
+    if (await claudeSignedIn())
+        return;
     applyLanguage(options.language);
     const texts = t().auth;
-    console.log(ui.warn(`\n${texts.noToken}`));
-    console.log(ui.dim(texts.noTokenDetail));
+    const executable = claudeExecutable();
+    if (!executable) {
+        console.log(ui.error(`\n${texts.noClaude}`));
+        process.exit(1);
+    }
+    console.log(ui.warn(`\n${texts.notSignedIn}`));
+    console.log(ui.dim(texts.notSignedInDetail));
     try {
-        const { generate } = await runWizard([{ type: "confirm", name: "generate", message: texts.generateQuestion, default: true }]);
-        if (!generate) {
+        const { signIn } = await runWizard([{ type: "confirm", name: "signIn", message: texts.signInQuestion, default: true }]);
+        if (!signIn) {
             console.log(ui.error(`\n${texts.cantStart}`));
             process.exit(0);
         }
@@ -82,10 +51,12 @@ export async function ensureClaudeAuth(config = {}, options = {}) {
             process.exit(0);
         throw error;
     }
-    console.log(ui.heading(`\n${texts.generatingHeading}`));
+    console.log(ui.heading(`\n${texts.signingInHeading}`));
     console.log(ui.dim(`${texts.browserWillOpen}\n`));
-    const token = await runSetupToken();
-    process.env.CLAUDE_CODE_OAUTH_TOKEN = token;
-    console.log(ui.success(`\n${texts.generated}\n`));
-    return token;
+    await runLogin(executable);
+    if (!(await claudeSignedIn())) {
+        console.log(ui.error(`\n${texts.notCompleted}`));
+        process.exit(1);
+    }
+    console.log(ui.success(`\n${texts.signedIn}\n`));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@falkenslab/agent-kit",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "description": "Library for building an agent on top of the Claude Agent SDK",
   "author": "Francisco Vargas Ruiz",
   "license": "MIT",
@@ -30,6 +30,17 @@
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./mcp": {
+      "types": "./dist/mcp/index.d.ts",
+      "default": "./dist/mcp/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist",
     "assets",
@@ -52,6 +63,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.3.300",
     "@inkjs/ui": "^2.0.0",
     "@inquirer/prompts": "^8.5.2",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@types/react": "^19.3.0",
     "ink": "^6.8.0",
     "isomorphic-git": "^1.44.5",