@prestyj/cli 4.11.4 → 4.12.1

package/dist/core/api-benchmark.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Real-API speed benchmark — sends actual requests to a live provider and
+ * measures TTFT, output throughput, cache behavior, and wall-clock latency.
+ *
+ * Unlike the mock benchmark, this hits real endpoints and produces
+ * production-representative numbers. Uses gg's own AuthStorage to resolve
+ * credentials (same path as a real session).
+ *
+ * Usage:
+ *   npx tsx src/core/api-benchmark.ts
+ *
+ * Environment overrides:
+ *   GG_BENCH_PROVIDER  — provider name (default: "glm")
+ *   GG_BENCH_MODEL     — model id (default: "glm-5.2")
+ *   GG_BENCH_TURNS     — number of turns (default: 5)
+ */
+export interface ApiTurnMetrics {
+    turn: number;
+    prompt: string;
+    ttftMs: number;
+    outputTokens: number;
+    outputDurationMs: number;
+    tokensPerSecond: number;
+    wallClockMs: number;
+    inputTokens: number;
+    cacheRead: number;
+    cacheWrite: number;
+    cacheHit: boolean;
+    stopReason: string;
+}
+export interface ApiBenchmarkResult {
+    provider: string;
+    model: string;
+    turns: ApiTurnMetrics[];
+    totalWallClockMs: number;
+    totalTtftMs: number;
+    totalOutputTokens: number;
+    avgTokensPerSecond: number;
+    avgTtftMs: number;
+    cacheHits: number;
+    cacheHitRate: number;
+}
+export declare function runApiBenchmark(config: {
+    provider: string;
+    model: string;
+    apiKey: string;
+    baseUrl?: string;
+    accountId?: string;
+    cacheRetention?: "short" | "long";
+    promptCacheKey?: string;
+    turns?: number;
+}): Promise<ApiBenchmarkResult>;
+export declare function formatApiResult(result: ApiBenchmarkResult): string;
+export interface ApiComparisonResult {
+    baseline: ApiBenchmarkResult;
+    optimized: ApiBenchmarkResult;
+    ttftImprovement: number;
+    throughputImprovement: number;
+    wallClockImprovement: number;
+    cacheHitRateDelta: number;
+}
+/** Format an A/B comparison between two API benchmark runs. */
+export declare function formatApiComparison(c: ApiComparisonResult): string;
+//# sourceMappingURL=api-benchmark.d.ts.map

package/dist/core/api-benchmark.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-benchmark.d.ts","sourceRoot":"","sources":["../../src/core/api-benchmark.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAwDD,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0I9B;AAID,wBAAgB,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAsClE;AAeD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,+DAA+D;AAC/D,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAiClE"}

package/dist/core/api-benchmark.js

