@quantiya/codevibe-codex-plugin 2.0.14 → 2.0.16

package/libexec/companion-launcher

@@ -36,6 +36,10 @@ while [ -L "$SOURCE" ]; do
 done
 SCRIPT_DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
 PLUGIN_DIR="$(dirname "$SCRIPT_DIR")"
+# Match Codex's documented configuration discovery. This also lets isolated
+# candidate runs keep hooks/config separate without changing HOME, which owns
+# the user's independent CodeVibe authentication state.
+CODEX_CONFIG_HOME="${CODEX_HOME:-$HOME/.codex}"
 
 # ─── PATH augmentation ───────────────────────────────────────────────
 # When the install one-liner runs in a fresh terminal, Homebrew's
@@ -162,8 +166,8 @@ _CV_OS_VER="$(uname -s | cv_sanitize)"
 [ -z "$_CV_OS_VER" ] && _CV_OS_VER="unknown"
 _CV_ARCH_VER="$(uname -m | cv_sanitize)"
 [ -z "$_CV_ARCH_VER" ] && _CV_ARCH_VER="unknown"
-_CV_CODEX_AUTH="false"; [ -f "$HOME/.codex/auth.json" ] && _CV_CODEX_AUTH="true"
-_CV_CODEX_CONFIG="false"; [ -f "$HOME/.codex/config.toml" ] && _CV_CODEX_CONFIG="true"
+_CV_CODEX_AUTH="false"; [ -f "$CODEX_CONFIG_HOME/auth.json" ] && _CV_CODEX_AUTH="true"
+_CV_CODEX_CONFIG="false"; [ -f "$CODEX_CONFIG_HOME/config.toml" ] && _CV_CODEX_CONFIG="true"
 _CV_INSIDE_TMUX="false"; [ -n "$TMUX" ] && _CV_INSIDE_TMUX="true"
 _CV_IS_TTY="false"; { [ -t 0 ] && [ -t 1 ]; } && _CV_IS_TTY="true"
 cv_telem "wrapper_started" "\"invocation\":\"session\",\"os\":\"$_CV_OS_VER\",\"arch\":\"$_CV_ARCH_VER\",\"codex_version\":\"$_CV_CODEX_VER\",\"node_version\":\"$_CV_NODE_VER\",\"tmux_version\":\"$_CV_TMUX_VER\",\"codex_auth_present\":$_CV_CODEX_AUTH,\"codex_config_present\":$_CV_CODEX_CONFIG,\"inside_tmux\":$_CV_INSIDE_TMUX,\"is_terminal\":$_CV_IS_TTY"
@@ -177,6 +181,27 @@ log() {
     echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" >> "$LOG_FILE"
 }
 
