@meridiona/meridian-darwin-arm64 1.69.0 → 1.70.0

package/.env.example

@@ -8,7 +8,6 @@
 # Core (optional — defaults shown)
 # ---------------------------------------------------------------------------
 
-# SCREENPIPE_DB=~/.screenpipe/db.sqlite
 # MERIDIAN_DB=~/.meridian/meridian.db
 # POLL_INTERVAL_SECS=60
 # RUST_LOG=meridian=info
@@ -103,16 +102,23 @@
 # Syncs the OPEN issues assigned to you from the listed GitHub Projects v2 (read
 # via the GraphQL API); logs worklogs as structured issue comments (GitHub has no
 # native time tracking).
-# Token: easiest is the gh CLI — `meridian setup` runs `gh auth token` and adds
-# the read:project scope for you (no PAT). Otherwise create a classic PAT with
-# the `repo`, `read:org`, `read:project` scopes (read:project reads Projects;
-# repo posts worklog comments).
+# Token: easiest is the dashboard's "Browser" connect — it runs GitHub's OAuth
+# device flow (shows a one-time code, no PAT, no CLI) and writes GITHUB_TOKEN
+# here for you. Otherwise create a classic PAT with the `repo`, `read:org`,
+# `read:project` scopes (read:project reads Projects; repo posts worklog comments).
 # GITHUB_PROJECT_IDS: comma-separated Projects v2 node IDs (PVT_xxx). Find them:
 #   gh api graphql -f query='{ viewer { projectsV2(first:10){nodes{id title}} } }'
+#
+# GITHUB_OAUTH_CLIENT_ID: overrides the baked-in OAuth App client id used by the
+# device flow (public identifier, no secret). Only needed for a SOURCE build (a
+# release bakes it in from the GH_OAUTH_CLIENT_ID repo secret via
+# MERIDIAN_GITHUB_OAUTH_CLIENT_ID) or a custom OAuth App — the app must have
+# "Enable Device Flow" checked.
 # ---------------------------------------------------------------------------
 
 # GITHUB_TOKEN=ghp_your_personal_access_token
 # GITHUB_PROJECT_IDS=PVT_xxx,PVT_yyy
+# GITHUB_OAUTH_CLIENT_ID=Ov23li_your_oauth_app_client_id
 
 # ---------------------------------------------------------------------------
 # Linear (LINEAR_API_KEY required to enable the Linear connector)
@@ -174,8 +180,9 @@
 # set both to the same value when Jira is configured).
 # JIRA_URL=https://your-org.atlassian.net
 
-# Disable Python OTLP tracing regardless of OO config (1 = off).
-# MERIDIAN_TRACING_DISABLED=0
+# Hard kill switch for local OTel capture (Rust daemon + Python agents both
+# read this same variable — see CLAUDE.md's observability env var table).
+# MERIDIAN_TELEMETRY_DISABLED=0
 
 # Confident AI key for the classifier eval harness (services/tests/evals only).
 # CONFIDENT_API_KEY=

package/VERSION

