@@ -12,7 +12,7 @@ import type {
1212 import { config } from "./config";
1313 import { MemoryStore } from "./memory";
1414 import { OllamaAgent, OllamaTimeoutError } from "./ollama";
15-import { buildActionPrompt, buildRegistrationPrompt } from "./prompt";
15+import { buildActionPrompt, buildRegistrationPrompt, type WorldSnapshot } from "./prompt";
1616 import { dispatchAction, validateAction } from "./actions";
1717 import { Tui } from "./tui";
1818
@@ -33,6 +33,10 @@ let credentials: Credentials | null = null;
3333 let pendingRegistration: RegistrationChoice | null = null;
3434 let includeHelpInPrompt = true;
3535 let actionLoopRunning = false;
36+let worldSnapshot: WorldSnapshot = {};
37+let registrationRetries = 0;
38+const MAX_REGISTRATION_RETRIES = 3;
39+const failedRegistrationNames: string[] = [];
3640
3741 async function loadCredentials(): Promise<Credentials | null> {
3842 try {
@@ -95,7 +99,7 @@ async function runRegistrationFlow(): Promise<void> {
9599 while (attempts < 3) {
96100 attempts += 1;
97101 try {
98- const prompt = buildRegistrationPrompt(true);
102+ const prompt = buildRegistrationPrompt(true, failedRegistrationNames);
99103 const result = await ollama.generateJson<RegistrationChoice>(prompt);
100104 const username = String(result.json.username ?? "").trim();
101105 const empire = String(result.json.empire ?? "").trim() as EmpireID;
@@ -131,6 +135,7 @@ async function startActionLoop(): Promise<void> {
131135 const recentEvents = memory.getRecentEvents(config.maxContextEvents);
132136 const prompt = buildActionPrompt({
133137 state: client.state,
138+ worldSnapshot,
134139 recentActions,
135140 recentEvents,
136141 includeHelp: includeHelpInPrompt,
@@ -159,6 +164,11 @@ async function startActionLoop(): Promise<void> {
159164 const actionLog = dispatchAction(client, validation.action);
160165 log(`Action: ${actionLog}`);
161166 memory.appendEvent("action_sent", { action: validation.action });
167+
168+ if (validation.action.action === "travel") {
169+ client.getSystem();
170+ client.getPOI();
171+ }
162172 } catch (error) {
163173 const message = (error as Error).message;
164174 if (error instanceof OllamaTimeoutError) {
@@ -185,6 +195,8 @@ function formatOkPayload(payload: Record<string, unknown>): string {
185195 if (payload.action) {
186196 return `OK ${payload.action}`;
187197 }
198+ const summary = summarizeOkPayload(payload);
199+ if (summary) return `OK ${summary}`;
188200 return `OK ${safeJson(payload)}`;
189201 }
190202
@@ -196,6 +208,26 @@ function safeJson(value: unknown): string {
196208 }
197209 }
198210
211+function summarizeOkPayload(payload: Record<string, unknown>): string | null {
212+ if (Array.isArray(payload.pois) && payload.pois.length > 0) {
213+ const system = payload.system as { id?: string; name?: string } | undefined;
214+ const systemLabel = system?.name || system?.id ? ` for ${system?.name ?? system?.id}` : "";
215+ return `system${systemLabel} with ${payload.pois.length} POIs`;
216+ }
217+ if (payload.poi && typeof payload.poi === "object") {
218+ const poi = payload.poi as { id?: string; name?: string; type?: string };
219+ return `poi ${poi.name ?? poi.id ?? ""}${poi.type ? ` (${poi.type})` : ""}`.trim();
220+ }
221+ if (payload.base && typeof payload.base === "object") {
222+ const base = payload.base as { id?: string; name?: string };
223+ return `base ${base.name ?? base.id ?? ""}`.trim();
224+ }
225+ if (payload.version) {
226+ return `version ${String(payload.version)}`;
227+ }
228+ return null;
229+}
230+
199231 function shutdown(): void {
200232 try {
201233 client.disconnect();
@@ -225,10 +257,12 @@ client.on<WelcomePayload>("welcome", async (data) => {
225257
226258 client.on<RegisteredPayload>("registered", async (data) => {
227259 memory.appendEvent("registered", data);
260+ registrationRetries = 0;
261+ failedRegistrationNames.length = 0;
228262 if (pendingRegistration) {
229263 await saveCredentials(pendingRegistration.username, data.token);
230264 log(`Registered. Saved credentials for ${pendingRegistration.username}`);
231- client.login(pendingRegistration.username, data.token);
265+ pendingRegistration = null;
232266 } else {
233267 log("Registered but no pending registration found.");
234268 }
@@ -237,6 +271,13 @@ client.on<RegisteredPayload>("registered", async (data) => {
237271 client.on<LoggedInPayload>("logged_in", (data) => {
238272 log(`Logged in as ${data.player.username} (${data.player.empire})`);
239273 memory.appendEvent("logged_in", data);
274+ worldSnapshot.system = data.system;
275+ worldSnapshot.poi = data.poi;
276+ client.getSystem();
277+ client.getPOI();
278+ if (data.player.docked_at_base) {
279+ client.getBase();
280+ }
240281 updateStatus();
241282 saveSnapshot();
242283 startActionLoop();
@@ -245,6 +286,22 @@ client.on<LoggedInPayload>("logged_in", (data) => {
245286 client.on<ErrorPayload>("error", (data) => {
246287 log(`Error [${data.code}] ${data.message}`);
247288 memory.appendEvent("error", data);
289+ if (data.code === "username_taken" && pendingRegistration) {
290+ if (pendingRegistration.username) {
291+ failedRegistrationNames.push(pendingRegistration.username);
292+ }
293+ if (registrationRetries < MAX_REGISTRATION_RETRIES) {
294+ registrationRetries += 1;
295+ log("Username taken. Requesting a new registration name...");
296+ pendingRegistration = null;
297+ runRegistrationFlow();
298+ } else {
299+ log("Username taken repeatedly. Falling back to random name.");
300+ const fallback = `molt-bot-${Math.floor(Math.random() * 10000)}`;
301+ pendingRegistration = { username: fallback, empire: "solarian" };
302+ client.register(fallback, "solarian");
303+ }
304+ }
248305 });
249306
250307 client.on<StateUpdatePayload>("state_update", (data) => {
@@ -269,6 +326,7 @@ client.on<ScanResultPayload>("scan_result", (data) => {
269326 client.on("ok", (data: Record<string, unknown>) => {
270327 log(formatOkPayload(data));
271328 memory.appendEvent("ok", data);
329+ updateWorldSnapshotFromOk(data);
272330 });
273331
274332 client.on("version_info", (data: Record<string, unknown>) => {
@@ -279,3 +337,18 @@ client.on("version_info", (data: Record<string, unknown>) => {
279337 credentials = await loadCredentials();
280338 await client.connect();
281339 updateStatus();
340+
341+function updateWorldSnapshotFromOk(data: Record<string, unknown>): void {
342+ if (data.system && typeof data.system === "object") {
343+ worldSnapshot.system = data.system as WorldSnapshot["system"];
344+ }
345+ if (Array.isArray(data.pois)) {
346+ worldSnapshot.pois = data.pois as WorldSnapshot["pois"];
347+ }
348+ if (data.poi && typeof data.poi === "object") {
349+ worldSnapshot.poi = data.poi as WorldSnapshot["poi"];
350+ }
351+ if (data.base && typeof data.base === "object") {
352+ worldSnapshot.base = data.base as WorldSnapshot["base"];
353+ }
354+}