+tmux_session_state() {
+    local target="$1"
+    local output
+    local rc
+    output="$(tmux has-session -t "$target" 2>&1)"
+    rc=$?
+    if [ "$rc" -eq 0 ]; then
+        printf '%s\n' "alive"
+        return
+    fi
+    case "$output" in
+        "can't find session:"*|"no server running on "*|"error connecting to "*" (No such file or directory)"|"error connecting to "*" (Connection refused)")
+            printf '%s\n' "absent"
+            ;;
+        *)
+            log "WARN: tmux inspection failed for $target; preserving daemon: $output"
+            printf '%s\n' "unknown"
+            ;;
+    esac
+}
+
 # Cleanup function to kill server when wrapper exits
 cleanup() {
     local wrapper_exit_code=$?
@@ -187,11 +212,17 @@ cleanup() {
     # that live Codex session disconnected on mobile. The daemon now monitors
     # this exact tmux session and performs normal cleanup when the native
     # session actually ends, so a detach transfers lifecycle ownership to it.
-    if [ "${_CV_TMUX_STARTED:-false}" = "true" ] \
-        && tmux has-session -t "$SESSION_NAME" 2>/dev/null; then
-        log "Tmux client detached while Codex remains active; leaving daemon running"
-        rm -f "${CODEVIBE_TMPDIR}/codevibe-codex-server-$$.pid"
-        return
+    if [ "${_CV_TMUX_STARTED:-false}" = "true" ]; then
+        local tmux_state
+        tmux_state="$(tmux_session_state "$SESSION_NAME")"
+        if [ "$tmux_state" = "alive" ]; then
+            log "Tmux client detached while Codex remains active; leaving daemon running"
+            return
+        fi
+        if [ "$tmux_state" = "unknown" ]; then
+            log "Tmux state is ambiguous; preserving daemon and native session"
+            return
+        fi
     fi
 
     # Fire wrapper_exited telemetry BEFORE killing the server so the MCP
@@ -247,7 +278,8 @@ cleanup() {
     rm -f "${CODEVIBE_TMPDIR}/codevibe-codex-${SESSION_NAME}.port"
     rm -f "$_CV_CODEX_EXIT_FILE"
 
-    # Remove our hooks from ~/.codex/hooks.json (idempotent, concurrent-safe).
+    # Remove our hooks from Codex's configured hooks.json (idempotent,
+    # concurrent-safe).
     # Uses Node (always available — required to run the daemon) so users
     # without jq don't end up with stale CodeVibe hook entries leftover
     # after the wrapper exits. Ownership check is path-prefix + filename
@@ -255,13 +287,13 @@ cleanup() {
     # that happen to contain the string codevibe-codex (e.g. a username,
     # a directory like /Users/codevibe-codex/) cannot trigger removal of
     # the user's unrelated hooks.
-    if [ -f "$HOME/.codex/hooks.json" ] && command -v node &> /dev/null; then
+    if [ -f "$CODEX_CONFIG_HOME/hooks.json" ] && command -v node &> /dev/null; then
         # Only remove if no other codevibe-codex sessions are running
         if [ "$(pgrep -f 'codevibe-codex' | wc -l)" -le 1 ]; then
-            log "Removing CodeVibe hooks from $HOME/.codex/hooks.json"
+            log "Removing CodeVibe hooks from $CODEX_CONFIG_HOME/hooks.json"
             # The shared helper keeps install and cleanup ownership rules in
             # lockstep, including task-named CodeVibe agent worktrees.
-            if CV_HOOKS_FILE="$HOME/.codex/hooks.json" \
+            if CV_HOOKS_FILE="$CODEX_CONFIG_HOME/hooks.json" \
               node "$PLUGIN_DIR/libexec/codex-hook-config.js" cleanup 2>>"$LOG_FILE"; then
               :
             else
@@ -313,6 +345,7 @@ fi
 # Generate a unique session name
 SESSION_NAME="${TMUX_SESSION_PREFIX}-$$"
 WORKING_DIR="$(pwd)"
+export CODEVIBE_CODEX_WRAPPER_PID="$$"
 
 log "Starting codevibe-codex with session: $SESSION_NAME"
 log "Working directory: $WORKING_DIR"
@@ -360,7 +393,7 @@ export CODEVIBE_CODEX_PLUGIN_DIR="$PLUGIN_DIR"
 # Install hooks.json for Codex CLI with absolute paths (idempotent)
 # Codex CLI does NOT expand env vars in hook commands, so we must
 # write absolute paths at runtime.
-CODEX_HOOKS_FILE="$HOME/.codex/hooks.json"
+CODEX_HOOKS_FILE="$CODEX_CONFIG_HOME/hooks.json"
 HOOKS_DIR="$PLUGIN_DIR/hooks"
 
 generate_hooks_json() {
@@ -379,8 +412,8 @@ HOOKEOF
 }
 
 # Ensure hooks feature flag is enabled in Codex config
-CODEX_CONFIG="$HOME/.codex/config.toml"
-mkdir -p "$HOME/.codex"
+CODEX_CONFIG="$CODEX_CONFIG_HOME/config.toml"
+mkdir -p "$CODEX_CONFIG_HOME"
 if [ ! -f "$CODEX_CONFIG" ]; then
   printf '[features]\nhooks = true\n' > "$CODEX_CONFIG"
   log "Created config.toml with hooks feature flag"

package/node_modules/fs-ext/build/Makefile

@@ -331,8 +331,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/hendryyeh/Library/Caches/node-gyp/24.4.0" "-Dnode_gyp_dir=/opt/homebrew/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/hendryyeh/Library/Caches/node-gyp/24.4.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/hendryyeh/Workspace/CodeVibe/.agent-worktrees/codex-1/p17-retry-containment/codevibe-codex-plugin/node_modules/fs-ext" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/hendryyeh/Workspace/CodeVibe/.agent-worktrees/codex-1/p17-retry-containment/codevibe-codex-plugin/node_modules/fs-ext/build/config.gypi -I/opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/hendryyeh/Library/Caches/node-gyp/24.4.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/../../../../../../../../Library/Caches/node-gyp/24.4.0/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/../../../../../../../../../../opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp
+cmd_regen_makefile = cd $(srcdir); /opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/hendryyeh/Library/Caches/node-gyp/24.4.0" "-Dnode_gyp_dir=/opt/homebrew/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/hendryyeh/Library/Caches/node-gyp/24.4.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/hendryyeh/Workspace/CodeVibe/codevibe-codex-plugin/node_modules/fs-ext" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/hendryyeh/Workspace/CodeVibe/codevibe-codex-plugin/node_modules/fs-ext/build/config.gypi -I/opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/hendryyeh/Library/Caches/node-gyp/24.4.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
+Makefile: $(srcdir)/../../../../../../../opt/homebrew/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../Library/Caches/node-gyp/24.4.0/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/node_modules/fs-ext/build/config.gypi

@@ -490,7 +490,7 @@
     "python": "/opt/homebrew/opt/python@3.14/bin/python3.14",
     "standalone_static_library": 1,
     "global_prefix": "/opt/homebrew",
-    "local_prefix": "/Users/hendryyeh/Workspace/CodeVibe/.agent-worktrees/codex-1/p17-retry-containment/codevibe-codex-plugin",
+    "local_prefix": "/Users/hendryyeh/Workspace/CodeVibe/codevibe-codex-plugin",
     "globalconfig": "/opt/homebrew/etc/npmrc",
     "init_module": "/Users/hendryyeh/.npm-init.js",
     "userconfig": "/Users/hendryyeh/.npmrc",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-codex-plugin",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "Control OpenAI Codex CLI from your iPhone and Android — real-time sync, approve file edits, send prompts by voice. Part of CodeVibe.",
   "main": "dist/server.js",
   "codevibe": {