relay-companion 0.1.25 → 0.1.26

package/overlay/host-select.cjs

@@ -23,8 +23,12 @@ function isRelayBundle(bundle) {
 }
 
 // Cold-start choice when NEITHER agent is running: pick by what's installed.
-// Spec (preserved from the original): prefer Codex if installed, else Claude Code.
-function defaultClickHost({ codexInstalled = false, claudeInstalled = false } = {}) {
+// macOS preserves the original preference (Codex, then Claude). Windows is
+// Claude-only for now: the Codex materializer still depends on macOS Codex
+// Desktop paths/app-server behavior, while Claude's claude:// resume handler is
+// registered by Claude Desktop on Windows.
+function defaultClickHost({ codexInstalled = false, claudeInstalled = false, platform = process.platform } = {}) {
+  if (platform === "win32") return "claude";
   if (codexInstalled) return "codex";
   if (claudeInstalled) return "claude";
   return "codex";
@@ -50,17 +54,22 @@ function chooseClickHost({
   codexRunning = false,
   codexInstalled = false,
   claudeInstalled = false,
+  platform = process.platform,
 } = {}) {
+  const codexSupported = platform !== "win32";
+  const effectiveCodexRunning = codexSupported && codexRunning;
+  const effectiveCodexInstalled = codexSupported && codexInstalled;
+
   if (frontHost) return frontHost;
 
   const capturedHostIsFresh = lastHost && now - lastHostSeenAt < 2500;
   if ((!bundle || isRelayBundle(bundle)) && capturedHostIsFresh) return lastHost;
 
-  if (claudeRunning && !codexRunning) return "claude";
-  if (codexRunning && !claudeRunning) return "codex";
-  if (claudeRunning && codexRunning && lastHost) return lastHost;
+  if (claudeRunning && !effectiveCodexRunning) return "claude";
+  if (effectiveCodexRunning && !claudeRunning) return "codex";
+  if (claudeRunning && effectiveCodexRunning && lastHost) return lastHost;
 
-  return defaultClickHost({ codexInstalled, claudeInstalled });
+  return defaultClickHost({ codexInstalled: effectiveCodexInstalled, claudeInstalled, platform });
 }
 
 module.exports = { hostFromBundle, isRelayBundle, defaultClickHost, chooseClickHost };

package/overlay/main.cjs

@@ -24,10 +24,10 @@ const { app, BrowserWindow, Menu, Tray, ipcMain, nativeImage, shell, screen } =
 const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
-const { execFile, spawn, pathToFileURL } = (() => {
+const { execFile, execFileSync, spawn, pathToFileURL } = (() => {
   const cp = require("node:child_process");
   const url = require("node:url");
-  return { execFile: cp.execFile, spawn: cp.spawn, pathToFileURL: url.pathToFileURL };
+  return { execFile: cp.execFile, execFileSync: cp.execFileSync, spawn: cp.spawn, pathToFileURL: url.pathToFileURL };
 })();
 const { hostFromBundle, chooseClickHost } = require("./host-select.cjs");
 
@@ -531,6 +531,11 @@ function rememberForegroundHost(host) {
 function appInstalled(appName) {
   const name = String(appName || "").replace(/[^A-Za-z0-9 ._-]/g, "");
   if (!name) return false;
+  if (process.platform === "win32" && /^claude$/i.test(name)) {
+    if (windowsUriSchemeRegistered("claude")) return true;
+    const appDataClaude = process.env.APPDATA && path.join(process.env.APPDATA, "Claude");
+    if (appDataClaude && fs.existsSync(appDataClaude)) return true;
+  }
   let candidates = [];
   if (process.platform === "darwin") {
     candidates = [
@@ -548,6 +553,23 @@ function appInstalled(appName) {
   return candidates.some((candidate) => fs.existsSync(candidate));
 }
 
+function windowsUriSchemeRegistered(scheme) {
+  if (process.platform !== "win32") return false;
+  const clean = String(scheme || "").replace(/[^A-Za-z0-9+.-]/g, "");
+  if (!clean) return false;
+  for (const hive of ["HKCU\\Software\\Classes", "HKCR"]) {
+    try {
+      const out = execFileSync("reg.exe", ["query", `${hive}\\${clean}\\shell\\open\\command`, "/ve"], {
+        encoding: "utf8",
+        timeout: 1000,
+        windowsHide: true,
+      });
+      if (String(out || "").trim()) return true;
+    } catch {}
+  }
+  return false;
+}
+
 // Resolve which host a click opens into from the current frontmost bundle, folding
 // in the polled running-process state (claudeRunning/codexRunning) so a host sitting
 // on another macOS Space still wins over cold-starting the other. Shared by every
@@ -565,6 +587,7 @@ function resolveClickHost(bundle) {
     codexRunning,
     codexInstalled: appInstalled("Codex"),
     claudeInstalled: appInstalled("Claude"),
+    platform: process.platform,
   });
 }
 
@@ -610,11 +633,20 @@ function claudeLogSawResume(sessionId, fromOffset) {
 // local_<uuid>.json within ~1s of actually focusing it — and keeps doing so
 // even when main.log has gone dead (observed live: log frozen for over an hour
 // while resumes worked, which made a log-only check fire false fallbacks).
-const CLAUDE_SESSIONS_DIR = path.join(os.homedir(), "Library", "Application Support", "Claude", "claude-code-sessions");
+function claudeDesktopBaseDir() {
+  if (process.platform === "win32") {
+    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "Claude");
+  }
+  return path.join(os.homedir(), "Library", "Application Support", "Claude");
+}
+function claudeDesktopSessionsDir() {
+  return process.env.CLAUDE_DESKTOP_SESSIONS_DIR || path.join(claudeDesktopBaseDir(), "claude-code-sessions");
+}
 function claudeSessionMetaPath(sessionId) {
+  const sessionsDir = claudeDesktopSessionsDir();
   try {
-    for (const org of fs.readdirSync(CLAUDE_SESSIONS_DIR)) {
-      const orgDir = path.join(CLAUDE_SESSIONS_DIR, org);
+    for (const org of fs.readdirSync(sessionsDir)) {
+      const orgDir = path.join(sessionsDir, org);
       let orgStat;
       try {
         orgStat = fs.statSync(orgDir);
@@ -640,6 +672,7 @@ function claudeLastFocusedAt(metaPath) {
 function openClaudeDeepLinkVerified(url, fallbackUrl, label) {
   const fire = () =>
     shell.openExternal(url).catch((error) => console.error("[overlay] openExternal failed:", error && error.message));
+  if (process.platform !== "darwin") return fire();
   const sessionId = claudeSessionIdFromUrl(url);
   if (!sessionId) return fire();
   const metaPath = claudeSessionMetaPath(sessionId);

package/package.json

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

package/src/claude-session-writer.js

@@ -268,16 +268,20 @@ export function importClaudeDesktopSession({ sessionId, activate = process.env.R
   if (process.env.RELAY_IMPORT_CLAUDE_DESKTOP === "0") {
     return { attempted: false, reason: "disabled", deepLink };
   }
-  if (process.platform !== "darwin") {
+  if (process.platform !== "darwin" && process.platform !== "win32") {
     return { attempted: false, reason: "unsupported-platform", deepLink };
   }
 
-  const args = activate ? [deepLink] : ["-g", deepLink];
-  const result = spawnSync("open", args, { encoding: "utf8", timeout: 5000 });
+  const command = process.platform === "win32" ? "cmd.exe" : "open";
+  const args =
+    process.platform === "win32"
+      ? ["/c", "start", "", deepLink]
+      : activate ? [deepLink] : ["-g", deepLink];
+  const result = spawnSync(command, args, { encoding: "utf8", timeout: 5000, windowsHide: true });
   return {
     attempted: true,
     deepLink,
-    command: "open",
+    command,
     args,
     status: result.status,
     signal: result.signal,

package/src/host-paths.js

@@ -12,20 +12,29 @@ export const DEFAULT_CODEX_HOME = path.join(os.homedir(), ".codex");
 export const DEFAULT_CODEX_GLOBAL_STATE = path.join(DEFAULT_CODEX_HOME, ".codex-global-state.json");
 export const DEFAULT_CODEX_STATE_DB = path.join(DEFAULT_CODEX_HOME, "state_5.sqlite");
 export const DEFAULT_CLAUDE_HOME = path.join(os.homedir(), ".claude");
-export const DEFAULT_CLAUDE_DESKTOP_CONFIG = path.join(
-  os.homedir(),
-  "Library",
-  "Application Support",
-  "Claude",
-  "claude_desktop_config.json",
-);
-export const DEFAULT_CLAUDE_DESKTOP_SESSIONS = path.join(
-  os.homedir(),
-  "Library",
-  "Application Support",
-  "Claude",
-  "claude-code-sessions",
-);
+
+function defaultWindowsAppData({ env = process.env, homedir = os.homedir() } = {}) {
+  return env.APPDATA || path.win32.join(homedir, "AppData", "Roaming");
+}
+
+export function defaultClaudeDesktopBaseDir({ platform = process.platform, env = process.env, homedir = os.homedir() } = {}) {
+  if (platform === "win32") return path.win32.join(defaultWindowsAppData({ env, homedir }), "Claude");
+  if (platform === "darwin") return path.join(homedir, "Library", "Application Support", "Claude");
+  return path.join(env.XDG_CONFIG_HOME || path.join(homedir, ".config"), "Claude");
+}
+
+export function defaultClaudeDesktopConfigPath(options = {}) {
+  const pathLib = options.platform === "win32" ? path.win32 : path;
+  return pathLib.join(defaultClaudeDesktopBaseDir(options), "claude_desktop_config.json");
+}
+
+export function defaultClaudeDesktopSessionsDir(options = {}) {
+  const pathLib = options.platform === "win32" ? path.win32 : path;
+  return pathLib.join(defaultClaudeDesktopBaseDir(options), "claude-code-sessions");
+}
+
+export const DEFAULT_CLAUDE_DESKTOP_CONFIG = defaultClaudeDesktopConfigPath();
+export const DEFAULT_CLAUDE_DESKTOP_SESSIONS = defaultClaudeDesktopSessionsDir();
 
 // Durable companion store dir. The cloud companion stages packets + state under
 // RELAY_HOME/RELAY_COMPANION_HOME (see notifications.companionHome()); the engine
@@ -58,10 +67,12 @@ export function claudeProjectsDir() {
   return process.env.CLAUDE_PROJECTS_DIR || path.join(claudeHome(), "projects");
 }
 
-export function claudeDesktopConfigPath() {
-  return process.env.CLAUDE_DESKTOP_CONFIG || DEFAULT_CLAUDE_DESKTOP_CONFIG;
+export function claudeDesktopConfigPath(options = {}) {
+  const env = options.env || process.env;
+  return env.CLAUDE_DESKTOP_CONFIG || defaultClaudeDesktopConfigPath({ env, ...options });
 }
 
-export function claudeDesktopSessionsDir() {
-  return process.env.CLAUDE_DESKTOP_SESSIONS_DIR || DEFAULT_CLAUDE_DESKTOP_SESSIONS;
+export function claudeDesktopSessionsDir(options = {}) {
+  const env = options.env || process.env;
+  return env.CLAUDE_DESKTOP_SESSIONS_DIR || defaultClaudeDesktopSessionsDir({ env, ...options });
 }