@@ -0,0 +1,381 @@
+/**
+ * Real-API speed benchmark — sends actual requests to a live provider and
+ * measures TTFT, output throughput, cache behavior, and wall-clock latency.
+ *
+ * Unlike the mock benchmark, this hits real endpoints and produces
+ * production-representative numbers. Uses gg's own AuthStorage to resolve
+ * credentials (same path as a real session).
+ *
+ * Usage:
+ *   npx tsx src/core/api-benchmark.ts
+ *
+ * Environment overrides:
+ *   GG_BENCH_PROVIDER  — provider name (default: "glm")
+ *   GG_BENCH_MODEL     — model id (default: "glm-5.2")
+ *   GG_BENCH_TURNS     — number of turns (default: 5)
+ */
+import { stream } from "@prestyj/ai";
+import { AuthStorage } from "./auth-storage.js";
+// ── System prompt (realistic coding-agent prefix) ──────────
+function buildSystemPrompt() {
+    return [
+        "You are EZ Coder — a coding agent that works directly in the user's codebase.",
+        "You explore, understand, change, and verify code — completing tasks end-to-end",
+        "rather than just suggesting edits.",
+        "",
+        "## How to Talk",
+        "Don't narrate tool calls. Stay silent between tools unless you have a decision.",
+        "Final replies: 1-3 sentences, hard cap 5.",
+        "",
+        "## How to Work",
+        "- Read before edit/write; re-read after formatters or codegen.",
+        "- Compute in bash; write with edit/write so read-tracking stays intact.",
+        "- Keep edits small; plan multi-file work first.",
+        "- Choose targeted verification appropriate to the change.",
+        "",
+        "## Tools",
+        "- read: Read file contents",
+        "- write: Write file contents",
+        "- edit: Replace text in a file via search-replace blocks",
+        "- bash: Execute shell commands",
+        "- grep: Search file contents using regex",
+        "- find: Find files matching a glob pattern",
+        "",
+        "## Code Quality",
+        "Intent-revealing names; reuse existing deps. Types first; handle I/O and errors.",
+        "No dead/commented code, placeholders, or unasked refactors.",
+        "",
+        "## Environment",
+        "- Working directory: /home/user/my-project",
+        "- Platform: linux",
+        "",
+        "<!-- uncached -->",
+        "Today's date: 20 June 2026",
+    ].join("\n");
+}
+// ── Conversation turns ──────────────────────────────────────
+/** Prompts designed to produce 100-300 token responses so throughput
+ *  measurement is meaningful (the simple one-liners gave 8-13 tokens
+ *  which made tok/s unreliable). */
+const CONVERSATION_TURNS = [
+    "Write a TypeScript function `rateLimit(opts: { maxAttempts: number; windowMs: number })` that returns an Express middleware. Include the full implementation with comments, error handling, and an in-memory store. Make it production quality.",
+    "Now write a test file for that rate limiter using vitest. Cover the happy path, rate limit exceeded, window reset, and multiple IPs. Include at least 4 test cases with full implementations.",
+    "Refactor the rate limiter to support a Redis backend as an alternative to the in-memory store. Show the interface, both implementations, and a factory function. Keep it backward compatible.",
+    "Write a README section documenting the rate limiter API: installation, usage examples for both backends, configuration options, and a comparison table of in-memory vs Redis.",
+    "Review the entire rate limiter module for security issues, edge cases, and performance. Write a brief analysis with specific findings and recommended fixes for each issue.",
+];
+// ── Benchmark runner ────────────────────────────────────────
+export async function runApiBenchmark(config) {
+    const { provider, model, apiKey, baseUrl, accountId, cacheRetention = "long", promptCacheKey = `bench-${Date.now()}`, turns = 5, } = config;
+    const messages = [{ role: "system", content: buildSystemPrompt() }];
+    const turnMetrics = [];
+    for (let i = 0; i < turns; i++) {
+        const userPrompt = CONVERSATION_TURNS[i % CONVERSATION_TURNS.length];
+        messages.push({ role: "user", content: userPrompt });
+        const turnStart = Date.now();
+        let ttftMs = 0;
+        let firstToken = true;
+        const result = stream({
+            provider: provider,
+            model,
+            messages: [...messages],
+            maxTokens: 1024,
+            apiKey,
+            baseUrl,
+            accountId,
+            cacheRetention,
+            promptCacheKey,
+        });
+        let response;
+        try {
+            // Consume the stream, measuring TTFT on first event.
+            for await (const event of result) {
+                if (firstToken && (event.type === "text_delta" || event.type === "thinking_delta")) {
+                    ttftMs = Date.now() - turnStart;
+                    firstToken = false;
+                }
+                if (event.type === "text_delta") {
+                    // Output counting happens via usage.outputTokens from the response.
+                }
+            }
+            response = await result.response;
+        }
+        catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            console.error(`  Turn ${i + 1} FAILED: ${errMsg.slice(0, 200)}`);
+            turnMetrics.push({
+                turn: i + 1,
+                prompt: userPrompt.slice(0, 50),
+                ttftMs: 0,
+                outputTokens: 0,
+                outputDurationMs: 0,
+                tokensPerSecond: 0,
+                wallClockMs: Date.now() - turnStart,
+                inputTokens: 0,
+                cacheRead: 0,
+                cacheWrite: 0,
+                cacheHit: false,
+                stopReason: "error",
+            });
+            // Don't continue — conversation context is broken after an error
+            break;
+        }
+        const wallClockMs = Date.now() - turnStart;
+        const outputTokens = response.usage.outputTokens;
+        const outputDurationMs = wallClockMs - ttftMs;
+        const tokensPerSecond = outputDurationMs > 0 ? (outputTokens / outputDurationMs) * 1000 : 0;
+        const cacheRead = response.usage.cacheRead ?? 0;
+        turnMetrics.push({
+            turn: i + 1,
+            prompt: userPrompt.slice(0, 50),
+            ttftMs,
+            outputTokens,
+            outputDurationMs,
+            tokensPerSecond,
+            wallClockMs,
+            inputTokens: response.usage.inputTokens,
+            cacheRead,
+            cacheWrite: response.usage.cacheWrite ?? 0,
+            cacheHit: cacheRead > 0,
+            stopReason: response.stopReason,
+        });
+        // Append assistant reply for next turn.
+        const assistantContent = typeof response.message.content === "string"
+            ? response.message.content
+            : response.message.content
+                .filter((p) => p.type === "text")
+                .map((p) => p.text ?? "")
+                .join("");
+        messages.push({ role: "assistant", content: assistantContent });
+        // Brief pause between turns (realistic user think time).
+        if (i < turns - 1) {
+            await sleep(2000);
+        }
+        // Progress output.
+        process.stdout.write(`  Turn ${i + 1}/${turns}: TTFT ${ttftMs}ms | ${tokensPerSecond.toFixed(0)} tok/s | ` +
+            `${outputTokens} out | cache ${cacheRead > 0 ? "HIT" : "miss"}` +
+            `${cacheRead > 0 ? ` (${cacheRead} tok)` : ""}\n`);
+    }
+    const totalWallClockMs = turnMetrics.reduce((s, t) => s + t.wallClockMs, 0);
+    const totalTtftMs = turnMetrics.reduce((s, t) => s + t.ttftMs, 0);
+    const totalOutputTokens = turnMetrics.reduce((s, t) => s + t.outputTokens, 0);
+    const cacheHits = turnMetrics.filter((t) => t.cacheHit).length;
+    const validTurns = turnMetrics.filter((t) => t.stopReason !== "error");
+    const avgTokensPerSecond = validTurns.length > 0
+        ? validTurns.reduce((s, t) => s + t.tokensPerSecond, 0) / validTurns.length
+        : 0;
+    const avgTtftMs = validTurns.length > 0 ? totalTtftMs / validTurns.length : 0;
+    return {
+        provider,
+        model,
+        turns: turnMetrics,
+        totalWallClockMs,
+        totalTtftMs,
+        totalOutputTokens,
+        avgTokensPerSecond,
+        avgTtftMs,
+        cacheHits,
+        cacheHitRate: turnMetrics.length > 0 ? cacheHits / turnMetrics.length : 0,
+    };
+}
+// ── Formatting ──────────────────────────────────────────────
+export function formatApiResult(result) {
+    const lines = [];
+    lines.push("");
+    lines.push("╔══════════════════════════════════════════════════════════════╗");
+    lines.push(`║  API BENCHMARK: ${result.provider} / ${result.model}`.padEnd(63) + "║");
+    lines.push("╠══════════════════════════════════════════════════════════════╣");
+    lines.push("");
+    lines.push("┌──────┬────────────┬──────────┬───────────┬────────┬──────────┐");
+    lines.push("│ Turn │ TTFT       │ Output   │ Tok/s     │ Cache  │ Wall     │");
+    lines.push("├──────┼────────────┼──────────┼───────────┼────────┼──────────┤");
+    for (const t of result.turns) {
+        const cacheLabel = t.cacheHit ? " HIT " : "miss";
+        lines.push(`│ ${String(t.turn).padStart(4)} │ ${fmt(t.ttftMs).padStart(10)} │ ` +
+            `${String(t.outputTokens).padStart(8)} │ ${t.tokensPerSecond.toFixed(0).padStart(9)} │ ` +
+            `${cacheLabel} │ ${fmt(t.wallClockMs).padStart(8)} │`);
+    }
+    lines.push("└──────┴────────────┴──────────┴───────────┴────────┴──────────┘");
+    lines.push("");
+    lines.push("┌─────────────────────────────┬──────────────────────────────┐");
+    lines.push("│ Metric                      │ Value                        │");
+    lines.push("├─────────────────────────────┼──────────────────────────────┤");
+    lines.push(`│ Avg TTFT                    │ ${fmt(result.avgTtftMs).padStart(28)} │`);
+    lines.push(`│ Avg output throughput       │ ${result.avgTokensPerSecond.toFixed(0).padStart(22)} tok/s │`);
+    lines.push(`│ Total output tokens         │ ${String(result.totalOutputTokens).padStart(28)} │`);
+    lines.push(`│ Total wall-clock            │ ${fmt(result.totalWallClockMs).padStart(28)} │`);
+    lines.push(`│ Cache hits                  │ ${String(result.cacheHits).padStart(28)} │`);
+    lines.push(`│ Cache hit rate              │ ${(result.cacheHitRate * 100).toFixed(0).padStart(27)}% │`);
+    lines.push("└─────────────────────────────┴──────────────────────────────┘");
+    lines.push("");
+    return lines.join("\n");
+}
+function fmt(ms) {
+    if (ms < 1000)
+        return `${Math.round(ms)}ms`;
+    return `${(ms / 1000).toFixed(2)}s`;
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/** Format an A/B comparison between two API benchmark runs. */
+export function formatApiComparison(c) {
+    const lines = [];
+    lines.push("");
+    lines.push("╔══════════════════════════════════════════════════════════════╗");
+    lines.push("║      REAL API A/B: BASELINE vs OPTIMIZED                   ║");
+    lines.push("╚══════════════════════════════════════════════════════════════╝");
+    lines.push("");
+    lines.push(formatApiResult(c.baseline));
+    lines.push(formatApiResult(c.optimized));
+    lines.push("┌─────────────────────────────┬──────────────┬──────────────┬───────────┐");
+    lines.push("│ Metric                      │    Baseline  │   Optimized  │    Delta  │");
+    lines.push("├─────────────────────────────┼──────────────┼──────────────┼───────────┤");
+    // TTFT/wall-clock: delta = (baseline - optimized), positive = faster = show -X%.
+    const pctDown = (delta) => `${delta >= 0 ? "-" : "+"}${Math.abs(delta).toFixed(1).padStart(5)}%`;
+    // Throughput: delta = (optimized - baseline), positive = faster = show +X%.
+    const pctUp = (delta) => `${delta >= 0 ? "+" : "-"}${Math.abs(delta).toFixed(1).padStart(5)}%`;
+    lines.push(`│ Avg TTFT                    │ ${fmt(c.baseline.avgTtftMs).padStart(11)} │ ${fmt(c.optimized.avgTtftMs).padStart(11)} │ ${pctDown(c.ttftImprovement).padStart(8)} │`);
+    lines.push(`│ Avg throughput (tok/s)      │ ${String(c.baseline.avgTokensPerSecond.toFixed(0)).padStart(11)} │ ${String(c.optimized.avgTokensPerSecond.toFixed(0)).padStart(11)} │ ${pctUp(c.throughputImprovement).padStart(8)} │`);
+    lines.push(`│ Total wall-clock            │ ${fmt(c.baseline.totalWallClockMs).padStart(11)} │ ${fmt(c.optimized.totalWallClockMs).padStart(11)} │ ${pctDown(c.wallClockImprovement).padStart(8)} │`);
+    lines.push(`│ Cache hit rate              │ ${(c.baseline.cacheHitRate * 100).toFixed(0).padStart(10)}% │ ${(c.optimized.cacheHitRate * 100).toFixed(0).padStart(10)}% │ ${c.cacheHitRateDelta >= 0 ? "+" : ""}${c.cacheHitRateDelta.toFixed(0).padStart(5)}pp │`);
+    lines.push("└─────────────────────────────┴──────────────┴──────────────┴───────────┘");
+    lines.push("");
+    return lines.join("\n");
+}
+async function main() {
+    const provider = process.env.GG_BENCH_PROVIDER ?? "glm";
+    const model = process.env.GG_BENCH_MODEL ?? "glm-5.2";
+    const turns = parseInt(process.env.GG_BENCH_TURNS ?? "5", 10);
+    const mode = process.env.GG_BENCH_MODE ?? "compare"; // "single" or "compare"
+    // Resolve credentials using gg's AuthStorage (same path as a real session).
+    const authStorage = new AuthStorage();
+    await authStorage.load();
+    let apiKey;
+    let baseUrl;
+    let accountId;
+    try {
+        const creds = await authStorage.resolveCredentials(provider);
+        apiKey = creds.accessToken;
+        baseUrl = creds.baseUrl;
+        accountId = creds.accountId;
+    }
+    catch (err) {
+        console.error(`❌ Could not resolve credentials for "${provider}". ` +
+            `Make sure you're logged in: run \`ezcoder login\` and choose ${provider}.\n` +
+            `   Error: ${err instanceof Error ? err.message : String(err)}`);
+        process.exit(1);
+    }
+    if (!apiKey) {
+        console.error(`❌ Resolved credentials for "${provider}" but accessToken is empty.`);
+        process.exit(1);
+    }
+    console.log(`\n🔍 API Benchmark: ${provider}/${model} — mode: ${mode} (${turns} turns)`);
+    console.log(`   API key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`);
+    console.log(`   Base URL: ${baseUrl ?? "(provider default)"}`);
+    if (accountId)
+        console.log(`   Account ID: ${accountId}`);
+    console.log("");
+    if (mode === "single") {
+        const result = await runApiBenchmark({
+            provider,
+            model,
+            apiKey,
+            baseUrl,
+            accountId,
+            cacheRetention: "long",
+            promptCacheKey: `bench-${provider}-${Date.now()}`,
+            turns,
+        });
+        console.log(formatApiResult(result));
+        return;
+    }
+    // A/B comparison mode.
+    console.log("━".repeat(50));
+    console.log("▶ BASELINE: cacheRetention=short, no prewarm");
+    console.log("━".repeat(50));
+    const baseline = await runApiBenchmark({
+        provider,
+        model,
+        apiKey,
+        baseUrl,
+        accountId,
+        cacheRetention: "short",
+        promptCacheKey: `bench-base-${provider}-${Date.now()}`,
+        turns,
+    });
+    // Cool-down between runs so the second run isn't affected by connection warming.
+    console.log("\n⏳ Cooling down 5s between runs...\n");
+    await sleep(5000);
+    console.log("━".repeat(50));
+    console.log("▶ OPTIMIZED: cacheRetention=long + prewarm");
+    console.log("━".repeat(50));
+    // Fire a prewarm request before the optimized run (same as AgentSession does).
+    if (provider === "anthropic") {
+        const { prewarmAnthropicCache } = await import("@prestyj/ai");
+        await prewarmAnthropicCache({
+            apiKey,
+            model,
+            system: buildSystemPrompt(),
+            cacheRetention: "long",
+            baseUrl,
+        }).catch(() => { });
+        console.log("   (prewarm sent)");
+    }
+    else {
+        // For non-Anthropic providers, fire a minimal warm-up request to prime
+        // the provider's prefix cache (GLM, OpenAI, etc. auto-cache on first hit).
+        console.log("   (warm-up request for prefix cache)");
+        await runApiBenchmark({
+            provider,
+            model,
+            apiKey,
+            baseUrl,
+            accountId,
+            cacheRetention: "long",
+            promptCacheKey: `bench-warm-${provider}-${Date.now()}`,
+            turns: 1,
+        }).catch(() => { });
+    }
+    const optimized = await runApiBenchmark({
+        provider,
+        model,
+        apiKey,
+        baseUrl,
+        accountId,
+        cacheRetention: "long",
+        promptCacheKey: `bench-opt-${provider}-${Date.now()}`,
+        turns,
+    });
+    const ttftImprovement = baseline.avgTtftMs > 0
+        ? ((baseline.avgTtftMs - optimized.avgTtftMs) / baseline.avgTtftMs) * 100
+        : 0;
+    const throughputImprovement = baseline.avgTokensPerSecond > 0
+        ? ((optimized.avgTokensPerSecond - baseline.avgTokensPerSecond) /
+            baseline.avgTokensPerSecond) *
+            100
+        : 0;
+    const wallClockImprovement = baseline.totalWallClockMs > 0
+        ? ((baseline.totalWallClockMs - optimized.totalWallClockMs) / baseline.totalWallClockMs) * 100
+        : 0;
+    const comparison = {
+        baseline,
+        optimized,
+        ttftImprovement,
+        throughputImprovement,
+        wallClockImprovement,
+        cacheHitRateDelta: (optimized.cacheHitRate - baseline.cacheHitRate) * 100,
+    };
+    console.log(formatApiComparison(comparison));
+}
+// Run when executed directly (not when imported by tests).
+const isDirectRun = process.argv[1]?.endsWith("api-benchmark.ts") ||
+    process.argv[1]?.endsWith("api-benchmark.js") ||
+    process.argv[1]?.endsWith("api-benchmark");
+if (isDirectRun) {
+    main().catch((err) => {
+        console.error("Benchmark failed:", err);
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=api-benchmark.js.map

package/dist/core/api-benchmark.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-benchmark.js","sourceRoot":"","sources":["../../src/core/api-benchmark.ts"],"names":[],"mappings":"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"}

package/dist/core/mcp/client.d.ts

@@ -7,6 +7,15 @@ export interface MCPConnectResult {
     toolCount: number;
     tools: AgentTool[];
     error?: string;
+    /** True when the server returned 401/Unauthorized and an OAuth login is
+     *  required before it can connect. The UI surfaces this as "requires login". */
+    requiresAuth?: boolean;
+}
+/** Outcome of an interactive remote-MCP OAuth login. */
+export interface MCPLoginResult {
+    ok: boolean;
+    toolCount: number;
+    error?: string;
 }
 export declare class MCPClientManager {
     private servers;
@@ -23,6 +32,18 @@ export declare class MCPClientManager {
      * server before persisting it.
      */
     probe(config: MCPServerConfig): Promise<MCPConnectResult>;
+    /**
+     * Run the interactive OAuth login for one remote MCP server end-to-end:
+     * start a loopback callback server, let the SDK open the browser via
+     * `onAuthorizationUrl`, capture the redirect, exchange the code, then verify
+     * the authorized connection by listing tools. Tokens are persisted by the
+     * provider so later (non-interactive) connects succeed silently.
+     *
+     * `onAuthorizationUrl` is invoked with the authorize URL so the host can open
+     * it (the ezcoder-app broadcasts it to the webview, which opens the system
+     * browser; the CLI prints it). Never throws — returns `{ ok:false, error }`.
+     */
+    login(config: MCPServerConfig, onAuthorizationUrl: (url: string) => void, timeoutMs?: number): Promise<MCPLoginResult>;
     private connectServer;
     dispose(): Promise<void>;
 }

package/dist/core/mcp/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AASlD,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAyB;IAElC,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKlE;;;;OAIG;IACG,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBjF;;;;OAIG;IACG,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAmBjD,aAAa;IAsHrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/core/mcp/client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAelD,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;oFACgF;IAChF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAyB;IAElC,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKlE;;;;OAIG;IACG,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAuBjF;;;;OAIG;IACG,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoB/D;;;;;;;;;;OAUG;IACG,KAAK,CACT,MAAM,EAAE,eAAe,EACvB,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EACzC,SAAS,SAAU,GAClB,OAAO,CAAC,cAAc,CAAC;YAwHZ,aAAa;IA+HrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}