relay-companion 0.1.5 → 0.1.7

package/bin/relay.js

@@ -11,7 +11,7 @@ import { writeConfig, readConfig, apiUrl, DEFAULT_API_URL, DEFAULT_WEB_URL } fro
 import { runTaskDaemon, pollTaskRuntimeOnce } from "../src/task-daemon.js";
 import { runMcpServer } from "../src/mcp.js";
 import { runSetupInstall, runUninstall } from "../src/install.js";
-import { shouldRequireLiveTools } from "../src/setup-activation.js";
+import { liveToolRequirement, requiredLiveHosts, shouldRequireLiveTools } from "../src/setup-activation.js";
 import { openRelay, openTask } from "../src/materializer.js";
 import { resetCompanionStateForAccount } from "../src/notifications.js";
 import { finishSetupOpenRelay, normalizeSetupHost, setupOpenRelayToken, setupOpenStatus } from "../src/setup-open.js";
@@ -65,9 +65,23 @@ function printActivationStatus(activation) {
   if (!activation) return;
   if (activation.host === "Codex") {
     if (activation.currentSessionReady) {
+      if (activation.readinessMode === "deferred_tool_search") {
+        console.log("Relay tools are available in this Codex session through Codex tool search (`relay_send`).");
+        return;
+      }
+      if (activation.readinessMode === "deferred_tool_search_unverified") {
+        console.log("Relay was added to Codex. Codex can load the Relay tools through tool search (`relay_send`).");
+        return;
+      }
       console.log("Relay tools are live in this Codex session (`relay_send` verified).");
       return;
     }
+    if (activation.serverCatalogHasTool) {
+      console.log(
+        "Relay was added to Codex and the MCP server advertises relay_send, but this open Codex session has not exposed relay_send to the agent yet.",
+      );
+      return;
+    }
     const detail = activation.reason ? ` (${activation.reason})` : "";
     console.log(`Relay was added to Codex, but this open Codex session does not expose relay_send yet${detail}.`);
     return;
@@ -82,7 +96,7 @@ function printActivationStatus(activation) {
 }
 
 /** Register the Relay tools into Claude Code + Codex and start the receive daemon. */
-async function applyInstall({ requireLiveTools = false } = {}) {
+async function applyInstall({ requireLiveTools = false, requiredHosts = requiredLiveHosts() } = {}) {
   const { installed, missing, daemon, pill, activations = [] } = await runSetupInstall();
   if (installed.length) console.log(`Added Relay to ${installed.join(" and ")} on this machine.`);
   for (const m of missing) {
@@ -98,9 +112,13 @@ async function applyInstall({ requireLiveTools = false } = {}) {
   else if (pill?.reason === "pill_runtime_missing") {
     console.log("Run `relay pill` to open the Relay pill.");
   }
-  if (requireLiveTools && installed.length && !activations.some((activation) => activation.currentSessionReady)) {
+  const liveRequirement = liveToolRequirement({ activations, requiredHosts });
+  if (requireLiveTools && installed.length && !liveRequirement.ok) {
+    const hostLabel = liveRequirement.missingHosts.length
+      ? liveRequirement.missingHosts.join(" and ")
+      : "this running agent session";
     throw new Error(
-      "Relay paired and installed, but this running agent session cannot call relay_send yet. Setup is not ready in the current agent.",
+      `Relay paired and installed, but ${hostLabel} cannot call relay_send yet. Setup is not ready in the current agent.`,
     );
   }
   return { installed, missing, daemon, pill, activations };
@@ -110,7 +128,10 @@ async function applyInstall({ requireLiveTools = false } = {}) {
 async function cmdSetup(flags) {
   await cmdPair(flags, { promptForDefaults: Boolean(flags.interactive) });
   console.log("");
-  await applyInstall({ requireLiveTools: Boolean(flags["require-live-tools"]) || shouldRequireLiveTools() });
+  await applyInstall({
+    requireLiveTools: Boolean(flags["require-live-tools"]) || shouldRequireLiveTools(),
+    requiredHosts: requiredLiveHosts(),
+  });
   const token = setupOpenRelayToken(flags);
   if (token) {
     console.log("");
@@ -136,7 +157,7 @@ async function cmdInstall() {
   if (!readConfig().deviceToken) {
     throw new Error("This device is not paired yet. Run `relay setup` with a pairing code first.");
   }
-  await applyInstall({ requireLiveTools: shouldRequireLiveTools() });
+  await applyInstall({ requireLiveTools: shouldRequireLiveTools(), requiredHosts: requiredLiveHosts() });
 }
 
 /** Remove the Relay tools from both agents and stop the background daemon. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-companion",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Relay companion: connects local coding agents to Relay tasks, approvals, and connector tools.",
   "type": "module",
   "bin": {

package/src/setup-activation.js

@@ -21,6 +21,37 @@ export function shouldRequireLiveTools(env = process.env) {
   return Boolean(env.CODEX_THREAD_ID || env.CLAUDECODE || env.CLAUDE_CODE_SESSION_ID);
 }
 
+export function requiredLiveHosts(env = process.env) {
+  const hosts = [];
+  if (env.CODEX_THREAD_ID) hosts.push("Codex");
+  if (env.CLAUDECODE || env.CLAUDE_CODE_SESSION_ID) hosts.push("Claude Code");
+  return hosts;
+}
+
+export function liveToolRequirement({ activations = [], requiredHosts = [] } = {}) {
+  const readyHosts = new Set(
+    activations
+      .filter((activation) => activation?.currentSessionReady)
+      .map((activation) => activation.host)
+      .filter(Boolean),
+  );
+  if (requiredHosts.length) {
+    const missingHosts = requiredHosts.filter((host) => !readyHosts.has(host));
+    return { ok: missingHosts.length === 0, readyHosts: Array.from(readyHosts), missingHosts };
+  }
+  return { ok: readyHosts.size > 0, readyHosts: Array.from(readyHosts), missingHosts: [] };
+}
+
+function codexCatalogDetail(statusResponse, serverName = "relay", toolName = "relay_send") {
+  const servers = Array.isArray(statusResponse?.data) ? statusResponse.data : [];
+  const server = servers.find((item) => item?.name === serverName);
+  return {
+    serverCatalogReady: Boolean(server),
+    serverCatalogHasTool: hasMcpTool(statusResponse, serverName, toolName),
+    serverNames: serverNames(statusResponse),
+  };
+}
+
 class JsonlRpcClient {
   constructor({ command = "codex", args = ["app-server", "proxy"], cwd = process.cwd(), timeoutMs = DEFAULT_TIMEOUT_MS } = {}) {
     this.command = command;
@@ -146,37 +177,51 @@ export async function activateCodexMcp({
 
     const deadline = Date.now() + timeoutMs;
     let lastStatus = null;
+    let catalog = {
+      serverCatalogReady: false,
+      serverCatalogHasTool: false,
+      serverNames: [],
+    };
     do {
       lastStatus = await rpc.request("mcpServerStatus/list", {
         detail: "toolsAndAuthOnly",
         limit: 100,
         ...(threadId ? { threadId } : {}),
       }, timeoutMs);
-      if (hasMcpTool(lastStatus)) {
-        return {
-          host: "Codex",
-          ok: true,
-          currentSessionReady: true,
-          reason: "relay_send_verified",
-          verifiedTool: "relay_send",
-        };
-      }
+      catalog = codexCatalogDetail(lastStatus);
+      if (catalog.serverCatalogHasTool) break;
       await new Promise((resolve) => setTimeout(resolve, 300));
     } while (Date.now() < deadline);
 
     return {
       host: "Codex",
-      ok: false,
-      currentSessionReady: false,
-      reason: "relay_send_not_listed",
-      serverNames: serverNames(lastStatus),
+      ok: catalog.serverCatalogHasTool,
+      currentSessionReady: catalog.serverCatalogHasTool,
+      reason: catalog.serverCatalogHasTool
+        ? "relay_send_available_via_tool_search"
+        : "relay_send_not_listed",
+      readinessMode: catalog.serverCatalogHasTool ? "deferred_tool_search" : undefined,
+      verifiedTool: catalog.serverCatalogHasTool ? "relay_send" : undefined,
+      ...catalog,
     };
   } catch (error) {
+    const reason = classifyCodexActivationError(error);
+    if (reason === "codex_control_socket_unavailable") {
+      return {
+        host: "Codex",
+        ok: true,
+        currentSessionReady: true,
+        reason: "relay_registered_for_codex_tool_search",
+        readinessMode: "deferred_tool_search_unverified",
+        verifiedTool: "relay_send",
+        detail: error?.stderr || error?.message || String(error),
+      };
+    }
     return {
       host: "Codex",
       ok: false,
       currentSessionReady: false,
-      reason: classifyCodexActivationError(error),
+      reason,
       detail: error?.stderr || error?.message || String(error),
     };
   } finally {