indusagi-coding-agent 0.50.0

package/dist/core/auth-storage.js

@@ -0,0 +1,278 @@
+/**
+ * Credential storage for API keys and OAuth tokens.
+ * Handles loading, saving, and refreshing credentials from auth.json.
+ *
+ * Uses file locking to prevent race conditions when multiple indusagi instances
+ * try to refresh tokens simultaneously.
+ */
+import { getEnvApiKey, getOAuthApiKey, getOAuthProvider, getOAuthProviders, } from "indusagi/ai";
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { dirname, join } from "path";
+import lockfile from "proper-lockfile";
+import { getAgentDir } from "../config.js";
+/**
+ * Credential storage backed by a JSON file.
+ */
+export class AuthStorage {
+    constructor(authPath = join(getAgentDir(), "auth.json")) {
+        this.authPath = authPath;
+        this.data = {};
+        this.runtimeOverrides = new Map();
+        this.reload();
+    }
+    /**
+     * Set a runtime API key override (not persisted to disk).
+     * Used for CLI --api-key flag.
+     */
+    setRuntimeApiKey(provider, apiKey) {
+        this.runtimeOverrides.set(provider, apiKey);
+    }
+    /**
+     * Remove a runtime API key override.
+     */
+    removeRuntimeApiKey(provider) {
+        this.runtimeOverrides.delete(provider);
+    }
+    /**
+     * Set a fallback resolver for API keys not found in auth.json or env vars.
+     * Used for custom provider keys from models.json.
+     */
+    setFallbackResolver(resolver) {
+        this.fallbackResolver = resolver;
+    }
+    /**
+     * Reload credentials from disk.
+     */
+    reload() {
+        if (!existsSync(this.authPath)) {
+            this.data = {};
+            return;
+        }
+        try {
+            this.data = JSON.parse(readFileSync(this.authPath, "utf-8"));
+        }
+        catch {
+            this.data = {};
+        }
+    }
+    /**
+     * Save credentials to disk.
+     */
+    save() {
+        const dir = dirname(this.authPath);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true, mode: 0o700 });
+        }
+        writeFileSync(this.authPath, JSON.stringify(this.data, null, 2), "utf-8");
+        chmodSync(this.authPath, 0o600);
+    }
+    /**
+     * Get credential for a provider.
+     */
+    get(provider) {
+        return this.data[provider] ?? undefined;
+    }
+    /**
+     * Set credential for a provider.
+     */
+    set(provider, credential) {
+        this.data[provider] = credential;
+        this.save();
+    }
+    /**
+     * Remove credential for a provider.
+     */
+    remove(provider) {
+        delete this.data[provider];
+        this.save();
+    }
+    /**
+     * List all providers with credentials.
+     */
+    list() {
+        return Object.keys(this.data);
+    }
+    /**
+     * Check if credentials exist for a provider in auth.json.
+     */
+    has(provider) {
+        return provider in this.data;
+    }
+    /**
+     * Check if any form of auth is configured for a provider.
+     * Unlike getApiKey(), this doesn't refresh OAuth tokens.
+     */
+    hasAuth(provider) {
+        if (this.runtimeOverrides.has(provider))
+            return true;
+        if (this.data[provider])
+            return true;
+        if (getEnvApiKey(provider))
+            return true;
+        if (this.fallbackResolver?.(provider))
+            return true;
+        return false;
+    }
+    /**
+     * Get all credentials (for passing to getOAuthApiKey).
+     */
+    getAll() {
+        return { ...this.data };
+    }
+    /**
+     * Login to an OAuth provider.
+     */
+    async login(providerId, callbacks) {
+        const provider = getOAuthProvider(providerId);
+        if (!provider) {
+            throw new Error(`Unknown OAuth provider: ${providerId}`);
+        }
+        const credentials = await provider.login(callbacks);
+        this.set(providerId, { type: "oauth", ...credentials });
+    }
+    /**
+     * Logout from a provider.
+     */
+    logout(provider) {
+        this.remove(provider);
+    }
+    /**
+     * Refresh OAuth token with file locking to prevent race conditions.
+     * Multiple indusagi instances may try to refresh simultaneously when tokens expire.
+     * This ensures only one instance refreshes while others wait and use the result.
+     */
+    async refreshOAuthTokenWithLock(providerId) {
+        const provider = getOAuthProvider(providerId);
+        if (!provider) {
+            return null;
+        }
+        // Ensure auth file exists for locking
+        if (!existsSync(this.authPath)) {
+            const dir = dirname(this.authPath);
+            if (!existsSync(dir)) {
+                mkdirSync(dir, { recursive: true, mode: 0o700 });
+            }
+            writeFileSync(this.authPath, "{}", "utf-8");
+            chmodSync(this.authPath, 0o600);
+        }
+        let release;
+        try {
+            // Acquire exclusive lock with retry and timeout
+            // Use generous retry window to handle slow token endpoints
+            release = await lockfile.lock(this.authPath, {
+                retries: {
+                    retries: 10,
+                    factor: 2,
+                    minTimeout: 100,
+                    maxTimeout: 10000,
+                    randomize: true,
+                },
+                stale: 30000, // Consider lock stale after 30 seconds
+            });
+            // Re-read file after acquiring lock - another instance may have refreshed
+            this.reload();
+            const cred = this.data[providerId];
+            if (cred?.type !== "oauth") {
+                return null;
+            }
+            // Check if token is still expired after re-reading
+            // (another instance may have already refreshed it)
+            if (Date.now() < cred.expires) {
+                // Token is now valid - another instance refreshed it
+                const apiKey = provider.getApiKey(cred);
+                return { apiKey, newCredentials: cred };
+            }
+            // Token still expired, we need to refresh
+            const oauthCreds = {};
+            for (const [key, value] of Object.entries(this.data)) {
+                if (value.type === "oauth") {
+                    oauthCreds[key] = value;
+                }
+            }
+            const result = await getOAuthApiKey(providerId, oauthCreds);
+            if (result) {
+                this.data[providerId] = { type: "oauth", ...result.newCredentials };
+                this.save();
+                return result;
+            }
+            return null;
+        }
+        finally {
+            // Always release the lock
+            if (release) {
+                try {
+                    await release();
+                }
+                catch {
+                    // Ignore unlock errors (lock may have been compromised)
+                }
+            }
+        }
+    }
+    /**
+     * Get API key for a provider.
+     * Priority:
+     * 1. Runtime override (CLI --api-key)
+     * 2. API key from auth.json
+     * 3. OAuth token from auth.json (auto-refreshed with locking)
+     * 4. Environment variable
+     * 5. Fallback resolver (models.json custom providers)
+     */
+    async getApiKey(providerId) {
+        // Runtime override takes highest priority
+        const runtimeKey = this.runtimeOverrides.get(providerId);
+        if (runtimeKey) {
+            return runtimeKey;
+        }
+        const cred = this.data[providerId];
+        if (cred?.type === "api_key") {
+            return cred.key;
+        }
+        if (cred?.type === "oauth") {
+            const provider = getOAuthProvider(providerId);
+            if (!provider) {
+                // Unknown OAuth provider, can't get API key
+                return undefined;
+            }
+            // Check if token needs refresh
+            const needsRefresh = Date.now() >= cred.expires;
+            if (needsRefresh) {
+                // Use locked refresh to prevent race conditions
+                try {
+                    const result = await this.refreshOAuthTokenWithLock(providerId);
+                    if (result) {
+                        return result.apiKey;
+                    }
+                }
+                catch {
+                    // Refresh failed - re-read file to check if another instance succeeded
+                    this.reload();
+                    const updatedCred = this.data[providerId];
+                    if (updatedCred?.type === "oauth" && Date.now() < updatedCred.expires) {
+                        // Another instance refreshed successfully, use those credentials
+                        return provider.getApiKey(updatedCred);
+                    }
+                    // Refresh truly failed - return undefined so model discovery skips this provider
+                    // User can /login to re-authenticate (credentials preserved for retry)
+                    return undefined;
+                }
+            }
+            else {
+                // Token not expired, use current access token
+                return provider.getApiKey(cred);
+            }
+        }
+        // Fall back to environment variable
+        const envKey = getEnvApiKey(providerId);
+        if (envKey)
+            return envKey;
+        // Fall back to custom resolver (e.g., models.json custom providers)
+        return this.fallbackResolver?.(providerId) ?? undefined;
+    }
+    /**
+     * Get all registered OAuth providers
+     */
+    getOAuthProviders() {
+        return getOAuthProviders();
+    }
+}

