@quantiya/codevibe-codex-plugin 2.0.93 → 2.0.94

package/README.md

@@ -44,10 +44,18 @@ install the unified `codevibe --agent` interface yet.
 - **macOS, Linux, or WSL Ubuntu** — Windows without WSL is not supported
 - **Node.js** 22.0.0+
 - **tmux** — `brew install tmux` on macOS, `apt install tmux` on Linux/WSL
-- **Codex CLI** installed and authenticated
+- **Codex CLI** installed and authenticated (latest recommended)
 
 ## How it works
 
+The own-tmux Companion route uses `--no-daemon` when Codex advertises that
+capability. On current Codex this keeps hooks in the wrapper's environment and
+avoids the shared server's message-size limit on large history resumes. Older
+CLIs without the option retain their previous native handling; there is no new
+minimum-version requirement. Direct tmux/non-TTY passthrough keeps native argv
+unchanged. Current local Companion execution rejects remote mode. Original
+arguments retain their order after an added local-process option.
+
 Codex CLI writes session logs to `~/.codex/sessions/` as JSONL files. A native
 hook supplies the exact rollout path and session id; CodeVibe never guesses log
 ownership from timestamps or working directories, so concurrent sessions in the

package/libexec/codex-local-mode.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const { spawnSync } = require('child_process');
+
+/** Companion hooks must execute in this wrapper's native process environment.
+ * The shared server also has a 128 MiB WebSocket response limit, which legacy
+ * history resumes can exceed. Keep the native in-process path for Companion.
+ */
+function localModePolicy(args, help) {
+  const delimiter = args.indexOf('--');
+  const options = delimiter < 0 ? args : args.slice(0, delimiter);
+  // Preserve established handling for older CLIs without this capability.
+  // The owner explicitly chose compatibility rather than a new minimum CLI.
+  if (!/(?:^|\s)--no-daemon(?:\s|$)/m.test(help)) return 'legacy';
+  if (options.some(arg => arg === '--remote' || arg.startsWith('--remote='))) {
+    throw new Error('CodeVibe Companion requires local Codex execution; remote Codex sessions cannot provide this wrapper\'s hooks.');
+  }
+  return options.includes('--no-daemon') ? 'present' : 'add';
+}
+
+if (require.main === module) {
+  try {
+    const result = spawnSync('codex', ['--help'], {
+      encoding: 'utf8', timeout: 5_000, maxBuffer: 1024 * 1024,
+    });
+    if (result.error || result.signal || result.status !== 0) {
+      throw new Error('Could not verify Codex local execution support. Run codex --help and retry.');
+    }
+    process.stdout.write(localModePolicy(process.argv.slice(2), result.stdout) + '\n');
+  } catch (error) {
+    process.stderr.write(`CodeVibe Companion: ${error.message}\n`);
+    process.exitCode = 1;
+  }
+}
+
+module.exports = { localModePolicy };

package/libexec/companion-launcher

