Tighten preview safety and quiet smoke tests

fallintoplace · fallintoplace · commit b5c68d125742 · 2026-05-25T12:56:58.000+02:00
diff --git a/Makefile b/Makefile
@@ -10,6 +10,7 @@ check: validate-desktop
 	bash -n scripts/install-electron-local.sh
 	bash -n scripts/install-local.sh
 	bash -n scripts/build-deb.sh
+	bash -n tests/electron_wrapper_smoke.sh
 	bash -n tests/install_electron_local_smoke.sh
 	bash -n tests/launcher_smoke.sh
 
@@ -28,6 +29,7 @@ validate-desktop:
 		rm -f "$$tmpfile"
 
 test: check
+	bash tests/electron_wrapper_smoke.sh
 	bash tests/install_electron_local_smoke.sh
 	bash tests/launcher_smoke.sh
 
diff --git a/README.md b/README.md
@@ -55,6 +55,12 @@ The current repository is not just a design memo. It already ships:
 | Updater | Not yet |
 | Stable v1 release | Not yet |
 
+## Package reality today
+
+`make build-deb` currently builds the **browser fallback utility package**, not the Electron desktop app.
+
+That means the `.deb` is useful as a preview/recovery install, but it is **not** yet the main Electron product this repository is aiming for.
+
 ## What it is not claiming
 
 This repository is not yet:
@@ -106,7 +112,7 @@ See [providers/contract.md](providers/contract.md), [providers/browser-shell.md]
 | XDG state layout | Yes | Config, cache, and state are separated |
 | Local install | Yes | `make install-local` installs the fallback utility |
 | Local Electron install | Yes | `make install-electron-local` swaps the active desktop launcher to repo code with rollback preserved |
-| Debian package build | Yes | Today this packages the fallback utility |
+| Debian package build | Yes | Today this packages the fallback utility, not `Codex Desktop` |
 | CI | Yes | Syntax, smoke tests, packaging |
 | Desktop-payload provider | Not yet | Main implementation target |
 | App Server provider | Not yet | Optional future provider |
@@ -121,6 +127,11 @@ See [providers/contract.md](providers/contract.md), [providers/browser-shell.md]
 | Browser fallback | People who want the current fully repo-owned path | Yes | Lowest-fidelity UX, but easiest to run from this repo today |
 | Electron developer path | People who want the real desktop feel | Yes | Best UX, with a staged local build bridge and local install flow |
 
+Important:
+
+- `make build-deb` packages the browser fallback path today
+- `Codex Desktop` is currently built and installed through the local Electron build/install flow, not through the `.deb`
+
 ### What you need locally
 
 Browser fallback:
@@ -225,6 +236,7 @@ Strict behavior:
 
 - invalid explicit runtime or browser overrides fail loudly
 - non-loopback bind values require `CODEX_UBUNTU_ALLOW_NON_LOOPBACK=1`
+- set `CODEX_UBUNTU_DISABLE_NOTIFICATIONS=1` if you want failure handling to stay terminal-only
 
 Install it locally:
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/electron/codex-desktop b/electron/codex-desktop
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+umask 077
 
 DISPLAY_NAME="Codex Desktop"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -9,16 +10,101 @@ LOG_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/codex-ubuntu"
 LOG_FILE="${LOG_DIR}/electron-wrapper.log"
 
 mkdir -p "$LOG_DIR"
-
-if [ -f "$CONFIG_FILE" ]; then
-  # shellcheck disable=SC1090
-  . "$CONFIG_FILE"
-fi
+chmod 700 "$LOG_DIR" >/dev/null 2>&1 || true
+mkdir -p "$CONFIG_DIR"
+chmod 700 "$CONFIG_DIR" >/dev/null 2>&1 || true
 
 log() {
   printf '[%s] %s\n' "$(date -Is)" "$*" >>"$LOG_FILE"
 }
 