package/dist/core/bash-executor.js

@@ -0,0 +1,211 @@
+/**
+ * Bash command execution with streaming support and cancellation.
+ *
+ * This module provides a unified bash execution implementation used by:
+ * - AgentSession.executeBash() for interactive and RPC modes
+ * - Direct calls from modes that need bash execution
+ */
+import { randomBytes } from "node:crypto";
+import { createWriteStream } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { spawn } from "child_process";
+import stripAnsi from "strip-ansi";
+import { getShellConfig, getShellEnv, killProcessTree, sanitizeBinaryOutput } from "../utils/shell.js";
+import { DEFAULT_MAX_BYTES, truncateTail } from "./tools/truncate.js";
+// ============================================================================
+// Implementation
+// ============================================================================
+/**
+ * Execute a bash command with optional streaming and cancellation support.
+ *
+ * Features:
+ * - Streams sanitized output via onChunk callback
+ * - Writes large output to temp file for later retrieval
+ * - Supports cancellation via AbortSignal
+ * - Sanitizes output (strips ANSI, removes binary garbage, normalizes newlines)
+ * - Truncates output if it exceeds the default max bytes
+ *
+ * @param command - The bash command to execute
+ * @param options - Optional streaming callback and abort signal
+ * @returns Promise resolving to execution result
+ */
+export function executeBash(command, options) {
+    return new Promise((resolve, reject) => {
+        const { shell, args } = getShellConfig();
+        const child = spawn(shell, [...args, command], {
+            detached: true,
+            env: getShellEnv(),
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        // Track sanitized output for truncation
+        const outputChunks = [];
+        let outputBytes = 0;
+        const maxOutputBytes = DEFAULT_MAX_BYTES * 2;
+        // Temp file for large output
+        let tempFilePath;
+        let tempFileStream;
+        let totalBytes = 0;
+        // Handle abort signal
+        const abortHandler = () => {
+            if (child.pid) {
+                killProcessTree(child.pid);
+            }
+        };
+        if (options?.signal) {
+            if (options.signal.aborted) {
+                // Already aborted, don't even start
+                child.kill();
+                resolve({
+                    output: "",
+                    exitCode: undefined,
+                    cancelled: true,
+                    truncated: false,
+                });
+                return;
+            }
+            options.signal.addEventListener("abort", abortHandler, { once: true });
+        }
+        const decoder = new TextDecoder();
+        const handleData = (data) => {
+            totalBytes += data.length;
+            // Sanitize once at the source: strip ANSI, replace binary garbage, normalize newlines
+            const text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\r/g, "");
+            // Start writing to temp file if exceeds threshold
+            if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
+                const id = randomBytes(8).toString("hex");
+                tempFilePath = join(tmpdir(), `indusagi-bash-${id}.log`);
+                tempFileStream = createWriteStream(tempFilePath);
+                // Write already-buffered chunks to temp file
+                for (const chunk of outputChunks) {
+                    tempFileStream.write(chunk);
+                }
+            }
+            if (tempFileStream) {
+                tempFileStream.write(text);
+            }
+            // Keep rolling buffer of sanitized text
+            outputChunks.push(text);
+            outputBytes += text.length;
+            while (outputBytes > maxOutputBytes && outputChunks.length > 1) {
+                const removed = outputChunks.shift();
+                outputBytes -= removed.length;
+            }
+            // Stream to callback if provided
+            if (options?.onChunk) {
+                options.onChunk(text);
+            }
+        };
+        child.stdout?.on("data", handleData);
+        child.stderr?.on("data", handleData);
+        child.on("close", (code) => {
+            // Clean up abort listener
+            if (options?.signal) {
+                options.signal.removeEventListener("abort", abortHandler);
+            }
+            if (tempFileStream) {
+                tempFileStream.end();
+            }
+            // Combine buffered chunks for truncation (already sanitized)
+            const fullOutput = outputChunks.join("");
+            const truncationResult = truncateTail(fullOutput);
+            // code === null means killed (cancelled)
+            const cancelled = code === null;
+            resolve({
+                output: truncationResult.truncated ? truncationResult.content : fullOutput,
+                exitCode: cancelled ? undefined : code,
+                cancelled,
+                truncated: truncationResult.truncated,
+                fullOutputPath: tempFilePath,
+            });
+        });
+        child.on("error", (err) => {
+            // Clean up abort listener
+            if (options?.signal) {
+                options.signal.removeEventListener("abort", abortHandler);
+            }
+            if (tempFileStream) {
+                tempFileStream.end();
+            }
+            reject(err);
+        });
+    });
+}
+/**
+ * Execute a bash command using custom BashOperations.
+ * Used for remote execution (SSH, containers, etc.).
+ */
+export async function executeBashWithOperations(command, cwd, operations, options) {
+    const outputChunks = [];
+    let outputBytes = 0;
+    const maxOutputBytes = DEFAULT_MAX_BYTES * 2;
+    let tempFilePath;
+    let tempFileStream;
+    let totalBytes = 0;
+    const decoder = new TextDecoder();
+    const onData = (data) => {
+        totalBytes += data.length;
+        // Sanitize: strip ANSI, replace binary garbage, normalize newlines
+        const text = sanitizeBinaryOutput(stripAnsi(decoder.decode(data, { stream: true }))).replace(/\r/g, "");
+        // Start writing to temp file if exceeds threshold
+        if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
+            const id = randomBytes(8).toString("hex");
+            tempFilePath = join(tmpdir(), `indusagi-bash-${id}.log`);
+            tempFileStream = createWriteStream(tempFilePath);
+            for (const chunk of outputChunks) {
+                tempFileStream.write(chunk);
+            }
+        }
+        if (tempFileStream) {
+            tempFileStream.write(text);
+        }
+        // Keep rolling buffer
+        outputChunks.push(text);
+        outputBytes += text.length;
+        while (outputBytes > maxOutputBytes && outputChunks.length > 1) {
+            const removed = outputChunks.shift();
+            outputBytes -= removed.length;
+        }
+        // Stream to callback
+        if (options?.onChunk) {
+            options.onChunk(text);
+        }
+    };
+    try {
+        const result = await operations.exec(command, cwd, {
+            onData,
+            signal: options?.signal,
+        });
+        if (tempFileStream) {
+            tempFileStream.end();
+        }
+        const fullOutput = outputChunks.join("");
+        const truncationResult = truncateTail(fullOutput);
+        const cancelled = options?.signal?.aborted ?? false;
+        return {
+            output: truncationResult.truncated ? truncationResult.content : fullOutput,
+            exitCode: cancelled ? undefined : (result.exitCode ?? undefined),
+            cancelled,
+            truncated: truncationResult.truncated,
+            fullOutputPath: tempFilePath,
+        };
+    }
+    catch (err) {
+        if (tempFileStream) {
+            tempFileStream.end();
+        }
+        // Check if it was an abort
+        if (options?.signal?.aborted) {
+            const fullOutput = outputChunks.join("");
+            const truncationResult = truncateTail(fullOutput);
+            return {
+                output: truncationResult.truncated ? truncationResult.content : fullOutput,
+                exitCode: undefined,
+                cancelled: true,
+                truncated: truncationResult.truncated,
+                fullOutputPath: tempFilePath,
+            };
+        }
+        throw err;
+    }
+}