@meridiona/meridian-darwin-arm64 1.32.1 → 1.34.0

package/.env.example

@@ -24,12 +24,29 @@
 # MERIDIAN_UI_PORT=3939
 
 # ---------------------------------------------------------------------------
-# Jira (all three required to enable the Jira connector)
+# Jira — choose ONE auth path:
+#
+#   (A) Browser OAuth (recommended): just run  `meridian oauth-login jira`.
+#       It opens your browser, you click Accept, and tokens land in
+#       ~/.meridian/oauth/jira.json (auto-refreshed). No env vars, no API
+#       token; the site is discovered automatically. Then `meridian restart`.
+#
+#   (B) Static API token (legacy): set JIRA_BASE_URL + JIRA_EMAIL + JIRA_API_TOKEN.
+#
+# If both are present, OAuth wins. JIRA_PROJECT_KEYS applies to either.
 # ---------------------------------------------------------------------------
 
+# (A) OAuth needs NO config — Meridian ships a public client id. The vars below are
+#     optional overrides (e.g. a self-hosted app or a non-default redirect port).
+# JIRA_OAUTH_CLIENT_ID=your-atlassian-app-client-id   # override the baked-in client id
+# JIRA_OAUTH_REDIRECT_PORT=9123      # must match the app's registered redirect
+                                     # http://127.0.0.1:<port>/callback
+
+# (B) Static API token
 # JIRA_BASE_URL=https://your-org.atlassian.net
 # JIRA_EMAIL=you@your-org.com
 # JIRA_API_TOKEN=your-api-token-here
+
 # JIRA_PROJECT_KEYS=KAN,ENG          # optional — comma-separated; empty = all projects
 
 # ---------------------------------------------------------------------------

package/VERSION

@@ -1 +1 @@
-1.32.1
+1.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meridiona/meridian-darwin-arm64",
-  "version": "1.32.1",
+  "version": "1.34.0",
   "description": "Prebuilt Meridian app for macOS arm64 (daemon binary + dashboard + Python services). Installed via @meridiona/meridian.",
   "homepage": "https://github.com/Meridiona/meridian",
   "repository": {

package/scripts/bootstrap.sh

@@ -86,8 +86,8 @@ fi
 
 # ── 4. Install @meridiona/meridian ───────────────────────────────────────────
 info "Installing @meridiona/meridian@latest…"
-info "  The npm package is small; the Python venv + Node runtime (~200 MB) download"
-info "  once during 'meridian setup' below. Budget 2–4 min on a typical connection."
+info "  The npm package is small; Python deps + Node runtime download once during"
+info "  'meridian setup' below. Budget 2–4 min on a typical connection."
 npm install -g @meridiona/meridian@latest
 ok "meridian installed ($(meridian --version 2>/dev/null || echo 'version unknown'))"
 

package/scripts/install-from-bundle.sh

@@ -84,6 +84,9 @@ collect_credentials() {
     echo "    (edit later anytime: meridian config edit)" >&2
     echo >&2
     if prompt_category "Jira"; then
+        info "Easiest: skip the token prompts below and, after install, run"
+        info "  meridian oauth-login jira   — connect in your browser, no API token."
+        info "Or fill these in for the legacy API-token path:"
         prompt_env_var "JIRA_BASE_URL" "Jira URL (e.g. https://your-org.atlassian.net)" 0 "$env_file"
         # The Python side reads JIRA_URL, the Rust side JIRA_BASE_URL — keep both in sync.
         local jira_url; jira_url="$(get_env_value JIRA_BASE_URL "$env_file")"
@@ -568,10 +571,42 @@ else
     info "Installing MLX inference server launchd agent…"
     bash "${APP_ROOT}/services/scripts/install-mlx-server-daemon.sh" --port "${MLX_PORT}" || warn "MLX agent install failed"
     info "Waiting for the MLX server to load the model…"
+    _MLX_LOG="${HOME}/.meridian/logs/mlx-server.log"
+    _MLX_ERR="${HOME}/.meridian/logs/mlx-server-error.log"
     _w=0
+
+    # Stream both log files while polling so the user can see which model is
+    # loading and whether a download is in progress.
+    # mlx-server.log  — JSON structured logs: model selection, readiness
+    # mlx-server-error.log — raw stderr: huggingface_hub download progress
+    # tail -F follows by name and retries if the file doesn't exist yet.
+    (tail -F "${_MLX_LOG}" 2>/dev/null | python3 -u -c '
+import sys, json
+for line in sys.stdin:
+    line = line.rstrip()
+    if not line:
+        continue
+    try:
+        d = json.loads(line)
+        lvl = d.get("level", "INFO")
+        msg = d.get("message", line)
+        prefix = "  ⚠ " if lvl in ("WARNING", "ERROR") else "  · "
+        print(prefix + msg, flush=True)
+    except Exception:
+        print("  " + line, flush=True)
+') &
+    _log_pid=$!
+    (tail -F "${_MLX_ERR}" 2>/dev/null | while IFS= read -r _eline; do
+        printf '  %s\n' "${_eline}"
+    done) &
+    _err_pid=$!
+
     until curl -sf "http://127.0.0.1:${MLX_PORT}/health" >/dev/null 2>&1; do
-        sleep 3; _w=$((_w+3)); [[ $_w -ge 300 ]] && { warn "MLX not ready after 300s — check: meridian logs mlx-server"; break; }
+        sleep 3; _w=$((_w+3))
+        [[ $_w -ge 300 ]] && { warn "MLX not ready after 300s — check: meridian logs mlx-server"; break; }
     done
+    { kill "${_log_pid}" "${_err_pid}" 2>/dev/null; wait "${_log_pid}" "${_err_pid}" 2>/dev/null; } || true
+
     # Only stamp after confirmed ready — prevents stale stamp on a failed restart.
     if curl -sf "http://127.0.0.1:${MLX_PORT}/health" >/dev/null 2>&1; then
         ok "MLX server ready (${_w}s)"

package/services/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meridian-agents"
-version = "1.32.1"
-description = "Meridian agents — hermes task linking and Jira progress updates for meridian.db"
+version = "1.34.0"
+description = "Meridian agents — MLX classifier server and Jira worklog synthesis for meridian.db"
 requires-python = ">=3.11"
 authors = [{ name = "Meridiona" }]
 license = { text = "MIT" }
@@ -53,9 +53,9 @@ meridian-server = "agents.server:main"
 
 [tool.uv]
 # Lock all extras so `uv lock` produces a complete, reproducible uv.lock.
-# The shipped venv installs BOTH server-side extras — `uv sync --extra mlx
-# --extra pm_worklog_update` — because the one MLX server serves
-# /classify_sessions (mlx) AND /synthesise_worklog (agno, pm_worklog_update).
+# At install time both extras are synced — `uv sync --extra mlx --extra
+# pm_worklog_update` — because the one MLX server serves /classify_sessions
+# (mlx) AND /synthesise_worklog (agno, pm_worklog_update).
 constraint-dependencies = []
 
 [tool.setuptools.packages.find]