@tarfa/cli 0.1.4 → 0.1.5

package/dist/{chunk-OC5VX7K3.js → chunk-KTUXNG4Q.js}

@@ -4432,8 +4432,9 @@ var TmuxAdapter = class {
     return set;
   }
   async createSession(input) {
+    const env = Object.entries(input.env ?? {}).flatMap(([k, v]) => ["-e", `${k}=${v}`]);
     try {
-      await this.tmux(["new-session", "-d", "-s", input.name, "-c", input.cwd, input.command]);
+      await this.tmux(["new-session", "-d", "-s", input.name, "-c", input.cwd, ...env, input.command]);
     } catch (err) {
       if ((err.stderr ?? "").includes("duplicate session")) throw new DuplicateSessionError(input.name);
       throw err;
@@ -5878,12 +5879,12 @@ function loginShellResolver(shell = process.env.SHELL || "/bin/sh") {
 }
 
 // src/infrastructure/codex-app-server.ts
-import { homedir } from "node:os";
+import { realpath as realpath3 } from "node:fs/promises";
 import { join as join7 } from "node:path";
 import { WebSocket } from "ws";
 var CodexAppServerDown = class extends Error {
-  constructor() {
-    super("the Codex app server is not running");
+  constructor(socketPath) {
+    super(`the Codex app server is not running (no socket at ${socketPath})`);
   }
 };
 var CodexRpcError = class extends Error {
@@ -5954,8 +5955,8 @@ var Connection = class {
 var CodexAppServer = class {
   socketPath;
   timeoutMs;
-  constructor(options = {}) {
-    this.socketPath = options.socketPath ?? join7(homedir(), ".codex", "app-server-control", "app-server-control.sock");
+  constructor(options) {
+    this.socketPath = "socketPath" in options ? options.socketPath : join7(options.codexHome, "app-server-control", "app-server-control.sock");
     this.timeoutMs = options.timeoutMs ?? 5e3;
   }
   loadedThreads() {
@@ -6009,9 +6010,15 @@ var CodexAppServer = class {
       return thread.id;
     });
   }
-  call(run) {
+  // Codex 0.167 binds the socket under /tmp/codex-daemon-<uid>/ and publishes this path as a link
+  // to it. Connecting to the link's target keeps the path within the 107 bytes a unix socket
+  // address holds, however deep CODEX_HOME is; a link to nothing means no daemon.
+  async call(run) {
+    const target = await realpath3(this.socketPath).catch((err) => {
+      throw err.code === "ENOENT" ? new CodexAppServerDown(this.socketPath) : err;
+    });
     return new Promise((resolve6, reject) => {
-      const ws = new WebSocket(`ws+unix://${this.socketPath}:/`, { perMessageDeflate: false });
+      const ws = new WebSocket(`ws+unix://${target}:/`, { perMessageDeflate: false });
       const c = new Connection(ws);
       let settled = false;
       const settle = (fn) => {
@@ -6030,7 +6037,7 @@ var CodexAppServer = class {
       }, this.timeoutMs);
       ws.once("error", (err) => {
         const down = err.code === "ENOENT" || err.code === "ECONNREFUSED";
-        settle(() => reject(down ? new CodexAppServerDown() : err));
+        settle(() => reject(down ? new CodexAppServerDown(this.socketPath) : err));
       });
       ws.once("close", () => settle(() => reject(new Error("the Codex app server closed the connection"))));
       ws.once("open", () => {
@@ -6046,6 +6053,45 @@ var CodexAppServer = class {
   }
 };
 
+// src/infrastructure/codex-versions.ts
+import { execFile as execFile5 } from "node:child_process";
+function loginShell(shell = process.env.SHELL || "/bin/sh", extraEnv = {}) {
+  return (script) => new Promise((resolve6, reject) => {
+    execFile5(shell, ["-lc", script], { env: { ...childEnv(), ...extraEnv }, timeout: 15e3 }, (err, stdout) => err ? reject(err) : resolve6(stdout));
+  });
+}
+function codexVersions(run = loginShell()) {
+  return async () => {
+    const [cliOut, daemonOut] = await Promise.all([
+      run("codex --version").catch((err) => {
+        throw new Error(`cannot run codex --version: ${err.message}`);
+      }),
+      run("codex app-server daemon version").catch((err) => {
+        throw new Error(`cannot read the Codex app server's version: ${err.message}`);
+      })
+    ]);
+    const cli = cliOut.trim().split(/\s+/).pop() ?? "";
+    let appServer;
+    try {
+      appServer = JSON.parse(daemonOut).appServerVersion;
+    } catch {
+      appServer = void 0;
+    }
+    if (typeof appServer !== "string" || appServer === "") throw new Error("the Codex app server is not running");
+    return { cli, appServer };
+  };
+}
+
+// src/infrastructure/codex-home.ts
+import { join as join8 } from "node:path";
+var MARK = "codex-home=";
+async function resolveCodexHome(env, home, run = loginShell()) {
+  if (env.CODEX_HOME) return env.CODEX_HOME;
+  const out = await run(`printf '\\n${MARK}%s\\n' "\${CODEX_HOME-}"`).catch(() => "");
+  const value = out.split("\n").reverse().find((line) => line.startsWith(MARK))?.slice(MARK.length);
+  return value || join8(home, ".codex");
+}
+
 export {
   packageRoot,
   packageVersion,
@@ -6149,5 +6195,8 @@ export {
   detectInstalled,
   loginShellResolver,
   CodexAppServerDown,
-  CodexAppServer
+  CodexAppServer,
+  loginShell,
+  codexVersions,
+  resolveCodexHome
 };

package/dist/cli.js

@@ -22,6 +22,7 @@ import {
   browseDir,
   childEnv,
   cloneOfUnit,
+  codexVersions,
   createWithFreshId,
   createWorkspace,
   describeStep,
@@ -41,6 +42,7 @@ import {
   loadConfig,
   loadOrCreateAgentKeys,
   locateAgentEnv,
+  loginShell,
   loginShellResolver,
   mainCheckout,
   migrateStateDir,
@@ -53,6 +55,7 @@ import {
   planCli,
   planSetup,
   renderService,
+  resolveCodexHome,
   resolveStateDir,
   revokeDevice,
   sanitizeDeviceName,
@@ -63,7 +66,7 @@ import {
   unitRunsLauncher,
   withEnrolmentMode,
   withLegacyEnv
-} from "./chunk-OC5VX7K3.js";
+} from "./chunk-KTUXNG4Q.js";
 
 // src/cli.ts
 import { randomBytes } from "node:crypto";
@@ -241,10 +244,9 @@ async function readOrNull(path) {
     throw err;
   }
 }
-function hooksFiles(home, hooksDir, port) {
+function hooksFiles(home, hooksDir, port, codexHome) {
   const settingsPath = join(home, ".claude", "settings.json");
-  const codexDir = join(home, ".codex");
-  const codexHooksPath = join(codexDir, "hooks.json");
+  const codexHooksPath = join(codexHome, "hooks.json");
   async function wanted() {
     const files = [];
     for (const script of SCRIPTS) {
@@ -254,7 +256,7 @@ function hooksFiles(home, hooksDir, port) {
     const settings = await readOrNull(settingsPath);
     const merged = installHooks({ settings: settings === null ? {} : JSON.parse(settings) }, { hookCommand: HOOK_COMMAND, guardCommand: GUARD_COMMAND, port });
     files.push({ path: settingsPath, current: settings, text: JSON.stringify(merged, null, 2) });
-    if (await fsIsDirectory(codexDir)) {
+    if (await fsIsDirectory(codexHome)) {
       const codex = await readOrNull(codexHooksPath);
       const codexMerged = installHooks(
         { settings: codex === null ? {} : JSON.parse(codex) },
@@ -1078,12 +1080,13 @@ async function spawnCodex(deps, input) {
     firstMessage: input.brief.replace(/\n+$/, "")
   });
   if (!/^[0-9A-Za-z-]+$/.test(thread)) throw new Error(`the Codex app server named an unexpected thread id: ${thread}`);
+  const codexHome = await deps.codex.home();
   const lockTitle = await titleLock(deps, title);
   const command = `codex resume ${thread}`;
   const id = await createWithFreshId(
     deps.ids,
     cwd,
-    (id2) => deps.tmux.createSession({ name: id2, cwd, command, codexThread: thread, ...parent ? { parent: parent.id } : {} })
+    (id2) => deps.tmux.createSession({ name: id2, cwd, command, codexThread: thread, env: { CODEX_HOME: codexHome }, ...parent ? { parent: parent.id } : {} })
   );
   return finishLaunch(deps, id, title, lockTitle, ` (Codex thread ${thread})`);
 }
@@ -1133,35 +1136,6 @@ function denySettings(denyPath) {
   };
 }
 
-// src/infrastructure/codex-versions.ts
-import { execFile as execFile6 } from "node:child_process";
-function loginShell(shell = process.env.SHELL || "/bin/sh") {
-  return (script) => new Promise((resolve2, reject) => {
-    execFile6(shell, ["-lc", script], { env: childEnv(), timeout: 15e3 }, (err, stdout) => err ? reject(err) : resolve2(stdout));
-  });
-}
-function codexVersions(run4 = loginShell()) {
-  return async () => {
-    const [cliOut, daemonOut] = await Promise.all([
-      run4("codex --version").catch((err) => {
-        throw new Error(`cannot run codex --version: ${err.message}`);
-      }),
-      run4("codex app-server daemon version").catch((err) => {
-        throw new Error(`cannot read the Codex app server's version: ${err.message}`);
-      })
-    ]);
-    const cli = cliOut.trim().split(/\s+/).pop() ?? "";
-    let appServer;
-    try {
-      appServer = JSON.parse(daemonOut).appServerVersion;
-    } catch {
-      appServer = void 0;
-    }
-    if (typeof appServer !== "string" || appServer === "") throw new Error("the Codex app server is not running");
-    return { cli, appServer };
-  };
-}
-
 // src/application/workspace-role.ts
 var WORKSPACE_ROLES = ["orchestrator", "child", "normal"];
 function workspaceRole(w, all) {
@@ -1266,7 +1240,7 @@ async function run3(argv, rawEnv, home, io = {}) {
       return JSON.stringify(await browseDir({ lister, hidden }, path, config.projectRoots), null, 2);
     }
     case "install-hooks": {
-      const hooks = hooksFiles(home, HOOKS_DIR, config.port);
+      const hooks = hooksFiles(home, HOOKS_DIR, config.port, await resolveCodexHome({ ...env, ...await agentEnvValues(env, home) }, home, io.loginShell));
       const { codex } = await hooks.install();
       if (!codex) return JSON.stringify({ installed: hooks.settingsPath, scriptPath: hooks.scriptPath });
       return JSON.stringify({
@@ -1413,7 +1387,7 @@ async function orchestration(command, argv, env, home, io) {
           nonce: () => randomBytes(6).toString("hex"),
           sleep: io.sleep ?? ((ms) => new Promise((resolve2) => setTimeout(resolve2, ms))),
           spawnDir: joinPath(config.stateDir, "spawn"),
-          codex: io.codex ?? { versions: codexVersions(), createThread: (input) => new CodexAppServer().createThread(input) }
+          codex: io.codex ?? codexSpawn({ ...env, ...values }, home, io)
         },
         {
           projectPath,
@@ -1633,6 +1607,15 @@ function pwaOrigin(value) {
   if (url.protocol !== "https:" && url.protocol !== "http:") throw new Error(`--pwa must be an http(s) origin (got ${value})`);
   return url.origin;
 }
+function codexSpawn(env, home, io) {
+  let codexHome;
+  const resolve2 = () => codexHome ??= resolveCodexHome(env, home, io.loginShell);
+  return {
+    home: resolve2,
+    versions: async () => codexVersions(loginShell(void 0, { CODEX_HOME: await resolve2() }))(),
+    createThread: async (input) => new CodexAppServer({ codexHome: await resolve2() }).createThread(input)
+  };
+}
 async function agentEnvValues(env, home) {
   try {
     return withLegacyEnv(parseEnvFile(await readFile6(await locateAgentEnv(env, home), "utf8")));
@@ -1790,7 +1773,7 @@ ${SETUP_USAGE.split("\n")[0]}
   const config = loadConfig({ ...withLegacyEnv(parseEnvFile(envText ?? "")), TARFA_MACHINE_ID: flags.machineId }, home);
   const tailscale = fx.tailscale ?? tailscaleCli();
   const owner = fx.portOwner ?? portOwner;
-  const hooks = hooksFiles(home, HOOKS_DIR, config.port);
+  const hooks = hooksFiles(home, HOOKS_DIR, config.port, await resolveCodexHome({ ...env, ...withLegacyEnv(parseEnvFile(envText ?? "")) }, home, io.loginShell));
   const devices2 = new FileDeviceStore(config.devicesPath);
   const hasRoster = await readFile6(config.devicesPath).then(() => true, () => false);
   const agentLivePath = cloneRepo === null ? "" : joinPath(cloneRepo, "deploy", "agent-live");
@@ -1916,7 +1899,7 @@ async function apply2(argv, env, home, io) {
   if (envText === null) throw new Error(`failed: check: no agent config at ${envPath}: run tarfa setup`);
   const config = loadConfig(withLegacyEnv(parseEnvFile(envText)), home);
   const service = fx.service ?? serviceInstall({ home, user: userInfo().username, uid: process.getuid?.() ?? 0 });
-  const hooks = hooksFiles(home, HOOKS_DIR, config.port);
+  const hooks = hooksFiles(home, HOOKS_DIR, config.port, await resolveCodexHome({ ...env, ...withLegacyEnv(parseEnvFile(envText)) }, home, io.loginShell));
   const launcherPath = joinPath(home, ".tarfa", "bin", "tarfa-agent");
   const log = fx.agentLog ?? agentLog({ home });
   const result = await runApply(

package/dist/serve.js

@@ -65,6 +65,7 @@ import {
   readHandshakeFrame,
   redeemPairing,
   relationOf,
+  resolveCodexHome,
   runsClaude,
   sessionOfCodexThread,
   standingOf,
@@ -73,7 +74,7 @@ import {
   systemPathResolver,
   withLegacyEnv,
   writeFileAtomic
-} from "./chunk-OC5VX7K3.js";
+} from "./chunk-KTUXNG4Q.js";
 
 // src/serve.ts
 import { homedir as homedir2 } from "node:os";
@@ -4185,6 +4186,9 @@ async function main() {
   const env = withLegacyEnv(process.env);
   const config = loadConfig(env, homedir2());
   for (const warning of configWarnings(process.env)) process.stderr.write(`${warning}
+`);
+  const codexHome = await resolveCodexHome(env, homedir2());
+  process.stdout.write(`tarfa agent: Codex home ${codexHome}
 `);
   await securePrivateDir(config.stateDir);
   await assertPrivateFiles([
@@ -4241,7 +4245,7 @@ async function main() {
       delivery: new CompositeDelivery({
         claude: new ClaudeInboxDelivery(claudeSessions, async (id) => await tmux.firstPaneId?.(id) ?? null),
         pi: new PiInboxDelivery(config.inboxDir),
-        codex: new CodexDelivery(new CodexAppServer())
+        codex: new CodexDelivery(new CodexAppServer({ codexHome }))
       }),
       log: new FileMessageLog(config.messageLogPath)
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarfa/cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Tarfa agent and CLI: serves your Claude Code terminal sessions (tmux workspaces) to the Tarfa phone app.",
   "repository": {
     "type": "git",