feat: Session Power Meter — 3D balance visualizer (#17 )

Add a glowing orb power meter to the Workshop scene that reflects the session balance in real time. - power-meter.js: new Three.js module — transparent outer shell, inner orb that scales 0→1 with fill fraction, lightning bolt overlay, point light and equator ring accent; DOM text label projected above the orb shows current sats. Color interpolates red→yellow→cyan. Pulses bright on 'fill' event, quick flicker on 'drain'. - session.js: imports meter helpers; tracks _sessionMax (initial deposit); calls setMeterVisible/setMeterBalance in _applySessionUI; triggers fill/drain pulses on payment and job deduction; exports openSessionPanel() for click-to-open wiring; clears meter on _clearSession. - websocket.js: handles session_balance_update WS event — updates fill level and fires pulse. - interaction.js: adds registerClickTarget(group, callback) — wired for both FPS pointer-lock and non-lock modes and short taps. - main.js: wires initPowerMeter/updatePowerMeter/disposePowerMeter into the build/animate/teardown cycle; registers meter as click target that opens the session panel. Fixes #17 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
[claude] Nostr identity lifecycle coverage T41–T45 (#55 ) (#106 )
2026-03-23 22:31:43 -04:00 · 2026-03-24 02:20:34 +00:00
17 changed files with 829 additions and 839 deletions
--- a/artifacts/api-server/src/lib/trust.ts
+++ b/artifacts/api-server/src/lib/trust.ts
@@ -205,6 +205,29 @@ export class TrustService {
  verifyToken(token: string): { pubkey: string; expiry: number } | null {
    return verifyToken(token);
  }
+
+  // TEST-ONLY: apply one decay cycle immediately, ignoring time thresholds.
+  // Subtracts DECAY_PER_DAY (default 1) from the stored trust score and persists.
+  async decayOnce(pubkey: string): Promise<{ previousScore: number; newScore: number; newTier: TrustTier }> {
+    const identity = await this.getOrCreate(pubkey);
+    const previousScore = identity.trustScore;
+    const newScore = Math.max(0, previousScore - DECAY_PER_DAY);
+    const newTier = computeTier(newScore);
+
+    await db
+      .update(nostrIdentities)
+      .set({ trustScore: newScore, tier: newTier, updatedAt: new Date() })
+      .where(eq(nostrIdentities.pubkey, pubkey));
+
+    logger.info("trust: test decay applied", {
+      pubkey: pubkey.slice(0, 8),
+      previousScore,
+      newScore,
+      newTier,
+    });
+
+    return { previousScore, newScore, newTier };
+  }
 }

 export const trustService = new TrustService();
--- a/artifacts/api-server/src/routes/identity.ts
+++ b/artifacts/api-server/src/routes/identity.ts
@@ -2,7 +2,7 @@ import { Router, type Request, type Response } from "express";
 import { randomBytes, randomUUID } from "crypto";
 import { verifyEvent, validateEvent } from "nostr-tools";
 import { db, nostrTrustVouches, nostrIdentities, timmyNostrEvents } from "@workspace/db";
-import { eq, count } from "drizzle-orm";
+import { eq, count, desc } from "drizzle-orm";
 import { trustService } from "../lib/trust.js";
 import { timmyIdentityService } from "../lib/timmy-identity.js";
 import { makeLogger } from "../lib/logger.js";
@@ -406,4 +406,65 @@ router.get("/identity/me", async (req: Request, res: Response) => {
  }
 });

+// ── POST /identity/me/decay (TEST-ONLY — disabled in production) ──────────────
+// Applies one decay cycle to the authenticated identity immediately, without
+// the normal 30-day absence threshold. Useful in test suites.
+// Returns 404 in production (NODE_ENV === "production").
+
+router.post("/identity/me/decay", async (req: Request, res: Response) => {
+  if (process.env["NODE_ENV"] === "production") {
+    res.status(404).json({ error: "Not found" });
+    return;
+  }
+
+  const raw = req.headers["x-nostr-token"];
+  const token = typeof raw === "string" ? raw.trim() : null;
+
+  if (!token) {
+    res.status(401).json({ error: "Missing X-Nostr-Token header" });
+    return;
+  }
+
+  const parsed = trustService.verifyToken(token);
+  if (!parsed) {
+    res.status(401).json({ error: "Invalid or expired nostr_token" });
+    return;
+  }
+
+  try {
+    const result = await trustService.decayOnce(parsed.pubkey);
+    res.json({
+      pubkey: parsed.pubkey,
+      previousScore: result.previousScore,
+      newScore: result.newScore,
+      newTier: result.newTier,
+    });
+  } catch (err) {
+    res.status(500).json({ error: err instanceof Error ? err.message : "Decay failed" });
+  }
+});
+
+// ── GET /identity/leaderboard ─────────────────────────────────────────────────
+// Returns the top 20 identities sorted by trust score descending.
+// Public endpoint — no authentication required.
+
+router.get("/identity/leaderboard", async (_req: Request, res: Response) => {
+  try {
+    const rows = await db
+      .select({
+        pubkey: nostrIdentities.pubkey,
+        trustScore: nostrIdentities.trustScore,
+        tier: nostrIdentities.tier,
+        interactionCount: nostrIdentities.interactionCount,
+      })
+      .from(nostrIdentities)
+      .orderBy(desc(nostrIdentities.trustScore))
+      .limit(20);
+
+    res.json(rows);
+  } catch (err) {
+    res.status(500).json({ error: err instanceof Error ? err.message : "Failed to fetch leaderboard" });
+  }
+});
+
 export default router;
--- a/artifacts/api-server/src/routes/testkit.ts
+++ b/artifacts/api-server/src/routes/testkit.ts
@@ -29,6 +29,12 @@ const router = Router();
 *              Guarded on stubMode=true; polls until state=provisioning|ready (20 s timeout).
 *  - T24 ADDED: costLedger completeness after job completion — 8 fields, honest-accounting
 *              invariant (actualAmountSats ≤ workAmountSats), refundState enum check.
+ *  - T41 ADDED: POST /api/jobs with valid Nostr token → nostrPubkey in response matches identity.
+ *  - T42 ADDED: POST /api/sessions with valid Nostr token → nostrPubkey in response matches identity.
+ *  - T43 ADDED: GET /identity/me returns full trust fields (tier, score, interactionCount).
+ *  - T44 ADDED: POST /identity/me/decay (test-only endpoint, 404 in prod) → score decremented.
+ *  - T45 ADDED: GET /identity/leaderboard → HTTP 200, array sorted by trustScore desc.
+ *              New endpoints identity/me/decay and identity/leaderboard added to identity.ts.
 */
 router.get("/testkit", (req: Request, res: Response) => {
  const proto =
@@ -1092,6 +1098,208 @@ NODESCRIPT
  fi
 fi

+# ===========================================================================
+# T41–T45 — Nostr identity lifecycle: token decorates jobs/sessions + trust ops
+# Requires node + nostr-tools (same guard as T36). All five tests share one
+# inline node script that performs the full lifecycle and emits a JSON blob.
+# ===========================================================================
+
+# ---------------------------------------------------------------------------
+# T41–T45 Preamble — ephemeral keypair → challenge → sign → verify → token
+# Then: create job, create session, GET /identity/me, decay, leaderboard.
+# ---------------------------------------------------------------------------
+NOSTR_LC_SKIP=false
+NOSTR_LC_OUT=""
+if ! command -v node >/dev/null 2>&1; then
+  NOSTR_LC_SKIP=true
+fi
+if [[ "\$NOSTR_LC_SKIP" == "false" ]]; then
+  NOSTR_LC_TMPFILE=\$(mktemp /tmp/nostr_lc_XXXXXX.cjs)
+  cat > "\$NOSTR_LC_TMPFILE" << 'NODESCRIPT'
+'use strict';
+const https = require('https');
+const http  = require('http');
+const BASE  = process.argv[2];
+let nt;
+const NOSTR_CJS = '/home/runner/workspace/artifacts/api-server/node_modules/nostr-tools/lib/cjs/index.js';
+try { nt = require('nostr-tools'); } catch (_) { try { nt = require(NOSTR_CJS); } catch (_) { process.stderr.write('nostr-tools not importable\n'); process.exit(1); } }
+const { generateSecretKey, getPublicKey, finalizeEvent } = nt;
+function request(url, opts, body) {
+  return new Promise((resolve, reject) => {
+    const u = new URL(url);
+    const mod = u.protocol === 'https:' ? https : http;
+    const req = mod.request(u, opts, (res) => {
+      let data = '';
+      res.on('data', c => data += c);
+      res.on('end', () => resolve({ status: res.statusCode, body: data }));
+    });
+    req.on('error', reject);
+    if (body) req.write(body);
+    req.end();
+  });
+}
+async function main() {
+  const sk = generateSecretKey();
+  const pubkey = getPublicKey(sk);
+  // challenge → sign → verify
+  const chalRes = await request(BASE + '/api/identity/challenge', { method: 'POST', headers: { 'Content-Type': 'application/json' } }, '{}');
+  if (chalRes.status !== 200) { process.stderr.write('challenge failed: ' + chalRes.status + '\n'); process.exit(1); }
+  const { nonce } = JSON.parse(chalRes.body);
+  const event = finalizeEvent({ kind: 27235, content: nonce, tags: [], created_at: Math.floor(Date.now() / 1000) }, sk);
+  const verRes = await request(BASE + '/api/identity/verify', { method: 'POST', headers: { 'Content-Type': 'application/json' } }, JSON.stringify({ event }));
+  if (verRes.status !== 200) { process.stderr.write('verify failed: ' + verRes.status + ' ' + verRes.body + '\n'); process.exit(1); }
+  const { nostr_token: token } = JSON.parse(verRes.body);
+  // POST /jobs with Nostr token
+  const jobRes  = await request(BASE + '/api/jobs', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Nostr-Token': token } }, JSON.stringify({ request: 'T41 Nostr job test' }));
+  const jobBody = JSON.parse(jobRes.body);
+  const jobCode = jobRes.status;
+  const jobId   = jobBody.jobId || null;
+  const jobNpub = jobBody.nostrPubkey || null;
+  // POST /sessions with Nostr token
+  const sessRes  = await request(BASE + '/api/sessions', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Nostr-Token': token } }, JSON.stringify({ amount_sats: 200 }));
+  const sessBody = JSON.parse(sessRes.body);
+  const sessCode = sessRes.status;
+  const sessId   = sessBody.sessionId || null;
+  const sessNpub = sessBody.nostrPubkey || null;
+  // GET /identity/me
+  const meRes  = await request(BASE + '/api/identity/me', { method: 'GET', headers: { 'X-Nostr-Token': token } });
+  const meBody = JSON.parse(meRes.body);
+  const meScore  = meBody.trust ? meBody.trust.score  : null;
+  const meTier   = meBody.trust ? meBody.trust.tier   : null;
+  const meIcount = meBody.trust ? meBody.trust.interactionCount : null;
+  // POST /identity/me/decay (test-only; non-200 → skip T44 gracefully)
+  const decayRes  = await request(BASE + '/api/identity/me/decay', { method: 'POST', headers: { 'X-Nostr-Token': token } });
+  const decayBody = JSON.parse(decayRes.body);
+  const decayCode = decayRes.status;
+  const decayPrev = decayBody.previousScore !== undefined ? decayBody.previousScore : null;
+  const decayNew  = decayBody.newScore      !== undefined ? decayBody.newScore      : null;
+  // GET /identity/leaderboard
+  const lbRes    = await request(BASE + '/api/identity/leaderboard', { method: 'GET', headers: {} });
+  const lbCode   = lbRes.status;
+  let lbBody = [];
+  try { lbBody = JSON.parse(lbRes.body); } catch (_) {}
+  const lbIsArray = Array.isArray(lbBody);
+  const lbSorted  = lbIsArray && lbBody.length < 2 ? true :
+    lbIsArray && lbBody.every((v, i) => i === 0 || lbBody[i - 1].trustScore >= v.trustScore);
+  process.stdout.write(JSON.stringify({
+    pubkey, token,
+    jobCode, jobId, jobNpub,
+    sessCode, sessId, sessNpub,
+    meScore, meTier, meIcount,
+    decayCode, decayPrev, decayNew,
+    lbCode, lbIsArray, lbSorted,
+  }) + '\n');
+}
+main().catch(err => { process.stderr.write(String(err) + '\n'); process.exit(1); });
+NODESCRIPT
+
+  NOSTR_LC_EXIT=0
+  NOSTR_LC_OUT=\$(node "\$NOSTR_LC_TMPFILE" "\$BASE" 2>/dev/null) || NOSTR_LC_EXIT=\$?
+  rm -f "\$NOSTR_LC_TMPFILE"
+  if [[ \$NOSTR_LC_EXIT -ne 0 || -z "\$NOSTR_LC_OUT" ]]; then
+    NOSTR_LC_SKIP=true
+  fi
+fi
+
+# Helper: extract a field from NOSTR_LC_OUT
+_lc() { echo "\$NOSTR_LC_OUT" | jq -r ".\$1" 2>/dev/null || echo ""; }
+
+# ---------------------------------------------------------------------------
+# T41 — POST /jobs with valid Nostr token → nostrPubkey in response
+# ---------------------------------------------------------------------------
+sep "Test 41 — POST /jobs with Nostr token → nostrPubkey set"
+if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
+  note SKIP "node unavailable or lifecycle preamble failed — skipping T41"
+  SKIP=\$((SKIP+1))
+else
+  T41_CODE=\$(_lc jobCode); T41_NPUB=\$(_lc jobNpub); T41_PK=\$(_lc pubkey)
+  if [[ "\$T41_CODE" == "201" && -n "\$T41_NPUB" && "\$T41_NPUB" != "null" && "\$T41_NPUB" == "\$T41_PK" ]]; then
+    note PASS "HTTP 201, nostrPubkey=\${T41_NPUB:0:8}... matches token identity"
+    PASS=\$((PASS+1))
+  else
+    note FAIL "code=\$T41_CODE nostrPubkey='\$T41_NPUB' expected='\$T41_PK'"
+    FAIL=\$((FAIL+1))
+  fi
+fi
+
+# ---------------------------------------------------------------------------
+# T42 — POST /sessions with valid Nostr token → nostrPubkey in response
+# ---------------------------------------------------------------------------
+sep "Test 42 — POST /sessions with Nostr token → nostrPubkey set"
+if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
+  note SKIP "node unavailable or lifecycle preamble failed — skipping T42"
+  SKIP=\$((SKIP+1))
+else
+  T42_CODE=\$(_lc sessCode); T42_NPUB=\$(_lc sessNpub); T42_PK=\$(_lc pubkey)
+  if [[ "\$T42_CODE" == "201" && -n "\$T42_NPUB" && "\$T42_NPUB" != "null" && "\$T42_NPUB" == "\$T42_PK" ]]; then
+    note PASS "HTTP 201, nostrPubkey=\${T42_NPUB:0:8}... matches token identity"
+    PASS=\$((PASS+1))
+  else
+    note FAIL "code=\$T42_CODE nostrPubkey='\$T42_NPUB' expected='\$T42_PK'"
+    FAIL=\$((FAIL+1))
+  fi
+fi
+
+# ---------------------------------------------------------------------------
+# T43 — GET /identity/me returns full trust fields (tier, score, interactionCount)
+# ---------------------------------------------------------------------------
+sep "Test 43 — GET /identity/me returns tier + score + interactionCount"
+if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
+  note SKIP "node unavailable or lifecycle preamble failed — skipping T43"
+  SKIP=\$((SKIP+1))
+else
+  T43_TIER=\$(_lc meTier); T43_SCORE=\$(_lc meScore); T43_ICOUNT=\$(_lc meIcount)
+  if [[ -n "\$T43_TIER" && "\$T43_TIER" != "null" \
+      && "\$T43_SCORE" != "" && "\$T43_SCORE" != "null" \
+      && "\$T43_ICOUNT" != "" && "\$T43_ICOUNT" != "null" ]]; then
+    note PASS "tier=\$T43_TIER score=\$T43_SCORE interactionCount=\$T43_ICOUNT"
+    PASS=\$((PASS+1))
+  else
+    note FAIL "tier='\$T43_TIER' score='\$T43_SCORE' icount='\$T43_ICOUNT'"
+    FAIL=\$((FAIL+1))
+  fi
+fi
+
+# ---------------------------------------------------------------------------
+# T44 — POST /identity/me/decay (test-only endpoint) → score decremented
+# Skipped gracefully if endpoint returns non-200 (e.g., production mode).
+# ---------------------------------------------------------------------------
+sep "Test 44 — POST /identity/me/decay (test mode) → trust_score decremented"
+if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
+  note SKIP "node unavailable or lifecycle preamble failed — skipping T44"
+  SKIP=\$((SKIP+1))
+else
+  T44_CODE=\$(_lc decayCode); T44_PREV=\$(_lc decayPrev); T44_NEW=\$(_lc decayNew)
+  if [[ "\$T44_CODE" != "200" ]]; then
+    note SKIP "decay endpoint returned code=\$T44_CODE (not in test mode) — skipping T44"
+    SKIP=\$((SKIP+1))
+  elif [[ -n "\$T44_PREV" && -n "\$T44_NEW" && "\$T44_NEW" =~ ^[0-9]+\$ && "\$T44_PREV" =~ ^[0-9]+\$ && \$T44_NEW -le \$T44_PREV ]]; then
+    note PASS "previousScore=\$T44_PREV newScore=\$T44_NEW (decremented or floored at 0)"
+    PASS=\$((PASS+1))
+  else
+    note FAIL "code=\$T44_CODE previousScore='\$T44_PREV' newScore='\$T44_NEW' (expected new ≤ prev)"
+    FAIL=\$((FAIL+1))
+  fi
+fi
+
+# ---------------------------------------------------------------------------
+# T45 — GET /identity/leaderboard → HTTP 200, array sorted by trust score
+# ---------------------------------------------------------------------------
+sep "Test 45 — GET /identity/leaderboard → sorted array"
+if [[ "\$NOSTR_LC_SKIP" == "true" ]]; then
+  note SKIP "node unavailable or lifecycle preamble failed — skipping T45"
+  SKIP=\$((SKIP+1))
+else
+  T45_CODE=\$(_lc lbCode); T45_ARRAY=\$(_lc lbIsArray); T45_SORTED=\$(_lc lbSorted)
+  if [[ "\$T45_CODE" == "200" && "\$T45_ARRAY" == "true" && "\$T45_SORTED" == "true" ]]; then
+    note PASS "HTTP 200, array returned and sorted by trustScore desc"
+    PASS=\$((PASS+1))
+  else
+    note FAIL "code=\$T45_CODE isArray=\$T45_ARRAY sorted=\$T45_SORTED"
+    FAIL=\$((FAIL+1))
+  fi
+fi
+
 # ===========================================================================
 # FUTURE STUBS — placeholders for upcoming tasks (do not affect PASS/FAIL)
 # ===========================================================================
--- a/artifacts/mobile/app.json
+++ b/artifacts/mobile/app.json
@@ -20,20 +20,7 @@
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/icon.png",
        "backgroundColor": "#0A0A12"
-      },
-      "intentFilters": [
-        {
-          "action": "VIEW",
-          "autoVerify": false,
-          "data": [
-            {
-              "scheme": "mobile",
-              "host": "nostr-callback"
-            }
-          ],
-          "category": ["BROWSABLE", "DEFAULT"]
-        }
-      ]
+      }
    },
    "web": {
      "favicon": "./assets/images/icon.png",
--- a/artifacts/mobile/app/_layout.tsx
+++ b/artifacts/mobile/app/_layout.tsx
@@ -16,7 +16,6 @@ import { SafeAreaProvider } from "react-native-safe-area-context";

 import { ErrorBoundary } from "@/components/ErrorBoundary";
 import { TimmyProvider } from "@/context/TimmyContext";
-import { NostrProvider } from "@/context/NostrContext";
 import { ONBOARDING_COMPLETED_KEY } from "@/constants/storage-keys";

 SplashScreen.preventAutoHideAsync();
@@ -78,11 +77,9 @@ export default function RootLayout() {
        <QueryClientProvider client={queryClient}>
          <GestureHandlerRootView style={{ flex: 1 }}>
            <KeyboardProvider>
-              <NostrProvider>
-                <TimmyProvider>
-                  <RootLayoutNav />
-                </TimmyProvider>
-              </NostrProvider>
+              <TimmyProvider>
+                <RootLayoutNav />
+              </TimmyProvider>
            </KeyboardProvider>
          </GestureHandlerRootView>
        </QueryClientProvider>
--- a/artifacts/mobile/app/settings.tsx
+++ b/artifacts/mobile/app/settings.tsx
@@ -1,101 +1,114 @@
-import { Stack } from "expo-router";
-import {
-  Linking,
-  Platform,
-  Pressable,
-  ScrollView,
-  StyleSheet,
-  Switch,
-  Text,
-  TextInput,
-  View,
-} from "react-native";
-import { useState, useEffect } from "react";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import Constants from "expo-constants";
-import { Ionicons } from "@expo/vector-icons";
+import { Stack } from 'expo-router';
+import { View, Text, StyleSheet, ScrollView, TextInput, Switch, Pressable, Linking, Platform } from 'react-native';
+import { useState, useEffect } from 'react';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import * as SecureStore from 'expo-secure-store';
+import Constants from 'expo-constants';
+import { useTimmy } from '@/context/TimmyContext';
+import { Ionicons } from '@expo/vector-icons';
+import { ConnectionBadge } from '@/components/ConnectionBadge';
+import { Colors } from '@/constants/colors';

-import { useTimmy } from "@/context/TimmyContext";
-import { useNostr, truncateNpub } from "@/context/NostrContext";
-import { ConnectionBadge } from "@/components/ConnectionBadge";
-import { NostrConnectModal } from "@/components/NostrConnectModal";
-import { Colors } from "@/constants/colors";
-
-const NOTIF_JOB_KEY = "settings.notifications_job_completion";
-const NOTIF_BALANCE_KEY = "settings.notifications_low_balance";
+const STORAGE_KEYS = {
+  SERVER_URL: 'settings_server_url',
+  NOTIFICATIONS_JOB_COMPLETION: 'settings_notifications_job_completion',
+  NOTIFICATIONS_LOW_BALANCE: 'settings_notifications_low_balance',
+  NOSTR_PRIVATE_KEY: 'settings_nostr_private_key', // Use SecureStore for this
+};

 export default function SettingsScreen() {
+  const { apiBaseUrl, setApiBaseUrl, isConnected, nostrPublicKey, connectNostr, disconnectNostr } = useTimmy();
  const C = Colors.dark;
-  const { apiBaseUrl, setApiBaseUrl, isConnected } = useTimmy();
-  const { npub, nostrConnected, signerType, disconnect: disconnectNostr } = useNostr();

  const [serverUrl, setServerUrl] = useState(apiBaseUrl);
  const [jobCompletionNotifications, setJobCompletionNotifications] = useState(false);
  const [lowBalanceWarning, setLowBalanceWarning] = useState(false);
-  const [nostrModalVisible, setNostrModalVisible] = useState(false);
-
-  // Sync local serverUrl with context value (e.g. on first load from AsyncStorage)
-  useEffect(() => {
-    setServerUrl(apiBaseUrl);
-  }, [apiBaseUrl]);
+  const [currentNpub, setCurrentNpub] = useState<string | null>(nostrPublicKey);

  useEffect(() => {
-    AsyncStorage.multiGet([NOTIF_JOB_KEY, NOTIF_BALANCE_KEY])
-      .then(([[, job], [, balance]]) => {
-        if (job !== null) setJobCompletionNotifications(JSON.parse(job));
-        if (balance !== null) setLowBalanceWarning(JSON.parse(balance));
-      })
-      .catch(() => {});
-  }, []);
+    // Load settings from AsyncStorage and SecureStore
+    const loadSettings = async () => {
+      const storedServerUrl = await AsyncStorage.getItem(STORAGE_KEYS.SERVER_URL);
+      if (storedServerUrl) {
+        setServerUrl(storedServerUrl);
+      }
+      const storedJobCompletion = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION);
+      if (storedJobCompletion !== null) {
+        setJobCompletionNotifications(JSON.parse(storedJobCompletion));
+      }
+      const storedLowBalance = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE);
+      if (storedLowBalance !== null) {
+        setLowBalanceWarning(JSON.parse(storedLowBalance));
+      }
+      // Nostr npub is handled by TimmyContext, so we just use the provided nostrPublicKey
+      setCurrentNpub(nostrPublicKey);
+    };
+    loadSettings();
+  }, [nostrPublicKey]);

-  const handleServerUrlBlur = () => {
+  // Update apiBaseUrl in context when serverUrl changes and is saved
+  useEffect(() => {
    if (serverUrl !== apiBaseUrl) {
      setApiBaseUrl(serverUrl);
+      AsyncStorage.setItem(STORAGE_KEYS.SERVER_URL, serverUrl);
    }
+  }, [serverUrl, setApiBaseUrl, apiBaseUrl]);
+
+  const handleServerUrlChange = (text: string) => {
+    setServerUrl(text);
  };

-  const toggleJobCompletion = async () => {
-    const next = !jobCompletionNotifications;
-    setJobCompletionNotifications(next);
-    await AsyncStorage.setItem(NOTIF_JOB_KEY, JSON.stringify(next));
+  const toggleJobCompletionNotifications = async () => {
+    const newValue = !jobCompletionNotifications;
+    setJobCompletionNotifications(newValue);
+    await AsyncStorage.setItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION, JSON.stringify(newValue));
  };

-  const toggleLowBalance = async () => {
-    const next = !lowBalanceWarning;
-    setLowBalanceWarning(next);
-    await AsyncStorage.setItem(NOTIF_BALANCE_KEY, JSON.stringify(next));
+  const toggleLowBalanceWarning = async () => {
+    const newValue = !lowBalanceWarning;
+    setLowBalanceWarning(newValue);
+    await AsyncStorage.setItem(STORAGE_KEYS.NOTIFICATIONS_LOW_BALANCE, JSON.stringify(newValue));
+  };
+
+  const handleConnectNostr = async () => {
+    // This will ideally link to a dedicated Nostr connection flow
+    console.log('Connect Nostr button pressed');
+    // For now, simulate connection if not connected
+    if (!currentNpub) {
+      // This is a placeholder. Real implementation would involve generating/importing keys.
+      const simulatedNpub = 'npub1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
+      connectNostr(simulatedNpub, 'private_key_placeholder'); // Pass a placeholder private key
+      setCurrentNpub(simulatedNpub);
+      // In a real app, the private key would be securely stored and managed by the context
+      // For now, just a placeholder to show connected state
+    }
  };

  const handleDisconnectNostr = async () => {
    await disconnectNostr();
+    setCurrentNpub(null);
  };

-  const appVersion = Constants.expoConfig?.version ?? "N/A";
-  const buildCommitHash = Constants.expoConfig?.extra?.["gitCommitHash"] ?? "N/A";
-  const giteaRepoUrl = "http://143.198.27.163:3000/replit/timmy-tower";
+  const appVersion = Constants.expoConfig?.version || 'N/A';
+  const buildCommitHash = Constants.expoConfig?.extra?.gitCommitHash || 'N/A';
+  const giteaRepoUrl = 'http://143.198.27.163:3000/replit/timmy-tower';
+
+  const openGiteaLink = () => {
+    Linking.openURL(giteaRepoUrl);
+  };

  return (
-    <View style={[styles.container, { backgroundColor: C.background }]}>
-      <Stack.Screen
-        options={{
-          title: "Settings",
-          headerShown: true,
-          headerStyle: { backgroundColor: C.surface },
-          headerTintColor: C.text,
-        }}
-      />
+    <View style={styles.container}>
+      <Stack.Screen options={{ title: 'Settings', headerShown: true, headerStyle: { backgroundColor: C.surface }, headerTintColor: C.text }} />
      <ScrollView contentContainerStyle={styles.scrollContent}>
-
-        {/* ── Connection ──────────────────────────────────────────────── */}
-        <Text style={[styles.sectionHeader, { color: C.text }]}>Connection</Text>
+        <Text style={styles.sectionHeader}>Connection</Text>
        <View style={styles.settingItem}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>Server URL</Text>
+          <Text style={styles.settingLabel}>Server URL</Text>
          <View style={styles.serverUrlContainer}>
            <TextInput
-              style={[styles.input, { color: C.text, backgroundColor: C.field, borderColor: C.border }]}
+              style={[styles.input, { color: C.text, backgroundColor: C.field }]} // Apply text and background color from Colors
              value={serverUrl}
-              onChangeText={setServerUrl}
-              onBlur={handleServerUrlBlur}
+              onChangeText={handleServerUrlChange}
              placeholder="Enter server URL"
              placeholderTextColor={C.textMuted}
              autoCapitalize="none"
@@ -105,100 +118,61 @@ export default function SettingsScreen() {
          </View>
        </View>

-        {/* ── Notifications ────────────────────────────────────────────── */}
-        <Text style={[styles.sectionHeader, { color: C.text }]}>Notifications</Text>
-        <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>Job Completion</Text>
+        <Text style={styles.sectionHeader}>Notifications</Text>
+        <View style={styles.settingItem}>
+          <Text style={styles.settingLabel}>Job Completion Push Notifications</Text>
          <Switch
            trackColor={{ false: C.surface, true: C.accentGlow }}
-            thumbColor={Platform.OS === "android" ? C.text : ""}
+            thumbColor={Platform.OS === 'android' ? C.text : ''}
            ios_backgroundColor={C.field}
-            onValueChange={toggleJobCompletion}
+            onValueChange={toggleJobCompletionNotifications}
            value={jobCompletionNotifications}
          />
        </View>
-        <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>Low Balance Warning</Text>
+        <View style={styles.settingItem}>
+          <Text style={styles.settingLabel}>Low Balance Warning</Text>
          <Switch
            trackColor={{ false: C.surface, true: C.accentGlow }}
-            thumbColor={Platform.OS === "android" ? C.text : ""}
+            thumbColor={Platform.OS === 'android' ? C.text : ''}
            ios_backgroundColor={C.field}
-            onValueChange={toggleLowBalance}
+            onValueChange={toggleLowBalanceWarning}
            value={lowBalanceWarning}
          />
        </View>

-        {/* ── Nostr Identity ───────────────────────────────────────────── */}
-        <Text style={[styles.sectionHeader, { color: C.text }]}>Identity</Text>
-        <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>Nostr Public Key</Text>
+        <Text style={styles.sectionHeader}>Identity</Text>
+        <View style={styles.settingItem}>
+          <Text style={styles.settingLabel}>Nostr Public Key</Text>
          <Text style={[styles.settingValue, { color: C.textMuted }]}>
-            {npub ? truncateNpub(npub) : "Not connected"}
+            {currentNpub ? `${currentNpub.substring(0, 10)}...${currentNpub.substring(currentNpub.length - 5)}` : 'Not connected'}
          </Text>
        </View>
-
-        {nostrConnected && signerType && (
-          <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-            <Text style={[styles.settingLabel, { color: C.text }]}>Signer</Text>
-            <Text style={[styles.settingValue, { color: C.textSecondary }]}>
-              {signerType === "amber" ? "Amber (NIP-55)" : "nsec key"}
-            </Text>
-          </View>
-        )}
-
        <View style={styles.buttonContainer}>
-          {!nostrConnected ? (
-            <Pressable
-              onPress={() => setNostrModalVisible(true)}
-              style={({ pressed }) => [
-                styles.button,
-                { backgroundColor: C.accent, opacity: pressed ? 0.8 : 1 },
-              ]}
-            >
-              <Text style={[styles.buttonText, { color: C.textInverted }]}>
-                Connect Nostr Identity
-              </Text>
+          {!currentNpub ? (
+            <Pressable onPress={handleConnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.accent, opacity: pressed ? 0.8 : 1 }]}>
+              <Text style={[styles.buttonText, { color: C.textInverted }]}>Connect Nostr</Text>
            </Pressable>
          ) : (
-            <Pressable
-              onPress={handleDisconnectNostr}
-              style={({ pressed }) => [
-                styles.button,
-                { backgroundColor: C.destructive, opacity: pressed ? 0.8 : 1 },
-              ]}
-            >
-              <Text style={[styles.buttonText, { color: C.textInverted }]}>
-                Disconnect Nostr
-              </Text>
+            <Pressable onPress={handleDisconnectNostr} style={({ pressed }) => [styles.button, { backgroundColor: C.destructive, opacity: pressed ? 0.8 : 1 }]}>
+              <Text style={[styles.buttonText, { color: C.textInverted }]}>Disconnect Nostr</Text>
            </Pressable>
          )}
        </View>

-        {/* ── About ───────────────────────────────────────────────────── */}
-        <Text style={[styles.sectionHeader, { color: C.text }]}>About</Text>
-        <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>App Version</Text>
+        <Text style={styles.sectionHeader}>About</Text>
+        <View style={styles.settingItem}>
+          <Text style={styles.settingLabel}>App Version</Text>
          <Text style={[styles.settingValue, { color: C.text }]}>{appVersion}</Text>
        </View>
-        <View style={[styles.settingItem, { borderBottomColor: C.border }]}>
-          <Text style={[styles.settingLabel, { color: C.text }]}>Build Commit</Text>
+        <View style={styles.settingItem}>
+          <Text style={styles.settingLabel}>Build Commit Hash</Text>
          <Text style={[styles.settingValue, { color: C.text }]}>{buildCommitHash}</Text>
        </View>
-        <Pressable
-          onPress={() => Linking.openURL(giteaRepoUrl)}
-          style={({ pressed }) => [styles.linkButton, { opacity: pressed ? 0.8 : 1 }]}
-        >
+        <Pressable onPress={openGiteaLink} style={({ pressed }) => [styles.linkButton, { opacity: pressed ? 0.8 : 1 }]}>
          <Ionicons name="link" size={16} color={C.text} />
-          <Text style={[styles.linkButtonText, { color: C.link }]}>
-            View project on Gitea
-          </Text>
+          <Text style={[styles.linkButtonText, { color: C.link }]}>View project on Gitea</Text>
        </Pressable>
      </ScrollView>
-
-      <NostrConnectModal
-        visible={nostrModalVisible}
-        onClose={() => setNostrModalVisible(false)}
-      />
    </View>
  );
 }
@@ -206,6 +180,7 @@ export default function SettingsScreen() {
 const styles = StyleSheet.create({
  container: {
    flex: 1,
+    backgroundColor: Colors.dark.background, // Use background color from Colors
  },
  scrollContent: {
    padding: 20,
@@ -213,35 +188,36 @@ const styles = StyleSheet.create({
  },
  sectionHeader: {
    fontSize: 18,
-    fontWeight: "bold",
+    fontWeight: 'bold',
+    color: Colors.dark.text,
    marginTop: 20,
    marginBottom: 10,
  },
  settingItem: {
-    flexDirection: "row",
-    justifyContent: "space-between",
-    alignItems: "center",
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
    paddingVertical: 12,
    borderBottomWidth: 0.5,
+    borderBottomColor: Colors.dark.border,
  },
  settingLabel: {
    fontSize: 16,
+    color: Colors.dark.text,
    flex: 1,
  },
  settingValue: {
-    fontSize: 14,
-    flexShrink: 1,
-    textAlign: "right",
-    marginLeft: 8,
+    fontSize: 16,
  },
  serverUrlContainer: {
-    flexDirection: "row",
-    alignItems: "center",
+    flexDirection: 'row',
+    alignItems: 'center',
    flex: 2,
  },
  input: {
    flex: 1,
    borderWidth: 1,
+    borderColor: Colors.dark.border,
    borderRadius: 8,
    padding: 8,
    fontSize: 14,
@@ -249,7 +225,7 @@ const styles = StyleSheet.create({
  },
  buttonContainer: {
    marginTop: 20,
-    alignItems: "flex-start",
+    alignItems: 'flex-start',
  },
  button: {
    paddingVertical: 10,
@@ -258,11 +234,11 @@ const styles = StyleSheet.create({
  },
  buttonText: {
    fontSize: 16,
-    fontWeight: "bold",
+    fontWeight: 'bold',
  },
  linkButton: {
-    flexDirection: "row",
-    alignItems: "center",
+    flexDirection: 'row',
+    alignItems: 'center',
    marginTop: 15,
    paddingVertical: 8,
  },
--- a/artifacts/mobile/components/NostrConnectModal.tsx
+++ b/artifacts/mobile/components/NostrConnectModal.tsx
@@ -1,276 +0,0 @@
-/**
- * NostrConnectModal — UI for connecting a Nostr identity on mobile.
- *
- * Android: offers "Connect with Amber" (NIP-55) as the primary action,
- *   with manual nsec entry as a secondary option.
- * iOS / other: manual nsec entry only.
- */
-
-import React, { useCallback, useState } from "react";
-import {
-  ActivityIndicator,
-  Modal,
-  Platform,
-  Pressable,
-  StyleSheet,
-  Text,
-  TextInput,
-  View,
-} from "react-native";
-import { Ionicons } from "@expo/vector-icons";
-
-import { Colors } from "@/constants/colors";
-import { useNostr } from "@/context/NostrContext";
-
-// ─── Props ────────────────────────────────────────────────────────────────────
-
-type Props = {
-  visible: boolean;
-  onClose: () => void;
-};
-
-// ─── Component ────────────────────────────────────────────────────────────────
-
-export function NostrConnectModal({ visible, onClose }: Props) {
-  const C = Colors.dark;
-  const { connectWithAmber, connectWithNsec, canUseAmber } = useNostr();
-
-  const [showNsecForm, setShowNsecForm] = useState(!canUseAmber);
-  const [nsecInput, setNsecInput] = useState("");
-  const [error, setError] = useState<string | null>(null);
-  const [loading, setLoading] = useState(false);
-
-  const handleClose = useCallback(() => {
-    setNsecInput("");
-    setError(null);
-    setShowNsecForm(!canUseAmber);
-    onClose();
-  }, [canUseAmber, onClose]);
-
-  const handleAmberPress = useCallback(async () => {
-    setError(null);
-    setLoading(true);
-    try {
-      await connectWithAmber();
-      // Amber opens; the result arrives via deep-link callback.
-      // Close the modal — NostrContext handles the incoming URL.
-      handleClose();
-    } finally {
-      setLoading(false);
-    }
-  }, [connectWithAmber, handleClose]);
-
-  const handleNsecConnect = useCallback(async () => {
-    if (!nsecInput.trim()) {
-      setError("Please enter your nsec key");
-      return;
-    }
-    setError(null);
-    setLoading(true);
-    const result = await connectWithNsec(nsecInput.trim());
-    setLoading(false);
-    if (result.success) {
-      handleClose();
-    } else {
-      setError(result.error);
-    }
-  }, [nsecInput, connectWithNsec, handleClose]);
-
-  return (
-    <Modal
-      visible={visible}
-      animationType="slide"
-      transparent
-      onRequestClose={handleClose}
-    >
-      <View style={styles.overlay}>
-        <View style={[styles.sheet, { backgroundColor: C.surface, borderColor: C.border }]}>
-          {/* Header */}
-          <View style={styles.header}>
-            <Text style={[styles.title, { color: C.text }]}>Connect Nostr Identity</Text>
-            <Pressable onPress={handleClose} hitSlop={12}>
-              <Ionicons name="close" size={22} color={C.textSecondary} />
-            </Pressable>
-          </View>
-
-          {/* Android: Amber option */}
-          {canUseAmber && !showNsecForm && (
-            <View style={styles.body}>
-              <Text style={[styles.description, { color: C.textSecondary }]}>
-                Connect using{" "}
-                <Text style={{ color: C.text, fontWeight: "600" }}>Amber</Text>{" "}
-                — your keys stay in Amber and are never exposed to this app.
-              </Text>
-
-              <Pressable
-                onPress={handleAmberPress}
-                disabled={loading}
-                style={({ pressed }) => [
-                  styles.primaryButton,
-                  { backgroundColor: C.accent, opacity: pressed || loading ? 0.75 : 1 },
-                ]}
-              >
-                {loading ? (
-                  <ActivityIndicator color={C.textInverted} />
-                ) : (
-                  <>
-                    <Ionicons name="shield-checkmark" size={18} color={C.textInverted} />
-                    <Text style={[styles.buttonText, { color: C.textInverted }]}>
-                      Connect with Amber
-                    </Text>
-                  </>
-                )}
-              </Pressable>
-
-              <Pressable
-                onPress={() => setShowNsecForm(true)}
-                style={styles.secondaryLink}
-              >
-                <Text style={[styles.secondaryLinkText, { color: C.link }]}>
-                  Enter nsec manually instead
-                </Text>
-              </Pressable>
-            </View>
-          )}
-
-          {/* nsec form */}
-          {showNsecForm && (
-            <View style={styles.body}>
-              {canUseAmber && (
-                <Pressable
-                  onPress={() => { setShowNsecForm(false); setError(null); }}
-                  style={styles.backLink}
-                >
-                  <Ionicons name="arrow-back" size={14} color={C.link} />
-                  <Text style={[styles.secondaryLinkText, { color: C.link }]}>
-                    Use Amber instead
-                  </Text>
-                </Pressable>
-              )}
-
-              <Text style={[styles.description, { color: C.textSecondary }]}>
-                Paste your{" "}
-                <Text style={{ color: C.text, fontWeight: "600" }}>nsec1…</Text>{" "}
-                private key. It will be stored only in the device secure keystore
-                and never logged or transmitted.
-              </Text>
-
-              <TextInput
-                style={[
-                  styles.input,
-                  {
-                    backgroundColor: C.field,
-                    color: C.text,
-                    borderColor: error ? C.destructive : C.border,
-                  },
-                ]}
-                placeholder="nsec1…"
-                placeholderTextColor={C.textMuted}
-                value={nsecInput}
-                onChangeText={(t) => { setNsecInput(t); setError(null); }}
-                autoCapitalize="none"
-                autoCorrect={false}
-                secureTextEntry
-                editable={!loading}
-              />
-
-              {error && (
-                <Text style={[styles.errorText, { color: C.destructive }]}>
-                  {error}
-                </Text>
-              )}
-
-              <Pressable
-                onPress={handleNsecConnect}
-                disabled={loading}
-                style={({ pressed }) => [
-                  styles.primaryButton,
-                  { backgroundColor: C.accent, opacity: pressed || loading ? 0.75 : 1 },
-                ]}
-              >
-                {loading ? (
-                  <ActivityIndicator color={C.textInverted} />
-                ) : (
-                  <Text style={[styles.buttonText, { color: C.textInverted }]}>
-                    Connect
-                  </Text>
-                )}
-              </Pressable>
-            </View>
-          )}
-        </View>
-      </View>
-    </Modal>
-  );
-}
-
-// ─── Styles ───────────────────────────────────────────────────────────────────
-
-const styles = StyleSheet.create({
-  overlay: {
-    flex: 1,
-    justifyContent: "flex-end",
-    backgroundColor: "rgba(0,0,0,0.6)",
-  },
-  sheet: {
-    borderTopLeftRadius: 20,
-    borderTopRightRadius: 20,
-    borderWidth: 1,
-    borderBottomWidth: 0,
-    paddingHorizontal: 24,
-    paddingTop: 20,
-    paddingBottom: Platform.OS === "ios" ? 40 : 24,
-  },
-  header: {
-    flexDirection: "row",
-    justifyContent: "space-between",
-    alignItems: "center",
-    marginBottom: 16,
-  },
-  title: {
-    fontSize: 18,
-    fontWeight: "700",
-  },
-  body: {
-    gap: 14,
-  },
-  description: {
-    fontSize: 14,
-    lineHeight: 20,
-  },
-  primaryButton: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "center",
-    gap: 8,
-    paddingVertical: 14,
-    borderRadius: 10,
-  },
-  buttonText: {
-    fontSize: 16,
-    fontWeight: "600",
-  },
-  secondaryLink: {
-    alignItems: "center",
-    paddingVertical: 4,
-  },
-  secondaryLinkText: {
-    fontSize: 14,
-  },
-  backLink: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: 4,
-  },
-  input: {
-    borderWidth: 1,
-    borderRadius: 10,
-    paddingHorizontal: 14,
-    paddingVertical: 12,
-    fontSize: 14,
-    fontFamily: Platform.OS === "ios" ? "Courier" : "monospace",
-  },
-  errorText: {
-    fontSize: 13,
-  },
-});
--- a/artifacts/mobile/constants/colors.ts
+++ b/artifacts/mobile/constants/colors.ts
@@ -29,10 +29,6 @@ export const Colors = {
    working: "#F59E0B",
    idle: "#6B7280",
    micActive: "#EF4444",
-    field: "#1A1A2E",
-    textInverted: "#0A0A12",
-    destructive: "#EF4444",
-    link: "#A78BFA",
  },
 } as const;

--- a/artifacts/mobile/constants/storage-keys.ts
+++ b/artifacts/mobile/constants/storage-keys.ts
@@ -1,2 +1 @@
 export const ONBOARDING_COMPLETED_KEY = "app.onboarding_completed";
-export const SERVER_URL_KEY = "settings.server_url";
--- a/artifacts/mobile/context/NostrContext.tsx
+++ b/artifacts/mobile/context/NostrContext.tsx
@@ -1,274 +0,0 @@
-/**
- * NostrContext — Nostr identity management for mobile.
- *
- * Android: NIP-55 Amber deep-link signing (com.greenart7c3.nostrsigner).
- *   Opens Amber via the `nostrsigner:` URI scheme to retrieve the user's
- *   public key; falls back to the Play Store install prompt when Amber is
- *   not installed.
- *
- * iOS / manual fallback: nsec paste-in stored exclusively in Expo SecureStore.
- *   The raw key is NEVER written to AsyncStorage, Redux state, or logs.
- */
-
-import React, {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
-import { Linking, Platform } from "react-native";
-import * as SecureStore from "expo-secure-store";
-import { getPublicKey, nip19 } from "nostr-tools";
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-export type NostrSignerType = "amber" | "nsec" | null;
-
-export type NostrConnectResult =
-  | { success: true }
-  | { success: false; error: string };
-
-type NostrContextValue = {
-  /** bech32 public key (npub1…), null when no identity is loaded */
-  npub: string | null;
-  /** Raw hex public key, null when no identity is loaded */
-  pubkeyHex: string | null;
-  /** How the key was connected */
-  signerType: NostrSignerType;
-  /** True when an identity is loaded */
-  nostrConnected: boolean;
-  /** True only on Android — Amber integration available */
-  canUseAmber: boolean;
-  /** Android only: launch Amber to retrieve the user's public key */
-  connectWithAmber: () => Promise<void>;
-  /** Both platforms: validate & store an nsec; derive and cache the npub */
-  connectWithNsec: (nsec: string) => Promise<NostrConnectResult>;
-  /** Wipe all Nostr credentials from SecureStore and reset state */
-  disconnect: () => Promise<void>;
-};
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const SECURE_KEY_NSEC = "nostr.nsec";
-const SECURE_KEY_NPUB = "nostr.npub";
-const SECURE_KEY_SIGNER_TYPE = "nostr.signer_type";
-
-/** The deep-link scheme declared in app.json */
-const APP_SCHEME = "mobile";
-/** Path Amber will call back to with the pubkey result */
-const AMBER_CALLBACK_URL = `${APP_SCHEME}://nostr-callback`;
-const AMBER_PACKAGE = "com.greenart7c3.nostrsigner";
-const AMBER_PLAY_STORE_URL =
-  "https://play.google.com/store/apps/details?id=com.greenart7c3.nostrsigner";
-
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-/** Truncate an npub for display: "npub1abcde…xyz12" */
-export function truncateNpub(npub: string): string {
-  if (npub.length <= 20) return npub;
-  return `${npub.substring(0, 10)}…${npub.substring(npub.length - 5)}`;
-}
-
-// ─── Context ──────────────────────────────────────────────────────────────────
-
-const NostrContext = createContext<NostrContextValue | null>(null);
-
-export function NostrProvider({ children }: { children: React.ReactNode }) {
-  const [npub, setNpub] = useState<string | null>(null);
-  const [pubkeyHex, setPubkeyHex] = useState<string | null>(null);
-  const [signerType, setSignerType] = useState<NostrSignerType>(null);
-
-  const canUseAmber = Platform.OS === "android";
-
-  // ── Load persisted identity on mount ──────────────────────────────────────
-
-  useEffect(() => {
-    async function loadIdentity() {
-      try {
-        const [storedNpub, storedSignerType] = await Promise.all([
-          SecureStore.getItemAsync(SECURE_KEY_NPUB),
-          SecureStore.getItemAsync(SECURE_KEY_SIGNER_TYPE),
-        ]);
-
-        if (storedNpub && storedSignerType) {
-          setNpub(storedNpub);
-          setSignerType(storedSignerType as NostrSignerType);
-          try {
-            const decoded = nip19.decode(storedNpub);
-            if (decoded.type === "npub") {
-              setPubkeyHex(decoded.data as string);
-            }
-          } catch {
-            // npub decode failure — identity still "connected", pubkeyHex stays null
-          }
-        }
-      } catch {
-        // SecureStore unavailable (e.g. web build) — proceed without identity
-      }
-    }
-    loadIdentity();
-  }, []);
-
-  // ── Handle Amber callback deep link (Android) ─────────────────────────────
-
-  useEffect(() => {
-    if (!canUseAmber) return;
-
-    function handleUrl({ url }: { url: string }) {
-      if (!url.startsWith(`${APP_SCHEME}://nostr-callback`)) return;
-
-      try {
-        // React Native's URL parsing is not available in all environments;
-        // parse manually to avoid importing a polyfill.
-        const queryStart = url.indexOf("?");
-        if (queryStart === -1) return;
-        const params = new URLSearchParams(url.slice(queryStart + 1));
-        const result = params.get("result");
-        if (!result) return;
-
-        // Amber returns the hex pubkey in `result`
-        let hexKey = result;
-        if (result.startsWith("npub1")) {
-          const decoded = nip19.decode(result);
-          if (decoded.type === "npub") hexKey = decoded.data as string;
-        }
-
-        const derivedNpub = nip19.npubEncode(hexKey);
-
-        // Persist — no private key stored for Amber flow
-        SecureStore.setItemAsync(SECURE_KEY_NPUB, derivedNpub).catch(() => {});
-        SecureStore.setItemAsync(SECURE_KEY_SIGNER_TYPE, "amber").catch(() => {});
-
-        setNpub(derivedNpub);
-        setPubkeyHex(hexKey);
-        setSignerType("amber");
-      } catch {
-        // Malformed callback — silently ignore
-      }
-    }
-
-    const subscription = Linking.addEventListener("url", handleUrl);
-    return () => subscription.remove();
-  }, [canUseAmber]);
-
-  // ── Actions ───────────────────────────────────────────────────────────────
-
-  const connectWithAmber = useCallback(async () => {
-    // NIP-55: request the user's public key from Amber
-    const amberUri = `nostrsigner:?type=get_public_key&compressionType=none&returnType=signature&callbackUrl=${encodeURIComponent(AMBER_CALLBACK_URL)}`;
-
-    let canOpen = false;
-    try {
-      canOpen = await Linking.canOpenURL(`nostrsigner:`);
-    } catch {
-      canOpen = false;
-    }
-
-    if (canOpen) {
-      await Linking.openURL(amberUri);
-    } else {
-      // Amber not installed — direct user to Play Store
-      await Linking.openURL(AMBER_PLAY_STORE_URL);
-    }
-  }, []);
-
-  const connectWithNsec = useCallback(
-    async (nsec: string): Promise<NostrConnectResult> => {
-      const trimmed = nsec.trim();
-
-      if (!trimmed.startsWith("nsec1")) {
-        return { success: false, error: "Key must start with nsec1" };
-      }
-
-      let decoded: ReturnType<typeof nip19.decode>;
-      try {
-        decoded = nip19.decode(trimmed);
-      } catch {
-        return { success: false, error: "Invalid bech32 encoding" };
-      }
-
-      if (decoded.type !== "nsec") {
-        return { success: false, error: "Not a valid nsec key" };
-      }
-
-      let hexPubkey: string;
-      try {
-        const sk = decoded.data as Uint8Array;
-        hexPubkey = getPublicKey(sk);
-      } catch {
-        return { success: false, error: "Could not derive public key" };
-      }
-
-      const derivedNpub = nip19.npubEncode(hexPubkey);
-
-      try {
-        // Store only in SecureStore — never AsyncStorage, never logs
-        await SecureStore.setItemAsync(SECURE_KEY_NSEC, trimmed);
-        await SecureStore.setItemAsync(SECURE_KEY_NPUB, derivedNpub);
-        await SecureStore.setItemAsync(SECURE_KEY_SIGNER_TYPE, "nsec");
-      } catch {
-        return { success: false, error: "Failed to store key securely" };
-      }
-
-      setNpub(derivedNpub);
-      setPubkeyHex(hexPubkey);
-      setSignerType("nsec");
-
-      return { success: true };
-    },
-    []
-  );
-
-  const disconnect = useCallback(async () => {
-    try {
-      await Promise.all([
-        SecureStore.deleteItemAsync(SECURE_KEY_NSEC),
-        SecureStore.deleteItemAsync(SECURE_KEY_NPUB),
-        SecureStore.deleteItemAsync(SECURE_KEY_SIGNER_TYPE),
-      ]);
-    } catch {
-      // Best-effort cleanup; reset state regardless
-    }
-    setNpub(null);
-    setPubkeyHex(null);
-    setSignerType(null);
-  }, []);
-
-  // ── Context value ─────────────────────────────────────────────────────────
-
-  const value = useMemo<NostrContextValue>(
-    () => ({
-      npub,
-      pubkeyHex,
-      signerType,
-      nostrConnected: npub !== null,
-      canUseAmber,
-      connectWithAmber,
-      connectWithNsec,
-      disconnect,
-    }),
-    [
-      npub,
-      pubkeyHex,
-      signerType,
-      canUseAmber,
-      connectWithAmber,
-      connectWithNsec,
-      disconnect,
-    ]
-  );
-
-  return (
-    <NostrContext.Provider value={value}>{children}</NostrContext.Provider>
-  );
-}
-
-export function useNostr(): NostrContextValue {
-  const ctx = useContext(NostrContext);
-  if (!ctx) throw new Error("useNostr must be used within NostrProvider");
-  return ctx;
-}
-
-export { AMBER_PACKAGE };
--- a/artifacts/mobile/context/TimmyContext.tsx
+++ b/artifacts/mobile/context/TimmyContext.tsx
@@ -8,9 +8,6 @@ import React, {
  useState,
 } from "react";
 import { AppState, Platform } from "react-native";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-
-import { SERVER_URL_KEY } from "@/constants/storage-keys";

 export type TimmyMood = "idle" | "thinking" | "working" | "speaking";

@@ -25,42 +22,33 @@ export type WsEvent = {
  count?: number;
 };

-export type ConnectionStatus =
-  | "connecting"
-  | "connected"
-  | "disconnected"
-  | "reconnecting"
-  | "error";
+export type ConnectionStatus = "connecting" | "connected" | "disconnected" | "reconnecting" | "error";

 type TimmyContextValue = {
  timmyMood: TimmyMood;
  connectionStatus: ConnectionStatus;
-  /** True when the WebSocket is fully open */
-  isConnected: boolean;
  recentEvents: WsEvent[];
  send: (msg: object) => void;
  sendVisitorMessage: (text: string) => void;
  visitorId: string;
-  /** Current API / WebSocket base domain */
-  apiBaseUrl: string;
-  /** Persist a new base URL and reconnect the WebSocket */
-  setApiBaseUrl: (url: string) => void;
 };

 const TimmyContext = createContext<TimmyContextValue | null>(null);

 const MAX_EVENTS = 100;
-const ENV_DOMAIN = process.env["EXPO_PUBLIC_DOMAIN"] ?? "";
+const BASE_URL = process.env.EXPO_PUBLIC_DOMAIN ?? "";
 const VISITOR_ID =
  Date.now().toString() + Math.random().toString(36).substr(2, 9);

-function buildWsUrl(domain: string): string {
-  let d = domain.trim();
-  if (!d) d = "localhost:8080";
-  d = d.replace(/^https?:\/\//, "");
-  d = d.replace(/\/$/, "");
-  const proto = d.startsWith("localhost") ? "ws" : "wss";
-  return `${proto}://${d}/api/ws`;
+function getWsUrl(): string {
+  let domain = BASE_URL;
+  if (!domain) {
+    domain = "localhost:8080";
+  }
+  domain = domain.replace(/^https?:\/\//, "");
+  domain = domain.replace(/\/$/, "");
+  const proto = domain.startsWith("localhost") ? "ws" : "wss";
+  return `${proto}://${domain}/api/ws`;
 }

 function deriveMood(agentStates: Record<string, string>): TimmyMood {
@@ -75,12 +63,10 @@ function deriveMood(agentStates: Record<string, string>): TimmyMood {
 }

 export function TimmyProvider({ children }: { children: React.ReactNode }) {
-  const [apiBaseUrl, setApiBaseUrlState] = useState(ENV_DOMAIN);
  const [timmyMood, setTimmyMood] = useState<TimmyMood>("idle");
  const [connectionStatus, setConnectionStatus] =
    useState<ConnectionStatus>("connecting");
  const [recentEvents, setRecentEvents] = useState<WsEvent[]>([]);
-
  const wsRef = useRef<WebSocket | null>(null);
  const retryTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
  const retryCountRef = useRef(0);
@@ -91,32 +77,6 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
    delta: "idle",
  });
  const speakingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // Stable ref so WebSocket callbacks always read the current URL
-  const apiBaseUrlRef = useRef(apiBaseUrl);
-  // Stable refs to break the connectWs ↔ scheduleRetry circular dependency
-  const connectWsRef = useRef<() => void>(() => {});
-  const scheduleRetryRef = useRef<() => void>(() => {});
-
-  // ── Load persisted URL on mount ────────────────────────────────────────
-
-  useEffect(() => {
-    AsyncStorage.getItem(SERVER_URL_KEY)
-      .then((stored) => {
-        if (stored) {
-          setApiBaseUrlState(stored);
-          apiBaseUrlRef.current = stored;
-        }
-      })
-      .catch(() => {});
-  }, []);
-
-  const setApiBaseUrl = useCallback((url: string) => {
-    setApiBaseUrlState(url);
-    apiBaseUrlRef.current = url;
-    AsyncStorage.setItem(SERVER_URL_KEY, url).catch(() => {});
-  }, []);
-
-  // ── WebSocket helpers ──────────────────────────────────────────────────

  const addEvent = useCallback((evt: Omit<WsEvent, "id" | "timestamp">) => {
    const entry: WsEvent = {
@@ -134,14 +94,14 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
      wsRef.current.close();
      wsRef.current = null;
    }
-    const url = buildWsUrl(apiBaseUrlRef.current);
+    const url = getWsUrl();
    setConnectionStatus("connecting");
    let ws: WebSocket;
    try {
      ws = new WebSocket(url);
    } catch {
      setConnectionStatus("error");
-      scheduleRetryRef.current();
+      scheduleRetry();
      return;
    }
    wsRef.current = ws;
@@ -174,7 +134,10 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {

      if (type === "world_state") {
        const states = (msg.agentStates as Record<string, string>) ?? {};
-        agentStatesRef.current = { ...agentStatesRef.current, ...states };
+        agentStatesRef.current = {
+          ...agentStatesRef.current,
+          ...states,
+        };
        setTimmyMood(deriveMood(agentStatesRef.current));
        return;
      }
@@ -224,7 +187,7 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {

    ws.onclose = () => {
      setConnectionStatus("disconnected");
-      scheduleRetryRef.current();
+      scheduleRetry();
    };

    ws.onerror = () => {
@@ -237,15 +200,9 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
    const delay = Math.min(1000 * Math.pow(2, retryCountRef.current), 30000);
    retryCountRef.current += 1;
    retryTimerRef.current = setTimeout(() => {
-      connectWsRef.current();
+      connectWs();
    }, delay);
-  }, []);
-
-  // Keep the stable refs current after every render
-  connectWsRef.current = connectWs;
-  scheduleRetryRef.current = scheduleRetry;
-
-  // ── Initial connect ────────────────────────────────────────────────────
+  }, [connectWs]);

  useEffect(() => {
    connectWs();
@@ -259,19 +216,7 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
    };
  }, [connectWs]);

-  // Reconnect when apiBaseUrl changes (skip the very first render)
-  const isFirstRenderRef = useRef(true);
-  useEffect(() => {
-    if (isFirstRenderRef.current) {
-      isFirstRenderRef.current = false;
-      return;
-    }
-    retryCountRef.current = 0;
-    connectWs();
-  }, [apiBaseUrl, connectWs]);
-
-  // ── AppState-aware reconnect on foreground ─────────────────────────────
-
+  // AppState-aware WebSocket reconnect on foreground
  useEffect(() => {
    if (Platform.OS === "web") return;

@@ -284,17 +229,20 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
      const isNowActive = nextAppState === "active";

      if (wasBackground && isNowActive) {
+        // App returned to foreground — check if WS is still alive
        const ws = wsRef.current;
        if (!ws || ws.readyState !== WebSocket.OPEN) {
+          // Cancel any pending retry so we don't create duplicates
          if (retryTimerRef.current) {
            clearTimeout(retryTimerRef.current);
            retryTimerRef.current = null;
          }
          retryCountRef.current = 0;
          setConnectionStatus("reconnecting");
-          connectWsRef.current();
+          connectWs();
        }
      } else if (nextAppState === "background") {
+        // Proactively close the WS to avoid OS killing it mid-frame
        if (retryTimerRef.current) {
          clearTimeout(retryTimerRef.current);
          retryTimerRef.current = null;
@@ -314,9 +262,7 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
    return () => {
      subscription.remove();
    };
-  }, []);
-
-  // ── Outbound messages ──────────────────────────────────────────────────
+  }, [connectWs]);

  const send = useCallback((msg: object) => {
    if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
@@ -324,42 +270,28 @@ export function TimmyProvider({ children }: { children: React.ReactNode }) {
    }
  }, []);

-  const sendVisitorMessage = useCallback((text: string) => {
-    if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
-      wsRef.current.send(
-        JSON.stringify({
-          type: "visitor_message",
-          visitorId: VISITOR_ID,
-          text,
-        })
-      );
-      setTimmyMood("thinking");
-    }
-  }, []);
+  const sendVisitorMessage = useCallback(
+    (text: string) => {
+      if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
+        wsRef.current.send(
+          JSON.stringify({ type: "visitor_message", visitorId: VISITOR_ID, text })
+        );
+        setTimmyMood("thinking");
+      }
+    },
+    []
+  );

-  // ── Context value ──────────────────────────────────────────────────────
-
-  const value = useMemo<TimmyContextValue>(
+  const value = useMemo(
    () => ({
      timmyMood,
      connectionStatus,
-      isConnected: connectionStatus === "connected",
      recentEvents,
      send,
      sendVisitorMessage,
      visitorId: VISITOR_ID,
-      apiBaseUrl,
-      setApiBaseUrl,
    }),
-    [
-      timmyMood,
-      connectionStatus,
-      recentEvents,
-      send,
-      sendVisitorMessage,
-      apiBaseUrl,
-      setApiBaseUrl,
-    ]
+    [timmyMood, connectionStatus, recentEvents, send, sendVisitorMessage]
  );

  return (
--- a/artifacts/mobile/package.json
+++ b/artifacts/mobile/package.json
@@ -57,9 +57,7 @@
  },
  "dependencies": {
    "@react-native-voice/voice": "^3.2.4",
-    "expo-secure-store": "~14.0.1",
    "expo-speech": "^14.0.8",
-    "nostr-tools": "^2.23.3",
    "react-native-qrcode-svg": "^6.3.21",
    "react-native-webview": "^13.15.0"
  }
--- a/the-matrix/js/interaction.js
+++ b/the-matrix/js/interaction.js
@@ -16,6 +16,9 @@ let _camera    = null;
 let _timmyGroup = null;
 let _applySlap  = null;

+// Registered 3D click targets: Array of { group: THREE.Object3D, callback: fn }
+const _clickTargets = [];
+
 const _raycaster = new THREE.Raycaster();
 const _pointer   = new THREE.Vector2();
 const _noCtxMenu = e => e.preventDefault();
@@ -33,6 +36,15 @@ export function registerSlapTarget(timmyGroup, applyFn) {
  _applySlap  = applyFn;
 }

+/**
+ * Register a Three.js Object3D as a clickable target.
+ * @param {THREE.Object3D} group     The mesh/group to raycast against.
+ * @param {Function}       callback  Called when the user clicks the object.
+ */
+export function registerClickTarget(group, callback) {
+  _clickTargets.push({ group, callback });
+}
+
 export function initInteraction(camera, renderer) {
  _camera = camera;
  _canvas = renderer.domElement;
@@ -52,6 +64,7 @@ export function disposeInteraction() {
  _camera     = null;
  _timmyGroup = null;
  _applySlap  = null;
+  _clickTargets.length = 0;
 }

 // ── Internal ──────────────────────────────────────────────────────────────────
@@ -120,6 +133,20 @@ function _tryAgentInspect(clientX, clientY) {
 let _tapStart = 0;
 let _tapX = 0, _tapY = 0;

+function _tryClickTargets(clientX, clientY) {
+  if (!_clickTargets.length || !_camera || !_canvas) return false;
+  const rect = _canvas.getBoundingClientRect();
+  _pointer.x = ((clientX - rect.left) / rect.width)  *  2 - 1;
+  _pointer.y = ((clientY - rect.top)  / rect.height) * -2 + 1;
+  _raycaster.setFromCamera(_pointer, _camera);
+  for (const target of _clickTargets) {
+    if (!target.group.visible) continue;
+    const hits = _raycaster.intersectObject(target.group, true);
+    if (hits.length > 0) { target.callback(); return true; }
+  }
+  return false;
+}
+
 function _onPointerDown(event) {
  // Record tap start for short-tap detection
  _tapStart = Date.now();
@@ -135,21 +162,30 @@ function _onPointerDown(event) {
      const dt    = Date.now() - _tapStart;
      const moved = Math.hypot(upEvent.clientX - _tapX, upEvent.clientY - _tapY);
      if (dt < 220 && moved < 18) {
-        // Short tap — try slap then inspect
-        if (!_hitTestTimmy(upEvent.clientX, upEvent.clientY)) {
-          _tryAgentInspect(upEvent.clientX, upEvent.clientY);
+        // Short tap — try click targets, then slap, then inspect
+        if (!_tryClickTargets(upEvent.clientX, upEvent.clientY)) {
+          if (!_hitTestTimmy(upEvent.clientX, upEvent.clientY)) {
+            _tryAgentInspect(upEvent.clientX, upEvent.clientY);
+          }
        }
      }
    };
    _canvas.addEventListener('pointerup', onUp, { once: true });
  } else {
-    // Desktop click: only fire when pointer lock is already active
-    // (otherwise navigation.js requests lock on this same click — that's fine,
-    //  both can fire; slap + lock request together is acceptable)
    if (document.pointerLockElement === _canvas) {
-      // Cast from screen center in FPS mode
+      // FPS mode: cast from screen centre
      _pointer.set(0, 0);
      _raycaster.setFromCamera(_pointer, _camera);
+      // Check registered click targets first
+      for (const target of _clickTargets) {
+        if (!target.group.visible) continue;
+        const hits = _raycaster.intersectObject(target.group, true);
+        if (hits.length > 0) {
+          target.callback();
+          event.stopImmediatePropagation();
+          return;
+        }
+      }
      if (_timmyGroup && _applySlap) {
        const hits = _raycaster.intersectObject(_timmyGroup, true);
        if (hits.length > 0) {
@@ -157,6 +193,9 @@ function _onPointerDown(event) {
          event.stopImmediatePropagation();
        }
      }
+    } else {
+      // Not in pointer lock — still handle click targets (e.g. power meter)
+      _tryClickTargets(event.clientX, event.clientY);
    }
  }
 }
--- a/the-matrix/js/main.js
+++ b/the-matrix/js/main.js
@@ -7,10 +7,10 @@ import {
 } from './agents.js';
 import { initEffects, updateEffects, disposeEffects, updateJobIndicators } from './effects.js';
 import { initUI, updateUI } from './ui.js';
-import { initInteraction, disposeInteraction, registerSlapTarget } from './interaction.js';
+import { initInteraction, disposeInteraction, registerSlapTarget, registerClickTarget } from './interaction.js';
 import { initWebSocket, getConnectionState, getJobCount } from './websocket.js';
 import { initPaymentPanel } from './payment.js';
-import { initSessionPanel } from './session.js';
+import { initSessionPanel, openSessionPanel } from './session.js';
 import { initNostrIdentity } from './nostr-identity.js';
 import { warmup as warmupEdgeWorker, onReady as onEdgeWorkerReady } from './edge-worker-client.js';
 import { setEdgeWorkerReady } from './ui.js';
@@ -18,6 +18,7 @@ import { initTimmyId } from './timmy-id.js';
 import { AGENT_DEFS } from './agent-defs.js';
 import { initNavigation, updateNavigation, disposeNavigation } from './navigation.js';
 import { initHudLabels, updateHudLabels, disposeHudLabels } from './hud-labels.js';
+import { initPowerMeter, updatePowerMeter, disposePowerMeter, getMeterGroup } from './power-meter.js';

 let running = false;
 let canvas  = null;
@@ -29,6 +30,7 @@ function buildWorld(firstInit, stateSnapshot) {

  initEffects(scene);
  initAgents(scene);
+  initPowerMeter(scene);

  if (stateSnapshot) applyAgentStates(stateSnapshot);

@@ -37,6 +39,7 @@ function buildWorld(firstInit, stateSnapshot) {

  initInteraction(camera, renderer);
  registerSlapTarget(getTimmyGroup(), applySlap);
+  registerClickTarget(getMeterGroup(), openSessionPanel);

  // AR floating labels
  initHudLabels(camera, AGENT_DEFS, TIMMY_WORLD_POS);
@@ -82,6 +85,7 @@ function buildWorld(firstInit, stateSnapshot) {
    updateEffects(now);
    updateAgents(now);
    updateJobIndicators(now);
+    updatePowerMeter(now, camera, renderer);
    updateUI({
      fps: currentFps,
      agentCount: getAgentCount(),
@@ -121,6 +125,7 @@ function teardown({ scene, renderer, ac }) {
  disposeNavigation();
  disposeInteraction();
  disposeHudLabels();
+  disposePowerMeter();
  disposeEffects();
  disposeAgents();
  disposeWorld(renderer, scene);
--- a/the-matrix/js/power-meter.js
+++ b/the-matrix/js/power-meter.js
@@ -0,0 +1,291 @@
+/**
+ * power-meter.js — 3D Session Power Meter
+ *
+ * A glowing orb that fills proportionally to the session balance.
+ * - Pulses brightly on payment received
+ * - Drains visibly on job cost deduction
+ * - Visible only when a funded session is active
+ * - Clicking the meter opens the session panel
+ */
+
+import * as THREE from 'three';
+
+// ── World position (bottom-right corner, visible from default camera) ──────────
+const METER_WORLD_POS = new THREE.Vector3(4.5, 0.85, 2.0);
+const DEFAULT_MAX_SATS = 5000;
+
+// ── Module state ───────────────────────────────────────────────────────────────
+let _scene         = null;
+let _meterGroup    = null;
+let _innerOrb      = null;
+let _outerShell    = null;
+let _boltMesh      = null;
+let _orbMat        = null;
+let _shellMat      = null;
+let _meterLight    = null;
+let _labelEl       = null;
+
+let _fillFraction   = 0;     // 0..1, currently displayed fill
+let _targetFill     = 0;     // 0..1, desired fill
+let _pulseIntensity = 0;     // 0..1, extra brightness from pulse
+let _pulseDecay     = 0;     // per-frame decay rate
+let _visible        = false;
+let _maxSats        = DEFAULT_MAX_SATS;
+let _currentSats    = 0;
+
+// ── Public API ─────────────────────────────────────────────────────────────────
+
+export function initPowerMeter(scene) {
+  _scene = scene;
+  _labelEl = _createLabelEl();
+
+  _meterGroup = new THREE.Group();
+  _meterGroup.position.copy(METER_WORLD_POS);
+  _meterGroup.visible = false;
+
+  // Outer transparent shell
+  _shellMat = new THREE.MeshPhysicalMaterial({
+    color: 0x00aacc,
+    emissive: 0x003344,
+    emissiveIntensity: 0.4,
+    transparent: true,
+    opacity: 0.18,
+    roughness: 0.05,
+    metalness: 0.15,
+    side: THREE.DoubleSide,
+  });
+  _outerShell = new THREE.Mesh(new THREE.SphereGeometry(0.48, 24, 18), _shellMat);
+  _meterGroup.add(_outerShell);
+
+  // Equatorial ring accent
+  const ringMat = new THREE.MeshBasicMaterial({
+    color: 0x00ccff,
+    transparent: true,
+    opacity: 0.55,
+  });
+  const ring = new THREE.Mesh(new THREE.TorusGeometry(0.48, 0.012, 8, 40), ringMat);
+  ring.rotation.x = Math.PI / 2;
+  _meterGroup.add(ring);
+
+  // Inner fill orb — scales with balance
+  _orbMat = new THREE.MeshStandardMaterial({
+    color: 0x00ffcc,
+    emissive: 0x00ffcc,
+    emissiveIntensity: 1.4,
+    roughness: 0.05,
+    transparent: true,
+    opacity: 0.90,
+  });
+  _innerOrb = new THREE.Mesh(new THREE.SphereGeometry(0.38, 20, 16), _orbMat);
+  _innerOrb.scale.setScalar(0.01);
+  _meterGroup.add(_innerOrb);
+
+  // Lightning bolt — flat shape rendered in front of sphere
+  _boltMesh = _makeBolt();
+  _boltMesh.position.set(0, 0, 0.50);
+  _meterGroup.add(_boltMesh);
+
+  // Point light — intensity tracks balance + pulse
+  _meterLight = new THREE.PointLight(0x00ccff, 0.0, 6);
+  _meterGroup.add(_meterLight);
+
+  scene.add(_meterGroup);
+  return _meterGroup;
+}
+
+/**
+ * Update balance and target fill level.
+ * @param {number} sats        Current balance in satoshis
+ * @param {number} [maxSats]   Session deposit cap (sets the "full" reference)
+ */
+export function setMeterBalance(sats, maxSats) {
+  _currentSats = Math.max(0, sats);
+  if (maxSats !== undefined && maxSats > 0) _maxSats = maxSats;
+  _targetFill = Math.min(1, _currentSats / _maxSats);
+  if (_labelEl) _labelEl.textContent = `${_currentSats} ⚡`;
+}
+
+/**
+ * Fire a pulse animation on the meter.
+ * @param {'fill'|'drain'} type
+ */
+export function triggerMeterPulse(type) {
+  if (type === 'fill') {
+    _pulseIntensity = 1.0;
+    _pulseDecay     = 0.022; // slow bright flash
+  } else {
+    _pulseIntensity = 0.45;
+    _pulseDecay     = 0.040; // quick drain flicker
+  }
+}
+
+/** Show or hide the power meter and its text label. */
+export function setMeterVisible(visible) {
+  _visible = visible;
+  if (_meterGroup) _meterGroup.visible = visible;
+  if (_labelEl) _labelEl.style.display = visible ? 'block' : 'none';
+  if (!visible) {
+    _pulseIntensity = 0;
+    _fillFraction   = 0;
+    _targetFill     = 0;
+    if (_innerOrb) _innerOrb.scale.setScalar(0.01);
+    if (_meterLight) _meterLight.intensity = 0;
+  }
+}
+
+/** Returns the Three.js Group for raycasting. */
+export function getMeterGroup() {
+  return _meterGroup;
+}
+
+/**
+ * Called every animation frame.
+ * @param {number} now       performance.now() value
+ * @param {THREE.Camera} camera
+ * @param {THREE.WebGLRenderer} renderer
+ */
+export function updatePowerMeter(now, camera, renderer) {
+  if (!_meterGroup || !_visible) return;
+
+  const t = now * 0.001;
+
+  // Smooth fill toward target
+  _fillFraction += (_targetFill - _fillFraction) * 0.06;
+
+  const s = Math.max(0.01, _fillFraction * 0.94);
+  _innerOrb.scale.setScalar(s);
+
+  // Colour interpolation: empty=red → mid=orange/yellow → full=cyan
+  _updateOrbColor(_fillFraction, _pulseIntensity);
+
+  // Pulse decay
+  if (_pulseIntensity > 0) {
+    _pulseIntensity = Math.max(0, _pulseIntensity - _pulseDecay);
+  }
+
+  // Point light
+  _meterLight.intensity = _fillFraction * 1.6 + _pulseIntensity * 4.5;
+
+  // Shell emissive pulse
+  _shellMat.emissiveIntensity = 0.3 + _pulseIntensity * 1.8 + _fillFraction * 0.35;
+
+  // Gentle bob + slow rotation
+  _meterGroup.position.y = METER_WORLD_POS.y + Math.sin(t * 1.4) * 0.06;
+  _meterGroup.rotation.y = t * 0.35;
+
+  // Bolt scale pulses with balance and on payment
+  const boltS = 1.0 + _pulseIntensity * 0.55 + Math.sin(t * 3.2) * 0.05;
+  _boltMesh.scale.setScalar(boltS);
+
+  // DOM label
+  if (_labelEl && camera && renderer) {
+    _updateLabelPosition(camera, renderer);
+  }
+}
+
+export function disposePowerMeter() {
+  if (_meterGroup && _scene) {
+    _scene.remove(_meterGroup);
+    _meterGroup.traverse(child => {
+      if (child.geometry) child.geometry.dispose();
+      if (child.material) {
+        const mats = Array.isArray(child.material) ? child.material : [child.material];
+        mats.forEach(m => m.dispose());
+      }
+    });
+    _meterGroup = null;
+  }
+  if (_labelEl) {
+    _labelEl.remove();
+    _labelEl = null;
+  }
+  _scene = null;
+}
+
+// ── Internals ──────────────────────────────────────────────────────────────────
+
+function _makeBolt() {
+  const shape = new THREE.Shape();
+  shape.moveTo( 0.075,  0.28);
+  shape.lineTo(-0.030,  0.04);
+  shape.lineTo( 0.040,  0.04);
+  shape.lineTo(-0.075, -0.28);
+  shape.lineTo( 0.030, -0.04);
+  shape.lineTo(-0.040, -0.04);
+  shape.closePath();
+
+  const mat = new THREE.MeshBasicMaterial({
+    color: 0xffee00,
+    side: THREE.DoubleSide,
+    transparent: true,
+    opacity: 0.95,
+  });
+  return new THREE.Mesh(new THREE.ShapeGeometry(shape), mat);
+}
+
+function _updateOrbColor(fill, pulse) {
+  let r, g, b;
+  if (fill < 0.5) {
+    const k = fill * 2;          // 0→1
+    r = 1.0 - k * 0.30;          // 1.00 → 0.70
+    g = k * 0.70;                 // 0.00 → 0.70
+    b = k * 0.20;                 // 0.00 → 0.20
+  } else {
+    const k = (fill - 0.5) * 2;  // 0→1
+    r = 0.70 - k * 0.70;         // 0.70 → 0.00
+    g = 0.70 + k * 0.30;         // 0.70 → 1.00
+    b = 0.20 + k * 0.80;         // 0.20 → 1.00
+  }
+
+  // Pulse brightens toward white
+  const pr = r + pulse * (1 - r);
+  const pg = g + pulse * (1 - g);
+  const pb = b + pulse * (1 - b);
+
+  _orbMat.color.setRGB(pr, pg, pb);
+  _orbMat.emissive.setRGB(pr * 0.8, pg * 0.8, pb * 0.8);
+  _orbMat.emissiveIntensity = 1.0 + fill * 0.8 + pulse * 2.5;
+
+  _meterLight.color.setRGB(pr, pg, pb);
+}
+
+function _createLabelEl() {
+  const el = document.createElement('div');
+  el.style.cssText = [
+    'position:fixed',
+    'pointer-events:none',
+    'color:#00ffee',
+    'font-size:11px',
+    'font-family:monospace',
+    'font-weight:bold',
+    'text-align:center',
+    'text-shadow:0 0 6px #00ffcc,0 0 14px #00aaff',
+    'display:none',
+    'z-index:50',
+    'transform:translateX(-50%)',
+    'white-space:nowrap',
+  ].join(';');
+  document.body.appendChild(el);
+  return el;
+}
+
+function _updateLabelPosition(camera, renderer) {
+  const canvas = renderer.domElement;
+  const rect   = canvas.getBoundingClientRect();
+
+  // Project a point slightly above the orb center
+  const worldPos = METER_WORLD_POS.clone();
+  worldPos.y += 0.72;
+  worldPos.project(camera);
+
+  if (worldPos.z > 1) {          // behind camera
+    _labelEl.style.display = 'none';
+    return;
+  }
+
+  _labelEl.style.display = 'block';
+  const x = rect.left + ( worldPos.x *  0.5 + 0.5) * rect.width;
+  const y = rect.top  + (-worldPos.y *  0.5 + 0.5) * rect.height;
+  _labelEl.style.left = `${x}px`;
+  _labelEl.style.top  = `${y}px`;
+}
--- a/the-matrix/js/session.js
+++ b/the-matrix/js/session.js
@@ -16,6 +16,7 @@ import { setSpeechBubble, setMood } from './agents.js';
 import { appendSystemMessage, setSessionSendHandler, setInputBarSessionMode } from './ui.js';
 import { getOrRefreshToken } from './nostr-identity.js';
 import { sentiment } from './edge-worker-client.js';
+import { setMeterBalance, triggerMeterPulse, setMeterVisible } from './power-meter.js';

 const API          = '/api';
 const LS_KEY       = 'timmy_session_v1';
@@ -33,6 +34,7 @@ let _pollTimer     = null;
 let _inFlight      = false;
 let _selectedSats  = 500;  // deposit amount selection
 let _topupSats     = 500;  // topup amount selection
+let _sessionMax    = 500;  // max sats for this session (initial deposit)

 // ── Public API ────────────────────────────────────────────────────────────────

@@ -105,6 +107,11 @@ export function isSessionActive() {
  return _sessionState === 'active' || _sessionState === 'paused';
 }

+/** Public entry-point used by the 3D power meter click handler. */
+export function openSessionPanel() {
+  _openPanel();
+}
+
 // Called by ui.js when user submits the input bar while session is active
 export async function sessionSendHandler(text) {
  if (!_sessionId || !_macaroon || _inFlight) return;
@@ -156,6 +163,7 @@ export async function sessionSendHandler(text) {
    _sessionState = _balanceSats < MIN_BALANCE ? 'paused' : 'active';
    _saveToStorage();
    _applySessionUI();
+    triggerMeterPulse('drain');

    const reply = data.result || data.reason || '…';
    setSpeechBubble(reply);
@@ -287,9 +295,11 @@ function _startDepositPolling() {
      if (data.state === 'active') {
        _macaroon     = data.macaroon;
        _balanceSats  = data.balanceSats;
+        _sessionMax   = _balanceSats; // initial deposit = full bar
        _sessionState = 'active';
        _saveToStorage();
        _applySessionUI();
+        triggerMeterPulse('fill');
        _closePanel(); // panel auto-closes; user types in input bar
        appendSystemMessage(`Session active — ${_balanceSats} sats`);
        return;
@@ -404,8 +414,10 @@ function _startTopupPolling() {
        _balanceSats  = data.balanceSats;
        _macaroon     = data.macaroon || _macaroon;
        _sessionState = data.state === 'active' ? 'active' : _sessionState;
+        _sessionMax   = Math.max(_sessionMax, _balanceSats);
        _saveToStorage();
        _applySessionUI();
+        triggerMeterPulse('fill');
        _setStep('active');
        _updateActiveStep();
        _setStatus('active', `⚡ Topped up! ${_balanceSats} sats`, '#22aa66');
@@ -512,6 +524,10 @@ function _applySessionUI() {
  // Low balance notice above input bar
  const $notice = document.getElementById('low-balance-notice');
  if ($notice) $notice.style.display = lowBal ? '' : 'none';
+
+  // 3D power meter visibility
+  setMeterVisible(anyActive);
+  if (anyActive) setMeterBalance(_balanceSats, _sessionMax);
 }

 function _updateActiveStep() {
@@ -530,7 +546,9 @@ function _clearSession() {
  _macaroon     = null;
  _balanceSats  = 0;
  _sessionState = null;
+  _sessionMax   = 500;
  localStorage.removeItem(LS_KEY);
+  setMeterVisible(false);
  setInputBarSessionMode(false);
  setSessionSendHandler(null);
  const $hud = document.getElementById('session-hud');
--- a/the-matrix/js/websocket.js
+++ b/the-matrix/js/websocket.js
@@ -6,6 +6,7 @@ import { sentiment } from './edge-worker-client.js';
 import { setLabelState } from './hud-labels.js';
 import { createJobIndicator, dissolveJobIndicator } from './effects.js';
 import { getPubkey } from './nostr-identity.js';
+import { setMeterBalance, triggerMeterPulse } from './power-meter.js';

 function resolveWsUrl() {
  const explicit = import.meta.env.VITE_WS_URL;
@@ -190,6 +191,15 @@ function handleMessage(msg) {
      break;
    }

+    case 'session_balance_update': {
+      // Real-time balance push from server: animate fill level and pulse
+      if (typeof msg.balanceSats === 'number') {
+        setMeterBalance(msg.balanceSats, msg.maxSats);
+        triggerMeterPulse(msg.delta > 0 ? 'fill' : 'drain');
+      }
+      break;
+    }
+
    case 'agent_count':
    case 'visitor_count':
      break;