@essentialai/cogent-plugin 3.20.0 → 3.20.2

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "cogent",
-  "version": "3.20.0",
+  "version": "3.20.2",
   "description": "Inter-session communication bridge for Claude Code with Slack integration. Enables CC agents and Slack team members to communicate in real time.",
   "author": {
     "name": "Essential AI Solutions",

package/bridge/cogent-bridge.mjs

@@ -26389,8 +26389,8 @@ var init_stdio2 = __esm({
 // src/constants.ts
 import { createRequire } from "node:module";
 function resolveVersion() {
-  if ("3.20.0") {
-    return "3.20.0";
+  if ("3.20.2") {
+    return "3.20.2";
   }
   try {
     const require2 = createRequire(import.meta.url);
@@ -26621,7 +26621,7 @@ var init_config = __esm({
       // purely additive/opt-in: nothing changes for any agent until a codex user
       // launches via the daemon (see bin/cogent-codex) and sets this to `app-server`.
       // Only affects COGENT_PLATFORM=codex; claude/gemini/mail rails never read it.
-      COGENT_CODEX_WAKE: import_zod2.z.enum(["exec-resume", "app-server"]).default("exec-resume"),
+      COGENT_CODEX_WAKE: import_zod2.z.enum(["auto", "exec-resume", "app-server"]).default("auto"),
       // Auto-recovery for a blocked Codex sandbox. On a host where the OS sandbox
       // can't initialize (unprivileged user namespaces blocked — Ubuntu 24.04's
       // apparmor_restrict_unprivileged_userns, containers, hardened kernels),
@@ -27253,6 +27253,8 @@ var init_cc_cli = __esm({
 import { execFile as execFile2 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 import fs8 from "node:fs/promises";
+import { join } from "node:path";
+import os5 from "node:os";
 function analyzeCodexHelp(helpText) {
   const checked = EXPECTED_CODEX_RESUME_FLAGS.map((f) => f.flag);
   const missing = EXPECTED_CODEX_RESUME_FLAGS.filter(
@@ -27357,6 +27359,27 @@ async function preflightCodexSandbox(config2) {
   }
   return res;
 }
+function detectCodexCogentServerCollision(configTomlText) {
+  return /^[ \t]*\[mcp_servers\.cogent(\.[^\]]+)?\]/m.test(configTomlText);
+}
+function codexConfigPath(codexHomeDir2) {
+  const home = codexHomeDir2 || process.env.CODEX_HOME || join(os5.homedir(), ".codex");
+  return join(home, "config.toml");
+}
+async function preflightCodexServerCollision(codexHomeDir2) {
+  const cfgPath = codexConfigPath(codexHomeDir2);
+  let text;
+  try {
+    text = await fs8.readFile(cfgPath, "utf8");
+  } catch {
+    return false;
+  }
+  if (!detectCodexCogentServerCollision(text)) return false;
+  logger.error(
+    `Codex config collision: ${cfgPath} defines a standalone [mcp_servers.cogent] server, which has the SAME NAME as the cogent@cogent plugin's MCP server. Codex collapses the two by name and MCP startup can fail ("MCP client for cogent failed to start \u2026 connection closed: initialize response"). FIX: remove the [mcp_servers.cogent] block from ${cfgPath} \u2014 the plugin already provides the cogent tools \u2014 then restart Codex (new thread). Use the plugin OR a manual 'codex mcp add cogent', never both.`
+  );
+  return true;
+}
 var execFileAsync, EXPECTED_CODEX_RESUME_FLAGS;
 var init_codex_preflight = __esm({
   "src/services/codex-preflight.ts"() {
@@ -32194,7 +32217,7 @@ var init_cloud = __esm({
 // src/services/codex-cli.ts
 import { spawn as spawn2 } from "node:child_process";
 import fs10 from "node:fs/promises";
-import os5 from "node:os";
+import os6 from "node:os";
 import path11 from "node:path";
 import { randomUUID } from "node:crypto";
 import { createReadStream } from "node:fs";
@@ -32223,7 +32246,7 @@ function execCodex(sessionId, message, cwd, timeoutMs) {
     const config2 = getConfig();
     const effectiveTimeout = timeoutMs ?? config2.COGENT_TIMEOUT_MS;
     const truncated = config2.COGENT_CHAR_LIMIT > 0 && message.length > config2.COGENT_CHAR_LIMIT ? message.slice(0, config2.COGENT_CHAR_LIMIT) + "\n...[truncated]" : message;
-    const lastMsgFile = path11.join(os5.tmpdir(), `cogent-codex-${randomUUID()}.txt`);
+    const lastMsgFile = path11.join(os6.tmpdir(), `cogent-codex-${randomUUID()}.txt`);
     const args = [
       "exec",
       "resume",
@@ -32441,13 +32464,42 @@ var init_codex_cli = __esm({
 // src/services/codex-app-server.ts
 import path12 from "node:path";
 import fs11 from "node:fs/promises";
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn3, spawnSync } from "node:child_process";
 function appServerSocketPath(codexHome = codexHomeDir()) {
   return path12.join(codexHome, "app-server-control", "app-server-control.sock");
 }
 function rpcUrl(sock) {
   return `ws+unix://${sock}:/rpc`;
 }
+function ancestryHasAppServer(startPid, getProc, maxDepth = 8) {
+  let pid = startPid;
+  for (let i = 0; i < maxDepth && pid > 1; i++) {
+    const p = getProc(pid);
+    if (!p) return false;
+    if (/(?:^|\/)codex\S*\s+app-server(?:\s|$)/.test(p.cmd)) return true;
+    pid = p.ppid;
+  }
+  return false;
+}
+function psProc(pid) {
+  try {
+    const out = spawnSync("ps", ["-o", "ppid=,args=", "-p", String(pid)], {
+      encoding: "utf8",
+      timeout: 3e3
+    }).stdout?.trim();
+    const m = out?.match(/^(\d+)\s+(.*)$/s);
+    if (!m) return null;
+    return { ppid: parseInt(m[1], 10), cmd: m[2] };
+  } catch {
+    return null;
+  }
+}
+function runningUnderAppServerDaemon() {
+  if (_underDaemon === void 0) {
+    _underDaemon = ancestryHasAppServer(process.ppid, psProc);
+  }
+  return _underDaemon;
+}
 async function ensureDaemon(codexHome = codexHomeDir(), deps = {}) {
   if (ensuredSock) return ensuredSock;
   const run = deps.run ?? defaultRun;
@@ -32635,7 +32687,7 @@ async function _injectTurn(threadId, message, cwd, timeoutMs, deps = {}) {
     client.close();
   }
 }
-var defaultWsFactory, ensuredSock, defaultRun, defaultSocketExists, sleep2, AppServerClient, idempotencyCache, IDEMPOTENCY_TTL_MS;
+var defaultWsFactory, _underDaemon, ensuredSock, defaultRun, defaultSocketExists, sleep2, AppServerClient, idempotencyCache, IDEMPOTENCY_TTL_MS;
 var init_codex_app_server = __esm({
   "src/services/codex-app-server.ts"() {
     "use strict";
@@ -32743,7 +32795,9 @@ var init_codex_app_server = __esm({
 
 // src/services/exec-remote.ts
 async function execCodexWake(sessionId, message, cwd, timeoutMs, idempotencyKey) {
-  if (getConfig().COGENT_CODEX_WAKE === "app-server") {
+  const wake = getConfig().COGENT_CODEX_WAKE;
+  const useAppServer = wake === "app-server" || wake === "auto" && runningUnderAppServerDaemon();
+  if (useAppServer) {
     try {
       const sock = await ensureDaemon();
       const result = await execCodexViaAppServer(sessionId, message, cwd, timeoutMs, { socketPath: sock, idempotencyKey });
@@ -33963,7 +34017,7 @@ __export(startup_exports, {
   runStartup: () => runStartup,
   triggerReRegistration: () => triggerReRegistration
 });
-import os6 from "node:os";
+import os7 from "node:os";
 import path13 from "node:path";
 import fs12 from "node:fs/promises";
 import readline2 from "node:readline";
@@ -34164,10 +34218,10 @@ async function runStartup() {
   if (envStatePath) {
     statePath = envStatePath;
   } else {
-    const defaultPath = path13.join(os6.homedir(), ".cogent");
+    const defaultPath = path13.join(os7.homedir(), ".cogent");
     statePath = await firstRunPrompt(defaultPath);
   }
-  if (!envStatePath && statePath !== path13.join(os6.homedir(), ".cogent")) {
+  if (!envStatePath && statePath !== path13.join(os7.homedir(), ".cogent")) {
     process.env.COGENT_STATE_PATH = statePath;
   } else if (!envStatePath) {
     process.env.COGENT_STATE_PATH = statePath;
@@ -34275,6 +34329,7 @@ async function runPreflights() {
   const config2 = getConfig();
   if (config2.COGENT_PLATFORM === "codex") {
     await preflightCodex(config2.COGENT_CODEX_PATH);
+    await preflightCodexServerCollision();
     const sandbox = await preflightCodexSandbox(config2);
     if (sandbox.status === "blocked" && config2.COGENT_CODEX_SANDBOX_FALLBACK) {
       setSandboxOverride("bypass");
@@ -34305,7 +34360,7 @@ var init_startup = __esm({
     init_auto_relay();
     UUID_V4_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
     execFileAsync3 = promisify4(execFile5);
-    PERSIST_PATH = path13.join(os6.homedir(), ".cogent-config.json");
+    PERSIST_PATH = path13.join(os7.homedir(), ".cogent-config.json");
     legacyWarnEmitted = false;
     cloudWsClient = null;
     cloudInbox = null;
@@ -34318,10 +34373,10 @@ var init_startup = __esm({
 import crypto3 from "node:crypto";
 import fs13 from "node:fs/promises";
 import path14 from "node:path";
-import os7 from "node:os";
+import os8 from "node:os";
 function defaultMailCredentialPath(cwd = process.cwd()) {
   const hash = crypto3.createHash("sha256").update(path14.resolve(cwd)).digest("hex").slice(0, 16);
-  return path14.join(os7.homedir(), ".cogent", "mail-credentials", `${hash}.json`);
+  return path14.join(os8.homedir(), ".cogent", "mail-credentials", `${hash}.json`);
 }
 function resolveMailCredentialPath(credentialPath) {
   if (credentialPath) return credentialPath;
@@ -36322,7 +36377,7 @@ var init_mail_fetcher = __esm({
 });
 
 // src/tools/fetch-mail.ts
-import os8 from "node:os";
+import os9 from "node:os";
 import path17 from "node:path";
 function registerFetchMailTool(server, deps = {}) {
   const makeFetcher = deps.fetcherFactory ?? ((creds) => new ImapflowMailFetcher(creds));
@@ -36385,7 +36440,7 @@ var init_fetch_mail = __esm({
     init_mail_fetcher();
     init_auth_error();
     init_validate();
-    DEFAULT_DOWNLOAD_DIR = path17.join(os8.homedir(), ".cogent", "mail-downloads");
+    DEFAULT_DOWNLOAD_DIR = path17.join(os9.homedir(), ".cogent", "mail-downloads");
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@essentialai/cogent-plugin",
-  "version": "3.20.0",
+  "version": "3.20.2",
   "description": "Cogent — Claude Code plugin (skills + slash-commands + MCP server) for the cross-agent comms fabric.",
   "author": { "name": "Essential AI Solutions Ltd.", "url": "https://essentialai.uk" },
   "homepage": "https://cogent.tools",