+load_config_file() {
+  local config_output=""
+  local line=""
+  local key=""
+  local value=""
+
+  [ -f "$CONFIG_FILE" ] || return 0
+
+  chmod 600 "$CONFIG_FILE" >/dev/null 2>&1 || true
+
+  if ! config_output="$(python3 - "$CONFIG_FILE" <<'PY'
+from pathlib import Path
+import shlex
+import sys
+
+config_path = Path(sys.argv[1])
+allowed_keys = {
+    "CODEX_UBUNTU_ELECTRON_APP_ROOT",
+    "CODEX_UBUNTU_NODE_BIN_DIR",
+}
+
+for line_number, raw_line in enumerate(
+    config_path.read_text(encoding="utf-8").splitlines(),
+    start=1,
+):
+    stripped = raw_line.strip()
+    if not stripped or stripped.startswith("#"):
+        continue
+    if "=" not in raw_line:
+        print(
+            f"Invalid config line in {config_path}:{line_number}",
+            file=sys.stderr,
+        )
+        raise SystemExit(1)
+
+    key, raw_value = raw_line.split("=", 1)
+    key = key.strip()
+    if key not in allowed_keys:
+        print(
+            f"Unsupported key in {config_path}:{line_number}: {key}",
+            file=sys.stderr,
+        )
+        raise SystemExit(1)
+
+    raw_value = raw_value.strip()
+    if not raw_value:
+        value = ""
+    else:
+        try:
+            tokens = shlex.split(raw_value, posix=True)
+        except ValueError as exc:
+            print(
+                f"Invalid shell-like value for {key} in {config_path}:{line_number}: {exc}",
+                file=sys.stderr,
+            )
+            raise SystemExit(1)
+
+        if len(tokens) != 1:
+            print(
+                f"Invalid shell-like value for {key} in {config_path}:{line_number}",
+                file=sys.stderr,
+            )
+            raise SystemExit(1)
+
+        value = tokens[0]
+
+    print(f"{key}={value}")
+PY
+)"; then
+    return 1
+  fi
+
+  while IFS= read -r line; do
+    [ -n "$line" ] || continue
+    key="${line%%=*}"
+    value="${line#*=}"
+    case "$key" in
+      CODEX_UBUNTU_ELECTRON_APP_ROOT)
+        CODEX_UBUNTU_ELECTRON_APP_ROOT="$value"
+        ;;
+      CODEX_UBUNTU_NODE_BIN_DIR)
+        CODEX_UBUNTU_NODE_BIN_DIR="$value"
+        ;;
+    esac
+  done <<<"$config_output"
+}
+
 prepend_path_once() {
   local dir="$1"
   case ":$PATH:" in
@@ -86,6 +172,7 @@ main() {
   local node_bin_dir=""
   local app_root=""
 
+  load_config_file
   prepend_path_once "${HOME}/.local/bin"
   if node_bin_dir="$(resolve_node_bin_dir)"; then
     prepend_path_once "$node_bin_dir"
diff --git a/launcher/codex-ubuntu b/launcher/codex-ubuntu
@@ -4,12 +4,14 @@ umask 077
 
 APP_ID="codex-ubuntu"
 APP_NAME="Codex Ubuntu (Unofficial)"
-APP_VERSION="${CODEX_UBUNTU_VERSION:-0.2.0}"
+APP_VERSION="${CODEX_UBUNTU_VERSION:-0.2.1}"
 PROVIDER="${CODEX_UBUNTU_PROVIDER:-browser-shell}"
 WEB_BIND="${CODEX_UBUNTU_BIND:-127.0.0.1}"
 DEFAULT_WEB_PORT="${CODEX_UBUNTU_PORT:-8080}"
 ALLOW_NON_LOOPBACK="${CODEX_UBUNTU_ALLOW_NON_LOOPBACK:-0}"
 DEBUG_SHOW_TOKEN_URL="${CODEX_UBUNTU_DEBUG_SHOW_TOKEN_URL:-0}"
+LOCK_TIMEOUT_SECONDS="${CODEX_UBUNTU_LOCK_TIMEOUT_SECONDS:-15}"
+DISABLE_NOTIFICATIONS="${CODEX_UBUNTU_DISABLE_NOTIFICATIONS:-0}"
 
 CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/${APP_ID}"
 CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/${APP_ID}"
@@ -47,6 +49,11 @@ log() {
 
 notify_failure() {
   local message="$1"
+  case "$DISABLE_NOTIFICATIONS" in
+    1|true|TRUE|yes|YES)
+      return 0
+      ;;
+  esac
   if command -v notify-send >/dev/null 2>&1; then
     notify-send "$APP_NAME" "$message" || true
   fi
@@ -57,13 +64,21 @@ ensure_dirs() {
 }
 
 with_lock() {
+  local message=""
+
   ensure_dirs
   if command -v flock >/dev/null 2>&1; then
     if [ "$LOCK_HELD" = "1" ]; then
       return 0
     fi
     exec 9>"$LOCK_FILE"
-    flock 9
+    if ! flock -w "$LOCK_TIMEOUT_SECONDS" 9; then
+      exec 9>&- || true
+      message="Another ${APP_NAME} launcher operation is already in progress. Wait a moment or run codex-ubuntu --status."
+      log "Timed out waiting ${LOCK_TIMEOUT_SECONDS}s for launcher lock"
+      printf '%s\n' "$message" >&2
+      return 1
+    fi
     LOCK_HELD=1
   fi
 }
@@ -822,11 +837,9 @@ cleanup_stale_state() {
 }
 
 stop_server() {
-  local pid=""
-  local port=""
   local status=0
 
-  with_lock
+  with_lock || return $?
   stop_server_locked || status=$?
   release_lock
   return "$status"
@@ -862,7 +875,7 @@ ensure_server() {
   ENSURE_SERVER_ACTION=""
   validate_loopback_bind
   validate_port_number "$DEFAULT_WEB_PORT"
-  with_lock
+  with_lock || return $?
   ensure_dirs
   cleanup_stale_state
 
diff --git a/packaging/deb/README.md b/packaging/deb/README.md
@@ -3,5 +3,11 @@
 Debian packaging templates for the Ubuntu app.
 
 Today the packaged implementation is still the browser fallback utility.
-The main packaging direction is the Electron desktop path.
+
+Important:
+
+- this `.deb` does **not** install the Electron desktop app yet
+- this `.deb` does install the fallback/recovery launcher
+- the main packaging direction is still the Electron desktop path
+
 The local Electron build/install bridge exists now, but that path is not yet what the `.deb` installs.
diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
@@ -33,3 +33,4 @@ mkdir -p "$DIST_DIR"
 dpkg-deb --build "$PKGROOT" "$PACKAGE_PATH" >/dev/null
 
 printf 'Built %s\n' "$PACKAGE_PATH"
+printf 'Package note: this preview .deb installs the browser fallback utility, not the Electron desktop app.\n'
diff --git a/scripts/install-electron-local.sh b/scripts/install-electron-local.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+umask 077
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
@@ -43,6 +44,7 @@ if [ "${1:-}" = "--help" ] || [ "${1:-}" = "-h" ]; then
 fi
 
 mkdir -p "$BIN_DIR" "$APP_DIR" "$ICON_DIR" "$CONFIG_DIR" "$(dirname "$TARGET_APP_ROOT")"
+chmod 700 "$CONFIG_DIR" >/dev/null 2>&1 || true
 
 detect_config_value() {
   local wrapper_path="$1"
@@ -137,13 +139,17 @@ copy_app_root_into_local_opt() {
 write_config_file() {
   local app_root="$1"
   local node_bin_dir="$2"
+  local temp_config="${CONFIG_FILE}.tmp.$$"
 
   {
     printf 'CODEX_UBUNTU_ELECTRON_APP_ROOT=%q\n' "$app_root"
     if [ -n "$node_bin_dir" ]; then
       printf 'CODEX_UBUNTU_NODE_BIN_DIR=%q\n' "$node_bin_dir"
     fi
-  } >"$CONFIG_FILE"
+  } >"$temp_config"
+
+  chmod 600 "$temp_config"
+  mv "$temp_config" "$CONFIG_FILE"
 }
 
 write_primary_wrapper() {
diff --git a/tests/electron_wrapper_smoke.sh b/tests/electron_wrapper_smoke.sh
diff --git a/tests/fixtures/notify-send b/tests/fixtures/notify-send
diff --git a/tests/install_electron_local_smoke.sh b/tests/install_electron_local_smoke.sh
diff --git a/tests/launcher_smoke.sh b/tests/launcher_smoke.sh

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ mkdir -p "$DIST_DIR"`
`33`	`33`	`dpkg-deb --build "$PKGROOT" "$PACKAGE_PATH" >/dev/null`
`34`	`34`
`35`	`35`	`printf 'Built %s\n' "$PACKAGE_PATH"`
	`36`	`+printf 'Package note: this preview .deb installs the browser fallback utility, not the Electron desktop app.\n'`