@@ -35,6 +35,7 @@ let includeHelpInPrompt = true;
3535 let actionLoopRunning = false;
3636 let worldSnapshot: WorldSnapshot = {};
3737 let registrationRetries = 0;
38+let travelInProgress = false;
3839 const MAX_REGISTRATION_RETRIES = 3;
3940 const failedRegistrationNames: string[] = [];
4041
@@ -74,11 +75,16 @@ function updateStatus(): void {
7475 `Hull ${state.ship.hull}/${state.ship.max_hull}`,
7576 `Shield ${state.ship.shield}/${state.ship.max_shield}`,
7677 `Fuel ${state.ship.fuel}/${state.ship.max_fuel}`,
78+ `Traveling ${travelInProgress ? "Y" : "N"}`,
7779 `Docked ${state.player.docked_at_base ? "Y" : "N"}`,
7880 `Tick ${state.currentTick}`,
7981 location,
8082 ].join(" | ");
81- tui.setStatus(status);
83+ const cargoList = state.ship.cargo?.length
84+ ? state.ship.cargo.map((item) => `${item.item_id}(${item.quantity})`).join(",")
85+ : "none";
86+ const statusWithCargo = `${status} | Cargo ${state.ship.cargo_used}/${state.ship.cargo_capacity} [${cargoList}]`;
87+ tui.setStatus(statusWithCargo);
8288 }
8389
8490 function saveSnapshot(): void {
@@ -131,6 +137,10 @@ async function startActionLoop(): Promise<void> {
131137
132138 while (client.state.authenticated) {
133139 try {
140+ if (travelInProgress) {
141+ await sleep(config.tickDelayMs);
142+ continue;
143+ }
134144 const recentActions = memory.getRecentActions(config.maxContextActions);
135145 const recentEvents = memory.getRecentEvents(config.maxContextEvents);
136146 const prompt = buildActionPrompt({
@@ -153,6 +163,21 @@ async function startActionLoop(): Promise<void> {
153163 continue;
154164 }
155165
166+ if (
167+ (validation.action.action === "scan" || validation.action.action === "attack") &&
168+ !isNearbyTarget(client.state.nearby, validation.action.args?.target_id)
169+ ) {
170+ const target = String(validation.action.args?.target_id ?? "").trim();
171+ const message = target
172+ ? `Invalid action from LLM: Unknown nearby target: ${target}`
173+ : "Invalid action from LLM: Missing target_id";
174+ log(message);
175+ memory.appendEvent("llm_invalid_action", { error: message, raw: result.raw });
176+ includeHelpInPrompt = true;
177+ await sleep(config.tickDelayMs);
178+ continue;
179+ }
180+
156181 memory.appendAction(
157182 validation.action.action,
158183 validation.action.args ?? {},
@@ -187,6 +212,21 @@ async function startActionLoop(): Promise<void> {
187212 actionLoopRunning = false;
188213 }
189214
215+function isNearbyTarget(
216+ nearby: { player_id?: string; username?: string }[] | undefined,
217+ targetId: unknown
218+): boolean {
219+ if (!nearby || nearby.length === 0) return false;
220+ const target = String(targetId ?? "").trim();
221+ if (!target) return false;
222+ const normalized = target.toLowerCase();
223+ return nearby.some((player) => {
224+ const id = player.player_id ? player.player_id.toLowerCase() : "";
225+ const name = player.username ? player.username.toLowerCase() : "";
226+ return normalized === id || normalized === name;
227+ });
228+}
229+
190230 function sleep(ms: number): Promise<void> {
191231 return new Promise((resolve) => setTimeout(resolve, ms));
192232 }
@@ -327,6 +367,15 @@ client.on("ok", (data: Record<string, unknown>) => {
327367 log(formatOkPayload(data));
328368 memory.appendEvent("ok", data);
329369 updateWorldSnapshotFromOk(data);
370+ const action = typeof data.action === "string" ? data.action : null;
371+ if (action === "travel") {
372+ travelInProgress = true;
373+ }
374+ if (action === "arrived") {
375+ travelInProgress = false;
376+ client.getSystem();
377+ client.getPOI();
378+ }
330379 });
331380
332381 client.on("version_info", (data: Record<string, unknown>) => {