1 Commits

Author SHA1 Message Date
Alexander Whitestone
ad2a5e23fa 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
25 changed files with 189 additions and 1352 deletions

View File

@@ -442,89 +442,6 @@ 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,10 +21,7 @@ export type CostEvent =
export type CommentaryEvent =
| { type: "agent_commentary"; agentId: string; jobId: string; text: string };
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;
export type BusEvent = JobEvent | SessionEvent | DebateEvent | CostEvent | CommentaryEvent;
class EventBus extends EventEmitter {
emit(event: "bus", data: BusEvent): boolean;

View File

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

View File

@@ -1,74 +0,0 @@
/**
* 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,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();

View File

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

View File

@@ -32,7 +32,6 @@ import { eventBus, type BusEvent } from "../lib/event-bus.js";
import { makeLogger } from "../lib/logger.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");
@@ -270,18 +269,6 @@ 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;
}
@@ -319,17 +306,6 @@ 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 {
@@ -362,7 +338,6 @@ export function attachWebSocketServer(server: Server): void {
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) {
@@ -462,22 +437,13 @@ 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, 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;

View File

@@ -18,7 +18,6 @@ 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();
@@ -34,7 +33,6 @@ 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

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

View File

@@ -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
# ===========================================================================
# 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

@@ -1,21 +0,0 @@
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

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

View File

@@ -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,
},
});

View File

@@ -1,15 +0,0 @@
-- 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,4 +14,3 @@ export * from "./relay-accounts";
export * from "./relay-event-queue";
export * from "./job-debates";
export * from "./session-messages";
export * from "./tower-log";

View File

@@ -1,10 +0,0 @@
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

@@ -599,188 +599,6 @@
#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>
@@ -822,8 +640,6 @@
<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>
@@ -973,16 +789,6 @@
<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>
@@ -1003,17 +809,6 @@
<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() {

View File

@@ -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; }
/**

View File

@@ -1,222 +0,0 @@
/**
* 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,13 +8,12 @@ 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, initTowerLog } from './websocket.js';
import { initWebSocket, getConnectionState, getJobCount } 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';
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';
@@ -45,13 +44,13 @@ function buildWorld(firstInit, stateSnapshot) {
if (firstInit) {
initUI();
initWebSocket(scene);
initTowerLog();
initPaymentPanel();
initSessionPanel();
initHistoryPanel();
void initNostrIdentity('/api');
setEdgeWorkerLoading();
warmupEdgeWorker();
onEdgeWorkerReady(() => setEdgeWorkerReady());
onEdgeWorkerError(() => setEdgeWorkerError());
void initTimmyId();
}

View File

@@ -10,7 +10,6 @@
*/
import { getOrRefreshToken } from './nostr-identity.js';
import { addHistoryEntry } from './history.js';
const API_BASE = '/api';
const POLL_INTERVAL_MS = 2000;
@@ -19,7 +18,6 @@ const POLL_TIMEOUT_MS = 60000;
let panel = null;
let closeBtn = null;
let currentJobId = null;
let currentRequest = '';
let pollTimer = null;
export function initPaymentPanel() {
@@ -98,7 +96,6 @@ 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);
@@ -170,7 +167,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, costLedger, completedAt } = data;
const { state, workInvoice, result, reason } = data;
if (state === 'awaiting_work_payment' && workInvoice) {
showWorkInvoice(workInvoice);
@@ -178,26 +175,10 @@ 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,7 +16,6 @@ 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';
@@ -153,21 +152,12 @@ 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

@@ -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).

View File

@@ -22,7 +22,6 @@ 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();
@@ -191,23 +190,6 @@ function handleMessage(msg) {
break;
}
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;
@@ -223,79 +205,3 @@ 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');
});
}