@poolzin/pool-bot 1.28.0 → 2026.1.26

package/README.md

@@ -2,22 +2,25 @@
 
 > Your AI pool of knowledge
 
-**Pool Bot** is a professional AI assistant with advanced PLCODE integrations and development-focused features.
+**Pool Bot** is a professional AI assistant built on the robust [Clawdbot](https://github.com/clawdbot/clawdbot) framework, customized with advanced PLCODE integrations and development-focused features.
 
 ![Pool Bot](README-header.png)
 
 ## 🌟 What Makes Pool Bot Different
 
 - 🎱 **PLCODE Integration** - Native support for coding workflows
-- 🧠 **Enhanced Memory** - Advanced context management
+- 🧠 **Enhanced Memory** - Advanced context management  
 - 🛠️ **Developer Tools** - Built for development teams
 - 🔒 **Private & Secure** - Your data, your control
-- 🌐 **Multi-Channel Support** - WhatsApp, Telegram, Discord, Slack, Signal, and more
+
+## Based on Clawdbot
+
+Pool Bot is built on the excellent [Clawdbot](https://github.com/clawdbot/clawdbot) framework by Peter Steinberger (MIT License). We maintain compatibility with upstream updates while adding our own enhancements.
 
 ## Installation
 
 ```bash
-npm install -g @poolzin/pool-bot
+npm install -g pool-bot
 poolbot --help
 ```
 
@@ -46,38 +49,12 @@ poolbot status
 
 ## Documentation
 
-Full documentation is available at [docs.clawd.bot](https://docs.clawd.bot)
-
-## Skills
-
-Pool Bot supports an extensible skills system:
-
-- 🎮 **WebGPU Three.js TSL** - 3D development with WebGPU
-- 🔍 **GitHub Integration** - Issues, PRs, and CI management
-- 🌦️ **Weather** - Current weather and forecasts
-- 📧 **Notion** - Database and page management
-- 🐦 **X/Twitter** - Social media engagement
-- And more...
-
-## Configuration
-
-Pool Bot uses a profile-based configuration system:
-
-```bash
-# Use default profile
-poolbot gateway start
-
-# Use custom profile
-poolbot --profile production gateway start
-
-# Use dev profile (isolated state)
-poolbot --dev gateway start
-```
+See [docs/](docs/) for full documentation, or visit the [Clawdbot docs](https://docs.clawd.bot) (most features are identical).
 
 ## Development
 
 ```bash
-# Clone repository
+# Clone the repo
 git clone https://github.com/plcunha/pool-bot.git
 cd pool-bot
 
@@ -87,26 +64,39 @@ pnpm install
 # Build
 pnpm build
 
-# Run tests
-pnpm test
-
-# Start gateway
-node dist/entry.js gateway
+# Run locally
+node dist/entry.js --help
 ```
 
-## Support
+## Staying Updated
+
+Pool Bot maintains sync with upstream Clawdbot for bug fixes and new features:
+
+```bash
+./sync-upstream.sh
+```
 
-- **Documentation**: https://docs.clawd.bot
-- **GitHub Issues**: https://github.com/plcunha/pool-bot/issues
-- **Community**: https://discord.com/invite/clawd
+See [CUSTOM.md](CUSTOM.md) for details on customizations and merge strategy.
 
-## Author
+## Contributing
 
-João Vitor Cunha dos Santos
-- Email: jvsantos.cunha@gmail.com
-- GitHub: @plcunha
-- Telegram: @poolzin
+Pool Bot is a private fork for specific use cases. For contributions to the base framework, please see [Clawdbot](https://github.com/clawdbot/clawdbot).
 
 ## License
 
-MIT License - see LICENSE file for details
+MIT License - Based on Clawdbot by Peter Steinberger
+
+Copyright (c) 2025 Peter Steinberger (Clawdbot)  
+Copyright (c) 2026 João Vitor Cunha dos Santos (Pool Bot customizations)
+
+See [LICENSE](LICENSE) for details.
+
+## Credits
+
+- **Original Framework:** [Clawdbot](https://github.com/clawdbot/clawdbot) by Peter Steinberger
+- **Pool Bot Customizations:** João Vitor Cunha dos Santos (@plcunha)
+- **PLCODE Integration:** Part of the PLCODE project
+
+---
+
+🎱 **Pool Bot** - Dive deep into intelligence

package/assets/chrome-extension/background.js

@@ -114,7 +114,7 @@ function onRelayClosed(reason) {
     setBadge(tabId, 'connecting')
     void chrome.action.setTitle({
       tabId,
-      title: 'Moltbot Browser Relay: disconnected (click to re-attach)',
+      title: 'Clawdbot Browser Relay: disconnected (click to re-attach)',
     })
   }
   tabs.clear()
@@ -225,7 +225,7 @@ async function attachTab(tabId, opts = {}) {
   tabBySession.set(sessionId, tabId)
   void chrome.action.setTitle({
     tabId,
-    title: 'Moltbot Browser Relay: attached (click to detach)',
+    title: 'Clawdbot Browser Relay: attached (click to detach)',
   })
 
   if (!opts.skipAttachedEvent) {
@@ -278,7 +278,7 @@ async function detachTab(tabId, reason) {
   setBadge(tabId, 'off')
   void chrome.action.setTitle({
     tabId,
-    title: 'Moltbot Browser Relay (click to attach/detach)',
+    title: 'Clawdbot Browser Relay (click to attach/detach)',
   })
 }
 
@@ -297,7 +297,7 @@ async function connectOrToggleForActiveTab() {
   setBadge(tabId, 'connecting')
   void chrome.action.setTitle({
     tabId,
-    title: 'Moltbot Browser Relay: connecting to local relay…',
+    title: 'Clawdbot Browser Relay: connecting to local relay…',
   })
 
   try {
@@ -308,7 +308,7 @@ async function connectOrToggleForActiveTab() {
     setBadge(tabId, 'error')
     void chrome.action.setTitle({
       tabId,
-      title: 'Moltbot Browser Relay: relay not running (open options for setup)',
+      title: 'Clawdbot Browser Relay: relay not running (open options for setup)',
     })
     void maybeOpenHelpOnce()
     // Extra breadcrumbs in chrome://extensions service worker logs.

package/assets/chrome-extension/manifest.json

@@ -1,8 +1,8 @@
 {
   "manifest_version": 3,
-  "name": "Moltbot Browser Relay",
+  "name": "PooL Browser Relay",
   "version": "0.1.0",
-  "description": "Attach Moltbot to your existing Chrome tab via a local CDP relay server.",
+  "description": "Attach PooL to your existing Chrome tab via a local CDP relay server.",
   "icons": {
     "16": "icons/icon16.png",
     "32": "icons/icon32.png",
@@ -13,7 +13,7 @@
   "host_permissions": ["http://127.0.0.1/*", "http://localhost/*"],
   "background": { "service_worker": "background.js", "type": "module" },
   "action": {
-    "default_title": "Moltbot Browser Relay (click to attach/detach)",
+    "default_title": "PooL Browser Relay (click to attach/detach)",
     "default_icon": {
       "16": "icons/icon16.png",
       "32": "icons/icon32.png",

package/assets/chrome-extension/options.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Moltbot Browser Relay</title>
+    <title>Clawdbot Browser Relay</title>
     <style>
       :root {
         color-scheme: light dark;
@@ -158,7 +158,7 @@
           <img src="icons/icon128.png" alt="" />
         </div>
         <div>
-          <h1>Moltbot Browser Relay</h1>
+          <h1>Clawdbot Browser Relay</h1>
           <p class="subtitle">Click the toolbar button on a tab to attach / detach.</p>
         </div>
       </header>
@@ -168,10 +168,11 @@
           <h2>Getting started</h2>
           <p>
             If you see a red <code>!</code> badge on the extension icon, the relay server is not reachable.
-            Start Moltbot’s browser relay on this machine (Gateway or node host), then click the toolbar button again.
+            Start Clawdbot’s browser relay on this machine (Gateway or <code>clawdbot browser serve</code>),
+            then click the toolbar button again.
           </p>
           <p>
-            Full guide (install, remote Gateway, security): <a href="https://docs.molt.bot/tools/chrome-extension" target="_blank" rel="noreferrer">docs.molt.bot/tools/chrome-extension</a>
+            Full guide (install, remote Gateway, security): <a href="https://docs.clawd.bot/tools/chrome-extension" target="_blank" rel="noreferrer">docs.clawd.bot/tools/chrome-extension</a>
           </p>
         </div>
 
@@ -184,7 +185,7 @@
           </div>
           <div class="hint">
             Default: <code>18792</code>. Extension connects to: <code id="relay-url">http://127.0.0.1:&lt;port&gt;/</code>.
-            Only change this if your Moltbot profile uses a different <code>cdpUrl</code> port.
+            Only change this if your Clawdbot profile uses a different <code>cdpUrl</code> port.
           </div>
           <div class="status" id="status"></div>
         </div>

package/assets/chrome-extension/options.js

@@ -31,7 +31,7 @@ async function checkRelayReachable(port) {
   } catch {
     setStatus(
       'error',
-      `Relay not reachable at ${url}. Start Moltbot’s browser relay on this machine, then click the toolbar button again.`,
+      `Relay not reachable at ${url}. Start Clawdbot’s browser relay on this machine, then click the toolbar button again.`,
     )
   } finally {
     clearTimeout(t)

package/dist/acp/client.js

@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import * as readline from "node:readline";
 import { Readable, Writable } from "node:stream";
 import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream, } from "@agentclientprotocol/sdk";
-import { ensureMoltbotCliOnPath } from "../infra/path-env.js";
+import { ensureClawdbotCliOnPath } from "../infra/path-env.js";
 function toArgs(value) {
     if (!value)
         return [];
@@ -50,8 +50,8 @@ export async function createAcpClient(opts = {}) {
     const cwd = opts.cwd ?? process.cwd();
     const verbose = Boolean(opts.verbose);
     const log = verbose ? (msg) => console.error(`[acp-client] ${msg}`) : () => { };
-    ensureMoltbotCliOnPath({ cwd });
-    const serverCommand = opts.serverCommand ?? "moltbot";
+    ensureClawdbotCliOnPath({ cwd });
+    const serverCommand = opts.serverCommand ?? "clawdbot";
     const serverArgs = buildServerArgs(opts);
     log(`spawning: ${serverCommand} ${serverArgs.join(" ")}`);
     const agent = spawn(serverCommand, serverArgs, {
@@ -88,7 +88,7 @@ export async function createAcpClient(opts = {}) {
             fs: { readTextFile: true, writeTextFile: true },
             terminal: true,
         },
-        clientInfo: { name: "moltbot-acp-client", version: "1.0.0" },
+        clientInfo: { name: "clawdbot-acp-client", version: "1.0.0" },
     });
     log("creating session");
     const session = await client.newSession({
@@ -107,7 +107,7 @@ export async function runAcpClientInteractive(opts = {}) {
         input: process.stdin,
         output: process.stdout,
     });
-    console.log("Moltbot ACP client");
+    console.log("PooL ACP client");
     console.log(`Session: ${sessionId}`);
     console.log('Type a prompt, or "exit" to quit.\n');
     const prompt = () => {

package/dist/acp/server.js

@@ -108,7 +108,7 @@ function parseArgs(args) {
     return opts;
 }
 function printHelp() {
-    console.log(`Usage: moltbot acp [options]
+    console.log(`Usage: clawdbot acp [options]
 
 Gateway-backed ACP server for IDE integration.
 

package/dist/acp/types.js

@@ -1,6 +1,6 @@
 import { VERSION } from "../version.js";
 export const ACP_AGENT_INFO = {
-    name: "moltbot-acp",
-    title: "Moltbot ACP Gateway",
+    name: "clawdbot-acp",
+    title: "PooL ACP Gateway",
     version: VERSION,
 };

package/dist/agents/agent-paths.js

@@ -2,15 +2,15 @@ import path from "node:path";
 import { resolveStateDir } from "../config/paths.js";
 import { DEFAULT_AGENT_ID } from "../routing/session-key.js";
 import { resolveUserPath } from "../utils.js";
-export function resolveMoltbotAgentDir() {
+export function resolveClawdbotAgentDir() {
     const override = process.env.CLAWDBOT_AGENT_DIR?.trim() || process.env.PI_CODING_AGENT_DIR?.trim();
     if (override)
         return resolveUserPath(override);
     const defaultAgentDir = path.join(resolveStateDir(), "agents", DEFAULT_AGENT_ID, "agent");
     return resolveUserPath(defaultAgentDir);
 }
-export function ensureMoltbotAgentEnv() {
-    const dir = resolveMoltbotAgentDir();
+export function ensureClawdbotAgentEnv() {
+    const dir = resolveClawdbotAgentDir();
     if (!process.env.CLAWDBOT_AGENT_DIR)
         process.env.CLAWDBOT_AGENT_DIR = dir;
     if (!process.env.PI_CODING_AGENT_DIR)

package/dist/agents/auth-health.js

@@ -1,6 +1,10 @@
-import { resolveAuthProfileDisplayLabel, } from "./auth-profiles.js";
+import { CLAUDE_CLI_PROFILE_ID, CODEX_CLI_PROFILE_ID, resolveAuthProfileDisplayLabel, } from "./auth-profiles.js";
 export const DEFAULT_OAUTH_WARN_MS = 24 * 60 * 60 * 1000;
-export function resolveAuthProfileSource(_profileId) {
+export function resolveAuthProfileSource(profileId) {
+    if (profileId === CLAUDE_CLI_PROFILE_ID)
+        return "claude-cli";
+    if (profileId === CODEX_CLI_PROFILE_ID)
+        return "codex-cli";
     return "store";
 }
 export function formatRemainingShort(remainingMs) {

package/dist/agents/auth-profiles/doctor.js

@@ -26,6 +26,6 @@ export function formatAuthDoctorHint(params) {
         `- config: ${legacyProfileId}${cfgProvider || cfgMode ? ` (provider=${cfgProvider ?? "?"}, mode=${cfgMode ?? "?"})` : ""}`,
         `- auth store oauth profiles: ${storeOauthProfiles || "(none)"}`,
         `- suggested profile: ${suggested}`,
-        `Fix: run "${formatCliCommand("moltbot doctor --yes")}"`,
+        `Fix: run "${formatCliCommand("clawdbot doctor --yes")}"`,
     ].join("\n");
 }

package/dist/agents/auth-profiles/external-cli-sync.js

@@ -1,5 +1,5 @@
-import { readQwenCliCredentialsCached } from "../cli-credentials.js";
-import { EXTERNAL_CLI_NEAR_EXPIRY_MS, EXTERNAL_CLI_SYNC_TTL_MS, QWEN_CLI_PROFILE_ID, log, } from "./constants.js";
+import { readClaudeCliCredentialsCached, readCodexCliCredentialsCached, readQwenCliCredentialsCached, } from "../cli-credentials.js";
+import { CLAUDE_CLI_PROFILE_ID, CODEX_CLI_PROFILE_ID, EXTERNAL_CLI_NEAR_EXPIRY_MS, EXTERNAL_CLI_SYNC_TTL_MS, QWEN_CLI_PROFILE_ID, log, } from "./constants.js";
 function shallowEqualOAuthCredentials(a, b) {
     if (!a)
         return false;
@@ -14,12 +14,24 @@ function shallowEqualOAuthCredentials(a, b) {
         a.projectId === b.projectId &&
         a.accountId === b.accountId);
 }
+function shallowEqualTokenCredentials(a, b) {
+    if (!a)
+        return false;
+    if (a.type !== "token")
+        return false;
+    return (a.provider === b.provider &&
+        a.token === b.token &&
+        a.expires === b.expires &&
+        a.email === b.email);
+}
 function isExternalProfileFresh(cred, now) {
     if (!cred)
         return false;
     if (cred.type !== "oauth" && cred.type !== "token")
         return false;
-    if (cred.provider !== "qwen-portal") {
+    if (cred.provider !== "anthropic" &&
+        cred.provider !== "openai-codex" &&
+        cred.provider !== "qwen-portal") {
         return false;
     }
     if (typeof cred.expires !== "number")
@@ -27,13 +39,146 @@ function isExternalProfileFresh(cred, now) {
     return cred.expires > now + EXTERNAL_CLI_NEAR_EXPIRY_MS;
 }
 /**
- * Sync OAuth credentials from external CLI tools (Qwen Code CLI) into the store.
+ * Find any existing openai-codex profile (other than codex-cli) that has the same
+ * access and refresh tokens. This prevents creating a duplicate codex-cli profile
+ * when the user has already set up a custom profile with the same credentials.
+ */
+export function findDuplicateCodexProfile(store, creds) {
+    for (const [profileId, profile] of Object.entries(store.profiles)) {
+        if (profileId === CODEX_CLI_PROFILE_ID)
+            continue;
+        if (profile.type !== "oauth")
+            continue;
+        if (profile.provider !== "openai-codex")
+            continue;
+        if (profile.access === creds.access && profile.refresh === creds.refresh) {
+            return profileId;
+        }
+    }
+    return undefined;
+}
+/**
+ * Sync OAuth credentials from external CLI tools (Claude Code CLI, Codex CLI) into the store.
+ * This allows clawdbot to use the same credentials as these tools without requiring
+ * separate authentication, and keeps credentials in sync when CLI tools refresh tokens.
  *
  * Returns true if any credentials were updated.
  */
-export function syncExternalCliCredentials(store) {
+export function syncExternalCliCredentials(store, options) {
     let mutated = false;
     const now = Date.now();
+    // Sync from Claude Code CLI (supports both OAuth and Token credentials)
+    const existingClaude = store.profiles[CLAUDE_CLI_PROFILE_ID];
+    const shouldSyncClaude = !existingClaude ||
+        existingClaude.provider !== "anthropic" ||
+        existingClaude.type === "token" ||
+        !isExternalProfileFresh(existingClaude, now);
+    const claudeCreds = shouldSyncClaude
+        ? readClaudeCliCredentialsCached({
+            allowKeychainPrompt: options?.allowKeychainPrompt,
+            ttlMs: EXTERNAL_CLI_SYNC_TTL_MS,
+        })
+        : null;
+    if (claudeCreds) {
+        const existing = store.profiles[CLAUDE_CLI_PROFILE_ID];
+        const claudeCredsExpires = claudeCreds.expires ?? 0;
+        // Determine if we should update based on credential comparison
+        let shouldUpdate = false;
+        let isEqual = false;
+        if (claudeCreds.type === "oauth") {
+            const existingOAuth = existing?.type === "oauth" ? existing : undefined;
+            isEqual = shallowEqualOAuthCredentials(existingOAuth, claudeCreds);
+            // Update if: no existing profile, type changed to oauth, expired, or CLI has newer token
+            shouldUpdate =
+                !existingOAuth ||
+                    existingOAuth.provider !== "anthropic" ||
+                    existingOAuth.expires <= now ||
+                    (claudeCredsExpires > now && claudeCredsExpires > existingOAuth.expires);
+        }
+        else {
+            const existingToken = existing?.type === "token" ? existing : undefined;
+            isEqual = shallowEqualTokenCredentials(existingToken, claudeCreds);
+            // Update if: no existing profile, expired, or CLI has newer token
+            shouldUpdate =
+                !existingToken ||
+                    existingToken.provider !== "anthropic" ||
+                    (existingToken.expires ?? 0) <= now ||
+                    (claudeCredsExpires > now && claudeCredsExpires > (existingToken.expires ?? 0));
+        }
+        // Also update if credential type changed (token -> oauth upgrade)
+        if (existing && existing.type !== claudeCreds.type) {
+            // Prefer oauth over token (enables auto-refresh)
+            if (claudeCreds.type === "oauth") {
+                shouldUpdate = true;
+                isEqual = false;
+            }
+        }
+        // Avoid downgrading from oauth to token-only credentials.
+        if (existing?.type === "oauth" && claudeCreds.type === "token") {
+            shouldUpdate = false;
+        }
+        if (shouldUpdate && !isEqual) {
+            store.profiles[CLAUDE_CLI_PROFILE_ID] = claudeCreds;
+            mutated = true;
+            log.info("synced anthropic credentials from claude cli", {
+                profileId: CLAUDE_CLI_PROFILE_ID,
+                type: claudeCreds.type,
+                expires: typeof claudeCreds.expires === "number"
+                    ? new Date(claudeCreds.expires).toISOString()
+                    : "unknown",
+            });
+        }
+    }
+    // Sync from Codex CLI
+    const existingCodex = store.profiles[CODEX_CLI_PROFILE_ID];
+    const existingCodexOAuth = existingCodex?.type === "oauth" ? existingCodex : undefined;
+    const duplicateExistingId = existingCodexOAuth
+        ? findDuplicateCodexProfile(store, existingCodexOAuth)
+        : undefined;
+    if (duplicateExistingId) {
+        delete store.profiles[CODEX_CLI_PROFILE_ID];
+        mutated = true;
+        log.info("removed codex-cli profile: credentials already exist in another profile", {
+            existingProfileId: duplicateExistingId,
+            removedProfileId: CODEX_CLI_PROFILE_ID,
+        });
+    }
+    const shouldSyncCodex = !existingCodex ||
+        existingCodex.provider !== "openai-codex" ||
+        !isExternalProfileFresh(existingCodex, now);
+    const codexCreds = shouldSyncCodex || duplicateExistingId
+        ? readCodexCliCredentialsCached({ ttlMs: EXTERNAL_CLI_SYNC_TTL_MS })
+        : null;
+    if (codexCreds) {
+        const duplicateProfileId = findDuplicateCodexProfile(store, codexCreds);
+        if (duplicateProfileId) {
+            if (store.profiles[CODEX_CLI_PROFILE_ID]) {
+                delete store.profiles[CODEX_CLI_PROFILE_ID];
+                mutated = true;
+                log.info("removed codex-cli profile: credentials already exist in another profile", {
+                    existingProfileId: duplicateProfileId,
+                    removedProfileId: CODEX_CLI_PROFILE_ID,
+                });
+            }
+        }
+        else {
+            const existing = store.profiles[CODEX_CLI_PROFILE_ID];
+            const existingOAuth = existing?.type === "oauth" ? existing : undefined;
+            // Codex creds don't carry expiry; use file mtime heuristic for freshness.
+            const shouldUpdate = !existingOAuth ||
+                existingOAuth.provider !== "openai-codex" ||
+                existingOAuth.expires <= now ||
+                codexCreds.expires > existingOAuth.expires;
+            if (shouldUpdate && !shallowEqualOAuthCredentials(existingOAuth, codexCreds)) {
+                store.profiles[CODEX_CLI_PROFILE_ID] = codexCreds;
+                mutated = true;
+                log.info("synced openai-codex credentials from codex cli", {
+                    profileId: CODEX_CLI_PROFILE_ID,
+                    expires: new Date(codexCreds.expires).toISOString(),
+                });
+            }
+        }
+    }
     // Sync from Qwen Code CLI
     const existingQwen = store.profiles[QWEN_CLI_PROFILE_ID];
     const shouldSyncQwen = !existingQwen ||

package/dist/agents/auth-profiles/oauth.js

@@ -2,7 +2,8 @@ import { getOAuthApiKey } from "@mariozechner/pi-ai";
 import lockfile from "proper-lockfile";
 import { refreshChutesTokens } from "../chutes-oauth.js";
 import { refreshQwenPortalCredentials } from "../../providers/qwen-portal-oauth.js";
-import { AUTH_STORE_LOCK_OPTIONS, log } from "./constants.js";
+import { writeClaudeCliCredentials } from "../cli-credentials.js";
+import { AUTH_STORE_LOCK_OPTIONS, CLAUDE_CLI_PROFILE_ID } from "./constants.js";
 import { formatAuthDoctorHint } from "./doctor.js";
 import { ensureAuthStoreFile, resolveAuthStorePath } from "./paths.js";
 import { suggestOAuthProfileIdForLegacyDefault } from "./repair.js";
@@ -58,6 +59,11 @@ async function refreshOAuthTokenWithLock(params) {
             type: "oauth",
         };
         saveAuthProfileStore(store, params.agentDir);
+        // Sync refreshed credentials back to Claude Code CLI if this is the claude-cli profile
+        // This ensures Claude Code continues to work after ClawdBot refreshes the token
+        if (params.profileId === CLAUDE_CLI_PROFILE_ID && cred.provider === "anthropic") {
+            writeClaudeCliCredentials(result.newCredentials);
+        }
         return result;
     }
     finally {
@@ -179,31 +185,6 @@ export async function resolveApiKeyForProfile(params) {
                 // keep original error
             }
         }
-        // Fallback: if this is a secondary agent, try using the main agent's credentials
-        if (params.agentDir) {
-            try {
-                const mainStore = ensureAuthProfileStore(undefined); // main agent (no agentDir)
-                const mainCred = mainStore.profiles[profileId];
-                if (mainCred?.type === "oauth" && Date.now() < mainCred.expires) {
-                    // Main agent has fresh credentials - copy them to this agent and use them
-                    refreshedStore.profiles[profileId] = { ...mainCred };
-                    saveAuthProfileStore(refreshedStore, params.agentDir);
-                    log.info("inherited fresh OAuth credentials from main agent", {
-                        profileId,
-                        agentDir: params.agentDir,
-                        expires: new Date(mainCred.expires).toISOString(),
-                    });
-                    return {
-                        apiKey: buildOAuthApiKey(mainCred.provider, mainCred),
-                        provider: mainCred.provider,
-                        email: mainCred.email,
-                    };
-                }
-            }
-            catch {
-                // keep original error if main agent fallback also fails
-            }
-        }
         const message = error instanceof Error ? error.message : String(error);
         const hint = formatAuthDoctorHint({
             cfg,

package/dist/agents/auth-profiles/paths.js

@@ -2,14 +2,14 @@ import fs from "node:fs";
 import path from "node:path";
 import { saveJsonFile } from "../../infra/json-file.js";
 import { resolveUserPath } from "../../utils.js";
-import { resolveMoltbotAgentDir } from "../agent-paths.js";
+import { resolveClawdbotAgentDir } from "../agent-paths.js";
 import { AUTH_PROFILE_FILENAME, AUTH_STORE_VERSION, LEGACY_AUTH_FILENAME } from "./constants.js";
 export function resolveAuthStorePath(agentDir) {
-    const resolved = resolveUserPath(agentDir ?? resolveMoltbotAgentDir());
+    const resolved = resolveUserPath(agentDir ?? resolveClawdbotAgentDir());
     return path.join(resolved, AUTH_PROFILE_FILENAME);
 }
 export function resolveLegacyAuthStorePath(agentDir) {
-    const resolved = resolveUserPath(agentDir ?? resolveMoltbotAgentDir());
+    const resolved = resolveUserPath(agentDir ?? resolveClawdbotAgentDir());
     return path.join(resolved, LEGACY_AUTH_FILENAME);
 }
 export function resolveAuthStorePathForDisplay(agentDir) {

package/dist/agents/auth-profiles/store.js

@@ -2,8 +2,8 @@ import fs from "node:fs";
 import lockfile from "proper-lockfile";
 import { resolveOAuthPath } from "../../config/paths.js";
 import { loadJsonFile, saveJsonFile } from "../../infra/json-file.js";
-import { AUTH_STORE_LOCK_OPTIONS, AUTH_STORE_VERSION, log } from "./constants.js";
-import { syncExternalCliCredentials } from "./external-cli-sync.js";
+import { AUTH_STORE_LOCK_OPTIONS, AUTH_STORE_VERSION, CODEX_CLI_PROFILE_ID, log, } from "./constants.js";
+import { findDuplicateCodexProfile, syncExternalCliCredentials } from "./external-cli-sync.js";
 import { ensureAuthStoreFile, resolveAuthStorePath, resolveLegacyAuthStorePath } from "./paths.js";
 function _syncAuthProfileStore(target, source) {
     target.version = source.version;
@@ -209,13 +209,13 @@ export function loadAuthProfileStore() {
     syncExternalCliCredentials(store);
     return store;
 }
-function loadAuthProfileStoreForAgent(agentDir, _options) {
+function loadAuthProfileStoreForAgent(agentDir, options) {
     const authPath = resolveAuthStorePath(agentDir);
     const raw = loadJsonFile(authPath);
     const asStore = coerceAuthStore(raw);
     if (asStore) {
         // Sync from external CLI tools on every load
-        const synced = syncExternalCliCredentials(asStore);
+        const synced = syncExternalCliCredentials(asStore, options);
         if (synced) {
             saveJsonFile(authPath, asStore);
         }
@@ -275,7 +275,7 @@ function loadAuthProfileStoreForAgent(agentDir, _options) {
         }
     }
     const mergedOAuth = mergeOAuthFileIntoStore(store);
-    const syncedCli = syncExternalCliCredentials(store);
+    const syncedCli = syncExternalCliCredentials(store, options);
     const shouldWrite = legacy !== null || mergedOAuth || syncedCli;
     if (shouldWrite) {
         saveJsonFile(authPath, store);
@@ -308,6 +308,14 @@ export function ensureAuthProfileStore(agentDir, options) {
     }
     const mainStore = loadAuthProfileStoreForAgent(undefined, options);
     const merged = mergeAuthProfileStores(mainStore, store);
+    // Keep per-agent view clean even if the main store has codex-cli.
+    const codexProfile = merged.profiles[CODEX_CLI_PROFILE_ID];
+    if (codexProfile?.type === "oauth") {
+        const duplicateId = findDuplicateCodexProfile(merged, codexProfile);
+        if (duplicateId) {
+            delete merged.profiles[CODEX_CLI_PROFILE_ID];
+        }
+    }
     return merged;
 }
 export function saveAuthProfileStore(store, agentDir) {