@@ -1,274 +1,308 @@
1-import { SpaceMoltClient } from "../client/src/client";
21 import type { ClientState } from "../client/src/client";
2+import { SpaceMoltClient } from "../client/src/client";
33 import type {
4- WelcomePayload,
5- RegisteredPayload,
6- LoggedInPayload,
7- ErrorPayload,
8- StateUpdatePayload,
9- ChatMessage,
10- ScanResultPayload,
11- EmpireID,
12- CargoItem,
4+ CargoItem,
5+ ChatMessage,
6+ EmpireID,
7+ ErrorPayload,
8+ LoggedInPayload,
9+ RegisteredPayload,
10+ ScanResultPayload,
11+ StateUpdatePayload,
12+ WelcomePayload,
1313 } from "../client/src/types";
14+import { dispatchAction, validateAction } from "./actions";
1415 import { config } from "./config";
1516 import { MemoryStore } from "./memory";
1617 import { OllamaAgent, OllamaTimeoutError } from "./ollama";
17-import { buildActionPrompt, buildRegistrationPrompt, type WorldSnapshot } from "./prompt";
18-import { dispatchAction, validateAction } from "./actions";
18+import {
19+ buildActionPrompt,
20+ buildRegistrationPrompt,
21+ type WorldSnapshot,
22+} from "./prompt";
1923 import { Tui } from "./tui";
2024
2125 type Credentials = { username: string; token: string };
2226 type RegistrationChoice = { username: string; empire: EmpireID };
2327
2428 const memory = new MemoryStore(config.memoryPath);
25-const ollama = new OllamaAgent(config.ollamaUrl, config.ollamaModel, config.ollamaTimeoutMs);
29+const ollama = new OllamaAgent(
30+ config.ollamaUrl,
31+ config.ollamaModel,
32+ config.ollamaTimeoutMs,
33+);
2634 const tui = new Tui(config.debug);
2735
2836 const client = new SpaceMoltClient({
29- url: config.spacemoltUrl,
30- debug: false, //config.debug,
31- reconnect: true,
37+ url: config.spacemoltUrl,
38+ debug: false, //config.debug,
39+ reconnect: true,
3240 });
3341
3442 let credentials: Credentials | null = null;
3543 let pendingRegistration: RegistrationChoice | null = null;
36-let includeHelpInPrompt = true;
3744 let actionLoopRunning = false;
38-let worldSnapshot: WorldSnapshot = {};
45+const worldSnapshot: WorldSnapshot = {};
3946 let registrationRetries = 0;
4047 let travelInProgress = false;
4148 let lastTravelTarget: string | null = null;
49+let currentGoal: string | null = null;
4250 const MAX_REGISTRATION_RETRIES = 3;
4351 const failedRegistrationNames: string[] = [];
4452
4553 async function loadCredentials(): Promise<Credentials | null> {
46- try {
47- const file = Bun.file(config.credentialsFile);
48- if (await file.exists()) {
49- return (await file.json()) as Credentials;
50- }
51- } catch {
52- return null;
53- }
54- return null;
54+ try {
55+ const file = Bun.file(config.credentialsFile);
56+ if (await file.exists()) {
57+ return (await file.json()) as Credentials;
58+ }
59+ } catch {
60+ return null;
61+ }
62+ return null;
5563 }
5664
5765 async function saveCredentials(username: string, token: string): Promise<void> {
58- const data: Credentials = { username, token };
59- await Bun.write(config.credentialsFile, JSON.stringify(data, null, 2));
66+ const data: Credentials = { username, token };
67+ await Bun.write(config.credentialsFile, JSON.stringify(data, null, 2));
6068 }
6169
6270 function log(message: string): void {
63- tui.log(message);
71+ tui.log(message);
6472 }
6573
6674 function updateStatus(): void {
67- const state = client.state;
68- if (!state.player || !state.ship) {
69- tui.setStatus("Not logged in");
70- tui.setSidebar("Not logged in.");
71- return;
72- }
73- const statusText = buildStatusText(state, worldSnapshot, travelInProgress, lastTravelTarget);
74- const sidebarText = formatSidebar(state, worldSnapshot, travelInProgress, lastTravelTarget);
75- tui.setStatus(statusText);
76- tui.setSidebar(sidebarText);
75+ const state = client.state;
76+ if (!state.player || !state.ship) {
77+ tui.setStatus("Not logged in");
78+ tui.setSidebar("Not logged in.");
79+ return;
80+ }
81+ const statusText = buildStatusText(
82+ state,
83+ worldSnapshot,
84+ travelInProgress,
85+ lastTravelTarget,
86+ currentGoal,
87+ );
88+ const sidebarText = formatSidebar(
89+ state,
90+ worldSnapshot,
91+ travelInProgress,
92+ lastTravelTarget,
93+ );
94+ tui.setStatus(statusText);
95+ tui.setSidebar(sidebarText);
7796 }
7897
7998 function saveSnapshot(): void {
80- memory.saveSnapshot({
81- tick: client.state.currentTick,
82- player: client.state.player,
83- ship: client.state.ship,
84- system: client.state.system,
85- poi: client.state.poi,
86- base: client.state.base,
87- nearby: client.state.nearby,
88- });
99+ memory.saveSnapshot({
100+ tick: client.state.currentTick,
101+ player: client.state.player,
102+ ship: client.state.ship,
103+ system: client.state.system,
104+ poi: client.state.poi,
105+ base: client.state.base,
106+ nearby: client.state.nearby,
107+ });
89108 }
90109
91110 async function runRegistrationFlow(): Promise<void> {
92- log("No credentials found. Asking LLM to create a character...");
93- let attempts = 0;
94- while (attempts < 3) {
95- attempts += 1;
96- try {
97- const prompt = buildRegistrationPrompt(true, failedRegistrationNames);
98- tui.setPrompt(prompt);
99- const result = await ollama.generateJson<RegistrationChoice>(prompt);
100- const username = String(result.json.username ?? "").trim();
101- const empire = String(result.json.empire ?? "").trim() as EmpireID;
102- if (!username || !isValidEmpire(empire)) {
103- throw new Error("Invalid registration response");
104- }
105- pendingRegistration = { username, empire };
106- log(`Registering new account: ${username} (${empire})`);
107- client.register(username, empire);
108- return;
109- } catch (error) {
110- log(`Registration attempt failed: ${(error as Error).message}`);
111- }
112- }
113-
114- const fallback = `molt-bot-${Math.floor(Math.random() * 10000)}`;
115- pendingRegistration = { username: fallback, empire: "solarian" };
116- log(`Falling back to account: ${fallback} (solarian)`);
117- client.register(fallback, "solarian");
111+ log("No credentials found. Asking LLM to create a character...");
112+ let attempts = 0;
113+ while (attempts < 3) {
114+ attempts += 1;
115+ try {
116+ const prompt = buildRegistrationPrompt(true, failedRegistrationNames);
117+ tui.setPrompt(prompt);
118+ const result = await ollama.generateJson<RegistrationChoice>(prompt);
119+ const username = String(result.json.username ?? "").trim();
120+ const empire = String(result.json.empire ?? "").trim() as EmpireID;
121+ if (!username || !isValidEmpire(empire)) {
122+ throw new Error("Invalid registration response");
123+ }
124+ pendingRegistration = { username, empire };
125+ log(`Registering new account: ${username} (${empire})`);
126+ client.register(username, empire);
127+ return;
128+ } catch (error) {
129+ log(`Registration attempt failed: ${(error as Error).message}`);
130+ }
131+ }
132+
133+ const fallback = `molt-bot-${Math.floor(Math.random() * 10000)}`;
134+ pendingRegistration = { username: fallback, empire: "solarian" };
135+ log(`Falling back to account: ${fallback} (solarian)`);
136+ client.register(fallback, "solarian");
118137 }
119138
120139 function isValidEmpire(empire: string): empire is EmpireID {
121- return ["solarian", "voidborn", "crimson", "nebula", "outerrim"].includes(empire);
140+ return ["solarian", "voidborn", "crimson", "nebula", "outerrim"].includes(
141+ empire,
142+ );
122143 }
123144
124145 async function startActionLoop(): Promise<void> {
125- if (actionLoopRunning) return;
126- actionLoopRunning = true;
127-
128- while (client.state.authenticated) {
129- try {
130- if (travelInProgress) {
131- await sleep(config.tickDelayMs);
132- continue;
133- }
134- const recentHistory = memory.getRecentHistory(config.maxContextActions, config.maxContextEvents);
135- const prompt = buildActionPrompt({
136- state: client.state,
137- worldSnapshot,
138- recentHistory,
139- includeHelp: includeHelpInPrompt,
140- });
141-
142- tui.setPrompt(prompt);
143-
144- const promptExcerpt = prompt.slice(0, 1000);
145- const result = await ollama.generateJson(prompt);
146- const validation = validateAction(result.json);
147- if (!validation.ok || !validation.action) {
148- const message = `Invalid action from LLM: ${validation.error ?? "unknown"}`;
149- log(message);
150- memory.appendEvent("llm_invalid_action", { error: validation.error, raw: result.raw });
151- includeHelpInPrompt = true;
152- await sleep(config.tickDelayMs);
153- continue;
154- }
155-
156- if (
157- (validation.action.action === "scan" || validation.action.action === "attack") &&
158- !isNearbyTarget(client.state.nearby, validation.action.args?.target_id)
159- ) {
160- const target = String(validation.action.args?.target_id ?? "").trim();
161- const message = target
162- ? `Invalid action from LLM: Unknown nearby target: ${target}`
163- : "Invalid action from LLM: Missing target_id";
164- log(message);
165- memory.appendEvent("llm_invalid_action", { error: message, raw: result.raw });
166- includeHelpInPrompt = true;
167- await sleep(config.tickDelayMs);
168- continue;
169- }
170-
171- const actionName = validation.action.action;
172- memory.appendAction(actionName, validation.action.args ?? {}, promptExcerpt, result.raw);
173- includeHelpInPrompt = actionName === "help";
174-
175- if (actionName === "help") {
176- log("Action: help (showing help menu)");
177- } else {
178- if (actionName === "travel") {
179- lastTravelTarget = String(validation.action.args?.target_poi ?? "").trim() || null;
180- }
181- const actionLog = dispatchAction(client, validation.action);
182- log(`Action: ${actionLog}`);
183- memory.appendEvent("action_sent", { action: validation.action });
184-
185- if (actionName === "travel") {
186- client.getSystem();
187- client.getPOI();
188- }
189- }
190- } catch (error) {
191- const message = (error as Error).message;
192- if (error instanceof OllamaTimeoutError) {
193- log(`LLM timeout: ${message}. Retrying next tick.`);
194- memory.appendEvent("llm_timeout", { message });
195- } else {
196- log(`Loop error: ${message}`);
197- memory.appendEvent("loop_error", { message });
198- }
199- includeHelpInPrompt = true;
200- }
201-
202- await sleep(config.tickDelayMs);
203- }
204-
205- actionLoopRunning = false;
146+ if (actionLoopRunning) return;
147+ actionLoopRunning = true;
148+
149+ while (client.state.authenticated) {
150+ try {
151+ if (travelInProgress) {
152+ await sleep(config.tickDelayMs);
153+ continue;
154+ }
155+ const recentHistory = memory.getRecentHistory(
156+ config.maxContextActions,
157+ config.maxContextEvents,
158+ );
159+ const prompt = buildActionPrompt({
160+ state: client.state,
161+ worldSnapshot,
162+ recentHistory,
163+ currentGoal,
164+ });
165+
166+ tui.setPrompt(prompt);
167+
168+ const promptExcerpt = prompt.slice(0, 1000);
169+ const result = await ollama.generateJson(prompt);
170+ const validation = validateAction(result.json);
171+ if (!validation.ok || !validation.action) {
172+ const message = `Invalid action from LLM: ${validation.error ?? "unknown"}`;
173+ log(message);
174+ memory.appendEvent("llm_invalid_action", {
175+ error: validation.error,
176+ raw: result.raw,
177+ });
178+ await sleep(config.tickDelayMs);
179+ continue;
180+ }
181+
182+ if (
183+ (validation.action.action === "scan" ||
184+ validation.action.action === "attack") &&
185+ !isNearbyTarget(client.state.nearby, validation.action.args?.target_id)
186+ ) {
187+ const target = String(validation.action.args?.target_id ?? "").trim();
188+ const message = target
189+ ? `Invalid action from LLM: Unknown nearby target: ${target}`
190+ : "Invalid action from LLM: Missing target_id";
191+ log(message);
192+ memory.appendEvent("llm_invalid_action", {
193+ error: message,
194+ raw: result.raw,
195+ });
196+ await sleep(config.tickDelayMs);
197+ continue;
198+ }
199+
200+ const actionName = validation.action.action;
201+ const goal = validation.action.goal ?? null;
202+ if (client.state.player?.username && goal) {
203+ currentGoal = goal;
204+ memory.setGoal(client.state.player.username, goal);
205+ }
206+ memory.appendAction(
207+ actionName,
208+ validation.action.args ?? {},
209+ promptExcerpt,
210+ result.raw,
211+ );
212+ if (actionName === "travel") {
213+ lastTravelTarget =
214+ String(validation.action.args?.target_poi ?? "").trim() || null;
215+ }
216+ const actionLog = dispatchAction(client, validation.action);
217+ log(`Action: ${actionLog}`);
218+ memory.appendEvent("action_sent", { action: validation.action });
219+
220+ if (actionName === "travel") {
221+ client.getSystem();
222+ client.getPOI();
223+ }
224+ } catch (error) {
225+ const message = (error as Error).message;
226+ if (error instanceof OllamaTimeoutError) {
227+ log(`LLM timeout: ${message}. Retrying next tick.`);
228+ memory.appendEvent("llm_timeout", { message });
229+ } else {
230+ log(`Loop error: ${message}`);
231+ memory.appendEvent("loop_error", { message });
232+ }
233+ }
234+
235+ await sleep(config.tickDelayMs);
236+ }
237+
238+ actionLoopRunning = false;
206239 }
207240
208241 function isNearbyTarget(
209- nearby: { player_id?: string; username?: string }[] | undefined,
210- targetId: unknown
242+ nearby: { player_id?: string; username?: string }[] | undefined,
243+ targetId: unknown,
211244 ): boolean {
212- if (!nearby || nearby.length === 0) return false;
213- const target = String(targetId ?? "").trim();
214- if (!target) return false;
215- const normalized = target.toLowerCase();
216- return nearby.some((player) => {
217- const id = player.player_id ? player.player_id.toLowerCase() : "";
218- const name = player.username ? player.username.toLowerCase() : "";
219- return normalized === id || normalized === name;
220- });
245+ if (!nearby || nearby.length === 0) return false;
246+ const target = String(targetId ?? "").trim();
247+ if (!target) return false;
248+ const normalized = target.toLowerCase();
249+ return nearby.some((player) => {
250+ const id = player.player_id ? player.player_id.toLowerCase() : "";
251+ const name = player.username ? player.username.toLowerCase() : "";
252+ return normalized === id || normalized === name;
253+ });
221254 }
222255
223256 function sleep(ms: number): Promise<void> {
224- return new Promise((resolve) => setTimeout(resolve, ms));
257+ return new Promise((resolve) => setTimeout(resolve, ms));
225258 }
226259
227260 function formatOkPayload(payload: Record<string, unknown>): string {
228- if (payload.action) {
229- return `OK ${payload.action}`;
230- }
231- const summary = summarizeOkPayload(payload);
232- if (summary) return `OK ${summary}`;
233- return `OK ${safeJson(payload)}`;
261+ if (payload.action) {
262+ return `OK ${payload.action}`;
263+ }
264+ const summary = summarizeOkPayload(payload);
265+ if (summary) return `OK ${summary}`;
266+ return `OK ${safeJson(payload)}`;
234267 }
235268
236269 function safeJson(value: unknown): string {
237- try {
238- return JSON.stringify(value);
239- } catch {
240- return "[unserializable]";
241- }
270+ try {
271+ return JSON.stringify(value);
272+ } catch {
273+ return "[unserializable]";
274+ }
242275 }
243276
244277 function summarizeOkPayload(payload: Record<string, unknown>): string | null {
245- if (Array.isArray(payload.pois) && payload.pois.length > 0) {
246- const system = payload.system as { id?: string; name?: string } | undefined;
247- const systemLabel = system?.name || system?.id ? ` for ${system?.name ?? system?.id}` : "";
248- return `system${systemLabel} with ${payload.pois.length} POIs`;
249- }
250- if (payload.poi && typeof payload.poi === "object") {
251- const poi = payload.poi as { id?: string; name?: string; type?: string };
252- return `poi ${poi.name ?? poi.id ?? ""}${poi.type ? ` (${poi.type})` : ""}`.trim();
253- }
254- if (payload.base && typeof payload.base === "object") {
255- const base = payload.base as { id?: string; name?: string };
256- return `base ${base.name ?? base.id ?? ""}`.trim();
257- }
258- if (payload.version) {
259- return `version ${String(payload.version)}`;
260- }
261- return null;
278+ if (Array.isArray(payload.pois) && payload.pois.length > 0) {
279+ const system = payload.system as { id?: string; name?: string } | undefined;
280+ const systemLabel =
281+ system?.name || system?.id ? ` for ${system?.name ?? system?.id}` : "";
282+ return `system${systemLabel} with ${payload.pois.length} POIs`;
283+ }
284+ if (payload.poi && typeof payload.poi === "object") {
285+ const poi = payload.poi as { id?: string; name?: string; type?: string };
286+ return `poi ${poi.name ?? poi.id ?? ""}${poi.type ? ` (${poi.type})` : ""}`.trim();
287+ }
288+ if (payload.base && typeof payload.base === "object") {
289+ const base = payload.base as { id?: string; name?: string };
290+ return `base ${base.name ?? base.id ?? ""}`.trim();
291+ }
292+ if (payload.version) {
293+ return `version ${String(payload.version)}`;
294+ }
295+ return null;
262296 }
263297
264298 function shutdown(): void {
265- try {
266- client.disconnect();
267- } catch {
268- // ignore
269- }
270- tui.destroy();
271- process.exit(0);
299+ try {
300+ client.disconnect();
301+ } catch {
302+ // ignore
303+ }
304+ tui.destroy();
305+ process.exit(0);
272306 }
273307
274308 tui.onExit(shutdown);
@@ -276,105 +310,108 @@ process.on("SIGINT", shutdown);
276310 process.on("SIGTERM", shutdown);
277311
278312 client.on<WelcomePayload>("welcome", async (data) => {
279- log(`Welcome: v${data.version} (tick ${data.tick_rate}s)`);
280- if (data.motd) log(`MOTD: ${data.motd}`);
281- memory.appendEvent("welcome", data);
282-
283- if (credentials) {
284- log(`Auto-login as ${credentials.username}`);
285- client.login(credentials.username, credentials.token);
286- } else {
287- await runRegistrationFlow();
288- }
313+ log(`Welcome: v${data.version} (tick ${data.tick_rate}s)`);
314+ if (data.motd) log(`MOTD: ${data.motd}`);
315+ memory.appendEvent("welcome", data);
316+
317+ if (credentials) {
318+ log(`Auto-login as ${credentials.username}`);
319+ client.login(credentials.username, credentials.token);
320+ } else {
321+ await runRegistrationFlow();
322+ }
289323 });
290324
291325 client.on<RegisteredPayload>("registered", async (data) => {
292- memory.appendEvent("registered", data);
293- registrationRetries = 0;
294- failedRegistrationNames.length = 0;
295- if (pendingRegistration) {
296- await saveCredentials(pendingRegistration.username, data.token);
297- log(`Registered. Saved credentials for ${pendingRegistration.username}`);
298- pendingRegistration = null;
299- } else {
300- log("Registered but no pending registration found.");
301- }
326+ memory.appendEvent("registered", data);
327+ registrationRetries = 0;
328+ failedRegistrationNames.length = 0;
329+ if (pendingRegistration) {
330+ await saveCredentials(pendingRegistration.username, data.token);
331+ log(`Registered. Saved credentials for ${pendingRegistration.username}`);
332+ pendingRegistration = null;
333+ } else {
334+ log("Registered but no pending registration found.");
335+ }
302336 });
303337
304338 client.on<LoggedInPayload>("logged_in", (data) => {
305- log(`Logged in as ${data.player.username} (${data.player.empire})`);
306- memory.appendEvent("logged_in", data);
307- worldSnapshot.system = data.system;
Cut short: this commit's diff is over 1000 lines.