From a925d61b7e7c8547f085147765b2bfe4112b8ee0 Mon Sep 17 00:00:00 2001 From: jenstandstad Date: Sat, 22 Aug 2026 16:55:45 +0200 Subject: [PATCH] =?UTF-8?q?Phone=20directory=20foundation:=20NPC=20contact?= =?UTF-8?q?s=20+=20phone=20node=20+=20terminal=E2=86=92NPC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NPCs gain phone_number and email (the phone book). A new 'phone' node type holds a directory whose terminals each bind to an NPC via npc_id (the callee reached by dialing that number) and wire to the dialogue that plays on connect. Migration 029 adds the columns/type; repositories and admin API thread contacts and the per-terminal NPC binding. Authoring foundation only — the dial runtime and tools sidebar come next. Co-Authored-By: Claude Opus 4.8 --- migrations/029_phone_directory.sql | 12 ++++++++++++ server/index.ts | 6 +++--- server/narrativeRepository.ts | 19 +++++++++++-------- server/storyGraphRepository.ts | 14 ++++++++------ 4 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 migrations/029_phone_directory.sql diff --git a/migrations/029_phone_directory.sql b/migrations/029_phone_directory.sql new file mode 100644 index 0000000..23c671f --- /dev/null +++ b/migrations/029_phone_directory.sql @@ -0,0 +1,12 @@ +-- Phone book + phone directory nodes. NPCs gain contact details; a phone node's +-- terminals each bind to an NPC (the callee) whose number the player dials. + +ALTER TABLE osint.npcs ADD COLUMN phone_number TEXT; +ALTER TABLE osint.npcs ADD COLUMN email TEXT; + +ALTER TABLE osint.story_nodes DROP CONSTRAINT story_nodes_node_type_check; +ALTER TABLE osint.story_nodes ADD CONSTRAINT story_nodes_node_type_check + CHECK (node_type IN ('cutscene','dialogue','level','det_gate','llm_gate','merit','phone')); + +-- A terminal on a phone node binds to the NPC you reach by dialing their number. +ALTER TABLE osint.story_node_terminals ADD COLUMN npc_id UUID REFERENCES osint.npcs(id) ON DELETE SET NULL; diff --git a/server/index.ts b/server/index.ts index f66b647..8a6d585 100644 --- a/server/index.ts +++ b/server/index.ts @@ -30,7 +30,7 @@ const textExtractor = createTextExtractorFromEnv() const levels = createLevelRepository(pool, editingEnabled, objectStorage) const narrative = createNarrativeRepository(pool, objectStorage) const storyGraph = createStoryGraphRepository(pool) -const STORY_NODE_TYPES: StoryNodeType[] = ['cutscene', 'dialogue', 'level', 'det_gate', 'llm_gate', 'merit'] +const STORY_NODE_TYPES: StoryNodeType[] = ['cutscene', 'dialogue', 'level', 'det_gate', 'llm_gate', 'merit', 'phone'] function wantsEdit(req: express.Request) { return editingEnabled && req.query.edit === '1' && hasAdminClaim(req) @@ -236,13 +236,13 @@ app.post('/api/admin/npcs', requireAdmin, async (req, res, next) => { try { if (!requireEditing(res)) return if (!req.body?.key) return res.status(400).json({ error: 'An NPC key is required' }) - res.status(201).json(await narrative.createNpc({ key: String(req.body.key), name: String(req.body.name || ''), role: String(req.body.role || ''), defaultPose: req.body.defaultPose || null })) + res.status(201).json(await narrative.createNpc({ key: String(req.body.key), name: String(req.body.name || ''), role: String(req.body.role || ''), defaultPose: req.body.defaultPose || null, phoneNumber: req.body.phoneNumber ?? null, email: req.body.email ?? null })) } catch (error) { next(error) } }) app.patch('/api/admin/npcs/:id', requireAdmin, async (req, res, next) => { try { if (!requireEditing(res)) return - const npc = await narrative.updateNpc(String(req.params.id), { name: req.body?.name, role: req.body?.role, defaultPose: req.body?.defaultPose }) + const npc = await narrative.updateNpc(String(req.params.id), { name: req.body?.name, role: req.body?.role, defaultPose: req.body?.defaultPose, phoneNumber: req.body?.phoneNumber, email: req.body?.email }) npc ? res.json(npc) : res.status(404).json({ error: 'NPC not found' }) } catch (error) { next(error) } }) diff --git a/server/narrativeRepository.ts b/server/narrativeRepository.ts index dd21c53..1dfbebd 100644 --- a/server/narrativeRepository.ts +++ b/server/narrativeRepository.ts @@ -6,7 +6,7 @@ import type { ObjectStorage } from './objectStorage.js' export type UploadedFile = { buffer: Buffer; originalname: string; mimetype: string; size: number } export type AssetDto = { id: string; originalName: string; mimeType: string; byteSize: number; url: string } export type PoseDto = { poseKey: string; assetId: string; url: string } -export type NpcDto = { id: string; key: string; name: string; role: string; defaultPose: string | null; poses: PoseDto[]; inUse: boolean } +export type NpcDto = { id: string; key: string; name: string; role: string; defaultPose: string | null; phoneNumber: string | null; email: string | null; poses: PoseDto[]; inUse: boolean } export type MysterySummary = { id: string; slug: string; title: string; nodes: number } export type PlaythroughSummary = { id: string; mysterySlug: string; levelSlug: string | null; status: 'active' | 'finished' } @@ -58,8 +58,8 @@ export interface NarrativeRepository { listAssets(): Promise deleteAsset(id: string): Promise<'deleted' | 'in_use' | 'not_found'> listNpcs(): Promise - createNpc(input: { key: string; name: string; role?: string; defaultPose?: string | null }): Promise - updateNpc(id: string, input: { name?: string; role?: string; defaultPose?: string | null }): Promise + createNpc(input: { key: string; name: string; role?: string; defaultPose?: string | null; phoneNumber?: string | null; email?: string | null }): Promise + updateNpc(id: string, input: { name?: string; role?: string; defaultPose?: string | null; phoneNumber?: string | null; email?: string | null }): Promise deleteNpc(id: string): Promise<'deleted' | 'in_use' | 'not_found'> addPose(npcId: string, poseKey: string, file: UploadedFile): Promise deletePose(npcId: string, poseKey: string): Promise @@ -173,8 +173,8 @@ export function createNarrativeRepository(pool: Pool, objectStorage: ObjectStora } async function loadNpc(id: string): Promise { - const npc = (await pool.query<{ id: string; npc_key: string; name: string; role: string; default_pose_key: string | null }>( - 'SELECT id,npc_key,name,role,default_pose_key FROM osint.npcs WHERE id=$1 AND mystery_id IS NULL', [id])).rows[0] + const npc = (await pool.query<{ id: string; npc_key: string; name: string; role: string; default_pose_key: string | null; phone_number: string | null; email: string | null }>( + 'SELECT id,npc_key,name,role,default_pose_key,phone_number,email FROM osint.npcs WHERE id=$1 AND mystery_id IS NULL', [id])).rows[0] if (!npc) return null const [poses, usage] = await Promise.all([ pool.query<{ pose_key: string; asset_id: string }>('SELECT pose_key,asset_id FROM osint.npc_poses WHERE npc_id=$1 AND asset_id IS NOT NULL ORDER BY pose_key', [id]), @@ -182,6 +182,7 @@ export function createNarrativeRepository(pool: Pool, objectStorage: ObjectStora ]) return { id: npc.id, key: npc.npc_key, name: npc.name, role: npc.role, defaultPose: npc.default_pose_key, + phoneNumber: npc.phone_number, email: npc.email, poses: poses.rows.map(pose => ({ poseKey: pose.pose_key, assetId: pose.asset_id, url: `/api/assets/${pose.asset_id}` })), inUse: Number(usage.rows[0].count) > 0, } @@ -372,17 +373,19 @@ export function createNarrativeRepository(pool: Pool, objectStorage: ObjectStora const key = input.key.trim().toLowerCase().replace(/[^a-z0-9-]+/g, '-').replace(/^-+|-+$/g, '') if (!key) throw new Error('An NPC key is required') const id = randomUUID() - await pool.query('INSERT INTO osint.npcs (id,mystery_id,npc_key,name,role,default_pose_key) VALUES ($1,NULL,$2,$3,$4,$5)', - [id, key, input.name.trim() || key, input.role?.trim() || '', input.defaultPose || null]) + await pool.query('INSERT INTO osint.npcs (id,mystery_id,npc_key,name,role,default_pose_key,phone_number,email) VALUES ($1,NULL,$2,$3,$4,$5,$6,$7)', + [id, key, input.name.trim() || key, input.role?.trim() || '', input.defaultPose || null, input.phoneNumber?.trim() || null, input.email?.trim() || null]) return (await loadNpc(id))! }, async updateNpc(id, input) { const existing = await loadNpc(id) if (!existing) return null - await pool.query('UPDATE osint.npcs SET name=$2,role=$3,default_pose_key=$4 WHERE id=$1 AND mystery_id IS NULL', [ + await pool.query('UPDATE osint.npcs SET name=$2,role=$3,default_pose_key=$4,phone_number=$5,email=$6 WHERE id=$1 AND mystery_id IS NULL', [ id, input.name?.trim() ?? existing.name, input.role?.trim() ?? existing.role, input.defaultPose === undefined ? existing.defaultPose : (input.defaultPose || null), + input.phoneNumber === undefined ? existing.phoneNumber : (input.phoneNumber?.trim() || null), + input.email === undefined ? existing.email : (input.email?.trim() || null), ]) return loadNpc(id) }, diff --git a/server/storyGraphRepository.ts b/server/storyGraphRepository.ts index bfc74c1..809885f 100644 --- a/server/storyGraphRepository.ts +++ b/server/storyGraphRepository.ts @@ -9,8 +9,8 @@ export type GraphSpecNode = { } export type GraphSpec = { entry: string; nodes: GraphSpecNode[] } -export type StoryNodeType = 'cutscene' | 'dialogue' | 'level' | 'det_gate' | 'llm_gate' | 'merit' -export type TerminalDto = { id: string; terminalKey: string; label: string; toNodeId: string | null; sortOrder: number } +export type StoryNodeType = 'cutscene' | 'dialogue' | 'level' | 'det_gate' | 'llm_gate' | 'merit' | 'phone' +export type TerminalDto = { id: string; terminalKey: string; label: string; toNodeId: string | null; sortOrder: number; npcId: string | null } export type StoryNodeDto = { id: string; nodeType: StoryNodeType; label: string; hasUtterances: boolean xpos: number; ypos: number; levelTemplateVersionId: string | null; componentKey: string | null; musicAssetId: string | null; musicVolume: number @@ -34,6 +34,7 @@ const DEFAULT_TERMINALS: Record det_gate: [{ key: 'pass', label: 'Pass' }], llm_gate: [{ key: 'pass', label: 'Pass' }], merit: [{ key: 'continue', label: 'Continue' }], + phone: [], // a phone node's terminals are added per contact (each bound to an NPC) } export interface StoryGraphRepository { @@ -42,7 +43,7 @@ export interface StoryGraphRepository { updateNode(nodeId: string, input: Partial<{ label: string; xpos: number; ypos: number; hasUtterances: boolean; componentKey: string | null; levelTemplateVersionId: string | null; musicAssetId: string | null; musicVolume: number; awardsFlag: string | null }>): Promise deleteNode(nodeId: string): Promise addTerminal(nodeId: string, input: { terminalKey: string; label?: string }): Promise - updateTerminal(terminalId: string, input: Partial<{ label: string; sortOrder: number; toNodeId: string | null }>): Promise<{ ok: boolean; error?: string }> + updateTerminal(terminalId: string, input: Partial<{ label: string; sortOrder: number; toNodeId: string | null; npcId: string | null }>): Promise<{ ok: boolean; error?: string }> deleteTerminal(terminalId: string): Promise setEntryNode(mysteryId: string, nodeId: string | null): Promise<{ ok: boolean; error?: string }> listLevelTemplates(): Promise @@ -65,14 +66,14 @@ export function createStoryGraphRepository(pool: Pool): StoryGraphRepository { const [nodes, terminals] = await Promise.all([ pool.query<{ id: string; node_type: StoryNodeType; label: string; has_utterances: boolean; xpos: number; ypos: number; level_template_version_id: string | null; component_key: string | null; music_asset_id: string | null; music_volume: number; awards_flag: string | null }>( 'SELECT id,node_type,label,has_utterances,xpos,ypos,level_template_version_id,component_key,music_asset_id,music_volume,awards_flag FROM osint.story_nodes WHERE mystery_id=$1 ORDER BY created_at', [mysteryId]), - pool.query<{ id: string; parent_node_id: string; terminal_key: string; label: string; to_node_id: string | null; sort_order: number }>( - `SELECT t.id,t.parent_node_id,t.terminal_key,t.label,t.to_node_id,t.sort_order FROM osint.story_node_terminals t + pool.query<{ id: string; parent_node_id: string; terminal_key: string; label: string; to_node_id: string | null; sort_order: number; npc_id: string | null }>( + `SELECT t.id,t.parent_node_id,t.terminal_key,t.label,t.to_node_id,t.sort_order,t.npc_id FROM osint.story_node_terminals t JOIN osint.story_nodes n ON n.id=t.parent_node_id WHERE n.mystery_id=$1 ORDER BY t.sort_order,t.terminal_key`, [mysteryId]), ]) const byNode = new Map() for (const row of terminals.rows) { const list = byNode.get(row.parent_node_id) || [] - list.push({ id: row.id, terminalKey: row.terminal_key, label: row.label, toNodeId: row.to_node_id, sortOrder: row.sort_order }) + list.push({ id: row.id, terminalKey: row.terminal_key, label: row.label, toNodeId: row.to_node_id, sortOrder: row.sort_order, npcId: row.npc_id }) byNode.set(row.parent_node_id, list) } return { @@ -158,6 +159,7 @@ export function createStoryGraphRepository(pool: Pool): StoryGraphRepository { if (input.label !== undefined) set('label', input.label.trim()) if (input.sortOrder !== undefined) set('sort_order', input.sortOrder) if (input.toNodeId !== undefined) set('to_node_id', input.toNodeId) + if (input.npcId !== undefined) set('npc_id', input.npcId || null) if (sets.length) await pool.query(`UPDATE osint.story_node_terminals SET ${sets.join(',')} WHERE id=$1`, values) return { ok: true } },