Compare commits
1 Commits
main
...
gemini/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd6bca74c5 |
@@ -280,6 +280,48 @@ 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.";
|
if (block.type !== "text") return "The crystal ball is cloudy… try again.";
|
||||||
return block.text!.trim();
|
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).
|
* Run a mini debate on a borderline eval request (#21).
|
||||||
* Two opposing Haiku calls argue accept vs reject, then a third synthesizes.
|
* Two opposing Haiku calls argue accept vs reject, then a third synthesizes.
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export interface TimmyState {
|
|||||||
export interface WorldState {
|
export interface WorldState {
|
||||||
timmyState: TimmyState;
|
timmyState: TimmyState;
|
||||||
agentStates: Record<string, string>;
|
agentStates: Record<string, string>;
|
||||||
|
visitorCount: number;
|
||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17,9 +18,22 @@ const DEFAULT_TIMMY: TimmyState = {
|
|||||||
const _state: WorldState = {
|
const _state: WorldState = {
|
||||||
timmyState: { ...DEFAULT_TIMMY },
|
timmyState: { ...DEFAULT_TIMMY },
|
||||||
agentStates: { alpha: "idle", beta: "idle", gamma: "idle", delta: "idle" },
|
agentStates: { alpha: "idle", beta: "idle", gamma: "idle", delta: "idle" },
|
||||||
|
visitorCount: 0,
|
||||||
updatedAt: new Date().toISOString(),
|
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 {
|
export function getWorldState(): WorldState {
|
||||||
return {
|
return {
|
||||||
timmyState: { ..._state.timmyState },
|
timmyState: { ..._state.timmyState },
|
||||||
|
|||||||
@@ -30,7 +30,12 @@ import { WebSocketServer } from "ws";
|
|||||||
import type { Server } from "http";
|
import type { Server } from "http";
|
||||||
import { eventBus, type BusEvent } from "../lib/event-bus.js";
|
import { eventBus, type BusEvent } from "../lib/event-bus.js";
|
||||||
import { makeLogger } from "../lib/logger.js";
|
import { makeLogger } from "../lib/logger.js";
|
||||||
import { getWorldState, setAgentStateInWorld } from "../lib/world-state.js";
|
import {
|
||||||
|
getWorldState,
|
||||||
|
setAgentStateInWorld,
|
||||||
|
incrementVisitorCount,
|
||||||
|
decrementVisitorCount,
|
||||||
|
} from "../lib/world-state.js";
|
||||||
import { agentService } from "../lib/agent.js";
|
import { agentService } from "../lib/agent.js";
|
||||||
import { db, worldEvents } from "@workspace/db";
|
import { db, worldEvents } from "@workspace/db";
|
||||||
|
|
||||||
@@ -315,6 +320,13 @@ export function attachWebSocketServer(server: Server): void {
|
|||||||
const ip = req.headers["x-forwarded-for"] ?? req.socket.remoteAddress ?? "unknown";
|
const ip = req.headers["x-forwarded-for"] ?? req.socket.remoteAddress ?? "unknown";
|
||||||
logger.info("ws client connected", { ip, clients: wss.clients.size });
|
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);
|
void sendWorldStateBootstrap(socket);
|
||||||
|
|
||||||
const busHandler = (ev: BusEvent) => broadcast(socket, ev);
|
const busHandler = (ev: BusEvent) => broadcast(socket, ev);
|
||||||
@@ -329,33 +341,7 @@ export function attachWebSocketServer(server: Server): void {
|
|||||||
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string; npub?: string };
|
const msg = JSON.parse(raw.toString()) as { type?: string; text?: string; visitorId?: string; npub?: string };
|
||||||
if (msg.type === "pong") return;
|
if (msg.type === "pong") return;
|
||||||
if (msg.type === "subscribe") {
|
if (msg.type === "subscribe") {
|
||||||
send(socket, { type: "agent_count", count: wss.clients.size });
|
send(socket, { type: "visitor_count", count: getWorldState().visitorCount });
|
||||||
}
|
|
||||||
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?` });
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
if (msg.type === "visitor_message" && msg.text) {
|
||||||
const text = String(msg.text).slice(0, 500);
|
const text = String(msg.text).slice(0, 500);
|
||||||
@@ -401,10 +387,25 @@ export function attachWebSocketServer(server: Server): void {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const VISITOR_FAREWELL_THROTTLE_MS = 30_000;
|
||||||
|
let lastFarewellTime = 0;
|
||||||
|
|
||||||
socket.on("close", () => {
|
socket.on("close", () => {
|
||||||
clearInterval(pingTimer);
|
clearInterval(pingTimer);
|
||||||
eventBus.off("bus", busHandler);
|
eventBus.off("bus", busHandler);
|
||||||
logger.info("ws client disconnected", { clients: wss.clients.size - 1 });
|
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) => {
|
socket.on("error", (err) => {
|
||||||
|
|||||||
@@ -37,6 +37,18 @@
|
|||||||
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
|
font-size: 13px; letter-spacing: 3px; margin-bottom: 4px;
|
||||||
color: #7799cc; text-shadow: 0 0 10px #4466aa;
|
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 Identity UI */
|
||||||
.nostr-btn {
|
.nostr-btn {
|
||||||
@@ -606,6 +618,7 @@
|
|||||||
<h1>THE WORKSHOP</h1>
|
<h1>THE WORKSHOP</h1>
|
||||||
<div id="fps">FPS: --</div>
|
<div id="fps">FPS: --</div>
|
||||||
<div id="active-jobs">JOBS: 0</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">
|
<div id="session-hud">
|
||||||
<span id="session-hud-balance">Balance: -- sats</span>
|
<span id="session-hud-balance">Balance: -- sats</span>
|
||||||
<a href="#" id="session-hud-topup">⚡ Top Up</a>
|
<a href="#" id="session-hud-topup">⚡ Top Up</a>
|
||||||
|
|||||||
@@ -344,6 +344,19 @@ 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) {
|
export function appendSystemMessage(text) {
|
||||||
if (!$log) return;
|
if (!$log) return;
|
||||||
const el = document.createElement('div');
|
const el = document.createElement('div');
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import * as THREE from 'three';
|
import * as THREE from 'three';
|
||||||
import { scene } from './world.js'; // Import the scene
|
import { scene } from './world.js'; // Import the scene
|
||||||
import { setAgentState, setSpeechBubble, applyAgentStates, setMood, TIMMY_WORLD_POS } from './agents.js';
|
import { setAgentState, setSpeechBubble, applyAgentStates, setMood, TIMMY_WORLD_POS } from './agents.js';
|
||||||
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker } from './ui.js';
|
import { appendSystemMessage, appendDebateMessage, showCostTicker, updateCostTicker, updateVisitorCount } from './ui.js';
|
||||||
import { sentiment } from './edge-worker-client.js';
|
import { sentiment } from './edge-worker-client.js';
|
||||||
import { setLabelState } from './hud-labels.js';
|
import { setLabelState } from './hud-labels.js';
|
||||||
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
|
import { createJobIndicator, dissolveJobIndicator } from './effects.js';
|
||||||
@@ -47,8 +47,6 @@ function connect() {
|
|||||||
ws.onopen = () => {
|
ws.onopen = () => {
|
||||||
connectionState = 'connected';
|
connectionState = 'connected';
|
||||||
clearTimeout(reconnectTimer);
|
clearTimeout(reconnectTimer);
|
||||||
const npub = getPubkey();
|
|
||||||
send({ type: 'visitor_enter', visitorId, visitorName: 'visitor', npub });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
ws.onmessage = event => {
|
ws.onmessage = event => {
|
||||||
@@ -190,8 +188,10 @@ function handleMessage(msg) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case 'agent_count':
|
|
||||||
case 'visitor_count':
|
case 'visitor_count':
|
||||||
|
if (typeof msg.count === 'number') {
|
||||||
|
updateVisitorCount(msg.count);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in New Issue
Block a user