3 Commits

Author SHA1 Message Date
Alexander Whitestone
c2f2cfe3ea feat: add Tower Log narrative event feed (Fixes #7)
Some checks failed
CI / Typecheck & Lint (pull_request) Failing after 0s
Adds the tower_log DB table, a narrateEvent method on AgentService (Haiku-powered, stub-safe), a tower-log service that persists and broadcasts entries, a GET /api/tower-log REST endpoint, WebSocket bootstrap and real-time push, and a bottom-sheet Tower Log panel in the-matrix UI with fade-in animations and auto-scroll.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-23 22:43:10 -04:00
b6569aeedc [claude] Mobile: Job history tab showing completed jobs (#31) (#107) 2026-03-24 02:26:13 +00:00
1e2edeee77 [claude] Nostr identity lifecycle coverage T41–T45 (#55) (#106) 2026-03-24 02:20:34 +00:00
20 changed files with 1124 additions and 119 deletions

View File

@@ -280,48 +280,6 @@ No hedging, no steering them back to the hosted version. The magic is meant to b
if (block.type !== "text") return "The crystal ball is cloudy… try again.";
return block.text!.trim();
}
async generateVisitorGreeting(ip: string): Promise<string> {
if (STUB_MODE) {
return STUB_CHAT_REPLIES[Math.floor(Math.random() * STUB_CHAT_REPLIES.length)]!;
}
const client = await getClient();
const now = new Date();
const hour = now.getHours();
let timeOfDay: string;
if (hour < 12) timeOfDay = "morning";
else if (hour < 18) timeOfDay = "afternoon";
else timeOfDay = "evening";
const message = await client.messages.create({
model: this.evalModel,
max_tokens: 100,
system: `You are Timmy, a whimsical wizard who runs a mystical workshop powered by Bitcoin Lightning. You are greeting a new visitor. Make it short (1-2 sentences), personalized to the time of day, and welcoming. Reference the current time of day (${timeOfDay}).`,
messages: [{ role: "user", content: `A new visitor has arrived with IP address ${ip}. Greet them!` }],
});
const block = message.content[0];
if (block.type !== "text") return "A new visitor has arrived!";
return block.text!.trim();
}
async generateVisitorFarewell(): Promise<string> {
if (STUB_MODE) {
return "Farewell, traveler!";
}
const client = await getClient();
const message = await client.messages.create({
model: this.evalModel,
max_tokens: 100,
system: `You are Timmy, a whimsical wizard who runs a mystical workshop powered by Bitcoin Lightning. A visitor has just left. Bid them a short (1-2 sentences) and warm farewell.`,
messages: [{ role: "user", content: `A visitor has just left. Bid them farewell!` }],
});
const block = message.content[0];
if (block.type !== "text") return "A visitor has departed!";
return block.text!.trim();
}
/**
* Run a mini debate on a borderline eval request (#21).
* Two opposing Haiku calls argue accept vs reject, then a third synthesizes.
@@ -484,6 +442,89 @@ Respond ONLY with valid JSON: {"accepted": true/false, "reason": "..."}`,
return "";
}
}
/**
* Generate a short narrative entry for the Tower Log.
* Uses Haiku (evalModel) with Timmy's wizardly persona.
* Returns a single sentence under 100 characters.
*
* In STUB_MODE returns a canned narrative so the full flow
* can be exercised without an Anthropic API key.
*/
async narrateEvent(eventType: string, context?: string): Promise<string> {
const STUB_NARRATIVES: Record<string, string[]> = {
"job:complete": [
"Timmy conjures a brilliant solution, weaving lightning and wisdom.",
"Another quest fulfilled — the Workshop hums with quiet satisfaction.",
"The crystal ball glows as Timmy delivers yet another worthy result.",
],
"job:rejected": [
"With gentle wisdom, Timmy declines — not all quests suit the Workshop.",
"The Beta oracle speaks: this path shall not be walked today.",
],
"job:failed": [
"The arcane machinery sputters — a job falters in the ether.",
"Even wizards face setbacks; Timmy regroups and stands ready.",
],
"visitor:enter": [
"A new traveler arrives, drawn by the Workshop's lightning glow.",
"The Workshop doors swing open to welcome another seeker.",
"Another soul finds the Workshop, guided by satoshi starlight.",
],
"visitor:leave": [
"A visitor departs, carrying a spark of the Workshop's magic.",
"The door closes softly — one more seeker returns to the world.",
],
"payment:eval": [
"⚡ Lightning strikes — eval fee confirmed, wisdom unlocked.",
"Sats flow in; the Workshop's scales tip toward action.",
],
"payment:work": [
"⚡ Work payment confirmed — Gamma stirs to weave the answer.",
"The Lightning Network delivers; Timmy's full power is unleashed.",
],
};
const candidates = STUB_NARRATIVES[eventType]
?? ["The Workshop stirs with quiet, purposeful magic."];
if (STUB_MODE) {
return candidates[Math.floor(Math.random() * candidates.length)]!;
}
const EVENT_CONTEXT: Record<string, string> = {
"job:complete": "A visitor's paid job completed successfully in Timmy's Workshop.",
"job:rejected": "A visitor's job request was rejected after AI evaluation.",
"job:failed": "A job failed unexpectedly in the Workshop.",
"visitor:enter": "A new visitor just entered Timmy's Workshop.",
"visitor:leave": "A visitor just left Timmy's Workshop.",
"payment:eval": "A visitor paid the evaluation fee via Lightning.",
"payment:work": "A visitor paid the work fee via Lightning, unlocking execution.",
};
const baseContext = EVENT_CONTEXT[eventType] ?? "Something noteworthy happened in the Workshop.";
const fullContext = context ? `${baseContext} ${context}` : baseContext;
try {
const client = await getClient();
const message = await client.messages.create({
model: this.evalModel, // Haiku — cheap and fast
max_tokens: 80,
system: `You are the chronicler of Timmy's Workshop — a mystical tower powered by Bitcoin Lightning where an AI wizard named Timmy fulfills paid quests for visitors.
Write a single vivid sentence (strictly under 100 characters) narrating what just happened.
Style: wizardly, warm, slightly epic. Present tense. No quotes. No hashtags.`,
messages: [{ role: "user", content: `Narrate this event: ${fullContext}` }],
});
const block = message.content[0];
if (block?.type === "text") {
const text = block.text!.trim().replace(/^["']|["']$/g, "");
return text.slice(0, 120); // hard cap
}
return candidates[0]!;
} catch (err) {
logger.warn("narrateEvent failed", { eventType, err: String(err) });
return candidates[Math.floor(Math.random() * candidates.length)]!;
}
}
}
export const agentService = new AgentService();

View File

@@ -21,7 +21,10 @@ export type CostEvent =
export type CommentaryEvent =
| { type: "agent_commentary"; agentId: string; jobId: string; text: string };
export type BusEvent = JobEvent | SessionEvent | DebateEvent | CostEvent | CommentaryEvent;
export type TowerLogEvent =
| { type: "tower_log:entry"; id: string; narrative: string; eventType: string; agentId: string | null; jobId: string | null; createdAt: string };
export type BusEvent = JobEvent | SessionEvent | DebateEvent | CostEvent | CommentaryEvent | TowerLogEvent;
class EventBus extends EventEmitter {
emit(event: "bus", data: BusEvent): boolean;

View File

@@ -0,0 +1,74 @@
/**
* Tower Log — narrative event feed (#7).
*
* Generates a prose narrative entry via Haiku whenever a key Workshop event
* occurs, persists it to the tower_log DB table, and emits it on the eventBus
* so connected WebSocket clients receive it in real time.
*/
import { randomUUID } from "crypto";
import { db, towerLog } from "@workspace/db";
import { desc } from "drizzle-orm";
import { eventBus } from "./event-bus.js";
import { agentService } from "./agent.js";
import { makeLogger } from "./logger.js";
const logger = makeLogger("tower-log");
export interface TowerLogRow {
id: string;
narrative: string;
eventType: string;
agentId: string | null;
jobId: string | null;
createdAt: Date;
}
/**
* Generate a narrative entry, persist it, and broadcast it via eventBus.
* Non-fatal — errors are logged but never thrown.
*/
export async function addTowerLogEntry(
eventType: string,
context?: string,
agentId?: string,
jobId?: string,
): Promise<void> {
try {
const narrative = await agentService.narrateEvent(eventType, context);
const id = randomUUID();
await db.insert(towerLog).values({
id,
narrative,
eventType,
agentId: agentId ?? null,
jobId: jobId ?? null,
});
// Broadcast to connected WS clients
eventBus.publish({
type: "tower_log:entry",
id,
narrative,
eventType,
agentId: agentId ?? null,
jobId: jobId ?? null,
createdAt: new Date().toISOString(),
});
} catch (err) {
logger.warn("addTowerLogEntry failed", { eventType, err: String(err) });
}
}
/**
* Fetch the most recent N entries from the DB, oldest-first.
*/
export async function getRecentTowerLog(limit = 20): Promise<TowerLogRow[]> {
const rows = await db
.select()
.from(towerLog)
.orderBy(desc(towerLog.createdAt))
.limit(limit);
return rows.reverse();
}

View File

@@ -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();

View File

@@ -6,7 +6,6 @@ export interface TimmyState {
export interface WorldState {
timmyState: TimmyState;
agentStates: Record<string, string>;
visitorCount: number;
updatedAt: string;
}
@@ -18,22 +17,9 @@ const DEFAULT_TIMMY: TimmyState = {
const _state: WorldState = {
timmyState: { ...DEFAULT_TIMMY },
agentStates: { alpha: "idle", beta: "idle", gamma: "idle", delta: "idle" },
visitorCount: 0,
updatedAt: new Date().toISOString(),
};
export function incrementVisitorCount(): number {
_state.visitorCount++;
_state.updatedAt = new Date().toISOString();
return _state.visitorCount;
}
export function decrementVisitorCount(): number {
_state.visitorCount--;
_state.updatedAt = new Date().toISOString();
return _state.visitorCount;
}
export function getWorldState(): WorldState {
return {
timmyState: { ..._state.timmyState },

View File

@@ -30,13 +30,9 @@ import { WebSocketServer } from "ws";
import type { Server } from "http";
import { eventBus, type BusEvent } from "../lib/event-bus.js";
import { makeLogger } from "../lib/logger.js";
import {
getWorldState,
setAgentStateInWorld,
incrementVisitorCount,
decrementVisitorCount,
} from "../lib/world-state.js";
import { getWorldState, setAgentStateInWorld } from "../lib/world-state.js";
import { agentService } from "../lib/agent.js";
import { addTowerLogEntry, getRecentTowerLog } from "../lib/tower-log.js";
import { db, worldEvents } from "@workspace/db";
const logger = makeLogger("ws-events");
@@ -274,6 +270,18 @@ function translateEvent(ev: BusEvent): object | null {
text: ev.text,
};
// ── Tower Log (#7) ────────────────────────────────────────────────────────
case "tower_log:entry":
return {
type: "tower_log_entry",
id: ev.id,
narrative: ev.narrative,
eventType: ev.eventType,
agentId: ev.agentId,
jobId: ev.jobId,
createdAt: ev.createdAt,
};
default:
return null;
}
@@ -311,6 +319,17 @@ async function sendWorldStateBootstrap(socket: WebSocket): Promise<void> {
} catch {
send(socket, { type: "world_state", ...getWorldState(), recentEvents: [] });
}
// Send recent tower log entries
try {
const logEntries = await getRecentTowerLog(20);
send(socket, {
type: "tower_log_history",
entries: logEntries,
});
} catch {
/* non-fatal */
}
}
export function attachWebSocketServer(server: Server): void {
@@ -320,13 +339,6 @@ export function attachWebSocketServer(server: Server): void {
const ip = req.headers["x-forwarded-for"] ?? req.socket.remoteAddress ?? "unknown";
logger.info("ws client connected", { ip, clients: wss.clients.size });
const newCount = incrementVisitorCount();
broadcastToAll(wss, { type: "visitor_count", count: newCount });
void (async () => {
const greeting = await agentService.generateVisitorGreeting(ip.toString());
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: greeting });
})();
void sendWorldStateBootstrap(socket);
const busHandler = (ev: BusEvent) => broadcast(socket, ev);
@@ -341,7 +353,34 @@ export function attachWebSocketServer(server: Server): void {
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string; npub?: string };
if (msg.type === "pong") return;
if (msg.type === "subscribe") {
send(socket, { type: "visitor_count", count: getWorldState().visitorCount });
send(socket, { type: "agent_count", count: wss.clients.size });
}
if (msg.type === "visitor_enter") {
const { visitorId, npub } = msg;
if (visitorId && npub) {
connectedVisitors.set(visitorId, npub);
const formattedNpub = `${npub.slice(0, 8)}${npub.slice(-4)}`;
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: `Welcome, Nostr user ${formattedNpub}! What can I help you with?` });
}
void addTowerLogEntry("visitor:enter", undefined, "timmy");
wss.clients.forEach(c => {
if (c !== socket && c.readyState === 1) {
c.send(JSON.stringify({ type: "visitor_count", count: wss.clients.size }));
}
});
send(socket, { type: "visitor_count", count: wss.clients.size });
}
if (msg.type === "visitor_leave") {
const { visitorId } = msg;
if (visitorId) {
connectedVisitors.delete(visitorId);
}
wss.clients.forEach(c => {
if (c !== socket && c.readyState === 1) {
c.send(JSON.stringify({ type: "visitor_count", count: Math.max(0, wss.clients.size - 1) }));
}
});
}
if (msg.type === "visitor_message" && msg.text) {
const text = String(msg.text).slice(0, 500);
@@ -387,25 +426,10 @@ export function attachWebSocketServer(server: Server): void {
}
});
const VISITOR_FAREWELL_THROTTLE_MS = 30_000;
let lastFarewellTime = 0;
socket.on("close", () => {
clearInterval(pingTimer);
eventBus.off("bus", busHandler);
logger.info("ws client disconnected", { clients: wss.clients.size - 1 });
const newCount = decrementVisitorCount();
broadcastToAll(wss, { type: "visitor_count", count: newCount });
const now = Date.now();
if (now - lastFarewellTime > VISITOR_FAREWELL_THROTTLE_MS) {
void (async () => {
const farewell = await agentService.generateVisitorFarewell();
broadcastToAll(wss, { type: "chat", agentId: "timmy", text: farewell });
})();
lastFarewellTime = now;
}
});
socket.on("error", (err) => {
@@ -438,13 +462,22 @@ export function attachWebSocketServer(server: Server): void {
agentId = "gamma"; phase = "starting";
} else if (ev.state === "complete") {
agentId = "alpha"; phase = "complete";
void addTowerLogEntry("job:complete", undefined, "alpha", ev.jobId);
} else if (ev.state === "rejected") {
agentId = "alpha"; phase = "rejected";
void addTowerLogEntry("job:rejected", undefined, "beta", ev.jobId);
} else if (ev.state === "failed") {
void addTowerLogEntry("job:failed", undefined, "alpha", ev.jobId);
}
} else if (ev.type === "job:paid") {
jobId = ev.jobId;
agentId = "delta";
phase = ev.invoiceType === "eval" ? "eval_paid" : "work_paid";
if (ev.invoiceType === "eval") {
void addTowerLogEntry("payment:eval", undefined, "delta", ev.jobId);
} else if (ev.invoiceType === "work") {
void addTowerLogEntry("payment:work", undefined, "delta", ev.jobId);
}
}
if (agentId && phase && jobId) {

View File

@@ -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;

View File

@@ -18,6 +18,7 @@ import adminRelayRouter from "./admin-relay.js";
import adminRelayQueueRouter from "./admin-relay-queue.js";
import geminiRouter from "./gemini.js";
import statsRouter from "./stats.js";
import towerLogRouter from "./tower-log.js";
const router: IRouter = Router();
@@ -33,6 +34,7 @@ router.use(relayRouter);
router.use(adminRelayRouter);
router.use(adminRelayQueueRouter);
router.use(demoRouter);
router.use(towerLogRouter);
router.use("/gemini", geminiRouter);
router.use(testkitRouter);
router.use(uiRouter);

View File

@@ -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
# ===========================================================================
# T41T45 — 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.
# ===========================================================================
# ---------------------------------------------------------------------------
# T41T45 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)
# ===========================================================================

View File

@@ -0,0 +1,21 @@
import { Router, type Request, type Response } from "express";
import { getRecentTowerLog } from "../lib/tower-log.js";
import { makeLogger } from "../lib/logger.js";
const logger = makeLogger("tower-log-route");
const router = Router();
/**
* GET /api/tower-log — return the 20 most recent narrative entries, oldest first.
*/
router.get("/tower-log", async (_req: Request, res: Response) => {
try {
const entries = await getRecentTowerLog(20);
res.json({ entries });
} catch (err) {
logger.error("GET /api/tower-log failed", { error: String(err) });
res.status(500).json({ error: "tower_log_error" });
}
});
export default router;

View File

@@ -0,0 +1,15 @@
-- Migration: Tower Log narrative event feed (#7)
-- Adds the tower_log table that stores prose narrative entries about
-- Workshop activity, generated by Haiku on key events.
CREATE TABLE IF NOT EXISTS tower_log (
id TEXT PRIMARY KEY,
narrative TEXT NOT NULL,
event_type TEXT NOT NULL,
agent_id TEXT,
job_id TEXT,
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);
CREATE INDEX IF NOT EXISTS idx_tower_log_created_at
ON tower_log(created_at DESC);

View File

@@ -14,3 +14,4 @@ export * from "./relay-accounts";
export * from "./relay-event-queue";
export * from "./job-debates";
export * from "./session-messages";
export * from "./tower-log";

View File

@@ -0,0 +1,10 @@
import { pgTable, text, timestamp } from "drizzle-orm/pg-core";
export const towerLog = pgTable("tower_log", {
id: text("id").primaryKey(),
narrative: text("narrative").notNull(),
eventType: text("event_type").notNull(),
agentId: text("agent_id"),
jobId: text("job_id"),
createdAt: timestamp("created_at").notNull().defaultNow(),
});

View File

@@ -37,18 +37,6 @@
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
color: #7799cc; text-shadow: 0 0 10px #4466aa;
}
#visitor-count-display {
margin-top: 5px;
font-size: 11px; color: #5588bb;
text-shadow: 0 0 6px #2244aa;
}
#visitor-count-display .count-number {
font-weight: bold;
}
@media (max-width: 600px) {
#visitor-count-display .desktop-only { display: none; }
#visitor-count-display .count-number::before { content: '👤 '; }
}
/* Nostr Identity UI */
.nostr-btn {
@@ -611,6 +599,188 @@
#activity-heatmap #heatmap-bar { display: none; }
#heatmap-icon-btn { display: block; }
}
/* ── History button ──────────────────────────────────────────────── */
#open-history-btn {
font-family: 'Courier New', monospace; font-size: 11px; font-weight: bold;
color: #aabbdd; background: rgba(20, 16, 50, 0.85); border: 1px solid #2a2a44;
padding: 7px 18px; cursor: pointer; letter-spacing: 2px;
box-shadow: 0 0 14px #2244aa22;
transition: background 0.15s, box-shadow 0.15s, color 0.15s;
border-radius: 2px;
min-height: 36px;
}
#open-history-btn:hover, #open-history-btn:active {
background: rgba(35, 28, 80, 0.95);
box-shadow: 0 0 20px #3355aa44;
color: #ccddff;
}
/* ── History panel (bottom sheet) ───────────────────────────────── */
#history-panel {
position: fixed; bottom: -100%; left: 0; right: 0;
height: 70vh;
background: rgba(5, 3, 12, 0.97);
border-top: 1px solid #1a1a2e;
z-index: 100;
font-family: 'Courier New', monospace;
transition: bottom 0.35s cubic-bezier(0.4, 0, 0.2, 1);
box-shadow: 0 -8px 32px rgba(40, 60, 120, 0.18);
display: flex; flex-direction: column;
}
#history-panel.open { bottom: 60px; }
.hist-header {
display: flex; align-items: center; gap: 8px;
padding: 14px 20px 10px;
border-bottom: 1px solid #1a1a2e;
font-size: 12px; letter-spacing: 3px; color: #5577aa;
flex-shrink: 0;
}
.hist-header span { flex: 1; text-shadow: 0 0 8px #2244aa66; }
#history-refresh-btn, #history-close {
background: transparent; border: 1px solid #1a1a2e;
color: #334466; font-family: 'Courier New', monospace;
font-size: 11px; padding: 3px 10px; cursor: pointer;
transition: color 0.2s, border-color 0.2s; letter-spacing: 1px;
border-radius: 2px;
}
#history-refresh-btn:hover { color: #5577aa; border-color: #334466; }
#history-refresh-btn:disabled { opacity: 0.4; cursor: default; }
#history-close { font-size: 14px; padding: 3px 8px; }
#history-close:hover { color: #6688bb; border-color: #4466aa; }
#history-list {
flex: 1; overflow-y: auto; padding: 12px 16px;
overscroll-behavior: contain;
}
.hist-empty {
color: #334466; font-size: 11px; letter-spacing: 1px;
line-height: 1.8; text-align: center;
margin-top: 40px; padding: 0 20px;
}
.hist-row {
border: 1px solid #1a1a2e; border-radius: 2px;
margin-bottom: 10px; overflow: hidden;
background: #060310;
}
.hist-row.hist-rejected { border-color: #331111; }
.hist-row-header {
padding: 10px 12px; cursor: pointer;
transition: background 0.15s;
}
.hist-row-header:hover { background: rgba(30, 25, 60, 0.6); }
.hist-prompt {
color: #aabbdd; font-size: 12px; line-height: 1.5;
display: -webkit-box; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; overflow: hidden;
margin-bottom: 6px;
}
.hist-meta {
display: flex; gap: 12px; align-items: center;
}
.hist-cost { font-size: 10px; color: #ffcc44; letter-spacing: 1px; }
.hist-rejected .hist-cost { color: #994444; }
.hist-time { font-size: 10px; color: #334466; letter-spacing: 0.5px; flex: 1; }
.hist-chevron { font-size: 10px; color: #334466; transition: color 0.15s; }
.hist-row-header:hover .hist-chevron { color: #5577aa; }
.hist-row-body {
max-height: 0; overflow: hidden;
transition: max-height 0.3s ease-out;
}
.hist-row.expanded .hist-row-body {
max-height: 400px;
border-top: 1px solid #1a1a2e;
}
.hist-result {
color: #aabbdd; font-family: 'Courier New', monospace;
font-size: 11px; line-height: 1.6;
white-space: pre-wrap; word-break: break-word;
padding: 12px; margin: 0;
max-height: 400px; overflow-y: auto;
}
/* ── Tower Log button ────────────────────────────────────────────── */
#open-tower-log-btn {
font-family: 'Courier New', monospace; font-size: 11px; font-weight: bold;
color: #ccaaff; background: rgba(25, 10, 45, 0.85); border: 1px solid #663399;
padding: 7px 18px; cursor: pointer; letter-spacing: 2px;
box-shadow: 0 0 14px #44116622;
transition: background 0.15s, box-shadow 0.15s, color 0.15s;
border-radius: 2px;
min-height: 36px;
}
#open-tower-log-btn:hover, #open-tower-log-btn:active {
background: rgba(45, 18, 80, 0.95);
box-shadow: 0 0 20px #55228844;
color: #eeddff;
}
/* ── Tower Log panel (bottom sheet) ─────────────────────────────── */
#tower-log-panel {
position: fixed; bottom: -100%; left: 0; right: 0;
height: 65vh;
background: rgba(6, 3, 14, 0.97);
border-top: 1px solid #2a1040;
z-index: 100;
font-family: 'Courier New', monospace;
transition: bottom 0.35s cubic-bezier(0.4, 0, 0.2, 1);
box-shadow: 0 -8px 32px rgba(80, 30, 130, 0.18);
display: flex; flex-direction: column;
}
#tower-log-panel.open { bottom: 60px; }
.tlog-header {
display: flex; align-items: center; gap: 8px;
padding: 14px 20px 10px;
border-bottom: 1px solid #2a1040;
font-size: 12px; letter-spacing: 3px; color: #9966cc;
flex-shrink: 0;
text-shadow: 0 0 8px #66228866;
}
.tlog-header span { flex: 1; }
#tower-log-close {
background: transparent; border: 1px solid #2a1040;
color: #664488; font-family: 'Courier New', monospace;
font-size: 14px; padding: 3px 8px; cursor: pointer;
transition: color 0.2s, border-color 0.2s; border-radius: 2px;
}
#tower-log-close:hover { color: #bb88ff; border-color: #8844bb; }
#tower-log-list {
flex: 1; overflow-y: auto; padding: 12px 20px;
overscroll-behavior: contain;
}
.tlog-empty {
color: #44224466; font-size: 11px; letter-spacing: 1px;
line-height: 1.8; text-align: center;
margin-top: 40px; padding: 0 20px;
}
.tlog-entry {
padding: 8px 0;
border-bottom: 1px solid #1a0a2a;
display: flex; gap: 10px; align-items: baseline;
animation: tlog-fade-in 0.4s ease-out;
}
.tlog-entry:last-child { border-bottom: none; }
@keyframes tlog-fade-in {
from { opacity: 0; transform: translateY(4px); }
to { opacity: 1; transform: translateY(0); }
}
.tlog-time {
font-size: 9px; color: #443355; letter-spacing: 0.5px;
white-space: nowrap; flex-shrink: 0; min-width: 48px;
}
.tlog-text {
font-size: 11px; color: #bb99dd; line-height: 1.5;
letter-spacing: 0.3px;
}
.tlog-new { color: #ddbbff; text-shadow: 0 0 6px #9944cc44; }
</style>
</head>
<body>
@@ -618,7 +788,6 @@
<h1>THE WORKSHOP</h1>
<div id="fps">FPS: --</div>
<div id="active-jobs">JOBS: 0</div>
<div id="visitor-count-display"><span class="desktop-only">VISITORS:</span> <span class="count-number">0</span></div>
<div id="session-hud">
<span id="session-hud-balance">Balance: -- sats</span>
<a href="#" id="session-hud-topup">⚡ Top Up</a>
@@ -653,6 +822,8 @@
<div id="top-buttons">
<button id="open-panel-btn">⚡ SUBMIT JOB</button>
<button id="open-session-btn">⚡ FUND SESSION</button>
<button id="open-history-btn">⏱ HISTORY</button>
<button id="open-tower-log-btn">📜 TOWER LOG</button>
<a id="relay-admin-btn" href="/admin/relay">⚙ RELAY ADMIN</a>
</div>
@@ -802,6 +973,16 @@
<div id="session-error"></div>
</div>
<!-- ── History panel (bottom sheet) ─────────────────────────────── -->
<div id="history-panel">
<div class="hist-header">
<span>⏱ JOB HISTORY</span>
<button id="history-refresh-btn">↺ REFRESH</button>
<button id="history-close"></button>
</div>
<div id="history-list"></div>
</div>
<!-- ── FPS crosshair ─────────────────────────────────────────────── -->
<div id="crosshair"></div>
@@ -822,6 +1003,17 @@
<span class="recovery-text">GPU context lost — recovering...</span>
</div>
<!-- ── Tower Log panel (bottom sheet) ────────────────────────────── -->
<div id="tower-log-panel">
<div class="tlog-header">
<span>📜 TOWER LOG</span>
<button id="tower-log-close"></button>
</div>
<div id="tower-log-list">
<div class="tlog-empty" id="tower-log-empty">The chronicle awaits… events will appear here as Timmy works his magic.</div>
</div>
</div>
<script>
// Show Relay Admin button if admin token is stored in localStorage
(function() {

222
the-matrix/js/history.js Normal file
View File

@@ -0,0 +1,222 @@
/**
* history.js — Job history panel for Timmy Tower Workshop.
*
* Persists completed jobs in localStorage and renders them in a
* bottom-sheet panel with expandable results and pull-to-refresh.
*
* Public API:
* addHistoryEntry(entry) — called by payment.js / session.js on completion
* initHistoryPanel() — wire up DOM (call once from main.js)
*/
const LS_KEY = 'timmy_history_v1';
const MAX_ENTRIES = 50;
// ── Persistence ───────────────────────────────────────────────────────────────
function _loadEntries() {
try {
const raw = localStorage.getItem(LS_KEY);
return raw ? JSON.parse(raw) : [];
} catch {
return [];
}
}
function _saveEntries(entries) {
try {
localStorage.setItem(LS_KEY, JSON.stringify(entries));
} catch { /* storage full — oldest already trimmed */ }
}
/**
* Record a completed job.
* @param {object} entry
* @param {string} entry.jobId
* @param {string} entry.request — user prompt
* @param {number} entry.costSats — sats charged (0 for free/session)
* @param {string} entry.result — AI answer or rejection reason
* @param {string} entry.state — 'complete' | 'rejected' | 'failed'
* @param {string} [entry.completedAt] — ISO timestamp (defaults to now)
*/
export function addHistoryEntry({ jobId, request, costSats, result, state, completedAt }) {
const entries = _loadEntries();
const entry = {
jobId: jobId ?? `local-${Date.now()}`,
request: request ?? '',
costSats: costSats ?? 0,
result: result ?? '',
state: state ?? 'complete',
completedAt: completedAt ?? new Date().toISOString(),
};
const idx = entries.findIndex(e => e.jobId === entry.jobId);
if (idx >= 0) {
entries[idx] = entry;
} else {
entries.unshift(entry); // newest first
if (entries.length > MAX_ENTRIES) entries.length = MAX_ENTRIES;
}
_saveEntries(entries);
}
// ── Helpers ───────────────────────────────────────────────────────────────────
function _relativeTime(isoString) {
try {
const diff = Date.now() - new Date(isoString).getTime();
const secs = Math.floor(diff / 1000);
if (secs < 60) return `${secs}s ago`;
const mins = Math.floor(secs / 60);
if (mins < 60) return `${mins} min ago`;
const hrs = Math.floor(mins / 60);
if (hrs < 24) return `${hrs}h ago`;
const days = Math.floor(hrs / 24);
return `${days}d ago`;
} catch {
return '';
}
}
function _escHtml(text) {
return String(text)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}
function _truncate(text, maxLen) {
if (!text) return '';
return text.length > maxLen ? text.slice(0, maxLen) + '…' : text;
}
// ── Rendering ─────────────────────────────────────────────────────────────────
function _renderEntries(entries, container) {
container.innerHTML = '';
if (!entries.length) {
const empty = document.createElement('div');
empty.className = 'hist-empty';
empty.textContent = 'No completed jobs yet. Submit a job to see your history here.';
container.appendChild(empty);
return;
}
entries.forEach(entry => {
const row = document.createElement('div');
row.className = 'hist-row' + (entry.state === 'rejected' ? ' hist-rejected' : '');
// ── Header (always visible) ────────────────────────────────────────────
const header = document.createElement('div');
header.className = 'hist-row-header';
const promptEl = document.createElement('div');
promptEl.className = 'hist-prompt';
promptEl.textContent = _truncate(entry.request, 140);
const metaEl = document.createElement('div');
metaEl.className = 'hist-meta';
const costEl = document.createElement('span');
costEl.className = 'hist-cost';
if (entry.state === 'rejected') {
costEl.textContent = 'rejected';
} else if (entry.costSats > 0) {
costEl.textContent = `${entry.costSats} sats`;
} else {
costEl.textContent = 'free';
}
const timeEl = document.createElement('span');
timeEl.className = 'hist-time';
timeEl.textContent = _relativeTime(entry.completedAt);
const chevronEl = document.createElement('span');
chevronEl.className = 'hist-chevron';
chevronEl.textContent = '▸';
metaEl.appendChild(costEl);
metaEl.appendChild(timeEl);
metaEl.appendChild(chevronEl);
header.appendChild(promptEl);
header.appendChild(metaEl);
// ── Body (expandable) ──────────────────────────────────────────────────
const body = document.createElement('div');
body.className = 'hist-row-body';
const pre = document.createElement('pre');
pre.className = 'hist-result';
pre.textContent = entry.result || '(no result)';
body.appendChild(pre);
// ── Toggle ─────────────────────────────────────────────────────────────
let expanded = false;
header.addEventListener('click', () => {
expanded = !expanded;
row.classList.toggle('expanded', expanded);
chevronEl.textContent = expanded ? '▾' : '▸';
});
row.appendChild(header);
row.appendChild(body);
container.appendChild(row);
});
}
// ── Panel state ───────────────────────────────────────────────────────────────
let _panel = null;
let _list = null;
let _refreshBtn = null;
function _open() {
if (!_panel) return;
_panel.classList.add('open');
_refresh();
}
function _close() {
_panel?.classList.remove('open');
}
function _refresh() {
if (!_list) return;
const entries = _loadEntries();
_renderEntries(entries, _list);
if (_refreshBtn) {
_refreshBtn.textContent = '↺ REFRESH';
_refreshBtn.disabled = false;
}
}
export function initHistoryPanel() {
_panel = document.getElementById('history-panel');
_list = document.getElementById('history-list');
_refreshBtn = document.getElementById('history-refresh-btn');
if (!_panel) return;
document.getElementById('open-history-btn')?.addEventListener('click', _open);
document.getElementById('history-close')?.addEventListener('click', _close);
if (_refreshBtn) {
_refreshBtn.addEventListener('click', () => {
_refreshBtn.textContent = '↺ …';
_refreshBtn.disabled = true;
setTimeout(_refresh, 150);
});
}
// Pull-to-refresh: detect downward drag when already scrolled to top
let _touchStartY = 0;
_list?.addEventListener('touchstart', e => {
_touchStartY = e.touches[0].clientY;
}, { passive: true });
_list?.addEventListener('touchend', e => {
const dy = e.changedTouches[0].clientY - _touchStartY;
if (dy > 60 && _list.scrollTop === 0) {
_refresh();
}
}, { passive: true });
}

View File

@@ -8,9 +8,10 @@ import {
import { initEffects, updateEffects, disposeEffects, updateJobIndicators } from './effects.js';
import { initUI, updateUI } from './ui.js';
import { initInteraction, disposeInteraction, registerSlapTarget } from './interaction.js';
import { initWebSocket, getConnectionState, getJobCount } from './websocket.js';
import { initWebSocket, getConnectionState, getJobCount, initTowerLog } from './websocket.js';
import { initPaymentPanel } from './payment.js';
import { initSessionPanel } from './session.js';
import { initHistoryPanel } from './history.js';
import { initNostrIdentity } from './nostr-identity.js';
import { warmup as warmupEdgeWorker, onReady as onEdgeWorkerReady } from './edge-worker-client.js';
import { setEdgeWorkerReady } from './ui.js';
@@ -44,8 +45,10 @@ function buildWorld(firstInit, stateSnapshot) {
if (firstInit) {
initUI();
initWebSocket(scene);
initTowerLog();
initPaymentPanel();
initSessionPanel();
initHistoryPanel();
void initNostrIdentity('/api');
warmupEdgeWorker();
onEdgeWorkerReady(() => setEdgeWorkerReady());

View File

@@ -10,6 +10,7 @@
*/
import { getOrRefreshToken } from './nostr-identity.js';
import { addHistoryEntry } from './history.js';
const API_BASE = '/api';
const POLL_INTERVAL_MS = 2000;
@@ -18,6 +19,7 @@ const POLL_TIMEOUT_MS = 60000;
let panel = null;
let closeBtn = null;
let currentJobId = null;
let currentRequest = '';
let pollTimer = null;
export function initPaymentPanel() {
@@ -96,6 +98,7 @@ async function submitJob() {
if (!res.ok) { setError(data.error || 'Failed to create job.'); return; }
currentJobId = data.jobId;
currentRequest = request;
showEvalInvoice(data.evalInvoice);
} catch (err) {
setError('Network error: ' + err.message);
@@ -167,7 +170,7 @@ function startPolling() {
const pollHeaders = token ? { 'X-Nostr-Token': token } : {};
const res = await fetch(`${API_BASE}/jobs/${currentJobId}`, { headers: pollHeaders });
const data = await res.json();
const { state, workInvoice, result, reason } = data;
const { state, workInvoice, result, reason, costLedger, completedAt } = data;
if (state === 'awaiting_work_payment' && workInvoice) {
showWorkInvoice(workInvoice);
@@ -175,10 +178,26 @@ function startPolling() {
return;
}
if (state === 'complete') {
addHistoryEntry({
jobId: currentJobId,
request: currentRequest,
costSats: costLedger?.workAmountSats ?? costLedger?.actualAmountSats ?? 0,
result,
state: 'complete',
completedAt: completedAt ?? new Date().toISOString(),
});
showResult(result, 'complete');
return;
}
if (state === 'rejected') {
addHistoryEntry({
jobId: currentJobId,
request: currentRequest,
costSats: 0,
result: reason,
state: 'rejected',
completedAt: completedAt ?? new Date().toISOString(),
});
showResult(reason, 'rejected');
return;
}

View File

@@ -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 { addHistoryEntry } from './history.js';
const API = '/api';
const LS_KEY = 'timmy_session_v1';
@@ -152,12 +153,21 @@ export async function sessionSendHandler(text) {
return;
}
const prevBalance = _balanceSats;
_balanceSats = data.balanceRemaining ?? 0;
_sessionState = _balanceSats < MIN_BALANCE ? 'paused' : 'active';
_saveToStorage();
_applySessionUI();
const reply = data.result || data.reason || '…';
const costSats = Math.max(0, prevBalance - _balanceSats);
addHistoryEntry({
request: text,
costSats,
result: reply,
state: data.reason && !data.result ? 'rejected' : 'complete',
completedAt: new Date().toISOString(),
});
setSpeechBubble(reply);
appendSystemMessage('Timmy: ' + reply.slice(0, 80));

View File

@@ -344,19 +344,6 @@ export function updateUI({ fps, jobCount, connectionState }) {
}
}
export function updateVisitorCount(count) {
const $visitorCountDisplay = document.querySelector('#visitor-count-display .count-number');
if ($visitorCountDisplay) {
$visitorCountDisplay.textContent = count;
const $desktopOnly = document.querySelector('#visitor-count-display .desktop-only');
if (window.innerWidth > 600) {
if ($desktopOnly) $desktopOnly.textContent = `VISITORS:`;
} else {
if ($desktopOnly) $desktopOnly.textContent = ``; // Hide 'VISITORS:' text on mobile
}
}
}
export function appendSystemMessage(text) {
if (!$log) return;
const el = document.createElement('div');

View File

@@ -1,7 +1,7 @@
import * as THREE from 'three';
import { scene } from './world.js'; // Import the scene
import { setAgentState, setSpeechBubble, applyAgentStates, setMood, TIMMY_WORLD_POS } from './agents.js';
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker, updateVisitorCount } from './ui.js';
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker } from './ui.js';
import { sentiment } from './edge-worker-client.js';
import { setLabelState } from './hud-labels.js';
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
@@ -22,6 +22,7 @@ let jobCount = 0;
let reconnectTimer = null;
let visitorId = null;
const RECONNECT_DELAY_MS = 5000;
let _towerLogHistory = [];
// Map to keep track of active job indicator positions for offsetting
const _jobIndicatorOffsets = new Map();
@@ -47,6 +48,8 @@ function connect() {
ws.onopen = () => {
connectionState = 'connected';
clearTimeout(reconnectTimer);
const npub = getPubkey();
send({ type: 'visitor_enter', visitorId, visitorName: 'visitor', npub });
};
ws.onmessage = event => {
@@ -188,11 +191,26 @@ function handleMessage(msg) {
break;
}
case 'visitor_count':
if (typeof msg.count === 'number') {
updateVisitorCount(msg.count);
case 'tower_log_history': {
// Load history when panel opens
if (Array.isArray(msg.entries)) {
_towerLogHistory = msg.entries;
_renderTowerLog();
}
break;
}
case 'tower_log_entry': {
// New entry streamed in real time
_towerLogHistory.push(msg);
if (_towerLogHistory.length > 20) _towerLogHistory.shift();
_renderTowerLog(msg.id); // pass id to highlight new entry
break;
}
case 'agent_count':
case 'visitor_count':
break;
default:
break;
@@ -205,3 +223,79 @@ export function sendVisitorMessage(text) {
export function getConnectionState() { return connectionState; }
export function getJobCount() { return jobCount; }
// ── Tower Log panel ────────────────────────────────────────────────────────
function _renderTowerLog(newId) {
const list = document.getElementById('tower-log-list');
const empty = document.getElementById('tower-log-empty');
if (!list) return;
if (_towerLogHistory.length === 0) {
if (empty) empty.style.display = 'block';
return;
}
if (empty) empty.style.display = 'none';
// Remove old entries (keep only the empty placeholder and rebuild)
Array.from(list.querySelectorAll('.tlog-entry')).forEach(el => el.remove());
for (const entry of _towerLogHistory) {
const el = document.createElement('div');
el.className = 'tlog-entry' + (entry.id === newId ? ' tlog-new' : '');
el.dataset.id = entry.id;
const t = document.createElement('div');
t.className = 'tlog-time';
const d = new Date(entry.createdAt);
t.textContent = d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
const n = document.createElement('div');
n.className = 'tlog-text';
n.textContent = entry.narrative;
el.appendChild(t);
el.appendChild(n);
list.appendChild(el);
}
// Auto-scroll to bottom
list.scrollTop = list.scrollHeight;
// Fade new entry highlight after 3s
if (newId) {
setTimeout(() => {
const el = list.querySelector(`[data-id="${newId}"]`);
if (el) el.classList.remove('tlog-new');
}, 3000);
}
}
export function initTowerLog() {
const openBtn = document.getElementById('open-tower-log-btn');
const panel = document.getElementById('tower-log-panel');
const closeBtn = document.getElementById('tower-log-close');
if (!openBtn || !panel || !closeBtn) return;
openBtn.addEventListener('click', () => {
panel.classList.add('open');
// Fetch history if empty
if (_towerLogHistory.length === 0) {
fetch('/api/tower-log')
.then(r => r.json())
.then(data => {
if (Array.isArray(data.entries)) {
_towerLogHistory = data.entries;
_renderTowerLog();
}
})
.catch(() => {});
} else {
_renderTowerLog();
}
});
closeBtn.addEventListener('click', () => {
panel.classList.remove('open');
});
}