openmausbot 0.1.97 → 0.1.99

package/dist-server/server/drivers/agents-catalog.js

@@ -26,6 +26,7 @@ export function catalogProfileFromEnv(env) {
         voiceNotes: env.OMB_VOICE_NOTES === "1",
         cloudHome: env.OMB_CLOUD_HOME === "1",
         memoryEnabled: env.OMB_MEMORY_ENABLED !== "0",
+        chief: env.OMB_CHIEF_OF_STAFF === "1",
         botId: env.OMB_BOT_ID ?? "",
     };
 }
@@ -85,7 +86,7 @@ const ROUTINE_SCHEDULE_SCHEMA = {
         },
         starts_at: {
             type: "string",
-            description: "Optional for type interval: RFC3339 date-time with an explicit timezone offset that anchors the cadence. Omit to start one interval after the routine is applied (immediately with granted Full Access, otherwise after confirmation).",
+            description: "Optional for type interval: RFC3339 date-time with an explicit timezone offset that anchors the cadence. Omit to start one interval after the routine is applied.",
         },
         window_start: {
             type: "string",
@@ -146,7 +147,7 @@ const ROUTINE_FIELDS_SCHEMA = {
     },
     continuity: {
         type: "boolean",
-        description: "Opt in to using the latest completed run's bounded report as historical context. Defaults to false; set false in an update to start fresh again. Included in the applied result or pending confirmation.",
+        description: "Opt in to using the latest completed run's bounded report as historical context. Use it for recurring work that builds on last time, such as QA passes, monitoring or follow-ups. Defaults to false; set false in an update to start fresh again. Included in the applied result or pending confirmation.",
     },
     overlap: {
         type: "string",
@@ -154,7 +155,13 @@ const ROUTINE_FIELDS_SCHEMA = {
         description: "While this routine is still working, skip scheduled occurrences (default) or queue at most one run. Queue skips further occurrences until the pending run starts; it never builds an unlimited backlog. Manual and webhook requests are separate.",
     },
 };
+// propose_profile's one sentence about for_bot_id, which a bot that is not a
+// Chief is not shown (catalogTools), along with the parameter itself.
+const CHIEF_PROFILE_TARGET = " A Chief of Staff may pass for_bot_id (from list_bots) for a requested change to another bot in its section.";
 const PROPOSAL_OUTCOME = " Read the result: granted Full Access may apply the change immediately. If applied, continue the requested work without another confirmation. Only a pending result requires ending the turn and waiting for the in-app decision. Never claim success from the permission mode alone; report failed or cancelled results honestly. This does not elevate another bot's execution permissions.";
+/** Routines, skills, profile and model: a bot's change to itself applies at
+ * any level (server/direct-apply.ts). */
+const SELF_CHANGE_OUTCOME = " Read the result: a change to your own routines, skills, profile or model applies immediately, and the person sees it with an Undo; a change for another bot may wait for the person's confirmation. If applied, continue the requested work without another confirmation. Only a pending result requires ending the turn and waiting for the in-app decision. Never claim success without an applied result; report failed or cancelled results honestly. This does not elevate another bot's execution permissions.";
 /** Every tool, in the order it is listed. Four peer tools are worded
  * differently for an external runtime, which may poll inside one process. */
 const toolDefinitions = (externalRuntime) => [
@@ -609,7 +616,7 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_routine",
-        description: "Prepare a new routine after the user explicitly asks to schedule recurring or future work. Call list_routines first for relative dates or times so you use its authoritative current time and timezone. Convert calendar requests (monthly dates, last days, nth weekdays) into a validated five-field cron schedule with an explicit IANA timeZone; keep elapsed every-N-minutes work as interval. Never approximate unsupported requests with a different weekly schedule or an AI date-check routine; explain the limitation instead. Resolve ambiguous dates, times, timezone, destination, or instructions with the user first, and always give one-time schedules an explicit RFC3339 offset. If the user asks for the routine to run as ANOTHER bot in your section, call list_bots and pass that bot's id as for_bot_id; each run retains that bot's own permissions." + PROPOSAL_OUTCOME,
+        description: "Prepare a new routine after the user explicitly asks to schedule recurring or future work. Call list_routines first for relative dates or times so you use its authoritative current time and timezone. Convert calendar requests (monthly dates, last days, nth weekdays) into a validated five-field cron schedule with an explicit IANA timeZone; keep elapsed every-N-minutes work as interval. Never approximate unsupported requests with a different weekly schedule or an AI date-check routine; explain the limitation instead. Resolve ambiguous dates, times, timezone, destination, or instructions with the user first, and always give one-time schedules an explicit RFC3339 offset. If the user asks for the routine to run as ANOTHER bot in your section, call list_bots and pass that bot's id as for_bot_id; each run retains that bot's own permissions." + SELF_CHANGE_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -625,7 +632,7 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_routine_action",
-        description: "Prepare a user-requested change to one of this bot's existing routines. Use list_routines first to get the routine id. If the user asks to change ANOTHER bot's routine and that bot is in your section, call list_bots and pass that bot's id as for_bot_id; the routine keeps its owner and every run keeps that bot's engine and permissions." + PROPOSAL_OUTCOME,
+        description: "Prepare a user-requested change to one of this bot's existing routines. Use list_routines first to get the routine id. If the user asks to change ANOTHER bot's routine and that bot is in your section, call list_bots and pass that bot's id as for_bot_id; the routine keeps its owner and every run keeps that bot's engine and permissions." + SELF_CHANGE_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -652,7 +659,7 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_profile",
-        description: "Submit user-requested changes to your own name, title, description, standing instructions (SOUL.md), working folder (cwd), or your alert and voice toggles (notifications, speakReplies). Keep SOUL.md short — who you are and the rules you never break; put step-by-step procedure into a skill instead. A Chief of Staff may pass for_bot_id (from list_bots) for a requested change to another bot in its section." + PROPOSAL_OUTCOME,
+        description: "Submit user-requested changes to your own name, title, description, standing instructions (SOUL.md), working folder (cwd), or your alert and voice toggles (notifications, speakReplies). Keep SOUL.md short — who you are and the rules you never break; put step-by-step procedure into a skill instead." + CHIEF_PROFILE_TARGET + SELF_CHANGE_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -664,7 +671,7 @@ const toolDefinitions = (externalRuntime) => [
                 cwd: {
                     type: "string",
                     maxLength: 1024,
-                    description: "Absolute path of the folder your tools read and write in (for example /Users/me/Projects/site). It must already exist. An empty string means your private workspace.",
+                    description: "Absolute path of the folder your tools read and write in (for example /Users/me/Projects/site). It must already exist. An empty string means your private workspace. A new folder waits for the person's confirmation unless this conversation has Full access.",
                 },
                 notifications: {
                     type: "boolean",
@@ -685,7 +692,7 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_model",
-        description: "Submit a user-requested switch of this bot's default engine and model. Use the exact instance and model ids the person named, or for a Chief the ids from the team-setup catalog. The card warns about capabilities the switch gains or loses; existing threads keep their current models." + PROPOSAL_OUTCOME,
+        description: "Submit a user-requested switch of this bot's default engine and model. Use the exact instance and model ids the person named, or for a Chief the ids from the team-setup catalog. The result warns about capabilities the switch gains or loses; existing threads keep their current models." + SELF_CHANGE_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -728,12 +735,12 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "skills_list",
-        description: "List this bot's imported skills (enabled and disabled) and any staged skill writes waiting for the user to confirm. Use this before skill_manage to avoid duplicate names. Listing does not enable anything.",
+        description: "List this bot's imported skills (enabled and disabled) and any staged skill writes still waiting for the user's decision. Use this before skill_manage to avoid duplicate names. Listing does not enable anything.",
         inputSchema: { type: "object", additionalProperties: false, properties: {} },
     },
     {
         name: "skill_manage",
-        description: "Submit a new or updated reusable SKILL.md. Never update unless the user explicitly asked to revise that named skill. While review is pending, a create stays inactive and an update leaves the current version unchanged." + PROPOSAL_OUTCOME,
+        description: "Submit a new or updated reusable SKILL.md. Never update unless the user explicitly asked to revise that named skill. If the result is pending, a create stays inactive and an update leaves the current version unchanged." + SELF_CHANGE_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -842,6 +849,14 @@ export const SHARED_COMPUTER_TOOL_NAMES = new Set(["list_shared_computers", "sha
 // tool whose every call would end in a setup error. The route behind it
 // refuses regardless; this keeps the catalog honest about what can work.
 const VOICE_TOOL_NAMES = new Set(["send_voice_note"]);
+// And for a role: every route behind these refuses a bot that is not its
+// section's Chief of Staff, as it does a for_bot_id naming another bot on
+// propose_profile or propose_model. (A routine's for_bot_id is open to any
+// bot that can reach that peer, so it stays.)
+const CHIEF_ONLY_TOOL_NAMES = new Set([
+    "create_bot", "list_team_setup", "propose_team_setup", "propose_bot_deletion", "create_room", "manage_room", "retry_thread",
+]);
+const CHIEF_TARGET_TOOL_NAMES = new Set(["propose_profile", "propose_model"]);
 // One teamwork path in room turns; keep all unrelated integrations available.
 // Ordinary direct chats use this same bounded coordinator. Goal-owned turns
 // retain their independent loop and cannot start a second coordinator.
@@ -878,10 +893,18 @@ function catalogTools(profile) {
     const VOICE_READY_TOOLS = profile.voiceNotes
         ? SHAREABLE_TOOLS
         : SHAREABLE_TOOLS.filter((tool) => !VOICE_TOOL_NAMES.has(tool.name));
+    const ROLE_TOOLS = profile.chief
+        ? VOICE_READY_TOOLS
+        : VOICE_READY_TOOLS.filter((tool) => !CHIEF_ONLY_TOOL_NAMES.has(tool.name)).map((tool) => {
+            if (!CHIEF_TARGET_TOOL_NAMES.has(tool.name))
+                return tool;
+            const properties = Object.fromEntries(Object.entries(tool.inputSchema.properties).filter(([key]) => key !== "for_bot_id"));
+            return { ...tool, description: tool.description.replace(CHIEF_PROFILE_TARGET, ""), inputSchema: { ...tool.inputSchema, properties } };
+        });
     return profile.externalRuntime
         ? BOT_SCOPED_TOOLS.filter(tool => EXTERNAL_TOOL_NAMES.has(tool.name))
         : profile.coordinating
-            ? VOICE_READY_TOOLS.filter(tool => !ROOM_REPLACED_TOOLS.has(tool.name) || (tool.name === "start_thread" && profile.ownThreadCreation))
+            ? ROLE_TOOLS.filter(tool => !ROOM_REPLACED_TOOLS.has(tool.name) || (tool.name === "start_thread" && profile.ownThreadCreation))
                 .map(tool => tool.name === "start_thread" ? {
                 ...tool,
                 description: "Open a separate job on yourself with its own history and run, without switching the person's selected conversation. Use only when the user requests independent jobs (for example one review per pull request). Give a short specific title and complete instructions; you can open at most five per turn. This is not a teammate handoff: use coordinate_bots for teammates and their automatic replies. Self-opened jobs cannot recursively open more jobs. If refused, do not retry; explain what remains.",
@@ -889,5 +912,5 @@ function catalogTools(profile) {
                         bot_id: { type: "string", enum: [profile.botId], description: "Leave out, or use your own bot ID. For teammates use coordinate_bots." },
                     } },
             } : tool)
-            : VOICE_READY_TOOLS.filter(tool => !ROOM_ONLY_TOOLS.has(tool.name));
+            : ROLE_TOOLS.filter(tool => !ROOM_ONLY_TOOLS.has(tool.name));
 }

package/dist-server/server/drivers/agents-proxy.js

@@ -12,6 +12,7 @@
 //   OMB_COMMS_TOKEN  shared secret for the localhost-only internal endpoints
 //   OMB_TURN_DEPTH   this turn's comms depth (the harness refuses recursion)
 //   OMB_EXTERNAL_RUNTIME  "1" for a standing process: peer tools and polling only
+//   OMB_CHIEF_OF_STAFF    "1" for a Chief of Staff, the only bot shown the Chief-only tools
 //
 // This file is the stdio front end only. What the tools are and which a turn
 // sees: agents-catalog.ts. What a call does: agents-call.ts. How the harness

package/dist-server/server/drivers/chat-mcp-tools.js

@@ -14,7 +14,9 @@ import { allowsTool, canUseMcpServer, parseToolScope } from "../../shared/tool-s
 export class ChatToolSessionError extends Error {
 }
 const STARTUP_MS = 8_000;
-const CALL_MS = 10 * 60_000;
+/** Historic per-call ceiling for a bot's MCP tools; a turn can override it
+ * with SendTurnInput.mcpCallTimeoutMs (server config `mcp.callTimeoutMinutes`). */
+const DEFAULT_CALL_MS = 10 * 60_000;
 const FRAME_BYTES = 2 * 1024 * 1024;
 const OUTPUT_BYTES = 50 * 1024;
 const TOOL_COUNT = 128;
@@ -283,7 +285,7 @@ function omitBlankDefaults(builtInBrowser, tool, args) {
             delete args[field];
     }
 }
-export async function mountChatTools(integrations, signal, computerUse = false, toolScope) {
+export async function mountChatTools(integrations, signal, computerUse = false, toolScope, callTimeoutMs = DEFAULT_CALL_MS) {
     const parsed = parseToolScope(toolScope);
     if (!parsed.ok)
         throw new Error(parsed.error);
@@ -411,7 +413,7 @@ export async function mountChatTools(integrations, signal, computerUse = false,
             }
             const tool = registered.get(name);
             try {
-                const result = await tool.client.call("tools/call", { name: tool.name, arguments: args }, AbortSignal.any([signal, callSignal]), CALL_MS);
+                const result = await tool.client.call("tools/call", { name: tool.name, arguments: args }, AbortSignal.any([signal, callSignal]), callTimeoutMs);
                 if (signal.aborted || callSignal.aborted)
                     throw aborted();
                 if (!object(result) || !Array.isArray(result.content) || (result.isError !== undefined && typeof result.isError !== "boolean"))

package/dist-server/server/drivers/claude-login-auth.js

@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import { killCliTree, spawnCli } from "../procs.js";
-import { canonicalPath } from "./codex-device-auth.js";
+import { canonicalPath } from "./device-auth.js";
 const MAX_OUTPUT = 32_768;
 /** Where Anthropic's sign-in lives. Anything else in the CLI's output is not a link we show. */
 const SIGN_IN_HOSTS = ["claude.com", "claude.ai", "console.anthropic.com", "platform.claude.com"];

package/dist-server/server/drivers/claude.js

@@ -15,7 +15,7 @@ import { createServer as createNetServer } from "node:net";
 import { homedir, tmpdir } from "node:os";
 import { join, dirname, isAbsolute, normalize } from "node:path";
 import { DATA_DIR, stripWorkspaceCredentialEnv } from "../config.js";
-import { writeFileAtomic } from "../atomic.js";
+import { writeFileAtomic, writeFileAtomicIfChanged } from "../atomic.js";
 import { augmentedPath } from "../env-path.js";
 import { brokerSocketPath, describeSpawnFailure, execCli, killCliTree, spawnCli } from "../procs.js";
 import { classifyResumeFailure, mayReplay, recoveryPromptFor } from "../resume-recovery.js";
@@ -599,6 +599,9 @@ export async function createPermissionBroker(opts) {
     let boundPath = opts.socketPaths[0] ?? "";
     const connectionHandler = (conn) => {
         conn.on("error", () => { });
+        // An ask carries the whole tool input (a Write's file content), so one
+        // line spans many reads. Decode as a stream so no character is split.
+        conn.setEncoding("utf8");
         let buf = "";
         conn.on("data", (chunk) => {
             buf += chunk;
@@ -932,8 +935,10 @@ function recordCostState(sessionId, state) {
     const ids = Object.keys(history);
     for (const id of ids.slice(0, Math.max(0, ids.length - COST_HISTORY_SESSIONS)))
         delete history[id];
+    // Written after every turn, so not fsynced: what a power cut could lose is
+    // the same thing a failed write already gives up (below).
     try {
-        writeFileAtomic(COST_HISTORY_FILE, JSON.stringify(history), { mode: 0o600 });
+        writeFileAtomic(COST_HISTORY_FILE, JSON.stringify(history), { mode: 0o600, durable: false });
     }
     catch {
         // a lost state only means a later resume keeps its whole figure
@@ -1051,6 +1056,26 @@ export const ClaudeDriver = {
         const readCliVersion = (env) => new Promise((resolve) => {
             execCli(config.cli, ["--version"], { timeout: 8000, env }, (err, stdout) => resolve(err ? null : stdout.trim() || null));
         });
+        // The --help read while it runs: snapshots that overlap (the server's
+        // read at start and the app's first one) share it.
+        let helpRead = null;
+        const readCliHelp = (version, env) => {
+            if (helpRead?.version === version)
+                return helpRead.done;
+            const read = {
+                version,
+                done: new Promise((resolve) => {
+                    execCli(config.cli, ["--help"], { timeout: 8000, env }, (err, stdout) => resolve(err ? null : stdout));
+                }).then((help) => {
+                    cliHasAutocompact = help === null ? null : /^\s*--autocompact\b/m.test(help);
+                    cliHelpVersion = version;
+                    if (helpRead === read)
+                        helpRead = null;
+                }),
+            };
+            helpRead = read;
+            return read.done;
+        };
         const listeners = new Set();
         // one active turn per thread; a second send while busy is a caller bug
         const active = new Map();
@@ -1411,14 +1436,18 @@ export const ClaudeDriver = {
                 ? readClaudeAuthSettings(env, input.environment) : {};
             // Harness hooks (item 0.2): one helper command for the events the
             // harness observes. The helper reads its bearer from a per-thread file
-            // the harness rewrites every turn, so a long-lived CLI process never
+            // the harness refreshes every turn, so a long-lived CLI process never
             // presents a stale token. Registered through the same private
             // --settings file as the auth override; both are 0600 and per launch.
             const hooks = turn.integrations?.hooks;
             const hookTokenPath = hooks ? hookTokenFile(threadId, botId) : null;
             if (hooks && hookTokenPath) {
                 mkdirSync(dirname(hookTokenPath), { recursive: true, mode: 0o700 });
-                writeFileAtomic(hookTokenPath, hooks.token, { mode: 0o600 });
+                // The bearer is usually the same as last turn, and it only lives in
+                // this process's memory, so a restart invalidates the file anyway:
+                // skip identical bytes and the fsync. A rotated bearer differs from
+                // what is on disk, so it is always written before the CLI launches.
+                writeFileAtomicIfChanged(hookTokenPath, hooks.token, { mode: 0o600, durable: false });
                 env.OMB_HOOK_URL = hooks.url;
                 env.OMB_HOOK_TOKEN_FILE = hookTokenPath;
                 env.OMB_HOOK_NODE = process.execPath;
@@ -2303,13 +2332,8 @@ export const ClaudeDriver = {
                 return { state: "unavailable", reason: `\`${config.cli}\` CLI not found` };
             cliVersion = parseClaudeCliVersion(version);
             cliVersionChecked = true;
-            if (version !== cliHelpVersion) {
-                const help = await new Promise((resolve) => {
-                    execCli(config.cli, ["--help"], { timeout: 8000, env }, (err, stdout) => resolve(err ? null : stdout));
-                });
-                cliHasAutocompact = help === null ? null : /^\s*--autocompact\b/m.test(help);
-                cliHelpVersion = version;
-            }
+            if (version !== cliHelpVersion)
+                await readCliHelp(version, env);
             const update = claudeCliUpdate(version, config.cli);
             const warning = claudeInheritWarning(env);
             if (config.requireApiKey) {

package/dist-server/server/drivers/codex-device-auth.js

@@ -1,35 +1,12 @@
-import { randomUUID } from "node:crypto";
-import { realpathSync } from "node:fs";
-import { homedir } from "node:os";
-import { basename, dirname, isAbsolute, join, resolve } from "node:path";
+// Codex's half of the in-app device-code sign-in (device-auth.ts): `codex
+// login --device-auth` for a ChatGPT account, with `codex login status` to
+// keep a working login and to confirm the new one, and `codex logout` for
+// Settings' sign-out.
 import { stripVTControlCharacters } from "node:util";
-import { killCliTree, spawnCli } from "../procs.js";
-const DEVICE_URL = "https://auth.openai.com/codex/device";
-const MAX_OUTPUT = 16_384;
-// Two configured instances can use the same on-disk login. Only the auth
-// operation is exclusive: normal turns are not blocked by this lock.
-const authenticatingHomes = new Set();
-/** The real path of a credential home, so two spellings of one home share
- * one sign-in lock. A missing tail keeps its name under its real parent. */
-export function canonicalPath(path) {
-    try {
-        return realpathSync(path);
-    }
-    catch {
-        const parent = dirname(path);
-        return parent === path ? path : join(canonicalPath(parent), basename(path));
-    }
-}
+import { deviceSignInPrompt } from "../../shared/device-sign-in.js";
+import { DeviceAuthController } from "./device-auth.js";
 export function codexDevicePrompt(output) {
-    const clean = stripVTControlCharacters(output);
-    // Chunks may stop halfway through a code. Never publish the incomplete
-    // final line before its newline arrives.
-    const lines = clean.split(/\r?\n/).slice(0, -1).map((line) => line.trim());
-    // Do not turn arbitrary output into a link, or pass through query tokens.
-    if (!lines.some((line) => /^https:\/\/auth\.openai\.com\/codex\/device\/?$/.test(line)))
-        return null;
-    const userCode = lines.find((line) => /^[A-Z0-9]{4,8}-[A-Z0-9]{4,8}$/.test(line));
-    return userCode ? { authorizationUrl: DEVICE_URL, userCode } : null;
+    return deviceSignInPrompt("codex", stripVTControlCharacters(output));
 }
 function loginFailure(output) {
     if (/(unexpected argument|unrecognized (argument|option)|unknown option).*device-auth/i.test(output)) {
@@ -43,293 +20,24 @@ function loginFailure(output) {
     }
     return "ChatGPT sign-in did not finish. Check the server's connection and that device-code login is enabled in ChatGPT, then try again.";
 }
-/** A fixed Codex login command, not a remotely accessible terminal. CLI
- * output stays in bounded private memory; only a device URL/code is exposed. */
-export class CodexDeviceAuthController {
-    flow = null;
-    command = null;
-    disposed = false;
-    options;
-    constructor(options) { this.options = options; }
-    async start() {
-        if (this.disposed)
-            throw new Error("This provider was removed. Refresh Settings before signing in.");
-        if (this.flow?.status.phase === "waiting") {
-            if (this.flow.ready)
-                return { ...this.flow.status, phase: "waiting" };
-            throw new Error("A ChatGPT sign-in is already starting. Please wait for the code.");
-        }
-        await this.flow?.stopping;
-        if (this.disposed)
-            throw new Error("This provider was removed. Refresh Settings before signing in.");
-        const env = this.options.environment();
-        const home = env.HOME || env.USERPROFILE || homedir();
-        if (!isAbsolute(home) || (env.CODEX_HOME && !isAbsolute(env.CODEX_HOME))) {
-            throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing in.");
-        }
-        const homeKey = canonicalPath(resolve(env.CODEX_HOME || join(home, ".codex")));
-        if (authenticatingHomes.has(homeKey)) {
-            throw new Error("A ChatGPT sign-in is already running for this server account. Finish or cancel it before starting another.");
-        }
-        authenticatingHomes.add(homeKey);
-        return new Promise((resolveStart, reject) => {
-            const flow = {
-                status: {
-                    phase: "waiting", flowId: randomUUID(), authorizationUrl: null,
-                    expiresAt: new Date(Date.now() + (this.options.lifetimeMs ?? 15 * 60_000)).toISOString(),
-                },
-                child: null, ready: false, resolve: resolveStart, reject, homeKey,
-                startupTimer: setTimeout(() => this.finish(flow, "failed", "Codex did not provide a sign-in code in time. Check the server connection and update Codex, then try again."), this.options.startupTimeoutMs ?? 30_000),
-                expiryTimer: setTimeout(() => this.finish(flow, "expired", "The ChatGPT sign-in code expired. Start sign-in again."), this.options.lifetimeMs ?? 15 * 60_000),
-            };
-            flow.startupTimer.unref();
-            flow.expiryTimer.unref();
-            this.flow = flow;
-            // Never overwrite a working login just because Connect was clicked twice.
-            this.run(flow, ["login", "status"], env, home, (code, output) => {
-                if (code === 0 && /^logged in.*chatgpt\b/im.test(output)) {
-                    this.finish(flow, "succeeded");
-                }
-                else if (code === 0 && /^logged in\b/im.test(output)) {
-                    this.finish(flow, "failed", "Codex already has a different sign-in method on this server. Ask the server administrator to review it before changing accounts.");
-                }
-                else if (code !== 0 && /^not logged in\b/im.test(output)) {
-                    this.run(flow, ["login", "--device-auth"], env, home, (loginCode, loginOutput) => {
-                        if (loginCode !== 0 || !flow.ready) {
-                            this.finish(flow, "failed", loginFailure(loginOutput));
-                            return;
-                        }
-                        // A successful command is not enough: verify credentials using the
-                        // same executable and environment that will run this client's bots.
-                        flow.startupTimer = setTimeout(() => this.finish(flow, "failed", "Codex finished sign-in but could not confirm the account. Refresh Settings and try again."), this.options.startupTimeoutMs ?? 30_000);
-                        flow.startupTimer.unref();
-                        this.run(flow, ["login", "status"], env, home, (statusCode, statusOutput) => {
-                            this.finish(flow, statusCode === 0 && /^logged in.*chatgpt\b/im.test(statusOutput) ? "succeeded" : "failed", "Codex finished sign-in but did not confirm a ChatGPT account. Refresh Settings and try again.");
-                        });
-                    }, true);
-                }
-                else
-                    this.finish(flow, "failed", "Codex could not confirm the existing sign-in on this server. Update Codex and check its login status before trying again.");
-            });
-        });
-    }
-    async get(flowId) {
-        if (!flowId || this.flow?.status.flowId !== flowId)
-            throw new Error("This sign-in is no longer available. Start sign-in again.");
-        return { ...this.flow.status };
-    }
-    async cancel() {
-        if (this.flow?.status.phase === "waiting")
-            this.finish(this.flow, "cancelled", "ChatGPT sign-in cancelled.");
-        await this.flow?.stopping;
-        if (this.flow?.terminationFailed)
-            throw new Error(this.flow.status.message);
-        if (this.command && !await this.stopChild(this.command)) {
-            throw new Error("Codex could not be stopped on this server. Ask the server administrator to stop the account command before trying again.");
-        }
-    }
-    async dispose() {
-        this.disposed = true;
-        await this.cancel();
-        this.flow = null;
-    }
-    /** Remove the ChatGPT sign-in Codex stores for this server account so a
-     * different account can connect. A sign-in in progress is never pulled
-     * away underneath the browser completing it. */
-    async signOut() {
-        if (this.disposed)
-            throw new Error("This provider was removed. Refresh Settings before signing out.");
-        if (this.flow?.status.phase === "waiting")
-            throw new Error("Finish or cancel the ChatGPT sign-in in progress before signing out.");
-        await this.flow?.stopping;
-        if (this.disposed)
-            throw new Error("This provider was removed. Refresh Settings before signing out.");
-        const env = this.options.environment();
-        const home = env.HOME || env.USERPROFILE || homedir();
-        if (!isAbsolute(home) || (env.CODEX_HOME && !isAbsolute(env.CODEX_HOME))) {
-            throw new Error("Use an absolute HOME and CODEX_HOME path for this server's Codex provider before signing out.");
-        }
-        const homeKey = canonicalPath(resolve(env.CODEX_HOME || join(home, ".codex")));
-        if (authenticatingHomes.has(homeKey)) {
-            throw new Error("A ChatGPT sign-in is running for this server account. Finish or cancel it before signing out.");
-        }
-        authenticatingHomes.add(homeKey);
-        try {
-            const before = await this.exec(["login", "status"], env, home);
-            if (before.code === 1 && /^not logged in\b/im.test(before.output))
-                return;
-            if (before.code !== 0 || !/^logged in.*chatgpt\b/im.test(before.output)) {
-                throw new Error("Codex did not confirm a ChatGPT sign-in. Other authentication methods will not be removed; ask the server administrator to check the account.");
-            }
-            const logout = await this.exec(["logout"], env, home);
-            if (logout.code !== 0)
-                throw new Error("Codex could not remove the sign-in on this server. Check the server's Codex installation and try again.");
-            // The command's own report is not enough: confirm with the same status
-            // check that decides whether bots may run on this account.
-            const status = await this.exec(["login", "status"], env, home);
-            if (status.code !== 1 || !/^not logged in\b/im.test(status.output)) {
-                throw new Error("Codex still reports a sign-in on this server. Update Codex and check its login status before trying again.");
-            }
-        }
-        finally {
-            // If the OS cannot stop a command, it may still change credentials.
-            // Keep the home reserved until that exact child actually exits.
-            const child = this.command;
-            if (child && child.exitCode === null && child.signalCode === null) {
-                child.once("close", () => authenticatingHomes.delete(homeKey));
-            }
-            else
-                authenticatingHomes.delete(homeKey);
-        }
-    }
-    /** One bounded, non-interactive Codex command. Its output stays here;
-     * callers see an exit code and a status-line match, never the text. */
-    exec(args, env, cwd) {
-        return new Promise((resolveExec, rejectExec) => {
-            if (this.disposed) {
-                rejectExec(new Error("This provider was removed. Refresh Settings before signing out."));
-                return;
-            }
-            let child;
-            try {
-                child = spawnCli(this.options.cli, args, { env: { ...env, NO_COLOR: "1" }, cwd, stdio: ["pipe", "pipe", "pipe"] });
-            }
-            catch {
-                rejectExec(new Error("Codex could not start on this server. Install or update the configured Codex CLI, then try again."));
-                return;
-            }
-            this.command = child;
-            child.stdin.end();
-            let output = "";
-            const receive = (chunk) => {
-                if (output.length < MAX_OUTPUT)
-                    output += chunk.toString("utf8").slice(0, MAX_OUTPUT - output.length);
-            };
-            child.stdout.on("data", receive);
-            child.stderr.on("data", receive);
-            // A hung CLI must not hold the credential-home lock forever.
-            const timer = setTimeout(() => {
-                void this.stopChild(child).catch(() => false).then((stopped) => {
-                    if (!stopped)
-                        rejectExec(new Error("Codex could not be stopped on this server. Ask the server administrator to stop the account command before trying again."));
-                });
-            }, this.options.startupTimeoutMs ?? 30_000);
-            timer.unref();
-            child.once("error", (error) => {
-                clearTimeout(timer);
-                rejectExec(new Error(error.code === "ENOENT"
-                    ? "Codex is not installed on this server. Run npm install -g @openai/codex@latest on the server, then try again."
-                    : "Codex could not start on this server. Check the configured CLI path and its executable permissions."));
-            });
-            child.once("close", (code) => {
-                clearTimeout(timer);
-                if (this.command === child)
-                    this.command = null;
-                resolveExec({ code, output: stripVTControlCharacters(output) });
-            });
-        });
-    }
-    run(flow, args, env, cwd, done, parsePrompt = false) {
-        if (flow.status.phase !== "waiting")
-            return;
-        let child;
-        try {
-            child = spawnCli(this.options.cli, args, { env: { ...env, NO_COLOR: "1" }, cwd, stdio: ["pipe", "pipe", "pipe"] });
-        }
-        catch {
-            this.finish(flow, "failed", "Codex could not start on this server. Install or update the configured Codex CLI, then try again.");
-            return;
-        }
-        flow.child = child;
-        child.stdin.end();
-        let output = "";
-        const receive = (chunk) => {
-            if (flow.status.phase !== "waiting")
-                return;
-            if (output.length + chunk.length > MAX_OUTPUT) {
-                this.finish(flow, "failed", "Codex returned an unexpected sign-in response. Update the server's Codex CLI and try again.");
-                return;
-            }
-            output += chunk.toString("utf8");
-            const prompt = parsePrompt && !flow.ready ? codexDevicePrompt(output) : null;
-            if (prompt) {
-                flow.status = { ...flow.status, ...prompt };
-                flow.ready = true;
-                clearTimeout(flow.startupTimer);
-                flow.resolve({ ...flow.status, phase: "waiting" });
-            }
-        };
-        child.stdout.on("data", receive);
-        child.stderr.on("data", receive);
-        child.once("error", (error) => {
-            const message = error.code === "ENOENT"
-                ? "Codex is not installed on this server. Run npm install -g @openai/codex@latest on the server, then try again."
-                : "Codex could not start on this server. Check the configured CLI path and its executable permissions.";
-            this.finish(flow, "failed", message);
-        });
-        child.once("close", (code) => {
-            if (flow.child === child)
-                flow.child = null;
-            if (flow.status.phase === "waiting")
-                done(code, stripVTControlCharacters(output));
-            output = "";
-        });
-    }
-    finish(flow, phase, message) {
-        if (flow.status.phase !== "waiting")
-            return;
-        clearTimeout(flow.startupTimer);
-        clearTimeout(flow.expiryTimer);
-        flow.status = {
-            phase, flowId: flow.status.flowId, authorizationUrl: null, expiresAt: null,
-            ...(phase !== "succeeded" && message ? { message } : {}),
-        };
-        if (!flow.ready) {
-            if (phase === "succeeded")
-                flow.resolve({ ...flow.status, phase });
-            else
-                flow.reject(new Error(message ?? "ChatGPT sign-in did not finish."));
-        }
-        flow.stopping = this.stopChild(flow.child).catch(() => false).then((stopped) => {
-            const release = () => authenticatingHomes.delete(flow.homeKey);
-            if (stopped) {
-                release();
-                return;
-            }
-            flow.terminationFailed = true;
-            flow.status = { ...flow.status, phase: "failed", message: "Codex could not be stopped on this server. Ask the server administrator to stop the login process before trying again." };
-            // Retain the credential-home lock until the OS actually reports exit.
-            const child = flow.child;
-            if (!child || child.exitCode !== null || child.signalCode !== null)
-                release();
-            else
-                child.once("close", release);
-        });
-        if (phase === "succeeded")
-            void this.options.onAuthenticated?.().catch(() => { });
-    }
-    async stopChild(child) {
-        if (!child || await killCliTree(child, this.options.terminateTimeoutMs ?? 1500))
-            return true;
-        // A broken CLI may ignore SIGTERM. Do not leave a stale device flow able
-        // to write credentials after the user cancelled it.
-        if (process.platform !== "win32" && child.pid) {
-            try {
-                process.kill(-child.pid, "SIGKILL");
-            }
-            catch {
-                child.kill("SIGKILL");
-            }
-        }
-        else
-            child.kill("SIGKILL");
-        await new Promise((resolveStop) => {
-            if (child.exitCode !== null || child.signalCode !== null)
-                return resolveStop();
-            const timer = setTimeout(resolveStop, 1500);
-            timer.unref();
-            child.once("close", () => { clearTimeout(timer); resolveStop(); });
-        });
-        return child.exitCode !== null || child.signalCode !== null;
-    }
+export const CODEX_DEVICE_SIGN_IN = {
+    provider: "codex",
+    product: "Codex",
+    account: "ChatGPT",
+    homeEnv: "CODEX_HOME",
+    homeDir: ".codex",
+    loginArgs: ["login", "--device-auth"],
+    install: "Run npm install -g @openai/codex@latest on the server, then try again.",
+    failure: loginFailure,
+    status: {
+        args: ["login", "status"],
+        read: (code, output) => code === 0 && /^logged in.*chatgpt\b/im.test(output) ? "signed-in"
+            : code === 0 && /^logged in\b/im.test(output) ? "other"
+                : code !== 0 && /^not logged in\b/im.test(output) ? "signed-out"
+                    : "unknown",
+    },
+    logoutArgs: ["logout"],
+};
+export class CodexDeviceAuthController extends DeviceAuthController {
+    constructor(options) { super(CODEX_DEVICE_SIGN_IN, options); }
 }