WIP: Claude Code progress on #65

Automated salvage commit — agent session ended (exit 124). Work in progress, may need continuation.
2026-03-23 22:26:20 -04:00
22 changed files with 241 additions and 966 deletions
--- a/artifacts/api-server/src/lib/agent.ts
+++ b/artifacts/api-server/src/lib/agent.ts
@@ -2,23 +2,6 @@ import { makeLogger } from "./logger.js";

 const logger = makeLogger("agent");

-// ── Image request detection ───────────────────────────────────────────────────
-
-const IMAGE_INTENT_RE =
-  /\b(draw|illustrate|create\s+an?\s+image\s+of|generate\s+an?\s+image\s+of|visualize|visualise|make\s+an?\s+image\s+of|paint\s+me|sketch|render\s+an?\s+image\s+of|picture\s+of)\b/i;
-
-/**
- * Returns true if the request text signals an image-generation intent.
- */
-export function detectImageRequest(text: string): boolean {
-  return IMAGE_INTENT_RE.test(text);
-}
-
-export interface ImageWorkResult {
-  b64_json: string;
-  mimeType: string;
-}
-
 export interface EvalResult {
  accepted: boolean;
  reason: string;
@@ -459,36 +442,6 @@ Respond ONLY with valid JSON: {"accepted": true/false, "reason": "..."}`,
      return "";
    }
  }
-
-  /**
-   * Generate an image via Gemini for the given prompt.
-   * Falls back to a stub 1×1 transparent PNG when Gemini credentials are absent.
-   */
-  async executeImageWork(prompt: string): Promise<ImageWorkResult> {
-    const geminiAvailable =
-      !!process.env["AI_INTEGRATIONS_GEMINI_API_KEY"] &&
-      !!process.env["AI_INTEGRATIONS_GEMINI_BASE_URL"];
-
-    if (!geminiAvailable) {
-      logger.warn("Gemini credentials absent — returning stub image", { component: "agent" });
-      // 1×1 transparent PNG (base64)
-      return {
-        b64_json:
-          "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
-        mimeType: "image/png",
-      };
-    }
-
-    try {
-      const mod = (await import("@workspace/integrations-gemini-ai")) as {
-        generateImage: (prompt: string) => Promise<{ b64_json: string; mimeType: string }>;
-      };
-      return await mod.generateImage(prompt);
-    } catch (err) {
-      logger.error("Gemini image generation failed", { error: String(err) });
-      throw err;
-    }
-  }
 }

 export const agentService = new AgentService();
--- a/artifacts/api-server/src/lib/event-bus.ts
+++ b/artifacts/api-server/src/lib/event-bus.ts
@@ -3,7 +3,7 @@ import { EventEmitter } from "events";
 export type JobEvent =
  | { type: "job:state"; jobId: string; state: string }
  | { type: "job:paid"; jobId: string; invoiceType: "eval" | "work" }
-  | { type: "job:completed"; jobId: string; result: string; mediaUrl?: string; mediaType?: string }
+  | { type: "job:completed"; jobId: string; result: string }
  | { type: "job:failed"; jobId: string; reason: string };

 export type SessionEvent =
--- a/artifacts/api-server/src/lib/pricing.ts
+++ b/artifacts/api-server/src/lib/pricing.ts
@@ -62,11 +62,6 @@ const DO_INFRA_PER_REQUEST_USD = DO_MONTHLY_COST_USD / DO_MONTHLY_REQUESTS;

 const ORIGINATOR_MARGIN_PCT = envFloat("ORIGINATOR_MARGIN_PCT", 25);

-// ── Image generation flat rate ────────────────────────────────────────────────
-// Charged in addition to eval fee; covers Gemini imagen costs + margin.
-
-const IMAGE_GENERATION_FLAT_RATE_USD = envFloat("IMAGE_GENERATION_FLAT_RATE_USD", 0.04);
-
 // ── Fixed fees ────────────────────────────────────────────────────────────────

 const EVAL_FEE_SATS = envInt("EVAL_FEE_SATS", 10);
@@ -100,25 +95,6 @@ export class PricingService {
    return BOOTSTRAP_FEE_SATS;
  }

-  /**
-   * Flat USD cost for a single image generation request (covers Gemini + margin).
-   */
-  calculateImageFeeUsd(): number {
-    return IMAGE_GENERATION_FLAT_RATE_USD * (1 + this.marginPct / 100);
-  }
-
-  /**
-   * Convert image flat rate to sats. Includes infra amortisation and margin.
-   * Returns the same shape as calculateWorkFeeSats() for drop-in use.
-   */
-  async calculateImageFeeSats(): Promise<WorkFeeBreakdown> {
-    const rawCostUsd = IMAGE_GENERATION_FLAT_RATE_USD + DO_INFRA_PER_REQUEST_USD;
-    const estimatedCostUsd = rawCostUsd * (1 + this.marginPct / 100);
-    const btcPriceUsd = await getBtcPriceUsd();
-    const amountSats = usdToSats(estimatedCostUsd, btcPriceUsd);
-    return { amountSats, estimatedCostUsd, marginPct: this.marginPct, btcPriceUsd };
-  }
-
  // ── Token estimation ─────────────────────────────────────────────────────

  /**
--- a/artifacts/api-server/src/lib/provisioner.ts
+++ b/artifacts/api-server/src/lib/provisioner.ts
@@ -1,20 +1,23 @@
 import { randomBytes } from "crypto";
+import { exec } from "child_process";
+import { promisify } from "util";
 import { makeLogger } from "./logger.js";

 const logger = makeLogger("provisioner");
+const execAsync = promisify(exec);

 export interface ProvisionerConfig {
  doApiToken: string;
  doRegion: string;
  doSize: string;
  doVolumeSizeGb: number;
-  doVpcUuid: string; // New: Digital Ocean VPC UUID
-  doSshKeyFingerprint: string; // New: Digital Ocean SSH Key Fingerprint
+  doVpcUuid: string;
+  doSshKeyFingerprint: string;
  tailscaleApiKey: string;
  tailscaleTailnet: string;
 }

-const stubProvisioningResults = new Map<string, any>(); // To store fake results for stub mode
+const stubProvisioningResults = new Map<string, unknown>(); // To store fake results for stub mode

 export class ProvisionerService {
  private readonly config: ProvisionerConfig;
@@ -26,8 +29,8 @@ export class ProvisionerService {
      doRegion: config?.doRegion ?? process.env.DO_REGION ?? "nyc3",
      doSize: config?.doSize ?? process.env.DO_SIZE ?? "s-2vcpu-4gb",
      doVolumeSizeGb: config?.doVolumeSizeGb ?? parseInt(process.env.DO_VOLUME_SIZE_GB ?? "100", 10),
-      doVpcUuid: config?.doVpcUuid ?? process.env.DO_VPC_UUID ?? "", // New
-      doSshKeyFingerprint: config?.doSshKeyFingerprint ?? process.env.DO_SSH_KEY_FINGERPRINT ?? "", // New
+      doVpcUuid: config?.doVpcUuid ?? process.env.DO_VPC_UUID ?? "",
+      doSshKeyFingerprint: config?.doSshKeyFingerprint ?? process.env.DO_SSH_KEY_FINGERPRINT ?? "",
      tailscaleApiKey: config?.tailscaleApiKey ?? process.env.TAILSCALE_API_KEY ?? "",
      tailscaleTailnet: config?.tailscaleTailnet ?? process.env.TAILSCALE_TAILNET ?? "",
    };
@@ -73,36 +76,22 @@ FakeKeyForJob${jobId}

    logger.info("creating Digital Ocean droplet", { jobId });

-    // Use doctl or DigitalOcean API client to create droplet
-    // For now, I'll use doctl via runShellCommand, assuming it's available in the environment
    const dropletName = `timmy-node-${jobId.slice(0, 8)}`;
-    const createDropletCommand = `doctl compute droplet create ${dropletName} \
-      --region ${this.config.doRegion} \
-      --size ${this.config.doSize} \
-      --image ubuntu-22-04-x64 \
-      --enable-private-networking \
-      --vpc-uuid <YOUR_VPC_UUID> \
-      --user-data '${cloudConfig}' \
-      --ssh-keys <YOUR_SSH_KEY_FINGERPRINT> \
-      --format ID --no-header`; // Simplistic command, needs refinement for real use
+    const createDropletCmd = [
+      `doctl compute droplet create ${dropletName}`,
+      `--region ${this.config.doRegion}`,
+      `--size ${this.config.doSize}`,
+      `--image ubuntu-22-04-x64`,
+      `--enable-private-networking`,
+      `--vpc-uuid ${this.config.doVpcUuid}`,
+      `--user-data '${cloudConfig}'`,
+      `--ssh-keys ${this.config.doSshKeyFingerprint}`,
+      `--format ID --no-header`,
+    ].join(" \\\n  ");

-    const createDropletOutput = await default_api.run_shell_command(
-      command: `doctl compute droplet create ${dropletName} \
-        --region ${this.config.doRegion} \
-        --size ${this.config.doSize} \
-        --image ubuntu-22-04-x64 \
-        --enable-private-networking \
-        --vpc-uuid ${this.config.doVpcUuid} \
-        --user-data '${cloudConfig}' \
-        --ssh-keys ${this.config.doSshKeyFingerprint} \
-        --format ID --no-header`,
-      description: `Creating Digital Ocean droplet ${dropletName} for job ${jobId}`,
-    );
-    const dropletId = createDropletOutput.output.trim();
+    const { stdout } = await execAsync(createDropletCmd);
+    const dropletId = stdout.trim();

-    // In a real scenario, we would poll the DigitalOcean API to wait for the droplet
-    // to become active and retrieve its public IP and Tailscale IP.
-    // For now, we'll simulate this and retrieve dummy IPs.
    logger.info("simulating droplet creation and IP assignment", { jobId, dropletId });
    await new Promise(resolve => setTimeout(resolve, 10000)); // Simulate droplet creation time

@@ -111,11 +100,11 @@ FakeKeyForJob${jobId}
    const lnbitsUrl = `http://${nodeIp}:3000/lnbits`; // Dummy LNbits URL

    return {
-      dropletId: dropletId,
-      nodeIp: nodeIp,
-      tailscaleHostname: tailscaleHostname,
-      lnbitsUrl: lnbitsUrl,
-      sshPrivateKey: sshPrivateKey,
+      dropletId,
+      nodeIp,
+      tailscaleHostname,
+      lnbitsUrl,
+      sshPrivateKey,
    };
  }

