@quantiya/codevibe-codex-plugin 2.0.75 → 2.0.77

package/hooks/common.sh

@@ -59,6 +59,7 @@ fi
 
 CODEVIBE_TMPDIR="${TMPDIR:-/tmp}"
 LOG_FILE="${LOG_FILE:-${CODEVIBE_TMPDIR}/codevibe-codex-hooks.log}"
+CODEVIBE_HOOKS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 log() {
   local level="$1"
@@ -525,9 +526,27 @@ ensure_codex_daemon() {
   return $rc
 }
 
+bind_codex_hook_session() {
+  local binding session environment rc=0
+  binding=$(printf '%s' "$1" | node "$CODEVIBE_HOOKS_DIR/../libexec/resolve-hook-session.js") || rc=$?
+  case "$rc" in
+    0) export CODEVIBE_HOOK_ALLOW_RECOVERY=1 ;;
+    2) export CODEVIBE_HOOK_ALLOW_RECOVERY=0
+       log "WARN" "Hook metadata unavailable; retaining existing-port POST only, daemon recovery disabled" ;;
+    *) log "WARN" "Hook has no unique live wrapper binding; not posting or starting recovery"; return 1 ;;
+  esac
+  IFS=$'\t' read -r session environment <<< "$binding"
+  if [ "$session" != "$CODEVIBE_CODEX_TMUX_SESSION" ]; then
+    log "INFO" "Corrected stale hook wrapper binding: $CODEVIBE_CODEX_TMUX_SESSION -> $session"
+  fi
+  export CODEVIBE_CODEX_TMUX_SESSION="$session"
+  export ENVIRONMENT="$environment"
+}
+
 send_to_server() {
   local endpoint="$1"
   local json_data="$2"
+  bind_codex_hook_session "$json_data" || return 1
 
   local server_url curl_exit http_code response
   server_url=$(get_server_url)
@@ -570,6 +589,10 @@ send_to_server() {
     log "ERROR" "Local curl invocation failed (exit $curl_exit) — not replacing the Codex daemon"
     return 1
   fi
+  if [ "${CODEVIBE_HOOK_ALLOW_RECOVERY:-1}" = "0" ]; then
+    log "WARN" "Hook transport unavailable and binding unverified; not replacing or launching a daemon"
+    return 1
+  fi
 
   # (#638) TRANSPORT failure = curl non-zero OR HTTP 000 (dead daemon / missing
   # port file). Relaunch the daemon ONCE and retry the POST once (one relaunch
@@ -627,4 +650,6 @@ export -f _reuse_live_codex_daemon
 export -f _codex_daemon_pid_on_port
 export -f _codex_candidate_is_excluded
 export -f ensure_codex_daemon
+export CODEVIBE_HOOKS_DIR
+export -f bind_codex_hook_session
 export -f send_to_server

package/libexec/resolve-hook-session.js

@@ -0,0 +1,113 @@
+#!/usr/bin/env node
+'use strict';
+
+const { execFileSync } = require('child_process');
+const { parse } = require('shell-quote');
+const nativeUuid = /^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
+const validNativeId = (id) => typeof id === 'string' && /^[A-Za-z0-9_-]{1,180}$/.test(id);
+const environmentFor = (value) => value === 'development' || value === 'experiment' ? value : 'production';
+
+// pane_start_command uses tmux args_escape/vis, not JSON. Decode bytes without
+// evaluating shell text; literal UTF-8 runs remain UTF-8 and octal runs are bytes.
+function decodeTmuxCommand(command) {
+  if (!command.startsWith('"')) return command;
+  if (!command.endsWith('"')) throw new Error('incomplete tmux quoting');
+  const body = command.slice(1, -1);
+  const chunks = [];
+  const escapes = { '\\': 92, '"': 34, '$': 36, '~': 126, a: 7, b: 8, e: 27,
+    f: 12, n: 10, r: 13, s: 32, t: 9, v: 11 };
+  let cursor = 0;
+  const literal = (text) => {
+    if (text.includes('\\')) throw new Error('unknown tmux escape');
+    chunks.push(Buffer.from(text));
+  };
+  for (const match of body.matchAll(/\\([0-7]{1,3}|[\\"$~abefnrstv])/g)) {
+    literal(body.slice(cursor, match.index));
+    const value = /^[0-7]/.test(match[1]) ? parseInt(match[1], 8) : escapes[match[1]];
+    chunks.push(Buffer.from([value]));
+    cursor = match.index + match[0].length;
+  }
+  literal(body.slice(cursor));
+  return Buffer.concat(chunks).toString('utf8');
+}
+
+function inheritedFallback(nativeId, session, environment) {
+  if (!validNativeId(nativeId) || !/^codevibe-codex-[1-9]\d*$/.test(session || '')) return null;
+  // Preserve the old existing-port POST on unavailable metadata, but never
+  // launch/replace a daemon without a verified binding.
+  return { session, environment: environmentFor(environment), allowRecovery: false };
+}
+
+// Resumed Codex shell snapshots can retain a previous wrapper's environment.
+// Match the hook's native id to an explicit, live wrapper resume command instead
+// of launching recovery for that stale name. Never evaluate pane command text.
+function wrapperCommand(session, command) {
+  if (!/^codevibe-codex-[1-9]\d*$/.test(session)) return null;
+  let words;
+  try {
+    command = decodeTmuxCommand(command);
+    words = parse(command);
+    if (words.length === 1 && typeof words[0] === 'string') words = parse(words[0]);
+  } catch { return { undecodable: true }; }
+  const statements = [[]];
+  for (const word of words) {
+    if (typeof word === 'object' && word.op === ';') statements.push([]);
+    else statements[statements.length - 1].push(word);
+  }
+  const hasExport = (value) => statements.some((s) => s.length === 2 && s[0] === 'export' && s[1] === value);
+  if (!hasExport(`CODEVIBE_CODEX_TMUX_SESSION=${session}`)
+      || !hasExport('CODEVIBE_CODEX_PRIMARY_COMPANION=1')) return null;
+  const environment = statements.find((s) => s.length === 2 && s[0] === 'export'
+    && 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) };
+}
+
+function resolveHookSession(nativeId, inheritedSession, inventory, inheritedEnvironment) {
+  if (!validNativeId(nativeId)) return null;
+  const entries = inventory.split('\n').filter(Boolean).flatMap((line) => {
+    const [session, dead, ...command] = line.split('\t');
+    if (dead !== '0') return [];
+    const wrapper = wrapperCommand(session, command.join('\t'));
+    return wrapper ? [{ session, wrapper }] : [];
+  });
+  const wrappers = entries.filter((e) => !e.wrapper.undecodable).map((e) => e.wrapper);
+  const resumed = wrappers.filter((w) => w.args[0] === 'resume' && w.args[1] === nativeId);
+  if (resumed.length > 1) return null;
+  const inherited = wrappers.filter((w) => w.session === inheritedSession);
+  if (entries.filter((e) => e.session === inheritedSession).length === 1
+      && entries.some((e) => e.session === inheritedSession && e.wrapper.undecodable)) {
+    return inheritedFallback(nativeId, inheritedSession, inheritedEnvironment);
+  }
+  // A live fresh/picker wrapper is not proven stale. Preserve it rather than
+  // redirecting its hooks merely because another wrapper resumes this history.
+  if (inherited.length === 1 && !(inherited[0].args[0] === 'resume'
+      && nativeUuid.test(inherited[0].args[1] || '')
+      && inherited[0].args[1].toLowerCase() !== nativeId.toLowerCase())) return inherited[0];
+  return resumed.length === 1 ? resumed[0] : null;
+}
+
+if (require.main === module) {
+  let input;
+  const emit = (binding) => {
+    if (!binding) { process.exitCode = 1; return; }
+    process.stdout.write(`${binding.session}\t${binding.environment}\n`);
+    if (binding.allowRecovery === false) process.exitCode = 2;
+  };
+  try {
+    input = JSON.parse(require('fs').readFileSync(0, 'utf8'));
+    const socket = (process.env.TMUX || '').split(',')[0];
+    const args = socket ? ['-S', socket] : [];
+    if (socket && !socket.startsWith('/')) throw new Error('invalid tmux socket');
+    const inventory = execFileSync('tmux', [...args, 'list-panes', '-a', '-F',
+      '#{session_name}\t#{pane_dead}\t#{pane_start_command}'], {
+      encoding: 'utf8', timeout: 2000, maxBuffer: 1024 * 1024,
+    });
+    emit(resolveHookSession(input.session_id, process.env.CODEVIBE_CODEX_TMUX_SESSION, inventory, process.env.ENVIRONMENT));
+  } catch {
+    emit(inheritedFallback(input?.session_id, process.env.CODEVIBE_CODEX_TMUX_SESSION, process.env.ENVIRONMENT));
+  }
+}
+
+module.exports = { resolveHookSession };

package/node_modules/@quantiya/codevibe-core/dist/appsync/appsync-client.d.ts

@@ -799,6 +799,9 @@ export declare class AppSyncClient {
      * subscribeToEvents path below uses this same factory for all providers. */
     desktopSyncLiveSession(options: DesktopSyncSessionScope & {
         root?: string;
+        revalidateRegistration?: boolean;
+        onRegistrationRevalidated?(): void;
+        onUpgradeRejected?(): void;
     }, onEvent: (event: Event) => Promise<void> | void, onError: (error: Error) => void, signal?: AbortSignal): Promise<DesktopSyncLiveConnection>;
     private syncEventForConsumer;
     retireDesktopSyncRegistration(options: DesktopSyncSessionScope & {

package/node_modules/@quantiya/codevibe-core/dist/appsync/sync-live-connection.d.ts

@@ -52,6 +52,9 @@ export declare class DesktopSyncLiveConnection {
         onUncertain?(count: number): void;
         retryExecutionAcknowledgement?(target: SyncRecoveryTarget, signal: AbortSignal): Promise<SyncExecutedInput>;
         onMaintenance?(signal: AbortSignal): Promise<void>;
+        revalidateRegistration?: boolean;
+        onRegistrationRevalidated?(): void;
+        onUpgradeRejected?(): void;
         onEvent(event: SyncReadEvent): Promise<void> | void;
         onError(error: Error): void;
         openSocket?: (url: string, options: WebSocket.ClientOptions) => WebSocket;