@jait/gateway 0.1.415 → 0.1.419

package/dist/providers/acp-provider.d.ts

@@ -1,6 +1,6 @@
 import { type SessionNotification } from "@agentclientprotocol/sdk";
 import type { CliProviderAdapter, ProviderEvent, ProviderAuthStatus, ProviderLoginResult, ProviderLogoutResult, ProviderId, ProviderInfo, ProviderModelInfo, ProviderSession, RuntimeMode, StartSessionOptions } from "./contracts.js";
-type AcpProviderAuthKind = "codex" | "claude-code";
+type AcpProviderAuthKind = "acp";
 export interface AcpProviderConfig {
     id: ProviderId;
     name: string;
@@ -19,11 +19,13 @@ export declare class AcpProvider implements CliProviderAdapter {
     private readonly sessions;
     private readonly emitter;
     private authLoginProcess;
+    private cachedModels;
     constructor(config: AcpProviderConfig);
     checkAvailability(): Promise<boolean>;
     listModels(): Promise<ProviderModelInfo[]>;
     getAuthStatus(): Promise<ProviderAuthStatus>;
     startLogin(): Promise<ProviderLoginResult>;
+    private checkProviderAuthenticated;
     logout(): Promise<ProviderLogoutResult>;
     startSession(options: StartSessionOptions): Promise<ProviderSession>;
     sendTurn(sessionId: string, message: string, attachments?: string[]): Promise<void>;
@@ -34,7 +36,7 @@ export declare class AcpProvider implements CliProviderAdapter {
     emitEvent(event: ProviderEvent): void;
     handleSessionUpdate(sessionId: string, params: SessionNotification): void;
     private getSession;
-    private getLoginCommand;
+    private probeAcpAuth;
 }
 export declare function loadAcpProviderConfigs(): AcpProviderConfig[];
 export {};

package/dist/providers/acp-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-provider.d.ts","sourceRoot":"","sources":["../../src/providers/acp-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAUL,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,kBAAkB,EAElB,aAAa,EACb,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AAWxB,KAAK,mBAAmB,GAAG,OAAO,GAAG,aAAa,CAAC;AAEnD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,mBAAmB,GAAG,KAAK,CAAC;CACpC;AAgDD,qBAAa,WAAY,YAAW,kBAAkB;IACpD,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8E;IACrG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsC;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,gBAAgB,CAA6B;gBAEzC,MAAM,EAAE,iBAAiB;IAmB/B,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBrC,UAAU,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAI1C,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;IA4B5C,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA0B1C,MAAM,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAmCvC,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IAsFpE,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BnF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/C,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzF,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnD,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAAG,MAAM,IAAI;IAK5D,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAIrC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAkEzE,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,eAAe;CAUxB;AAgGD,wBAAgB,sBAAsB,IAAI,iBAAiB,EAAE,CA4B5D"}
+{"version":3,"file":"acp-provider.d.ts","sourceRoot":"","sources":["../../src/providers/acp-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAWL,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,kBAAkB,EAElB,aAAa,EACb,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AASxB,KAAK,mBAAmB,GAAG,KAAK,CAAC;AAEjC,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,mBAAmB,GAAG,KAAK,CAAC;CACpC;AAwDD,qBAAa,WAAY,YAAW,kBAAkB;IACpD,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8E;IACrG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsC;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,YAAY,CAAoC;gBAE5C,MAAM,EAAE,iBAAiB;IAmB/B,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBrC,UAAU,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAmC1C,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAmB5C,UAAU,IAAI,OAAO,CAAC,mBAAmB,CAAC;YAwDlC,0BAA0B;IAWlC,MAAM,IAAI,OAAO,CAAC,oBAAoB,CAAC;IA4BvC,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgGpE,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BnF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/C,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzF,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnD,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAAG,MAAM,IAAI;IAK5D,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAIrC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAkEzE,OAAO,CAAC,UAAU;YAMJ,YAAY;CAgD3B;AAkHD,wBAAgB,sBAAsB,IAAI,iBAAiB,EAAE,CA4D5D"}

package/dist/providers/acp-provider.js

@@ -1,23 +1,34 @@
 import { spawn, spawnSync } from "node:child_process";
 import { EventEmitter } from "node:events";
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { Readable, Writable } from "node:stream";
 import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream, } from "@agentclientprotocol/sdk";
 import { uuidv7 } from "../db/uuidv7.js";
-import { DEVICE_PROVIDER_AUTH, NO_PROVIDER_AUTH, killChildTree as killAuthChildTree, runAuthCommand, startDeviceLoginCommand, unsupportedLogin, unsupportedLogout, } from "./provider-auth.js";
+import { NO_PROVIDER_AUTH, killChildTree as killAuthChildTree, runAuthCommand, unsupportedLogin, unsupportedLogout, } from "./provider-auth.js";
 class JaitAcpClient {
     provider;
     sessionId;
     approvals;
-    constructor(provider, sessionId, approvals) {
+    runtimeMode;
+    constructor(provider, sessionId, approvals, runtimeMode) {
         this.provider = provider;
         this.sessionId = sessionId;
         this.approvals = approvals;
+        this.runtimeMode = runtimeMode;
     }
     async requestPermission(params) {
+        const allowOptionId = params.options.find((option) => option.kind.startsWith("allow"))?.optionId ?? params.options[0]?.optionId ?? "allow";
+        const rejectOptionId = params.options.find((option) => option.kind.startsWith("reject"))?.optionId ?? params.options.at(-1)?.optionId ?? "reject";
+        // In full-access mode, auto-approve all tool requests without prompting.
+        if (this.runtimeMode === "full-access") {
+            return { outcome: { outcome: "selected", optionId: allowOptionId } };
+        }
         const requestId = uuidv7();
+        const response = new Promise((resolve) => {
+            this.approvals.set(requestId, { allowOptionId, rejectOptionId, resolve });
+        });
         this.provider.emitEvent({
             type: "tool.approval-required",
             sessionId: this.sessionId,
@@ -25,11 +36,7 @@ class JaitAcpClient {
             args: params.toolCall.rawInput,
             requestId,
         });
-        const allowOptionId = params.options.find((option) => option.kind.startsWith("allow"))?.optionId ?? params.options[0]?.optionId ?? "allow";
-        const rejectOptionId = params.options.find((option) => option.kind.startsWith("reject"))?.optionId ?? params.options.at(-1)?.optionId ?? "reject";
-        return new Promise((resolve) => {
-            this.approvals.set(requestId, { allowOptionId, rejectOptionId, resolve });
-        });
+        return response;
     }
     async sessionUpdate(params) {
         this.provider.handleSessionUpdate(this.sessionId, params);
@@ -43,9 +50,10 @@ export class AcpProvider {
     sessions = new Map();
     emitter = new EventEmitter();
     authLoginProcess = null;
+    cachedModels = null;
     constructor(config) {
         this.id = config.id;
-        this.authKind = config.auth === false ? null : config.auth ?? inferAcpAuthKind(config.id);
+        this.authKind = config.auth === false ? null : "acp";
         this.config = {
             ...config,
             args: config.args ?? [],
@@ -58,7 +66,7 @@ export class AcpProvider {
             description: config.description,
             available: false,
             modes: this.config.modes,
-            auth: this.authKind ? DEVICE_PROVIDER_AUTH : NO_PROVIDER_AUTH,
+            auth: this.authKind ? { login: true, logout: false, deviceCode: false } : NO_PROVIDER_AUTH,
         };
     }
     async checkAvailability() {
@@ -78,91 +86,143 @@ export class AcpProvider {
         return true;
     }
     async listModels() {
-        return [];
-    }
-    async getAuthStatus() {
-        switch (this.authKind) {
-            case "codex": {
-                const authenticated = !!process.env.OPENAI_API_KEY?.trim() || checkCodexAuthFile();
-                return {
-                    ...DEVICE_PROVIDER_AUTH,
-                    authenticated,
-                    detail: authenticated
-                        ? "Codex CLI credentials are configured."
-                        : "Codex CLI is not authenticated.",
-                };
+        if (this.cachedModels)
+            return this.cachedModels;
+        try {
+            const probe = await this.probeAcpAuth();
+            try {
+                const newSession = await probe.connection.newSession({
+                    cwd: process.cwd(),
+                    mcpServers: [],
+                });
+                const models = [];
+                const modelState = newSession.models;
+                if (modelState && modelState.availableModels?.length) {
+                    for (const model of modelState.availableModels) {
+                        models.push({
+                            id: model.modelId,
+                            name: model.name,
+                            description: model.description ?? undefined,
+                            isDefault: model.modelId === modelState.currentModelId,
+                        });
+                    }
+                }
+                await probe.connection.closeSession?.({ sessionId: newSession.sessionId }).catch(() => { });
+                this.cachedModels = models;
+                return models;
             }
-            case "claude-code": {
-                const status = await runAuthCommand(this.id, "claude", ["auth", "status"], 10_000);
-                const authenticated = !!process.env.ANTHROPIC_API_KEY?.trim() || status.ok;
-                return {
-                    ...DEVICE_PROVIDER_AUTH,
-                    authenticated,
-                    detail: authenticated
-                        ? "Claude Code credentials are configured."
-                        : status.rawOutput ?? "Claude Code is not authenticated.",
-                };
+            finally {
+                probe.child.kill();
             }
-            default:
-                return { ...NO_PROVIDER_AUTH, authenticated: null, detail: "Auth is managed by the ACP agent." };
+        }
+        catch {
+            return [];
         }
     }
+    async getAuthStatus() {
+        if (!this.authKind) {
+            return { ...NO_PROVIDER_AUTH, authenticated: null, detail: "Auth is managed by the ACP agent." };
+        }
+        const probe = await this.probeAcpAuth().catch(() => null);
+        const login = (probe?.authMethods.length ?? 0) > 0;
+        const logout = Boolean(probe?.initialized.agentCapabilities?.auth?.logout);
+        probe?.child.kill();
+        const authenticated = await this.checkProviderAuthenticated();
+        return {
+            login,
+            logout,
+            deviceCode: false,
+            authenticated,
+            detail: probe ? formatAcpAuthDetail(this.info.name, authenticated) : "Could not read ACP authentication capabilities.",
+        };
+    }
     async startLogin() {
-        const login = this.getLoginCommand();
-        if (!login)
+        if (!this.authKind)
             return unsupportedLogin(this.id, "Auth is managed by the ACP agent.");
         if (this.authLoginProcess) {
             killAuthChildTree(this.authLoginProcess);
             this.authLoginProcess = null;
         }
-        const { result, child } = await startDeviceLoginCommand({
-            providerId: this.id,
-            label: login.label,
-            commandLine: login.commandLine,
-            args: login.args,
-            timeoutMs: 30_000,
-        });
-        if (child) {
+        const probe = await this.probeAcpAuth();
+        const method = chooseAcpAuthMethod(probe.authMethods);
+        if (!method) {
+            probe.child.kill();
+            return unsupportedLogin(this.id, "ACP agent did not advertise a login method.");
+        }
+        if (isTerminalAuthMethod(method)) {
+            probe.child.kill();
+            const args = [...this.config.args, ...(method.args ?? [])];
+            const child = spawn(this.config.command, args, {
+                cwd: process.cwd(),
+                stdio: "ignore",
+                env: { ...process.env, ...this.config.env, ...method.env },
+            });
             this.authLoginProcess = child;
             child.on("exit", () => {
                 if (this.authLoginProcess === child)
                     this.authLoginProcess = null;
+                this.cachedModels = null;
                 void this.checkAvailability();
             });
+            return {
+                ok: true,
+                status: "started",
+                providerId: this.id,
+                message: `${method.name} login started through ACP.`,
+            };
         }
-        return result;
+        const child = probe.child;
+        this.authLoginProcess = child;
+        void probe.connection.authenticate({ methodId: method.id })
+            .catch(() => { })
+            .finally(() => {
+            if (this.authLoginProcess === child)
+                this.authLoginProcess = null;
+            child.kill();
+            this.cachedModels = null;
+            void this.checkAvailability();
+        });
+        return {
+            ok: true,
+            status: "started",
+            providerId: this.id,
+            message: `${method.name} login started through ACP.`,
+        };
+    }
+    async checkProviderAuthenticated() {
+        if (this.id === "codex") {
+            return Boolean(process.env.OPENAI_API_KEY?.trim()) || checkCodexAuthFile();
+        }
+        if (this.id === "claude-code") {
+            const status = await runAuthCommand(this.id, "claude", ["auth", "status"], 10_000).catch(() => null);
+            return Boolean(process.env.ANTHROPIC_API_KEY?.trim()) || Boolean(status?.ok);
+        }
+        return null;
     }
     async logout() {
         if (this.authLoginProcess) {
             killAuthChildTree(this.authLoginProcess);
             this.authLoginProcess = null;
         }
-        switch (this.authKind) {
-            case "codex": {
-                const result = await runAuthCommand(this.id, "codex", ["logout"]);
-                const cleared = result.ok ? clearCodexAuthFile() : true;
-                await this.checkAvailability().catch(() => false);
-                return {
-                    ...result,
-                    ok: result.ok && cleared,
-                    status: result.ok && cleared ? result.status : "error",
-                    message: result.ok
-                        ? cleared
-                            ? "Codex logout completed."
-                            : "Codex logout ran, but stored credentials could not be removed."
-                        : result.message,
-                };
-            }
-            case "claude-code": {
-                const result = await runAuthCommand(this.id, "claude", ["auth", "logout"]);
-                await this.checkAvailability().catch(() => false);
-                return {
-                    ...result,
-                    message: result.ok ? "Claude Code logout completed." : result.message,
-                };
+        if (!this.authKind) {
+            return unsupportedLogout(this.id, "Auth is managed by the ACP agent.");
+        }
+        const probe = await this.probeAcpAuth();
+        try {
+            if (!probe.initialized.agentCapabilities?.auth?.logout) {
+                return unsupportedLogout(this.id, "ACP agent did not advertise logout support.");
             }
-            default:
-                return unsupportedLogout(this.id, "Auth is managed by the ACP agent.");
+            await probe.connection.unstable_logout({});
+            return {
+                ok: true,
+                status: "completed",
+                providerId: this.id,
+                message: `${this.info.name} logout completed.`,
+            };
+        }
+        finally {
+            probe.child.kill();
+            await this.checkAvailability().catch(() => false);
         }
     }
     async startSession(options) {
@@ -179,7 +239,9 @@ export class AcpProvider {
             cwd: options.workingDirectory,
             stdio: ["pipe", "pipe", "pipe"],
             env: { ...process.env, ...this.config.env, ...options.env },
+            shell: true,
         });
+        child.on("error", () => { }); // prevent unhandled ENOENT on Windows
         child.stderr?.on("data", (chunk) => {
             const text = chunk.toString("utf8").trim();
             if (text) {
@@ -191,7 +253,7 @@ export class AcpProvider {
         const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
         const connection = new ClientSideConnection((agent) => {
             capturedAgent = agent;
-            return new JaitAcpClient(this, sessionId, approvals);
+            return new JaitAcpClient(this, sessionId, approvals, options.mode);
         }, stream);
         child.once("exit", (code, signal) => {
             const current = this.sessions.get(sessionId);
@@ -208,23 +270,31 @@ export class AcpProvider {
             });
             this.sessions.delete(sessionId);
         });
-        const initialized = await connection.initialize({
-            protocolVersion: PROTOCOL_VERSION,
-            clientInfo: { name: "Jait", version: "0.1" },
-            clientCapabilities: {
-                fs: { readTextFile: false, writeTextFile: false },
-                terminal: false,
-            },
-        });
-        const newSession = await connection.newSession({
-            cwd: options.workingDirectory,
-            mcpServers: (options.mcpServers ?? []).map(toAcpMcpServer),
-        });
-        if (options.mode) {
-            await connection.setSessionMode({ sessionId: newSession.sessionId, modeId: options.mode }).catch(() => { });
+        let initialized;
+        let newSession;
+        try {
+            initialized = await connection.initialize({
+                protocolVersion: PROTOCOL_VERSION,
+                clientInfo: { name: "Jait", version: "0.1" },
+                clientCapabilities: {
+                    fs: { readTextFile: false, writeTextFile: false },
+                    terminal: false,
+                },
+            });
+            newSession = await connection.newSession({
+                cwd: options.workingDirectory,
+                mcpServers: (options.mcpServers ?? []).map(toAcpMcpServer),
+            });
+            if (options.mode) {
+                await connection.setSessionMode({ sessionId: newSession.sessionId, modeId: options.mode }).catch(() => { });
+            }
+            if (options.model) {
+                await connection.unstable_setSessionModel({ sessionId: newSession.sessionId, modelId: options.model }).catch(() => { });
+            }
         }
-        if (options.model) {
-            await connection.unstable_setSessionModel({ sessionId: newSession.sessionId, modelId: options.model }).catch(() => { });
+        catch (error) {
+            child.kill();
+            throw error;
         }
         session.status = "running";
         const state = {
@@ -289,7 +359,7 @@ export class AcpProvider {
         const state = this.sessions.get(sessionId);
         if (!state)
             return;
-        await state.connection.closeSession?.({ sessionId: state.acpSessionId }).catch(() => { });
+        await withTimeout(state.connection.closeSession?.({ sessionId: state.acpSessionId }) ?? Promise.resolve(), 2_000).catch(() => { });
         state.session.status = "completed";
         state.session.completedAt = new Date().toISOString();
         state.child.kill();
@@ -374,23 +444,60 @@ export class AcpProvider {
             throw new Error(`Unknown ACP session: ${sessionId}`);
         return state;
     }
-    getLoginCommand() {
-        switch (this.authKind) {
-            case "codex":
-                return { label: "Codex", commandLine: "codex", args: ["login", "--device-auth"] };
-            case "claude-code":
-                return { label: "Claude Code", commandLine: "claude", args: ["auth", "login", "--claudeai"] };
-            default:
-                return null;
+    async probeAcpAuth() {
+        const child = spawn(this.config.command, this.config.args, {
+            cwd: process.cwd(),
+            stdio: ["pipe", "pipe", "pipe"],
+            env: { ...process.env, ...this.config.env },
+            shell: true,
+        });
+        // Prevent unhandled 'error' events from crashing the process (e.g. ENOENT on Windows)
+        const spawnError = new Promise((_, reject) => {
+            child.on("error", (err) => reject(err));
+        });
+        const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
+        const connection = new ClientSideConnection(() => ({
+            async requestPermission() {
+                return { outcome: { outcome: "cancelled" } };
+            },
+            async sessionUpdate() { },
+        }), stream);
+        try {
+            const initialized = await Promise.race([
+                connection.initialize({
+                    protocolVersion: PROTOCOL_VERSION,
+                    clientInfo: { name: "Jait", version: "0.1" },
+                    clientCapabilities: {
+                        auth: { terminal: true },
+                        fs: { readTextFile: false, writeTextFile: false },
+                        terminal: false,
+                    },
+                }),
+                spawnError,
+            ]);
+            return { child, connection, initialized, authMethods: initialized.authMethods ?? [] };
+        }
+        catch (error) {
+            child.kill();
+            throw error;
         }
     }
 }
-function inferAcpAuthKind(id) {
-    if (id === "codex")
-        return "codex";
-    if (id === "claude-code")
-        return "claude-code";
-    return null;
+function chooseAcpAuthMethod(methods) {
+    return (methods.find(isTerminalAuthMethod) ??
+        methods.find((method) => method.id === "chat-gpt") ??
+        methods[0] ??
+        null);
+}
+function isTerminalAuthMethod(method) {
+    return "type" in method && method.type === "terminal";
+}
+function formatAcpAuthDetail(providerName, authenticated) {
+    if (authenticated === true)
+        return `${providerName} credentials are configured. Login and logout are managed through ACP.`;
+    if (authenticated === false)
+        return `${providerName} credentials are not configured. Login and logout are managed through ACP.`;
+    return `${providerName} authentication is managed through ACP.`;
 }
 function getCodexAuthPath() {
     const codexHome = process.env.CODEX_HOME ?? join(homedir(), ".codex");
@@ -423,26 +530,6 @@ function checkCodexAuthFile() {
         return false;
     }
 }
-function clearCodexAuthFile() {
-    const auth = readCodexAuthFile();
-    if (!auth)
-        return true;
-    delete auth.OPENAI_API_KEY;
-    delete auth.tokens;
-    const remaining = Object.entries(auth).filter(([, value]) => value !== undefined && value !== null);
-    try {
-        if (remaining.length === 0) {
-            unlinkSync(getCodexAuthPath());
-        }
-        else {
-            writeFileSync(getCodexAuthPath(), `${JSON.stringify(Object.fromEntries(remaining), null, 2)}\n`, "utf-8");
-        }
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 function toAcpMcpServer(server) {
     if (server.transport === "stdio") {
         return {
@@ -452,6 +539,14 @@ function toAcpMcpServer(server) {
             env: Object.entries(server.env ?? {}).map(([name, value]) => ({ name, value })),
         };
     }
+    if (server.transport === "http") {
+        return {
+            type: "http",
+            name: server.name,
+            url: server.url ?? "",
+            headers: [],
+        };
+    }
     return {
         type: "sse",
         name: server.name,
@@ -474,6 +569,18 @@ function stringifyUnknown(value) {
         return String(value);
     }
 }
+function withTimeout(promise, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error("Operation timed out")), timeoutMs);
+        promise.then((value) => {
+            clearTimeout(timeout);
+            resolve(value);
+        }, (error) => {
+            clearTimeout(timeout);
+            reject(error);
+        });
+    });
+}
 export function loadAcpProviderConfigs() {
     const defaults = [
         {
@@ -490,6 +597,38 @@ export function loadAcpProviderConfigs() {
             command: "npx",
             args: ["-y", "@agentclientprotocol/claude-agent-acp"],
         },
+        {
+            id: "cursor",
+            name: "Cursor",
+            description: "Cursor Agent via Agent Client Protocol",
+            command: "npx",
+            args: ["-y", "@blowmage/cursor-agent-acp"],
+            auth: false,
+        },
+        {
+            id: "pi",
+            name: "Pi",
+            description: "Pi coding agent via Agent Client Protocol",
+            command: "npx",
+            args: ["-y", "pi-acp"],
+            auth: false,
+        },
+        {
+            id: "pi-gemini",
+            name: "Pi Gemini",
+            description: "Gemini-backed Pi ACP provider",
+            command: "npx",
+            args: ["-y", "pi-gemini-acp"],
+            auth: false,
+        },
+        {
+            id: "deepagents",
+            name: "DeepAgents",
+            description: "DeepAgents via Agent Client Protocol",
+            command: "npx",
+            args: ["-y", "deepagents-acp"],
+            auth: false,
+        },
     ];
     const raw = process.env.JAIT_ACP_PROVIDERS?.trim();
     if (!raw)