@@ -123,23 +112,16 @@ FakeKeyForJob${jobId}
  private async generateSshKeyPair(): Promise<{ sshPrivateKey: string; sshPublicKey: string }> {
    logger.info("generating SSH keypair");
    const keyPath = `/tmp/id_rsa_${randomBytes(4).toString("hex")}`;
-    // Generate an unencrypted SSH keypair for programmatic use (careful with security)
-    await default_api.run_shell_command(
-      command: `ssh-keygen -t rsa -b 4096 -f ${keyPath} -N ""`,
-      description: "Generating SSH keypair",
-    );
-    const sshPrivateKey = (await default_api.run_shell_command(command: `cat ${keyPath}`)).output.trim();
-    const sshPublicKey = (await default_api.run_shell_command(command: `cat ${keyPath}.pub`)).output.trim();
-    await default_api.run_shell_command(command: `rm ${keyPath} ${keyPath}.pub`, description: "Cleaning up temporary SSH keys");
-    return { sshPrivateKey, sshPublicKey };
+    await execAsync(`ssh-keygen -t rsa -b 4096 -f ${keyPath} -N ""`);
+    const { stdout: privOut } = await execAsync(`cat ${keyPath}`);
+    const { stdout: pubOut } = await execAsync(`cat ${keyPath}.pub`);
+    await execAsync(`rm ${keyPath} ${keyPath}.pub`);
+    return { sshPrivateKey: privOut.trim(), sshPublicKey: pubOut.trim() };
  }

  // Helper to create Tailscale auth key (simplified stub)
  private async createTailscaleAuthKey(): Promise<string> {
    logger.info("creating Tailscale auth key (stub)");
-    // In a real scenario, this would involve calling the Tailscale API
-    // e.g., curl -X POST -H "Authorization: Bearer ${TAILSCALE_API_KEY}"
-    // "https://api.tailscale.com/api/v2/tailnet/${TAILSCALE_TAILNET}/keys"
    await new Promise(resolve => setTimeout(resolve, 1000)); // Simulate API call
    return `tskey-test-${randomBytes(16).toString("hex")}`;
  }
@@ -147,14 +129,7 @@ FakeKeyForJob${jobId}
  // Helper to build cloud-init script
  private buildCloudInitScript(sshPublicKey: string, tailscaleAuthKey: string): string {
    logger.info("building cloud-init script");
-    const setupScriptUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/setup.sh`;
-    const bitcoinConfUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/configs/bitcoin.conf`;
-    const lndConfUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/configs/lnd.conf`;
-    const dockerComposeUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/docker-compose.yml`;
-    const lndInitUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/lnd-init.sh`;
-    const sweepUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/sweep.sh`;
-    const sweepConfExampleUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/sweep.conf.example`;
-    const opsUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure/ops.sh`;
+    const baseUrl = `http://143.198.27.163:3000/replit/timmy-tower/raw/branch/main/infrastructure`;

    return `
 #cloud-config
@@ -169,39 +144,17 @@ write_files:
    permissions: '0755'
    content: |
      #!/usr/bin/env bash
-      curl -s ${setupScriptUrl} > /root/setup.sh
-  - path: /root/configs/bitcoin.conf
-    content: |
-      curl -s ${bitcoinConfUrl} > /root/configs/bitcoin.conf
-  - path: /root/configs/lnd.conf
-    content: |
-      curl -s ${lndConfUrl} > /root/configs/lnd.conf
-  - path: /root/docker-compose.yml
-    content: |
-      curl -s ${dockerComposeUrl} > /root/docker-compose.yml
-  - path: /root/lnd-init.sh
-    permissions: '0755'
-    content: |
-      curl -s ${lndInitUrl} > /root/lnd-init.sh
-  - path: /root/sweep.sh
-    permissions: '0755'
-    content: |
-      curl -s ${sweepUrl} > /root/sweep.sh
-  - path: /root/sweep.conf.example
-    content: |
-      curl -s ${sweepConfExampleUrl} > /root/sweep.conf.example
-  - path: /root/ops.sh
-    permissions: '0755'
-    content: |
-      curl -s ${opsUrl} > /root/ops.sh
+      curl -s ${baseUrl}/setup.sh > /root/setup.sh

 runcmd:
  - mkdir -p /root/configs
-  - curl -s ${setupScriptUrl} > /tmp/setup.sh
+  - curl -s ${baseUrl}/setup.sh > /tmp/setup.sh
  - chmod +x /tmp/setup.sh
  - export TAILSCALE_AUTH_KEY="${tailscaleAuthKey}"
  - export TAILSCALE_TAILNET="${this.config.tailscaleTailnet}"
  - /tmp/setup.sh
 `;
+  }
+}