@@ -223,6 +223,20 @@ cleanup() {
             log "Tmux state is ambiguous; preserving daemon and native session"
             return
         fi
+        # Only an absent session proves native termination. A successful tmux
+        # client can still wrap a native error; collect that status here so
+        # setup/attach failures after native termination use the same path.
+        local native_exit
+        native_exit="$(head -c 16 "$_CV_CODEX_EXIT_FILE" 2>/dev/null)" || native_exit=""
+        if [[ "$native_exit" =~ ^(0|[1-9][0-9]{0,2})$ ]] && [ "$native_exit" -le 255 ]; then
+            log "Native Codex session ended with status $native_exit"
+            if [ "$wrapper_exit_code" -ne 130 ] && [ "$wrapper_exit_code" -ne 143 ]; then
+                wrapper_exit_code=$native_exit
+            fi
+        elif [ "$wrapper_exit_code" -eq 0 ]; then
+            log "WARN: native session ended without a valid exit status"
+            wrapper_exit_code=1
+        fi
     fi
 
     # Fire wrapper_exited telemetry BEFORE killing the server so the MCP
@@ -327,6 +341,7 @@ cleanup() {
     elif [ "$server_exit" -ne 0 ]; then
         exit "$server_exit"
     fi
+    exit 0
 }
 
 # Set up trap for cleanup
@@ -366,7 +381,10 @@ if [ ! -f "$PLUGIN_DIR/dist/server.js" ]; then
     exit 1
 fi
 
-# Generate a unique session name
+# Direct routes retain verbatim native argument handling.
+CODEX_LOCAL_ARGS=()
+
+# Generate a unique session name.
 SESSION_NAME="${TMUX_SESSION_PREFIX}-$$"
 WORKING_DIR="$(pwd)"
 export CODEVIBE_CODEX_WRAPPER_PID="$$"
@@ -391,7 +409,7 @@ if [ -n "$TMUX" ]; then
     # leaves _CV_RC at its 0 default. printf's `|| true` keeps a
     # disk-full failure from clobbering diagnostics.
     _CV_RC=0
-    env -u QUORUM_REVIEWER_SUBPROCESS codex "$@" || _CV_RC=$?
+    env -u QUORUM_REVIEWER_SUBPROCESS codex "${CODEX_LOCAL_ARGS[@]}" "$@" || _CV_RC=$?
     printf '%s' "$_CV_RC" > "$_CV_CODEX_EXIT_FILE" 2>/dev/null || true
     exit "$_CV_RC"
 fi
@@ -402,11 +420,23 @@ if [ ! -t 0 ] || [ ! -t 1 ]; then
     _CV_AGENT_INVOKED="true"
     _CV_AGENT_STARTED_AT="$(date +%s)"
     _CV_RC=0
-    env -u QUORUM_REVIEWER_SUBPROCESS codex "$@" || _CV_RC=$?
+    env -u QUORUM_REVIEWER_SUBPROCESS codex "${CODEX_LOCAL_ARGS[@]}" "$@" || _CV_RC=$?
     printf '%s' "$_CV_RC" > "$_CV_CODEX_EXIT_FILE" 2>/dev/null || true
     exit "$_CV_RC"
 fi
 
+# Select in-process execution only for the own-tmux Companion route, before
+# hook/cloud startup. Older CLIs retain their previous native execution mode.
+if ! _CV_LOCAL_MODE=$(node "$PLUGIN_DIR/libexec/codex-local-mode.js" "$@"); then
+    cv_failed "codex_local_execution_unavailable"
+    exit 1
+fi
+case "$_CV_LOCAL_MODE" in
+    add) CODEX_LOCAL_ARGS=(--no-daemon) ;;
+    present|legacy) ;;
+    *) cv_failed "codex_local_execution_unavailable"; exit 1 ;;
+esac
+
 # Start the session log watcher server in background
 log "Starting session log watcher server..."
 export CODEX_WORKING_DIRECTORY="$WORKING_DIR"
@@ -664,9 +694,11 @@ log "Creating tmux session: $SESSION_NAME"
 
 # Build the codex command with proper escaping
 CODEX_CMD="codex"
-for arg in "$@"; do
-    # Escape single quotes in arguments
-    escaped_arg=$(printf '%s' "$arg" | sed "s/'/'\\\\''/g")
+for arg in "${CODEX_LOCAL_ARGS[@]}" "$@"; do
+    # The sentinel prevents command substitution from stripping trailing
+    # newlines belonging to the argument. Remove only the appended sentinel.
+    escaped_arg=$(printf '%s' "$arg" | sed "s/'/'\\\\''/g"; printf x)
+    escaped_arg=${escaped_arg%x}
     CODEX_CMD="$CODEX_CMD '$escaped_arg'"
 done
 
@@ -705,8 +737,8 @@ echo "$SESSION_NAME" > "${CODEVIBE_TMPDIR}/codevibe-codex-tmux-session-$$"
 
 log "Attaching to tmux session: $SESSION_NAME"
 
-# Attach to the session
+# Attach reports the client status. Cleanup collects native status only after
+# this exact session is absent; a detach keeps the daemon and native alive.
 tmux attach-session -t "$SESSION_NAME"
 
-# After tmux exits, cleanup is handled by trap
-log "Tmux session ended"
+log "Tmux client returned"

package/libexec/resolve-hook-session.js

@@ -61,7 +61,12 @@ function wrapperCommand(session, command) {
     && typeof s[1] === 'string' && s[1].startsWith('ENVIRONMENT='));
   const codex = statements.filter((s) => s[0] === 'codex');
   if (!environment || codex.length !== 1 || !codex[0].every((w) => typeof w === 'string')) return null;
-  return { session, environment: environmentFor(environment[1].slice('ENVIRONMENT='.length)), args: codex[0].slice(1) };
+  const args = codex[0].slice(1);
+  // The launcher adds this global flag before the original vendor arguments.
+  // Remove only that leading option when recognizing an explicit resume; never
+  // normalize flags or prompt text elsewhere in the argument list.
+  if (args[0] === '--no-daemon') args.shift();
+  return { session, environment: environmentFor(environment[1].slice('ENVIRONMENT='.length)), args };
 }
 
 function resolveHookSession(nativeId, inheritedSession, inventory, inheritedEnvironment) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-codex-plugin",
-  "version": "2.0.93",
+  "version": "2.0.94",
   "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": {