@@ -1 +1 @@
-1.69.0
+1.70.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meridiona/meridian-darwin-arm64",
-  "version": "1.69.0",
+  "version": "1.70.0",
   "description": "Prebuilt Meridian app for macOS arm64 (daemon binary + dashboard + Python services). Installed via @meridiona/meridian.",
   "homepage": "https://github.com/Meridiona/meridian",
   "repository": {
@@ -16,7 +16,6 @@
   ],
   "files": [
     "bin/",
-    "ui.tar.gz",
     "services/",
     "scripts/",
     ".env.example",

package/scripts/com.meridiona.daemon.plist

@@ -37,8 +37,6 @@
              ahead of the system defaults. -->
         <key>PATH</key>
         <string>{{HOME}}/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-        <key>SCREENPIPE_DB</key>
-        <string>{{HOME}}/.screenpipe/db.sqlite</string>
         <key>MERIDIAN_DB</key>
         <string>{{HOME}}/.meridian/meridian.db</string>
         <key>POLL_INTERVAL_SECS</key>

package/scripts/install-from-bundle.sh

@@ -129,30 +129,6 @@ source "${APP_ROOT}/scripts/lib-trello-setup.sh"
 GUI_TARGET="gui/$(id -u)"
 LAUNCH_AGENTS="${HOME}/Library/LaunchAgents"
 
-# Retire the legacy standalone dashboard Node server. The dashboard now ships
-# embedded INSIDE the tray binary (static export, no Node server), so any
-# `com.meridiona.ui` launchd agent from a pre-fold install is a zombie — a
-# KeepAlive=true Node server holding the old dashboard port. Boot it out + remove
-# its plist, and drop the now-orphaned ABI-matched Node runtime cache. Idempotent
-# (no-op when absent) and non-fatal (a launchctl hiccup must not abort the
-# update) — but logged, never silent.
-retire_legacy_ui_server() {
-    local label="com.meridiona.ui"
-    local plist="${LAUNCH_AGENTS}/${label}.plist"
-    if launchctl print "${GUI_TARGET}/${label}" >/dev/null 2>&1; then
-        info "Retiring the legacy dashboard server (now bundled in the tray app)…"
-        launchctl bootout "${GUI_TARGET}/${label}" 2>/dev/null \
-            || warn "could not bootout ${label} (continuing)"
-    fi
-    if [[ -f "${plist}" ]]; then
-        rm -f "${plist}" && ok "removed legacy ${label} launchd agent" \
-            || warn "could not remove ${plist} (continuing)"
-    fi
-    # The pinned Node runtime existed only to ABI-match better-sqlite3 in the old
-    # server; nothing uses it now.
-    rm -rf "${HOME}/.meridian/node-runtime" 2>/dev/null || true
-}
-
 # Enable accessibility mode in VS Code / Cursor / Antigravity so screenpipe
 # captures their a11y tree instead of falling back to OCR. Chromium/Electron
 # editors only expose their AX tree when editor.accessibilitySupport = "on"
@@ -478,11 +454,6 @@ fi
 # this, screenpipe falls back to OCR for those editors instead of their a11y tree.
 configure_editor_accessibility
 
-# ── 5b. Retire the legacy dashboard Node server (one-time, for pre-fold installs) ─
-# The dashboard is now embedded in the tray binary, so an old standalone UI agent
-# is a zombie. This runs on every (re)install/update — idempotent + non-fatal.
-retire_legacy_ui_server
-
 # ── 6. Daemons — restart only what changed ───────────────────────────────────
 # screenpipe: external npm binary, plist may have changed → always refresh.
 info "Installing screenpipe launchd agent…"

package/scripts/meridian-cli.sh

@@ -11,7 +11,6 @@ REPO_ROOT="$(cd "$(dirname "$SELF")/.." && pwd)"
 # --- constants ---
 LABEL_SCREENPIPE="com.meridiona.screenpipe"
 LABEL_DAEMON="com.meridiona.daemon"
-LABEL_UI="com.meridiona.ui"
 LABEL_MLX="com.meridiona.mlx-server"
 # Capture runs in-process in the tray (no screenpipe launchd agent since Bucket-2).
 # Jira worklogs and coding-agent ingest run inside the Rust daemon — no
@@ -112,6 +111,24 @@ cmd_stop() {
         pkill -f "mlx_lm.server" 2>/dev/null || true
         info "killed orphaned mlx_lm.server process(es)"
     fi
+    # Kill any orphaned dev-build daemons (`cargo watch`/`cargo run --bin
+    # meridian` from dev-start.sh, or a bare `cargo run`) — not tracked by
+    # launchd, so `bootout` above never touches them. Closing the Terminal
+    # window a dev session runs in (instead of Ctrl-C, or re-running
+    # dev-start.sh, which has its own cleanup) reparents this chain to PID 1
+    # and it silently keeps running — including its clock-aligned worklog
+    # trigger, which then races the canonical daemon and double-runs every
+    # hour's worklog pipeline. Anchored to the debug/release binary path so
+    # this never matches the canonical `~/.meridian/bin/meridian` or the
+    # `meridian`/`meridian-daemon` CLI wrappers.
+    if pgrep -f "target/(debug|release)/meridian$" >/dev/null 2>&1; then
+        pkill -f "target/(debug|release)/meridian$" 2>/dev/null || true
+        info "killed orphaned dev-build daemon process(es)"
+    fi
+    if pgrep -f "cargo-watch.*--bin meridian" >/dev/null 2>&1; then
+        pkill -f "cargo-watch.*--bin meridian" 2>/dev/null || true
+        info "killed orphaned cargo-watch process(es)"
+    fi
 }
 
 # --- restart ---
@@ -152,52 +169,76 @@ cmd_status() {
 }
 
 # --- logs ---
-cmd_logs() {
-    local target="daemon"
-    local follow=0
-    local lines=100
+# Resolve the compiled `meridian` binary (distinct from THIS bash wrapper,
+# which is what gets invoked as `meridian` on PATH). Mirrors
+# tray/src-tauri/src/install.rs's `meridian_bin()`: packaged native locations
+# first, a dev build only for a source checkout.
+_meridian_native_bin() {
+    local p
+    for p in "${HOME}/.meridian/bin/meridian" "${HOME}/.meridian/app/bin/meridian"; do
+        [[ -x "$p" ]] && { echo "$p"; return 0; }
+    done
+    if _is_source_checkout; then
+        for p in "${REPO_ROOT}/target/release/meridian" "${REPO_ROOT}/target/debug/meridian"; do
+            [[ -x "$p" ]] && { echo "$p"; return 0; }
+        done
+    fi
+    return 1
+}
 
-    # consume target if it's not a flag
+# `meridian logs [target] [-n N] [-f]` decodes the local OTel telemetry spool
+# (`~/.meridian/telemetry/{pending,sent}/*.otlp`) via the compiled binary's
+# `logs` subcommand (`src/telemetry_spool/render.rs`) — the OTel spool is now
+# the ONLY log/trace sink (see `observability.rs`'s module doc), so this is
+# the one supported way to read logs locally without OpenObserve. `target`
+# maps to `--service <name>`; omit it to see every service interleaved.
+cmd_logs() {
+    local target=""
     if [[ $# -gt 0 && "${1:-}" != -* ]]; then
         target="$1"; shift
     fi
 
-    while [[ $# -gt 0 ]]; do
-        case "$1" in
-            -f) follow=1; shift ;;
-            -n) lines="${2:?-n requires a value}"; shift 2 ;;
-            *) err "unknown option: $1"; exit 1 ;;
-        esac
-    done
-
-    local log_file
+    # `*-error` targets used to map to a distinct launchd StandardErrorPath
+    # file capturing WARN+ output only. The OTel spool has no such separate
+    # file, so these now pass `--min-severity WARN` to the decoder instead —
+    # same filtering intent (errors/warnings only), applied at read time.
+    local service_args=()
     case "$target" in
-        daemon)            log_file="${LOG_DIR}/daemon.log" ;;
-        daemon-error)      log_file="${LOG_DIR}/daemon-error.log" ;;
-        screenpipe)        log_file="${LOG_DIR}/screenpipe.log" ;;
-        screenpipe-error)  log_file="${LOG_DIR}/screenpipe-error.log" ;;
-        ui)                log_file="${LOG_DIR}/ui.log" ;;
-        ui-error)          log_file="${LOG_DIR}/ui-error.log" ;;
-        mlx-server)        log_file="${LOG_DIR}/mlx-server.log" ;;
-        mlx-server-error)  log_file="${LOG_DIR}/mlx-server-error.log" ;;
-        tray)              log_file="${LOG_DIR}/tray.log" ;;
-        tray-error)        log_file="${LOG_DIR}/tray-error.log" ;;
-        # screenpipe/ui are retired post-v1.64.0 (capture is in-process in the
-        # tray; the dashboard is embedded) — kept here so old log files remain
-        # tailable, but `tray`/`tray-error` are the live targets now.
-        *) err "unknown log target: ${target} (daemon|daemon-error|mlx-server|mlx-server-error|tray|tray-error)"; exit 1 ;;
+        ""|all)                     ;;
+        daemon)                     service_args=(--service meridian-rust) ;;
+        daemon-error)               service_args=(--service meridian-rust --min-severity WARN) ;;
+        mlx-server)                 service_args=(--service meridian-mlx-server) ;;
+        mlx-server-error)           service_args=(--service meridian-mlx-server --min-severity WARN) ;;
+        tray)                       service_args=(--service meridian-tray) ;;
+        tray-error)                 service_args=(--service meridian-tray --min-severity WARN) ;;
+        screenpipe|screenpipe-error|ui|ui-error)
+            # Retired pre-in-process-capture / pre-Tauri-fold services — they
+            # never participated in the OTel pipeline. Fall back to raw-tailing
+            # whatever plain-text launchd file might still exist from before.
+            local log_file="${LOG_DIR}/${target}.log"
+            [[ -f "$log_file" ]] || { err "no log file at ${log_file}"; exit 1; }
+            local lines=100 follow=()
+            while [[ $# -gt 0 ]]; do
+                case "$1" in
+                    -f) follow=(-f); shift ;;
+                    -n) lines="${2:?-n requires a value}"; shift 2 ;;
+                    *) err "unknown option: $1"; exit 1 ;;
+                esac
+            done
+            # macOS ships bash 3.2 as /bin/bash — under `set -u`, expanding an
+            # empty array with "${arr[@]}" throws "unbound variable" (fixed
+            # only in bash 4.4+). The `${arr[@]+"${arr[@]}"}` guard skips
+            # expansion entirely when the array is empty/unset.
+            exec tail -n "$lines" ${follow[@]+"${follow[@]}"} "$log_file"
+            ;;
+        *) err "unknown log target: ${target} (daemon|mlx-server|tray, or omit for all)"; exit 1 ;;
     esac
 