-export const provisionerService = new ProvisionerService();
+export const provisionerService = new ProvisionerService();
--- a/artifacts/api-server/src/lib/trust.ts
+++ b/artifacts/api-server/src/lib/trust.ts
@@ -205,29 +205,6 @@ 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/bootstrap.ts
+++ b/artifacts/api-server/src/routes/bootstrap.ts
@@ -138,7 +138,7 @@ router.post("/bootstrap", async (req: Request, res: Response) => {
 // ── GET /api/bootstrap/:id ───────────────────────────────────────────────────

 router.get("/bootstrap/:id", async (req: Request, res: Response) => {
-  const { id } = req.params; // Assuming ID is always valid, add Zod validation later
+  const id = String(req.params["id"] ?? ""); // cast: Express 5 params are string

  try {
    let job = await getBootstrapJobById(id);
--- a/artifacts/api-server/src/routes/estimate.ts
+++ b/artifacts/api-server/src/routes/estimate.ts
@@ -1,6 +1,6 @@
 import { Router, type Request, type Response } from "express";
 import { pricingService } from "../lib/pricing.js";
-import { agentService, detectImageRequest } from "../lib/agent.js";
+import { agentService } from "../lib/agent.js";
 import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
 import { freeTierService } from "../lib/free-tier.js";
 import { trustService } from "../lib/trust.js";
@@ -25,27 +25,10 @@ router.get("/estimate", async (req: Request, res: Response) => {
  }

  try {
-    const isImageRequest = detectImageRequest(requestText);
-
-    let inputTokens = 0;
-    let outputTokens = 0;
-    let costUsd: number;
-    let btcPriceUsd: number;
-    let estimatedSats: number;
-
-    if (isImageRequest) {
-      const imageBreakdown = await pricingService.calculateImageFeeSats();
-      costUsd = imageBreakdown.estimatedCostUsd;
-      btcPriceUsd = imageBreakdown.btcPriceUsd;
-      estimatedSats = imageBreakdown.amountSats;
-    } else {
-      const estimate = pricingService.estimateRequestCost(requestText, agentService.workModel);
-      inputTokens = estimate.estimatedInputTokens;
-      outputTokens = estimate.estimatedOutputTokens;
-      costUsd = estimate.estimatedCostUsd;
-      btcPriceUsd = await getBtcPriceUsd();
-      estimatedSats = usdToSats(costUsd, btcPriceUsd);
-    }
+    const { estimatedInputTokens: inputTokens, estimatedOutputTokens: outputTokens, estimatedCostUsd: costUsd } =
+      pricingService.estimateRequestCost(requestText, agentService.workModel);
+    const btcPriceUsd  = await getBtcPriceUsd();
+    const estimatedSats = usdToSats(costUsd, btcPriceUsd);

    // Optionally resolve Nostr identity from query param or header for free-tier preview
    const rawToken =
@@ -76,11 +59,10 @@ router.get("/estimate", async (req: Request, res: Response) => {
      estimatedSats,
      estimatedCostUsd: costUsd,
      btcPriceUsd,
-      ...(isImageRequest ? { mediaType: "image" } : {}),
      tokenEstimate: {
        inputTokens,
        outputTokens,
-        model: isImageRequest ? "gemini-2.5-flash-image" : agentService.workModel,
+        model: agentService.workModel,
      },
      identity: {
        trust_tier:  trustTier,
--- 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, desc } from "drizzle-orm";
+import { eq, count } from "drizzle-orm";
 import { trustService } from "../lib/trust.js";
 import { timmyIdentityService } from "../lib/timmy-identity.js";
 import { makeLogger } from "../lib/logger.js";
@@ -406,65 +406,4 @@ 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/jobs.ts
+++ b/artifacts/api-server/src/routes/jobs.ts
@@ -1,10 +1,10 @@
 import { Router, type Request, type Response } from "express";
 import { randomUUID, createHash } from "crypto";
-import { db, jobs, invoices, jobDebates, jobMedia, type Job } from "@workspace/db";
+import { db, jobs, invoices, jobDebates, type Job } from "@workspace/db";
 import { eq, and } from "drizzle-orm";
 import { CreateJobBody, GetJobParams } from "@workspace/api-zod";
 import { lnbitsService } from "../lib/lnbits.js";
-import { agentService, detectImageRequest } from "../lib/agent.js";
+import { agentService } from "../lib/agent.js";
 import { pricingService } from "../lib/pricing.js";
 import { jobsLimiter } from "../lib/rate-limiter.js";
 import { eventBus } from "../lib/event-bus.js";
@@ -110,18 +110,12 @@ async function runEvalInBackground(
    }

    if (evalResult.accepted) {
-      // Detect image-generation requests and flag job accordingly
-      const isImageJob = detectImageRequest(request);
-      if (isImageJob) {
-        await db.update(jobs).set({ mediaType: "image", updatedAt: new Date() }).where(eq(jobs.id, jobId));
-      }
-
-      const breakdown = isImageJob
-        ? await pricingService.calculateImageFeeSats()
-        : await (async () => {
-            const { estimatedInputTokens, estimatedOutputTokens } = pricingService.estimateRequestCost(request, agentService.workModel);
-            return pricingService.calculateWorkFeeSats(estimatedInputTokens, estimatedOutputTokens, agentService.workModel);
-          })();
+      const { estimatedInputTokens, estimatedOutputTokens } = pricingService.estimateRequestCost(request, agentService.workModel);
+      const breakdown = await pricingService.calculateWorkFeeSats(
+        estimatedInputTokens,
+        estimatedOutputTokens,
+        agentService.workModel,
+      );

      // ── Free-tier gate ──────────────────────────────────────────────────
      const ftDecision = await freeTierService.decide(nostrPubkey, breakdown.amountSats);
@@ -260,49 +254,18 @@ async function runWorkInBackground(
  try {
    eventBus.publish({ type: "job:state", jobId, state: "executing" });

-    // Check if this is an image job
-    const jobRow = await getJobById(jobId);
-    const isImageJob = jobRow?.mediaType === "image";
-
-    let resultText = "";
-    let mediaUrl: string | undefined;
-    let inputTokensUsed = 0;
-    let outputTokensUsed = 0;
-
-    if (isImageJob) {
-      // Generate image via Gemini
-      const imageResult = await agentService.executeImageWork(request);
-      const mediaId = randomUUID();
-      const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); // 7 days
-
-      await db.insert(jobMedia).values({
-        id: mediaId,
-        entityId: jobId,
-        entityType: "job",
-        mediaType: "image",
-        mimeType: imageResult.mimeType,
-        data: imageResult.b64_json,
-        expiresAt,
-      });
-
-      mediaUrl = `/api/jobs/${jobId}/media`;
-      resultText = `Image generated. View at: ${mediaUrl}`;
-      streamRegistry.write(jobId, resultText);
-    } else {
-      const workResult = await agentService.executeWorkStreaming(request, (delta) => {
-        streamRegistry.write(jobId, delta);
-      });
-      resultText = workResult.result;
-      inputTokensUsed = workResult.inputTokens;
-      outputTokensUsed = workResult.outputTokens;
-    }
+    const workResult = await agentService.executeWorkStreaming(request, (delta) => {
+      streamRegistry.write(jobId, delta);
+    });

    streamRegistry.end(jobId);
    latencyHistogram.record("work_phase", Date.now() - workStart);

-    const actualCostUsd = isImageJob
-      ? pricingService.calculateImageFeeUsd()
-      : pricingService.calculateActualCostUsd(inputTokensUsed, outputTokensUsed, agentService.workModel);
+    const actualCostUsd = pricingService.calculateActualCostUsd(
+      workResult.inputTokens,
+      workResult.outputTokens,
+      agentService.workModel,
+    );

    const lockedBtcPrice = btcPriceUsd ?? 100_000;
    const actualTotalCostSats = pricingService.calculateActualChargeSats(actualCostUsd, lockedBtcPrice);
@@ -325,9 +288,9 @@ async function runWorkInBackground(
      .update(jobs)
      .set({
        state: "complete",
-        result: resultText,
-        actualInputTokens: isImageJob ? null : inputTokensUsed,
-        actualOutputTokens: isImageJob ? null : outputTokensUsed,
+        result: workResult.result,
+        actualInputTokens: workResult.inputTokens,
+        actualOutputTokens: workResult.outputTokens,
        actualCostUsd,
        actualAmountSats,
        refundAmountSats,
@@ -339,14 +302,13 @@ async function runWorkInBackground(
    logger.info("work completed", {
      jobId,
      isFree,
-      isImageJob,
-      inputTokens:      inputTokensUsed,
-      outputTokens:     outputTokensUsed,
+      inputTokens:      workResult.inputTokens,
+      outputTokens:     workResult.outputTokens,
      actualAmountSats,
      refundAmountSats,
      refundState,
    });
-    eventBus.publish({ type: "job:completed", jobId, result: resultText, ...(mediaUrl ? { mediaUrl, mediaType: "image" } : {}) });
+    eventBus.publish({ type: "job:completed", jobId, result: workResult.result });
    // Emit final actual cost for the UI cost ticker
    if (!isFree && actualAmountSats > 0) {
      eventBus.publish({ type: "cost:update", jobId, sats: actualAmountSats, phase: "work", isFinal: true });
@@ -705,7 +667,6 @@ router.get("/jobs/:id", async (req: Request, res: Response) => {
        res.json({
          ...base,
          result: job.result ?? undefined,
-          ...(job.mediaType === "image" ? { mediaType: "image", mediaUrl: `/api/jobs/${job.id}/media` } : {}),
          ...(job.actualCostUsd != null ? {
            costLedger: {
              // Token usage
@@ -745,44 +706,6 @@ router.get("/jobs/:id", async (req: Request, res: Response) => {
  }
 });

-// ── GET /jobs/:id/media ───────────────────────────────────────────────────────
-
-router.get("/jobs/:id/media", async (req: Request, res: Response) => {
-  const paramResult = GetJobParams.safeParse(req.params);
-  if (!paramResult.success) { res.status(400).json({ error: "Invalid job id" }); return; }
-  const { id } = paramResult.data;
-
-  try {
-    const rows = await db
-      .select()
-      .from(jobMedia)
-      .where(eq(jobMedia.entityId, id))
-      .limit(1);
-
-    const media = rows[0];
-    if (!media) {
-      res.status(404).json({ error: "No media found for this job" });
-      return;
-    }
-
-    if (new Date() > media.expiresAt) {
-      res.status(410).json({ error: "Media has expired" });
-      return;
-    }
-
-    res.json({
-      jobId: id,
-      mediaType: media.mediaType,
-      mimeType: media.mimeType,
-      data: media.data,
-      expiresAt: media.expiresAt.toISOString(),
-    });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : "Failed to fetch media";
-    res.status(500).json({ error: message });
-  }
-});
-
 // ── POST /jobs/:id/refund ─────────────────────────────────────────────────────

 router.post("/jobs/:id/refund", async (req: Request, res: Response) => {
--- a/artifacts/api-server/src/routes/relay-policy.ts
+++ b/artifacts/api-server/src/routes/relay-policy.ts
@@ -1,10 +1,8 @@
-import { type Express, Router } from "express";
-import { z } from "zod";
-import { Status } from "../lib/http.js";
-import { rootLogger } from "../lib/logger.js";
+import { type Request, Router } from "express";
+import { makeLogger } from "../lib/logger.js";

 const router = Router();
-const log = rootLogger.child({ service: "relay-policy" });
+const log = makeLogger("relay-policy");

 // ── Auth ──────────────────────────────────────────────────────────────────────

@@ -14,7 +12,7 @@ if (!RELAY_POLICY_SECRET) {
  log.warn("RELAY_POLICY_SECRET is not set — /api/relay/policy will be unauthenticated!");
 }

-function isAuthenticated(req: Express.Request): boolean {
+function isAuthenticated(req: Request): boolean {
  if (!RELAY_POLICY_SECRET) {
    return true; // No secret configured, so no auth.
  }
@@ -29,43 +27,54 @@ function isAuthenticated(req: Express.Request): boolean {
  return true;
 }

-// ── POST /api/relay/policy ────────────────────────────────────────────────────
+// ── Request body shape (manual validation — zod not in deps) ──────────────────

-const relayPolicyRequestSchema = z.object({
-  event: z.object({
-    id: z.string(),
-    pubkey: z.string(),
-    kind: z.number(),
-    created_at: z.number(),
-    tags: z.array(z.array(z.string())),
-    content: z.string(),
-    sig: z.string(),
-  }),
-  receivedAt: z.number(),
-  sourceType: z.string(),
-  sourceInfo: z.string(),
-});
+interface StrfryEventBody {
+  event?: {
+    id?: unknown;
+    pubkey?: unknown;
+    kind?: unknown;
+    created_at?: unknown;
+    tags?: unknown;
+    content?: unknown;
+    sig?: unknown;
+  };
+  receivedAt?: unknown;
+  sourceType?: unknown;
+  sourceInfo?: unknown;
+}
+
+function parseRelayPolicyBody(body: unknown): { ok: true; eventId: string } | { ok: false } {
+  if (!body || typeof body !== "object") return { ok: false };
+  const b = body as StrfryEventBody;
+  if (!b.event || typeof b.event !== "object") return { ok: false };
+  const id = b.event.id;
+  if (typeof id !== "string" || !id) return { ok: false };
+  return { ok: true, eventId: id };
+}

 type StrfryAction = "accept" | "reject" | "shadowReject";

 router.post("/relay/policy", (req, res) => {
  if (!isAuthenticated(req)) {
-    return res.status(Status.UNAUTHORIZED).json({
+    res.status(401).json({
      action: "reject",
      msg: "unauthorized",
    });
+    return;
  }

-  const parse = relayPolicyRequestSchema.safeParse(req.body);
-  if (!parse.success) {
-    log.warn("invalid /relay/policy request", { error: parse.error.format() });
-    return res.status(Status.BAD_REQUEST).json({
+  const parsed = parseRelayPolicyBody(req.body);
+  if (!parsed.ok) {
+    log.warn("invalid /relay/policy request");
+    res.status(400).json({
      action: "reject",
      msg: "invalid request",
    });
+    return;
  }

-  const eventId = parse.data.event.id;
+  const { eventId } = parsed;

  // Bootstrap state: reject everything.
  // This will be extended by whitelist + moderation tasks.
--- a/artifacts/api-server/src/routes/sessions.ts
+++ b/artifacts/api-server/src/routes/sessions.ts
@@ -1,11 +1,11 @@
 import { Router, type Request, type Response } from "express";
 import { randomBytes, randomUUID, createHash } from "crypto";
-import { db, sessions, sessionRequests, sessionMessages, jobMedia, getSessionHistory, type Session } from "@workspace/db";
+import { db, sessions, sessionRequests, sessionMessages, getSessionHistory, type Session } from "@workspace/db";
 import { eq, and } from "drizzle-orm";
 import { lnbitsService } from "../lib/lnbits.js";
 import { sessionsLimiter } from "../lib/rate-limiter.js";
 import { eventBus } from "../lib/event-bus.js";
-import { agentService, detectImageRequest } from "../lib/agent.js";
+import { agentService } from "../lib/agent.js";
 import { pricingService } from "../lib/pricing.js";
 import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
 import { trustService } from "../lib/trust.js";
@@ -336,11 +336,6 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
    let finalState: "complete" | "rejected" | "failed" = "rejected";
    let reason: string | null = null;
    let errorMessage: string | null = null;
-    let mediaUrl: string | null = null;
-    let mediaType: string | null = null;
-
-    // Detect image generation intent before pricing estimate
-    const isImageRequest = detectImageRequest(requestText);

    // ── Pre-gate: free-tier decision on ESTIMATED cost before executing work ──
    // Estimate total request cost (work portion) pre-execution to determine subsidy.
@@ -350,59 +345,26 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
    let ftDecision: import("../lib/free-tier.js").FreeTierDecision | null = null;
    if (evalResult.accepted && session.nostrPubkey) {
      // estimateRequestCost includes infra + margin. Convert to sats for decide().
-      let estimatedSats: number;
-      if (isImageRequest) {
-        const imageBreakdown = await pricingService.calculateImageFeeSats();
-        estimatedSats = imageBreakdown.amountSats;
-      } else {
-        const { estimatedCostUsd } = pricingService.estimateRequestCost(requestText, agentService.workModel);
-        estimatedSats = usdToSats(estimatedCostUsd, btcPriceUsd);
-      }
+      const { estimatedCostUsd } = pricingService.estimateRequestCost(requestText, agentService.workModel);
+      const estimatedSats = usdToSats(estimatedCostUsd, btcPriceUsd);
      ftDecision = await freeTierService.decide(session.nostrPubkey, estimatedSats);
    }

    if (evalResult.accepted) {
-      if (isImageRequest) {
-        try {
-          const imageResult = await agentService.executeImageWork(requestText);
-          const mediaId = randomUUID();
-          const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); // 7 days
-
-          await db.insert(jobMedia).values({
-            id: mediaId,
-            entityId: requestId,
-            entityType: "session_request",
-            mediaType: "image",
-            mimeType: imageResult.mimeType,
-            data: imageResult.b64_json,
-            expiresAt,
-          });
-
-          mediaUrl = `/api/sessions/${id}/requests/${requestId}/media`;
-          mediaType = "image";
-          workCostUsd = pricingService.calculateImageFeeUsd();
-          result = `Image generated. View at: ${mediaUrl}`;
-          finalState = "complete";
-        } catch (err) {
-          errorMessage = err instanceof Error ? err.message : "Image generation error";
-          finalState = "failed";
-        }
-      } else {
-        try {
-          const workResult = await agentService.executeWork(requestText, history);
-          workInputTokens = workResult.inputTokens;
-          workOutputTokens = workResult.outputTokens;
-          workCostUsd = pricingService.calculateActualCostUsd(
-            workResult.inputTokens,
-            workResult.outputTokens,
-            agentService.workModel,
-          );
-          result = workResult.result;
-          finalState = "complete";
-        } catch (err) {
-          errorMessage = err instanceof Error ? err.message : "Execution error";
-          finalState = "failed";
-        }
+      try {
+        const workResult = await agentService.executeWork(requestText, history);
+        workInputTokens = workResult.inputTokens;
+        workOutputTokens = workResult.outputTokens;
+        workCostUsd = pricingService.calculateActualCostUsd(
+          workResult.inputTokens,
+          workResult.outputTokens,
+          agentService.workModel,
+        );
+        result = workResult.result;
+        finalState = "complete";
+      } catch (err) {
+        errorMessage = err instanceof Error ? err.message : "Execution error";
+        finalState = "failed";
      }
    } else {
      reason = evalResult.reason;
@@ -529,7 +491,6 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
      ...(result ? { result } : {}),
      ...(reason ? { reason } : {}),
      ...(errorMessage ? { errorMessage } : {}),
-      ...(mediaUrl ? { mediaUrl, mediaType } : {}),
      debitedSats,
      balanceRemaining: newBalance,
      ...(freeTierServed ? { free_tier: true, absorbed_sats: absorbedSats } : {}),
@@ -647,43 +608,4 @@ router.delete("/sessions/:id/history", async (req: Request, res: Response) => {
  }
 });

-// ── GET /sessions/:id/requests/:requestId/media ───────────────────────────────
-
-router.get("/sessions/:id/requests/:requestId/media", async (req: Request, res: Response) => {
-  const sessionId = req.params.id as string;
-  const requestId = req.params.requestId as string;
-
-  try {
-    const session = await getSessionById(sessionId);
-    if (!session) { res.status(404).json({ error: "Session not found" }); return; }
-
-    const rows = await db
-      .select()
-      .from(jobMedia)
-      .where(eq(jobMedia.entityId, requestId))
-      .limit(1);
-
-    const media = rows[0];
-    if (!media) {
-      res.status(404).json({ error: "No media found for this request" });
-      return;
-    }
-
-    if (new Date() > media.expiresAt) {
-      res.status(410).json({ error: "Media has expired" });
-      return;
-    }
-
-    res.json({
-      requestId,
-      mediaType: media.mediaType,
-      mimeType: media.mimeType,
-      data: media.data,
-      expiresAt: media.expiresAt.toISOString(),
-    });
-  } catch (err) {
-    res.status(500).json({ error: err instanceof Error ? err.message : "Failed to fetch media" });
-  }
-});
-
 export default router;
--- a/artifacts/api-server/src/routes/testkit.ts
+++ b/artifacts/api-server/src/routes/testkit.ts
@@ -29,12 +29,6 @@ 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 =
@@ -1098,208 +1092,6 @@ 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/(tabs)/_layout.tsx
+++ b/artifacts/mobile/app/(tabs)/_layout.tsx
@@ -1,11 +1,11 @@
 import { BlurView } from "expo-blur";
 import { isLiquidGlassAvailable } from "expo-glass-effect";
-import { Link, Tabs, router } from "expo-router";
+import { Link, Tabs } from "expo-router";
 import { Icon, Label, NativeTabs } from "expo-router/unstable-native-tabs";
 import { SymbolView } from "expo-symbols";
 import { Feather, MaterialCommunityIcons, Ionicons } from "@expo/vector-icons";
 import React from "react";
-import { Platform, Pressable, StyleSheet, View, useColorScheme } from "react-native";
+import { Platform, Pressable, StyleSheet, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";

 import { Colors } from "@/constants/colors";
@@ -13,16 +13,16 @@ import { Colors } from "@/constants/colors";
 function NativeTabLayout() {
  return (
    <NativeTabs>
-      <NativeTabs.Trigger name=\"index\">
-        <Icon sf={{ default: \"face.smiling\", selected: \"face.smiling.fill\" }} />
+      <NativeTabs.Trigger name="index">
+        <Icon sf={{ default: "face.smiling", selected: "face.smiling.fill" }} />
        <Label>Timmy</Label>
      </NativeTabs.Trigger>
-      <NativeTabs.Trigger name=\"matrix\">
-        <Icon sf={{ default: \"cube\", selected: \"cube.fill\" }} />
+      <NativeTabs.Trigger name="matrix">
+        <Icon sf={{ default: "cube", selected: "cube.fill" }} />
        <Label>Matrix</Label>
      </NativeTabs.Trigger>
-      <NativeTabs.Trigger name=\"feed\">
-        <Icon sf={{ default: \"list.bullet\", selected: \"list.bullet.circle.fill\" }} />
+      <NativeTabs.Trigger name="feed">
+        <Icon sf={{ default: "list.bullet", selected: "list.bullet.circle.fill" }} />
        <Label>Feed</Label>
      </NativeTabs.Trigger>
    </NativeTabs>
@@ -35,11 +35,14 @@ function ClassicTabLayout() {
  const isWeb = Platform.OS === "web";
  const C = Colors.dark;

+  void insets; // used by callers that extend this
+
  return (
    <Tabs
      screenOptions={{
        headerShown: false,
-        tabBarActiveTintColor: C.accentGlow,\n        tabBarInactiveTintColor: C.textMuted,
+        tabBarActiveTintColor: C.accentGlow,
+        tabBarInactiveTintColor: C.textMuted,
        tabBarStyle: {
          position: "absolute",
          backgroundColor: isIOS ? "transparent" : C.surface,
@@ -51,7 +54,7 @@ function ClassicTabLayout() {
          isIOS ? (
            <BlurView
              intensity={80}
-              tint=\"dark\"
+              tint="dark"
              style={[StyleSheet.absoluteFill, { borderTopWidth: 0.5, borderTopColor: C.border }]}
            />
          ) : isWeb ? (
@@ -60,53 +63,60 @@ function ClassicTabLayout() {
            />
          ) : (
            <View style={[StyleSheet.absoluteFill, { backgroundColor: C.surface, borderTopWidth: 0.5, borderTopColor: C.border }]} />
-          ),\
-      }}\
+          ),
+      }}
    >
      <Tabs.Screen
-        name=\"index\"
+        name="index"
        options={{
          title: "Timmy",
          headerShown: true,
-          headerRight: () => (\n            <Link href=\"/settings\" asChild>\n              <Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>
-                <Ionicons name=\"settings-outline\" size={24} color={C.text} style={{ marginRight: 15 }} />\n              </Pressable>\n            </Link>\n          ),
+          headerRight: () => (
+            <Link href="/settings" asChild>
+              <Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>
+                <Ionicons name="settings-outline" size={24} color={C.text} style={{ marginRight: 15 }} />
+              </Pressable>
+            </Link>
+          ),
          tabBarIcon: ({ color, size }) =>
            isIOS ? (
-              <SymbolView name=\"face.smiling\" tintColor={color} size={size} />
+              <SymbolView name="face.smiling" tintColor={color} size={size} />
            ) : (
-              <MaterialCommunityIcons name=\"emoticon-outline\" size={size} color={color} />
-            ),\
-        }}\
+              <MaterialCommunityIcons name="emoticon-outline" size={size} color={color} />
+            ),
+        }}
      />
      <Tabs.Screen
-        name=\"matrix\"
+        name="matrix"
        options={{
          title: "Matrix",
          tabBarIcon: ({ color, size }) =>
            isIOS ? (
-              <SymbolView name=\"cube\" tintColor={color} size={size} />
+              <SymbolView name="cube" tintColor={color} size={size} />
            ) : (
-              <MaterialCommunityIcons name=\"cube-outline\" size={size} color={color} />
-            ),\
-        }}\
+              <MaterialCommunityIcons name="cube-outline" size={size} color={color} />
+            ),
+        }}
      />
      <Tabs.Screen
-        name=\"feed\"
+        name="feed"
        options={{
          title: "Feed",
          tabBarIcon: ({ color, size }) =>
            isIOS ? (
-              <SymbolView name=\"list.bullet\" tintColor={color} size={size} />
+              <SymbolView name="list.bullet" tintColor={color} size={size} />
            ) : (
-              <Feather name=\"activity\" size={size} color={color} />
-            ),\
-        }}\
+              <Feather name="activity" size={size} color={color} />
+            ),
+        }}
      />
    </Tabs>
  );
 }

 export default function TabLayout() {
-  if (isLiquidGlassAvailable()) {\n    return (\n      <NativeTabs>\n        <NativeTabs.Screen\n          name=\"index\"\n          options={{\n            title: \"Timmy\",\n            headerShown: true,\n            headerRight: () => (\n              <Link href=\"/settings\" asChild>\n                <Pressable style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}>\n                  <Ionicons name=\"settings-outline\" size={24} color={C.text} style={{ marginRight: 15 }} />\n                </Pressable>\n              </Link>\n            ),\n          }}\n        />\n        <NativeTabs.Screen name=\"matrix\" />\n        <NativeTabs.Screen name=\"feed\" />\n      </NativeTabs>\n    );\n  }
-  return <ClassicTabLayout />;\
+  if (isLiquidGlassAvailable()) {
+    return <NativeTabLayout />;
+  }
+  return <ClassicTabLayout />;
 }
--- a/artifacts/mobile/app/settings.tsx
+++ b/artifacts/mobile/app/settings.tsx
@@ -2,7 +2,6 @@ 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';
@@ -13,49 +12,30 @@ 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 { connectionStatus } = useTimmy();
  const C = Colors.dark;

-  const [serverUrl, setServerUrl] = useState(apiBaseUrl);
+  const [serverUrl, setServerUrl] = useState('');
  const [jobCompletionNotifications, setJobCompletionNotifications] = useState(false);
  const [lowBalanceWarning, setLowBalanceWarning] = useState(false);
-  const [currentNpub, setCurrentNpub] = useState<string | null>(nostrPublicKey);

  useEffect(() => {
-    // Load settings from AsyncStorage and SecureStore
    const loadSettings = async () => {
      const storedServerUrl = await AsyncStorage.getItem(STORAGE_KEYS.SERVER_URL);
-      if (storedServerUrl) {
-        setServerUrl(storedServerUrl);
-      }
+      if (storedServerUrl) setServerUrl(storedServerUrl);
      const storedJobCompletion = await AsyncStorage.getItem(STORAGE_KEYS.NOTIFICATIONS_JOB_COMPLETION);
-      if (storedJobCompletion !== null) {
-        setJobCompletionNotifications(JSON.parse(storedJobCompletion));
-      }
+      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);
+      if (storedLowBalance !== null) setLowBalanceWarning(JSON.parse(storedLowBalance));
    };
    loadSettings();
-  }, [nostrPublicKey]);
+  }, []);

-  // 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 handleServerUrlSave = async () => {
+    await AsyncStorage.setItem(STORAGE_KEYS.SERVER_URL, serverUrl);
  };

  const toggleJobCompletionNotifications = async () => {
@@ -70,32 +50,11 @@ export default function SettingsScreen() {
    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 appVersion = Constants.expoConfig?.version ?? 'N/A';
+  const buildCommitHash = (Constants.expoConfig?.extra as Record<string, string> | undefined)?.gitCommitHash ?? 'N/A';
  const giteaRepoUrl = 'http://143.198.27.163:3000/replit/timmy-tower';

-  const openGiteaLink = () => {
-    Linking.openURL(giteaRepoUrl);
-  };
+  const openGiteaLink = () => { Linking.openURL(giteaRepoUrl); };

  return (
    <View style={styles.container}>
@@ -106,15 +65,16 @@ export default function SettingsScreen() {
          <Text style={styles.settingLabel}>Server URL</Text>
          <View style={styles.serverUrlContainer}>
            <TextInput
-              style={[styles.input, { color: C.text, backgroundColor: C.field }]} // Apply text and background color from Colors
+              style={[styles.input, { color: C.text, backgroundColor: C.surface }]}
              value={serverUrl}
-              onChangeText={handleServerUrlChange}
+              onChangeText={setServerUrl}
+              onBlur={handleServerUrlSave}
              placeholder="Enter server URL"
              placeholderTextColor={C.textMuted}
              autoCapitalize="none"
              autoCorrect={false}
            />
-            <ConnectionBadge isConnected={isConnected} />
+            <ConnectionBadge status={connectionStatus} />
          </View>
        </View>

@@ -124,7 +84,7 @@ export default function SettingsScreen() {
          <Switch
            trackColor={{ false: C.surface, true: C.accentGlow }}
            thumbColor={Platform.OS === 'android' ? C.text : ''}
-            ios_backgroundColor={C.field}
+            ios_backgroundColor={C.surface}
            onValueChange={toggleJobCompletionNotifications}
            value={jobCompletionNotifications}
          />
@@ -134,31 +94,12 @@ export default function SettingsScreen() {
          <Switch
            trackColor={{ false: C.surface, true: C.accentGlow }}
            thumbColor={Platform.OS === 'android' ? C.text : ''}
-            ios_backgroundColor={C.field}
+            ios_backgroundColor={C.surface}
            onValueChange={toggleLowBalanceWarning}
            value={lowBalanceWarning}
          />
        </View>

-        <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 }]}>
-            {currentNpub ? `${currentNpub.substring(0, 10)}...${currentNpub.substring(currentNpub.length - 5)}` : 'Not connected'}
-          </Text>
-        </View>
-        <View style={styles.buttonContainer}>
-          {!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>
-          )}
-        </View>
-
        <Text style={styles.sectionHeader}>About</Text>
        <View style={styles.settingItem}>
          <Text style={styles.settingLabel}>App Version</Text>
@@ -170,7 +111,7 @@ export default function SettingsScreen() {
        </View>
        <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.accentGlow }]}>View project on Gitea</Text>
        </Pressable>
      </ScrollView>
    </View>
@@ -180,7 +121,7 @@ export default function SettingsScreen() {
 const styles = StyleSheet.create({
  container: {
    flex: 1,
-    backgroundColor: Colors.dark.background, // Use background color from Colors
+    backgroundColor: Colors.dark.background,
  },
  scrollContent: {
    padding: 20,
@@ -223,27 +164,13 @@ const styles = StyleSheet.create({
    fontSize: 14,
    marginRight: 10,
  },
-  buttonContainer: {
-    marginTop: 20,
-    alignItems: 'flex-start',
-  },
-  button: {
-    paddingVertical: 10,
-    paddingHorizontal: 15,
-    borderRadius: 8,
-  },
-  buttonText: {
-    fontSize: 16,
-    fontWeight: 'bold',
-  },
  linkButton: {
    flexDirection: 'row',
    alignItems: 'center',
-    marginTop: 15,
-    paddingVertical: 8,
+    gap: 6,
+    paddingVertical: 12,
  },
  linkButtonText: {
-    marginLeft: 5,
    fontSize: 16,
  },
 });
--- a/lib/db/migrations/0010_job_media.sql
+++ b/lib/db/migrations/0010_job_media.sql
@@ -1,26 +0,0 @@
-- Migration: Image generation media storage (#19)
-- Adds job_media table for storing generated images (base64) with 7-day TTL.
-- Also adds media_type column to jobs table to flag image-type work.
-
-- ── job_media ─────────────────────────────────────────────────────────────────
-- Stores generated media for both standalone jobs and session requests.
-- entity_id is polymorphic: job ID or session request ID.
-- expires_at is set to NOW + 7 days at insert time.
-
-CREATE TABLE IF NOT EXISTS job_media (
-  id          TEXT PRIMARY KEY,
-  entity_id   TEXT NOT NULL,        -- job ID or session request ID
-  entity_type TEXT NOT NULL,        -- 'job' | 'session_request'
-  media_type  TEXT NOT NULL,        -- 'image'
-  mime_type   TEXT NOT NULL,        -- e.g. 'image/png'
-  data        TEXT NOT NULL,        -- base64-encoded image data
-  created_at  TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-  expires_at  TIMESTAMPTZ NOT NULL
-);
-
-CREATE INDEX IF NOT EXISTS idx_job_media_entity_id ON job_media(entity_id);
-
-- ── jobs.media_type ───────────────────────────────────────────────────────────
-- Nullable flag set during eval phase for image-generation requests.
-
-ALTER TABLE jobs ADD COLUMN IF NOT EXISTS media_type TEXT;
--- a/lib/db/src/schema/index.ts
+++ b/lib/db/src/schema/index.ts
@@ -14,4 +14,3 @@ export * from "./relay-accounts";
 export * from "./relay-event-queue";
 export * from "./job-debates";
 export * from "./session-messages";
-export * from "./job-media";
--- a/lib/db/src/schema/job-media.ts
+++ b/lib/db/src/schema/job-media.ts
@@ -1,19 +0,0 @@
-import { pgTable, text, timestamp } from "drizzle-orm/pg-core";
-
-/**
- * job_media — stores generated media (images) for jobs and session requests.
- * entityId is polymorphic: it can be a job ID or a session request ID.
- * expiresAt is set to NOW + 7 days; a cleanup job should purge expired rows.
- */
-export const jobMedia = pgTable("job_media", {
-  id: text("id").primaryKey(),
-  entityId: text("entity_id").notNull(),       // job ID or session request ID
-  entityType: text("entity_type").notNull(),   // 'job' | 'session_request'
-  mediaType: text("media_type").notNull(),      // 'image'
-  mimeType: text("mime_type").notNull(),        // e.g. 'image/png'
-  data: text("data").notNull(),                 // base64-encoded image data
-  createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
-  expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
-});
-
-export type JobMedia = typeof jobMedia.$inferSelect;
--- a/lib/db/src/schema/jobs.ts
+++ b/lib/db/src/schema/jobs.ts
@@ -52,9 +52,6 @@ export const jobs = pgTable("jobs", {
  refundState: text("refund_state").$type<"not_applicable" | "pending" | "paid">(),
  refundPaymentHash: text("refund_payment_hash"),

-  // ── Image generation (set during eval if request is an image job) ───────────
-  mediaType: text("media_type"),  // 'image' | null
-
  createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
  updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
 });
--- a/the-matrix/js/edge-worker-client.js
+++ b/the-matrix/js/edge-worker-client.js
@@ -10,6 +10,7 @@
 *                       }>
 *   sentiment(text)  → Promise<{ label:'POSITIVE'|'NEGATIVE'|'NEUTRAL', score }>
 *   onReady(fn)      → register a callback fired when models finish loading
+ *   onError(fn)      → register a callback fired if the worker fails to boot
 *   isReady()        → boolean — true once both models are warm
 *   warmup()         → start the worker early so first classify() is fast
 *
@@ -23,8 +24,9 @@
 */

 let _worker = null;
-let _ready  = false;
+let _ready   = false;
 let _readyCb = null;
+let _errorCb = null;
 const _pending = new Map(); // id → { resolve, reject }
 let _nextId = 1;

@@ -45,6 +47,7 @@ function _init() {
      }
      if (data?.type === 'error') {
        console.warn('[edge-worker] worker boot error:', data.message);
+        if (_errorCb) { _errorCb(data.message); _errorCb = null; }
        // Resolve all pending with fallback values
        for (const [, { resolve }] of _pending) resolve(_fallback(null));
        _pending.clear();
@@ -103,6 +106,11 @@ export function onReady(fn) {
  _readyCb = fn;
 }

+/** Register a callback fired if the worker fails to boot (model load error). */
+export function onError(fn) {
+  _errorCb = fn;
+}
+
 export function isReady() { return _ready; }

 /**
--- a/the-matrix/js/main.js
+++ b/the-matrix/js/main.js
@@ -12,8 +12,8 @@ import { initWebSocket, getConnectionState, getJobCount } from './websocket.js';
 import { initPaymentPanel } from './payment.js';
 import { initSessionPanel } 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';
+import { warmup as warmupEdgeWorker, onReady as onEdgeWorkerReady, onError as onEdgeWorkerError } from './edge-worker-client.js';
+import { setEdgeWorkerReady, setEdgeWorkerLoading, setEdgeWorkerError } from './ui.js';
 import { initTimmyId } from './timmy-id.js';
 import { AGENT_DEFS } from './agent-defs.js';
 import { initNavigation, updateNavigation, disposeNavigation } from './navigation.js';
@@ -47,8 +47,10 @@ function buildWorld(firstInit, stateSnapshot) {
    initPaymentPanel();
    initSessionPanel();
    void initNostrIdentity('/api');
+    setEdgeWorkerLoading();
    warmupEdgeWorker();
    onEdgeWorkerReady(() => setEdgeWorkerReady());
+    onEdgeWorkerError(() => setEdgeWorkerError());
    void initTimmyId();
  }

--- a/the-matrix/js/session.js
+++ b/the-matrix/js/session.js
@@ -157,20 +157,15 @@ export async function sessionSendHandler(text) {
    _saveToStorage();
    _applySessionUI();

-    if (data.mediaType === 'image' && data.mediaUrl) {
-      // Fetch image data and render inline
-      _renderImageResponse(data.mediaUrl, text);
-    } else {
-      const reply = data.result || data.reason || '…';
-      setSpeechBubble(reply);
-      appendSystemMessage('Timmy: ' + reply.slice(0, 80));
+    const reply = data.result || data.reason || '…';
+    setSpeechBubble(reply);
+    appendSystemMessage('Timmy: ' + reply.slice(0, 80));

-      // Sentiment-driven mood on inbound Timmy reply
-      sentiment(reply).then(s => {
-        setMood(s.label);
-        setTimeout(() => setMood(null), 10_000);
-      }).catch(() => {});
-    }
+    // Sentiment-driven mood on inbound Timmy reply
+    sentiment(reply).then(s => {
+      setMood(s.label);
+      setTimeout(() => setMood(null), 10_000);
+    }).catch(() => {});

    // Update active-step balance if panel is open
    _updateActiveStep();
@@ -183,66 +178,6 @@ export async function sessionSendHandler(text) {
  }
 }

-// ── Image rendering ───────────────────────────────────────────────────────────
-
-async function _renderImageResponse(mediaUrl, prompt) {
-  const $log = document.getElementById('event-log');
-  if (!$log) return;
-
-  setSpeechBubble('✨ Here is your image!');
-  appendSystemMessage('Timmy: ✨ Image generated!');
-
-  try {
-    const res = await fetch(mediaUrl);
-    if (!res.ok) {
-      appendSystemMessage('Timmy: Image ready — ' + mediaUrl);
-      return;
-    }
-    const data = await res.json();
-    const src = `data:${data.mimeType};base64,${data.data}`;
-
-    const container = document.createElement('div');
-    container.className = 'log-entry timmy-image-result';
-    container.style.cssText = [
-      'margin:6px 0;padding:6px;',
-      'border:1px solid #336655;border-radius:4px;',
-      'background:#0a1a14;',
-    ].join('');
-
-    const img = document.createElement('img');
-    img.src = src;
-    img.alt = prompt.slice(0, 60);
-    img.style.cssText = [
-      'max-width:100%;max-height:240px;',
-      'display:block;border-radius:3px;',
-      'cursor:pointer;',
-    ].join('');
-    img.title = 'Click to view full size';
-
-    const dlBtn = document.createElement('a');
-    dlBtn.href = src;
-    dlBtn.download = 'timmy-image.png';
-    dlBtn.textContent = '⬇ Download';
-    dlBtn.style.cssText = [
-      'display:inline-block;margin-top:4px;',
-      'font-size:10px;color:#44cc88;',
-      'text-decoration:none;letter-spacing:1px;',
-    ].join('');
-
-    container.appendChild(img);
-    container.appendChild(dlBtn);
-
-    const entries = $log.querySelectorAll('.log-entry');
-    if (entries.length >= 6) {
-      $log.removeChild(entries[0]);
-    }
-    $log.appendChild(container);
-    $log.scrollTop = $log.scrollHeight;
-  } catch {
-    appendSystemMessage('Timmy: Image generated — ' + mediaUrl);
-  }
-}
-
 // ── Panel open/close ──────────────────────────────────────────────────────────

 function _openPanel() {
--- a/the-matrix/js/ui.js
+++ b/the-matrix/js/ui.js
@@ -32,32 +32,48 @@ export function setInputBarSessionMode(active, placeholder) {
 }

 // ── Model-ready indicator ─────────────────────────────────────────────────────
-// A small badge on the input bar showing when local AI is warm and ready.
-// Hidden until the first `ready` event from the edge worker.
+// A small badge on the input bar showing local AI status: loading / ready / error.
+// Appears immediately when warmup() starts so users know the worker is initialising.

 let $readyBadge = null;

-export function setEdgeWorkerReady() {
-  if (!$readyBadge) {
-    $readyBadge = document.createElement('span');
-    $readyBadge.id = 'edge-ready-badge';
-    $readyBadge.title = 'Local AI active — trivial queries answered without Lightning payment';
-    $readyBadge.style.cssText = [
-      'font-size:10px;color:#44cc88;border:1px solid #226644',
-      'border-radius:3px;padding:1px 5px;margin-left:6px',
-      'vertical-align:middle;cursor:default',
-    ].join(';');
-    $readyBadge.textContent = '⚡ local AI';
-    const $input = document.getElementById('visitor-input');
-    $input?.insertAdjacentElement('afterend', $readyBadge);
-    // Fallback: append to send button area
-    if (!$readyBadge.isConnected) {
-      document.getElementById('send-btn')?.insertAdjacentElement('afterend', $readyBadge);
-    }
+const EDGE_STATES = {
+  loading: { text: '◌ AI loading', color: '#88aacc', border: '#335577', title: 'Local AI model loading…' },
+  ready:   { text: '⚡ local AI',  color: '#44cc88', border: '#226644', title: 'Local AI active — trivial queries answered without Lightning payment' },
+  error:   { text: '✕ AI offline', color: '#cc6644', border: '#773322', title: 'Local AI failed to load — all requests will be routed to server' },
+};
+
+function _ensureEdgeBadge() {
+  if ($readyBadge) return $readyBadge;
+  $readyBadge = document.createElement('span');
+  $readyBadge.id = 'edge-ready-badge';
+  $readyBadge.style.cssText = [
+    'font-size:10px;border-radius:3px;padding:1px 5px;margin-left:6px',
+    'vertical-align:middle;cursor:default;transition:color .3s,border-color .3s',
+  ].join(';');
+  const $input = document.getElementById('visitor-input');
+  $input?.insertAdjacentElement('afterend', $readyBadge);
+  if (!$readyBadge.isConnected) {
+    document.getElementById('send-btn')?.insertAdjacentElement('afterend', $readyBadge);
  }
-  $readyBadge.style.display = '';
+  return $readyBadge;
 }

+export function setEdgeWorkerStatus(state) {
+  const cfg = EDGE_STATES[state] ?? EDGE_STATES.loading;
+  const el = _ensureEdgeBadge();
+  el.textContent    = cfg.text;
+  el.title          = cfg.title;
+  el.style.color    = cfg.color;
+  el.style.border   = `1px solid ${cfg.border}`;
+  el.style.display  = '';
+}
+
+/** Convenience wrappers kept for backward-compat with main.js callers. */
+export function setEdgeWorkerReady()   { setEdgeWorkerStatus('ready'); }
+export function setEdgeWorkerLoading() { setEdgeWorkerStatus('loading'); }
+export function setEdgeWorkerError()   { setEdgeWorkerStatus('error'); }
+
 // ── Cost preview badge ────────────────────────────────────────────────────────
 // Shown beneath the input bar: "~N sats" / "FREE" / "answered locally".
 // Fetched from GET /api/estimate once the user stops typing (300 ms debounce).