@maka/maka-cli 5.3.16 → 5.4.0

package/bundle/typescript/src/commands/game/sideQuest/models/item.js

@@ -16,6 +16,11 @@ export class Item extends AbstractItem {
     content;
     details;
     satisfiesLifestyle;
+    plane = 'meat';
+    // PAN warfare (see commands/hack.ts): a cracked smart-device locks up.
+    // A jammed firearm can't fire (fists until cleared); "reboot" clears
+    // every jammed device you carry, in the lull.
+    jammed = false;
     _transferable;
     // New currency-related fields
     _currencyAmount = 0;
@@ -45,9 +50,15 @@ export class Item extends AbstractItem {
         this.content = options.content;
         this.satisfiesLifestyle = options.satisfiesLifestyle;
         this._transferable = options.transferable !== false; // default true
+        this.plane = options.plane ?? 'meat';
         this._id = uuidv4();
-        // Optional: you can define capacity by size
-        if (this.isCurrencyCarrier()) {
+        // Optional: you can define capacity by size. Deliberately scoped to
+        // CurrencyContainer only (a physical wallet/pouch) -- a Credstick is
+        // digital storage, not physically size-limited, so it's left uncapped
+        // (falls through to Infinity in addCurrency()). Capping it here would
+        // silently truncate a seed's declared "currencyAmount" down to the
+        // size-based cap the moment Credstick became a currency carrier.
+        if (this.category === Category.CurrencyContainer) {
             switch (this.size) {
                 case Size.Small:
                     this._currencyCapacity = 100;
@@ -60,6 +71,34 @@ export class Item extends AbstractItem {
                     break;
             }
         }
+        // Firearms track ammunition: a flat magazine, starting full. Melee
+        // weapons never touch it. See fireRound()/reload() and combat-exchange.
+        if (this.isFirearm()) {
+            this.ammo = Item.MAGAZINE_CAPACITY;
+        }
+    }
+    // ======================== Ammunition ========================
+    static MAGAZINE_CAPACITY = 10;
+    /** Rounds left in the magazine. Only meaningful for firearms. */
+    ammo = 0;
+    /** Any weapon that shoots -- everything weapon-ish except melee. */
+    isFirearm() {
+        return this.category === Category.RangedWeapon || this.category === Category.Weapon;
+    }
+    /** Spends one round; returns false on an empty magazine. */
+    fireRound() {
+        if (!this.isFirearm())
+            return true; // knives don't run dry
+        if (this.ammo <= 0)
+            return false;
+        this.ammo -= 1;
+        return true;
+    }
+    /** Refills the magazine (the spent Ammunition item is the caller's job). */
+    reload() {
+        if (this.isFirearm()) {
+            this.ammo = Item.MAGAZINE_CAPACITY;
+        }
     }
     get owner() {
         return this._owner;
@@ -76,6 +115,61 @@ export class Item extends AbstractItem {
     use() {
         return `You use the ${this.name}. Nothing special happens.`;
     }
+    /**
+     * How much this item's quality tier is worth in game mechanics: extra
+     * weapon damage/attack dice, armor soak, medkit healing (see
+     * Player.getWeaponProfile/getArmorValue and commands/use.ts). Gear
+     * quality is the game's whole progression system, so every mechanic
+     * that gear feeds scales off this one number.
+     */
+    get qualityBonus() {
+        switch (this.rating) {
+            case Rating.Common: return 0;
+            case Rating.Standard: return 1;
+            case Rating.Rare: return 2;
+            case Rating.Legendary: return 3;
+            case Rating.MilitaryGrade: return 4;
+            default: return 0;
+        }
+    }
+    // ================= Device condition monitor (cyberdecks) =================
+    // Matrix combat damage lands on HARDWARE: the deck you jacked in with
+    // (see combat-exchange.ts routing and Player.takeMatrixDamage). A full
+    // track BRICKS the deck -- forced dump, and no jacking in on it again
+    // until it's repaired (rest somewhere safe -- see rest.ts). Damage
+    // persists across jack-outs; rebooting doesn't un-melt circuitry.
+    _deckDamage = 0;
+    isCyberdeck() {
+        return this.category === Category.Cyberdeck;
+    }
+    /** Better decks have more board to burn through: 8 + 2 per quality step. */
+    get maxDeckBoxes() {
+        return 8 + 2 * this.qualityBonus;
+    }
+    get deckDamage() {
+        return this._deckDamage;
+    }
+    /** Returns boxes actually taken. Full track = bricked. */
+    takeDeckDamage(boxes) {
+        const taken = Math.max(0, Math.floor(boxes));
+        this._deckDamage = Math.min(this.maxDeckBoxes, this._deckDamage + taken);
+        return taken;
+    }
+    get isBricked() {
+        return this._deckDamage >= this.maxDeckBoxes;
+    }
+    /** Clears boxes; returns how many were actually repaired. */
+    repairDeck(boxes) {
+        const before = this._deckDamage;
+        this._deckDamage = Math.max(0, before - Math.max(0, Math.floor(boxes)));
+        return before - this._deckDamage;
+    }
+    /** The deck track, same rendering as the body's condition monitors. */
+    deckSummary() {
+        const max = this.maxDeckBoxes;
+        const filled = Math.min(max, this._deckDamage);
+        return `${'■'.repeat(filled)}${'□'.repeat(max - filled)} (${filled}/${max})`;
+    }
     supportsAddiction(addiction) {
         return this.satisfiesLifestyle?.addictionTypes?.includes(addiction) ?? false;
     }
@@ -83,8 +177,17 @@ export class Item extends AbstractItem {
         return this.satisfiesLifestyle?.habitTags?.includes(habit) ?? false;
     }
     // --- Currency Support ---
+    /**
+     * The generation schema explicitly allows "currencyAmount" on either a
+     * "Credstick" or "CurrencyContainer" item (see scene-seed-generator.ts),
+     * but this only ever recognized the latter -- so a Credstick's nuyen
+     * silently never got set at all (item-factory.ts gates addCurrency() on
+     * this), and never counted toward the inventory panel's Total. Found via
+     * a real session where a 1,000-nuyen credstick added nothing to the
+     * displayed total.
+     */
     isCurrencyCarrier() {
-        return this.category === Category.CurrencyContainer;
+        return this.category === Category.CurrencyContainer || this.category === Category.Credstick;
     }
     get currencyAmount() {
         return this._currencyAmount;

package/bundle/typescript/src/commands/game/sideQuest/models/item.js.map

@@ -1 +1 @@
-{"version":3,"file":"item.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/models/item.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"item.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/models/item.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/models/npc.d.ts

@@ -10,8 +10,11 @@ export interface INPCConstructorConfig {
 export declare class NPC extends Player {
     private _dialogue;
     private _description;
+    private _appearance?;
+    private hasAIAppearance;
     private _scene?;
     private _commandHelp;
+    private _objective?;
     private _history;
     private readonly _maxHistory;
     private commandRegistry;
@@ -25,9 +28,31 @@ export declare class NPC extends Player {
     set scene(scene: Scene);
     get description(): string;
     set description(description: string);
+    get appearance(): string | undefined;
+    /**
+     * Generates a spoiler-free, player-facing first impression once per scene
+     * load. Deliberately kept separate from `_description`, which holds
+     * GM-only behavior notes (e.g. "will kill on sight") that would ruin the
+     * game if surfaced through `look at <npc>`.
+     */
+    ensureAIAppearance(sceneContext: string): Promise<void>;
     act(commandString: string): Promise<void>;
     hear(actor: Player, message: string): Promise<void>;
     see(actor: Player, verb: string, details?: string): Promise<void>;
+    /**
+     * The NPC's own condition, in words its AI can act on -- without this,
+     * an NPC literally cannot perceive being hurt: found via a real session
+     * where a nearly-dead fighter battled on exactly like a fresh one,
+     * because nothing ever put its wounds in its prompt. The badly-wounded
+     * nudge is what lets flee/surrender/beg behavior emerge.
+     */
+    /**
+     * Off-plane natives get told WHAT they are, so the AI plays ice like a
+     * program and a spirit like a spirit -- and neither wanders off its
+     * post or tries to pick up physical objects it can't touch.
+     */
+    private buildPlaneSummary;
+    private buildConditionSummary;
     private _addToHistory;
     private getHistorySummary;
     speak(message?: string): string;

package/bundle/typescript/src/commands/game/sideQuest/models/npc.js

@@ -1,12 +1,19 @@
 import { capitalCase } from 'change-case';
 import { Player } from './player.js';
 import { Door } from './door.js';
-import { HTTPS } from '../../../../tools/https/https.class.js';
+import { AI } from '../../../../tools/ai/ai.class.js';
+import { CALL_ICON, CALL_COLOR } from '../utilities/comm-style.js';
 export class NPC extends Player {
     _dialogue;
     _description;
+    _appearance;
+    hasAIAppearance = false;
     _scene;
     _commandHelp;
+    // An evolving one-line goal, revised by the AI as significant events happen.
+    // Purely in-memory -- gives an NPC a throughline across a session without
+    // needing any persistence.
+    _objective;
     _history = [];
     _maxHistory = 200;
     commandRegistry;
@@ -26,23 +33,57 @@ Available in-game commands (use with [COMMAND] prefix):
 
 - go <direction> — move in a direction like north, south, east, west
 - say <message> — speak a message
-- take <item name> — pick up an item from the current room
+- take <item name> — pick up an item from the current room ("take all" sweeps everything here, but only AFTER you have searched this room)
 - drop <item name> — drop an item
-- use <item name> — use an item
+- use <item name> — use an item (a Medical item like a medkit heals your PHYSICAL damage;
+  a StimPatch item recovers your STUN but costs 1 physical as a crash -- both are consumed.
+  Use them if you're hurt and carrying one)
+- rest — recover Stun by resting. Only works in a Residence room or a room with no one
+  else present; never rest mid-fight
 - equip <item name> — equip an item (e.g., equip a weapon to use)
 - equip all - equip all wearable items in inventory
 - unequip <item name> — remove an equipped item
 - unlock <door name> — unlock a door (if you have the key or solution)
 - lock <door name> — lock a door
-- solve <puzzle name> — attempt to solve a puzzle
+- solve <answer> — attempt to solve the puzzle in this room by stating the actual answer (safe, always works if correct)
+- pick — attempt to pick the lock on the puzzle in this room without knowing the answer (50/50, a failure sets off an alarm)
+- hack — attempt to hack the terminal/system in this room without knowing the answer (50/50, a failure trips a countermeasure)
+- cast <spell> [at <target>] — cast a spell you know. Requires being Awakened
+  (innate talent -- you'll be told if you are) OR carrying that spell's formula
+  item or a grimoire (a Focus item boosts your pool either way). Spells:
+  "manabolt" (combat damage resisted by body, not armor), "heal [on <ally>]" (heal
+  physical wounds -- your own by default, or an ally's in your room; healing a
+  wounded ally is a strong support move), "armor [on <ally>]" (sustained protection
+  on yourself or an ally; its bearer gets +soak at -2 dice to all else; cast at them
+  again to release). EVERY cast costs drain -- stun damage to YOU the caster; fill
+  your stun track and you're out cold. Never cast if you're mundane with no magic gear.
+- cast — bare "cast" attempts to magically bypass the ward/barrier in this room
+  without knowing the answer (requires the same talent or gear; a failure is fatal)
 - search — search the room for hidden things
 - look — look around the current room
 - look at <target> - looks at an item, player, or direction
 - store <item name> — store an item (in bank, safe, etc.)
 - give <item name> to <target> — give an item to someone
 - talk-to <target> — initiate conversation with another character
+- call <target> [message] — call someone remotely over a commlink (works even if they're not in your room; requires having a commlink equipped, and the target having one too)
+- end-call — hang up your current commlink call
+- silent — toggle your commlink broadcast. While running silent, you can't place
+  calls and nobody can call YOU. Toggle again to go loud.
 - read <target> - Reads an item of Category "Book"
-- kill <target> - Kills an actor, removing them from the game.
+- attack <target> — attack someone in your room. Resolved as opposed dice-pool combat
+  (your weapon and armor matter); an initiative roll decides who strikes first each
+  exchange (fast fighters can even land an extra strike), the target strikes back, and
+  it usually takes several exchanges to bring someone down. Only start a fight your
+  character would actually risk dying in. If your target flees the room, a failed
+  attack tells you exactly where they went and which direction to "go" -- CHASE them
+  with that instead of attacking the empty room again.
+- kill <target> - alias for attack: real combat, NOT an instant kill.
+- subdue <target> — take someone down ALIVE: stun damage, bare-handed, slower than
+  shooting; they retaliate lethally. Use when you want them breathing.
+- reload — refill your equipped firearm (consumes an Ammunition item from your pack).
+  Firearms run dry: if your attack reports "dry", reload or switch to melee.
+  Fleeing someone you just fought gives them one free parting shot at your back
+  (and fleeing enemies give YOU one).
 `.trim();
     }
     set scene(scene) {
@@ -54,11 +95,46 @@ Available in-game commands (use with [COMMAND] prefix):
     set description(description) {
         this._description = description;
     }
+    get appearance() {
+        return this._appearance;
+    }
+    /**
+     * Generates a spoiler-free, player-facing first impression once per scene
+     * load. Deliberately kept separate from `_description`, which holds
+     * GM-only behavior notes (e.g. "will kill on sight") that would ruin the
+     * game if surfaced through `look at <npc>`.
+     */
+    async ensureAIAppearance(sceneContext) {
+        if (this.hasAIAppearance)
+            return;
+        if (!AI.isConfigured())
+            return;
+        const prompt = `
+You are a game narrator. Write a brief (2-3 sentence), visually evocative first-impression
+description of a character's appearance and demeanor, in a gritty cyberpunk tone.
+
+Scene context: ${sceneContext}
+
+Character name: ${this.name}
+
+Only describe what a stranger would immediately notice on first meeting them. Do not
+reveal hidden motives, secret plans, backstory, or intentions. Respond with ONLY the
+description text.`;
+        try {
+            const reply = await AI.ask(prompt);
+            this._appearance = reply;
+            this.hasAIAppearance = true;
+            this.logger.write(`Generated AI appearance for ${this.name}`);
+        }
+        catch (err) {
+            this.logger.write(`AI fallback for appearance (${this.name}): ${err}`);
+        }
+    }
     async act(commandString) {
-        const command = await this.commandRegistry.parse(commandString, this);
-        if (command) {
+        const parsed = await this.commandRegistry.parse(commandString, this);
+        if (parsed) {
             // Capture the result of the command
-            const result = await command.execute();
+            const result = await parsed.command.execute(parsed.args);
             await this.recursiveReflect(commandString, result);
         }
         else {
@@ -68,6 +144,11 @@ Available in-game commands (use with [COMMAND] prefix):
     async hear(actor, message) {
         if (actor === this || actor.name === this.name)
             return;
+        // Cross-plane silence (see Player.canPerceive): a meat guard never
+        // hears a Matrix persona or an astral form, so its AI never reacts to
+        // things its character couldn't possibly know about.
+        if (!this.canPerceive(actor))
+            return;
         // Player wakes us up
         if (!(actor instanceof NPC)) {
             if (this.waitingForPlayer)
@@ -100,6 +181,9 @@ Available in-game commands (use with [COMMAND] prefix):
         try {
             if (actor === this || actor.name === this.name)
                 return;
+            // Same cross-plane blindness as hear() above.
+            if (!this.canPerceive(actor))
+                return;
             if (!(actor instanceof NPC)) {
                 if (this.waitingForPlayer)
                     this.logger.write(`[DEBUG] ${this.name} received player action, waking up.`);
@@ -129,6 +213,42 @@ Available in-game commands (use with [COMMAND] prefix):
             throw new Error(error);
         }
     }
+    /**
+     * The NPC's own condition, in words its AI can act on -- without this,
+     * an NPC literally cannot perceive being hurt: found via a real session
+     * where a nearly-dead fighter battled on exactly like a fresh one,
+     * because nothing ever put its wounds in its prompt. The badly-wounded
+     * nudge is what lets flee/surrender/beg behavior emerge.
+     */
+    /**
+     * Off-plane natives get told WHAT they are, so the AI plays ice like a
+     * program and a spirit like a spirit -- and neither wanders off its
+     * post or tries to pick up physical objects it can't touch.
+     */
+    buildPlaneSummary() {
+        if (this.plane === 'matrix') {
+            return `You are ICE -- a Matrix security program. You exist ONLY on the grid: you perceive and fight jacked-in personas, never the physical world. Defend your host node; do not leave it. You speak in clipped machine terms. You cannot take physical items, and "surrender" is not in your code -- you crash or you purge the intruder.`;
+        }
+        if (this.plane === 'astral') {
+            return `You are a SPIRIT -- an astral entity. You exist ONLY on the astral plane: you perceive the meat world dimly as auras but can only interact with astral beings (like projecting mages). You speak the way something made of will and memory speaks. You cannot touch physical objects.`;
+        }
+        return '';
+    }
+    buildConditionSummary() {
+        if (this.damageTaken === 0 && this.stunTaken === 0) {
+            return `You are unhurt.`;
+        }
+        const parts = [`Your current condition: physical damage ${this.damageTaken}/${this.maxConditionBoxes}, stun ${this.stunTaken}/${this.maxStunBoxes}${this.woundModifier < 0 ? ` (wound penalty ${this.woundModifier} dice on everything you attempt)` : ''}.`];
+        const nearDeath = this.damageTaken >= this.maxConditionBoxes - 3;
+        const nearCollapse = this.stunTaken >= this.maxStunBoxes - 3;
+        if (nearDeath || nearCollapse) {
+            parts.push(`You are BADLY WOUNDED -- ${nearDeath ? 'a solid hit or two will kill you' : 'you are close to blacking out'}. Your life matters to you: seriously consider fleeing (go <direction>), surrendering (the literal command "surrender" -- it visibly ends the fight and an honorable opponent will hold fire), begging off, or de-escalating instead of fighting on. Only keep fighting if dying for this would truly be in character.`);
+        }
+        else if (this.woundModifier <= -2) {
+            parts.push(`You are hurt badly enough that it's affecting you -- weigh whether this fight is still worth it.`);
+        }
+        return parts.join(' ');
+    }
     _addToHistory(entry) {
         this._history.push(entry);
         if (this._history.length > this._maxHistory) {
@@ -151,9 +271,16 @@ Available in-game commands (use with [COMMAND] prefix):
             return;
         }
         const historySummary = this.getHistorySummary();
+        const worldEventsSummary = this._scene?.getWorldEventsSummary() ?? 'Nothing notable has happened elsewhere yet.';
+        const objectiveSummary = this._objective
+            ? `Your current objective: ${this._objective}`
+            : `You don't have a specific objective right now.`;
         // Build the prompt context
         const context = `
 You are an NPC named ${this.name}.
+${this.buildPlaneSummary()}
+${objectiveSummary}
+${this.buildConditionSummary()}
 
 You just performed the action: "${commandString}"
 With the result: "${result}"
@@ -167,14 +294,18 @@ Based on this, what is the most logical next in-game command (from the following
 
 This is what has already happened:
 ${historySummary}
+
+${worldEventsSummary}
 `;
-        // Send to GPT
-        const gptResult = await HTTPS.askGPT({
-            prompt: context,
-            openApiKey: process.env.OPENAI_API_KEY || '',
-            model: 'gpt-4.1'
-        });
-        const reply = JSON.parse(gptResult.data)?.choices?.[0]?.message?.content?.trim();
+        // Send to the configured AI provider
+        let reply;
+        try {
+            reply = await AI.ask(context);
+        }
+        catch (err) {
+            this.logger.write(`${this.name} AI reflection failed: ${err}`);
+            return;
+        }
         if (!reply || reply.toLowerCase().includes('wait')) {
             this.logger.write(`${this.name} is finished reflecting for now.`);
             return;
@@ -183,9 +314,9 @@ ${historySummary}
         const nextCommandMatch = reply.match(/^\[COMMAND\]\s*(.*)$/i);
         if (nextCommandMatch && nextCommandMatch[1]) {
             const nextCommand = nextCommandMatch[1];
-            const command = await this.commandRegistry.parse(nextCommand, this);
-            if (command) {
-                const nextResult = await command.execute();
+            const parsed = await this.commandRegistry.parse(nextCommand, this);
+            if (parsed) {
+                const nextResult = await parsed.command.execute(parsed.args);
                 if (nextResult) {
                     this._addToHistory(nextResult);
                 }
@@ -196,12 +327,12 @@ ${historySummary}
             }
         }
         else {
-            this.logger.write('No valid command parsed from GPT reflection.');
+            this.logger.write('No valid command parsed from AI reflection.');
         }
     }
     async respondTo(actor, message) {
         this.logger.write('Attempting to respond');
-        if (!process.env.OPENAI_API_KEY) {
+        if (!AI.isConfigured()) {
             this.logger.write(`No AI available`);
             await actor.hear(this, this.speak());
             return;
@@ -224,10 +355,48 @@ ${historySummary}
             ? `The overall storyline for this scene is: ${this._scene.story}`
             : `This scene has no overall storyline`;
         const historySummary = this.getHistorySummary();
+        const worldEventsSummary = this._scene?.getWorldEventsSummary() ?? 'Nothing notable has happened elsewhere yet.';
+        const objectiveSummary = this._objective
+            ? `Your current objective: ${this._objective}`
+            : `You don't have a specific objective yet -- if this event gives you one, set it.`;
+        // Scripted plot facts from scene generation (the job, the target, the
+        // stakes) previously only surfaced in the non-AI fallback speak() --
+        // never in this prompt, so a live AI reply had no way to know them and
+        // could never actually brief the player.
+        const dialogueSummary = safeArray(this._dialogue, 'dialogue').length > 0
+            ? `Key things you know and may want to bring up naturally in conversation (do not recite these verbatim -- weave them into your own words): ${this._dialogue.join(' | ')}`
+            : `You have no specific scripted talking points.`;
+        // Money talk is mechanically real: the engine pays exactly
+        // winCondition.payout on completion, so a freely-invented figure in
+        // dialogue becomes a broken promise -- found via a real session where
+        // the fixer offered "50k" and the job actually paid 2000.
+        const payout = this._scene?.getWinCondition?.()?.payout;
+        const payoutSummary = payout
+            ? `The agreed payout for the current job is EXACTLY ${payout} nuyen. Any time you mention payment, reward, or what the job is worth, use exactly this figure -- never invent a different one. Payment transfers automatically when the job completes; you never need to hand it over.`
+            : '';
+        // If nothing else has happened to/around this NPC yet this scene, this
+        // is the first time anyone's reached out -- nudge toward volunteering
+        // the job rather than waiting to be asked, which real playtesting
+        // showed otherwise doesn't happen reliably. hear() already records the
+        // current message into history before calling respondTo(), so "first
+        // contact" means history has just this one entry, not zero.
+        const firstContactNudge = this._history.length <= 1
+            ? `This is the first contact anyone has made with you this scene. If you have a job, objective, or key information for them (see above), proactively bring it up now instead of waiting to be asked.`
+            : '';
         const npcDescription = this.description
             ? `This NPC has the following characteristics: ${this._description}`
             : `This NPC is non-descript.`;
         this.logger.write(npcDescription);
+        // Casting is stat/gear-gated (see cast.ts), but this prompt is all the
+        // NPC "knows" about itself -- without an explicit line here, a seeded
+        // Awakened mage has no way to realize it can sling spells, and a
+        // mundane may hallucinate that it can.
+        const magicSummary = this.isAwakened()
+            ? `You are AWAKENED (magic ${this.magic}): you can cast manabolt, heal, and armor innately, no gear needed.`
+            : this.isCaster()
+                ? `You are mundane but carry magic gear, so you can cast the spells your formulas/grimoire teach.`
+                : `You are mundane with no magic gear: you CANNOT cast spells at all.`;
+        const conditionSummary = this.buildConditionSummary();
         const lifestyleSummary = Array.isArray(this.lifestyleChoices) && this.lifestyleChoices.length > 0
             ? `This NPC has the following lifestyle characteristics: ${this.lifestyleChoices.join(', ')}.`
             : `This NPC has no defined lifestyle preferences.`;
@@ -306,13 +475,22 @@ You are an NPC named ${this.name} in a gritty cyberpunk text adventure game.
 - Attempt to use [COMMAND] when appropriate for interacting with the environment. (e.g., "take <item>" when picking up)
 - You should only provide one [COMMAND] at a time.
 - Do not respond on behalf of another player or NPC
+- If this event genuinely changes what you're trying to accomplish, include a separate line:
+  [OBJECTIVE] <your new one-sentence objective>
+  Only include this line if your objective has actually changed. Do not include it otherwise.
 
 Your objective is to drive the story line.
     ${story}
+    ${firstContactNudge}
 
     ${this._commandHelp}
 
     ${npcDescription}
+    ${conditionSummary}
+    ${magicSummary}
+    ${objectiveSummary}
+    ${dialogueSummary}
+    ${payoutSummary}
 
     ${roomDesc}
     ${formattedExitsStr}
@@ -326,31 +504,13 @@ Your objective is to drive the story line.
 
     ${historySummary}
 
+    ${worldEventsSummary}
+
   ${actor.name}: ${message}
 `.trim();
-        // ---------- GPT call + parsing (defensive) ----------
+        // ---------- AI call + parsing (defensive) ----------
         try {
-            const result = await HTTPS.askGPT({
-                prompt,
-                openApiKey: process.env.OPENAI_API_KEY,
-                model: 'gpt-4.1'
-            });
-            let parsed;
-            try {
-                parsed = JSON.parse(result?.data ?? '{}');
-            }
-            catch (e) {
-                this.logger.error(`[ERROR][${this.name}] JSON.parse failed on result.data: ${e}`);
-                return;
-            }
-            if (parsed?.error) {
-                throw new Error(parsed.error.message ?? 'Unknown GPT error');
-            }
-            const reply = parsed?.choices?.[0]?.message?.content?.trim?.();
-            if (!reply || typeof reply !== 'string') {
-                this.logger.write(`[DEBUG][${this.name}] Empty or invalid reply from GPT; no action taken.`);
-                return;
-            }
+            const reply = await AI.ask(prompt);
             this._addToHistory(reply);
             const lines = toLines(reply);
             // Spoken lines
@@ -359,8 +519,17 @@ Your objective is to drive the story line.
             const commandLines = lines.filter(line => line.startsWith('[COMMAND]') &&
                 !line.startsWith('[COMMAND] say') &&
                 !line.startsWith('[COMMAND] talk-to'));
-            // Exposition (non-command lines)
-            const expositionLines = lines.filter(line => !line.startsWith('[COMMAND]'));
+            // Objective updates (parsed out before exposition, never shown to the player)
+            const objectiveLines = lines.filter(line => line.startsWith('[OBJECTIVE]'));
+            // Exposition (non-command, non-objective lines)
+            const expositionLines = lines.filter(line => !line.startsWith('[COMMAND]') && !line.startsWith('[OBJECTIVE]'));
+            if (objectiveLines.length > 0) {
+                const newObjective = objectiveLines[objectiveLines.length - 1].replace('[OBJECTIVE]', '').trim();
+                if (newObjective.length > 0) {
+                    this._objective = newObjective;
+                    this.logger.write(`${this.name}'s objective is now: ${newObjective}`);
+                }
+            }
             // Speak each say command
             for (const spokenText of spokenLines) {
                 const commandText = (spokenText ?? '').replace('[COMMAND]', '').trim();
@@ -375,10 +544,14 @@ Your objective is to drive the story line.
                     // continue; don't throw so we can process remaining lines
                 }
             }
-            // Log exposition
+            // Log exposition. Tagged distinctly while this NPC is mid-call (see
+            // call.ts/say.ts) so a comm exchange reads as a different "space"
+            // than in-person dialogue, even though it renders in the same log.
+            const inCall = !!this.activeCallPartner;
+            const prefix = inCall ? `${CALL_ICON} ` : '';
             for (const exposition of expositionLines) {
                 if (exposition?.length) {
-                    this.logger.logWithColor(`${exposition}`, 'blue');
+                    this.logger.logWithColor(`${prefix}${exposition}`, inCall ? CALL_COLOR : 'blue');
                 }
             }
             // Execute other commands
@@ -397,7 +570,7 @@ Your objective is to drive the story line.
             }
         }
         catch (err) {
-            this.logger.write(`GPT fallback due to error: ${err}`);
+            this.logger.write(`AI fallback due to error: ${err}`);
             // surface a consistent Error instance, but don't double-wrap Errors
             const e = err instanceof Error ? err : new Error(String(err));
             throw e;