-    if [[ ! -f "$log_file" ]]; then
-        err "no log file at ${log_file}"
-        exit 1
-    fi
-
-    if [[ $follow -eq 1 ]]; then
-        tail -n "$lines" -f "$log_file"
-    else
-        tail -n "$lines" "$log_file"
-    fi
+    local bin
+    bin="$(_meridian_native_bin)" || { err "meridian binary not found — run ./install.sh"; exit 1; }
+    # Same bash-3.2-unbound-variable guard as above — service_args is empty
+    # for the ""/all case, which is the most common invocation.
+    exec "$bin" logs ${service_args[@]+"${service_args[@]}"} "$@"
 }
 
 # --- doctor ---
@@ -279,7 +320,6 @@ _doctor_fallback() {
     _plist_row "$LABEL_DAEMON" "daemon plist"
     _plist_row "$LABEL_SCREENPIPE" "screenpipe plist"
     _plist_row "$LABEL_MLX" "mlx plist"
-    _plist_row "$LABEL_UI" "ui plist"
     _group "builds"
     _row "$([[ -f "${REPO_ROOT}/packages/meridian-mcp/dist/index.js" ]] && echo ok || echo fail)" "mcp built" ""
     _row "$([[ -d "${REPO_ROOT}/ui/.next" ]] && echo ok || echo fail)" "ui built" ""
@@ -691,24 +731,10 @@ _dev_wait_mlx() {
 _dev_build_daemon() { info "building daemon (cargo --release)…"; ( cd "${REPO_ROOT}" && cargo build --release ); }
 _dev_build_ui()     { info "building UI (npm run build)…";       ( cd "${REPO_ROOT}/ui" && npm run build ); }
 
-# Stop the launchd (production) dashboard so `next dev` can bind its port.
-# Disable too, so KeepAlive doesn't race to relaunch the prod server.
-_dev_stop_prod_ui() {
-    if launchctl print "${GUI_TARGET}/${LABEL_UI}" >/dev/null 2>&1; then
-        set +e
-        launchctl disable "${GUI_TARGET}/${LABEL_UI}" 2>/dev/null
-        launchctl bootout  "${GUI_TARGET}/${LABEL_UI}" 2>/dev/null
-        set -e
-        info "stopped launchd dashboard (freeing the port for the dev server)"
-    fi
-}
-
 # Run the Next.js dev server in the FOREGROUND (hot reload). Replaces this shell
 # (exec), so Ctrl-C stops just the UI server — backing services keep running.
-# Re-enable the prod dashboard later with `meridian start`.
 _dev_ui_server() {
     local port="${MERIDIAN_UI_PORT:-3939}"
-    _dev_stop_prod_ui
     echo
     info "UI dev server (hot reload) → http://localhost:${port}   ·   Ctrl-C to stop"
     info "edit-and-save reflects instantly; backing services keep running in the background"