xonecas.io
5875
Os

ollama-space-molt-player / commit 2dbef25

refactor: consolidate logging system and streamline model configuration

xonecas2026-02-03 2dbef25cdcfa4c7f0cef8946bb8d9ee45029c118 parent 7caf7b3

9 files changed

README.md+2−0
@@ -42,6 +42,8 @@ cd packages/client
4242 bun run start
4343 ```
4444
45+ollama logs: journalctl -u ollama -f -n 100
46+
4547 **Important:** Set `OLLAMA_CONTEXT_LENGTH=16384` before starting the Ollama server. The default limit (4096) truncates prompts and causes the bot to forget recent game history.
4648
4749 Model configurations are defined in `player-models.json` at the repo root.
packages/client/src/cli.ts+2−2
@@ -62,7 +62,7 @@ export function parseArgs(args: string[]): ParsedArgs {
6262 const config: ClientConfig = {
6363 instanceId: getArg(cleanArgs, "--instance", "-i"),
6464 hint: getArg(cleanArgs, "--hint"),
65- model: getArg(cleanArgs, "--model", "-m") || "lfm-thinking",
65+ model: getArg(cleanArgs, "--model", "-m") || undefined,
6666 verbose: cleanArgs.includes("--verbose"),
6767 archetype: getArg(cleanArgs, "--archetype", "-a"),
6868 tickRate: 20000,
@@ -111,7 +111,7 @@ COMMANDS:
111111 OPTIONS:
112112 -i, --instance <id> Instance ID (4 chars). Auto-generated if not provided.
113113 --hint <text> Hint message to inject into LLM context each tick
114- -m, --model <name> Model configuration name (default: lfm-thinking, see MODELS below)
114+ -m, --model <name> Model configuration name (see MODELS below, default in player-models.json)
115115 --verbose Enable detailed logging (shows full message payloads)
116116 -a, --archetype <name> Restrict LLM to single archetype choice (diplomat, opportunist, agitator)
117117 --ollama-timeout <ms> Ollama API timeout in milliseconds (default: 30000)
packages/client/src/game-client.ts+3−3
@@ -307,7 +307,7 @@ ${contextJson}
307307 Choose a creative username.
308308 Choose an empire from: ${empireList}
309309
310-CRITICAL: You must respond with ONLY valid JSON. No explanations, no markdown, just the JSON command.
310+CRITICAL: You must respond with a SINGLE, VALID JSON OBJECT
311311
312312 JSON Format:
313313 {"type": "register", "payload": {"username": "[your username]", "empire": "[your empire]"}}
@@ -414,7 +414,7 @@ Your JSON response:`;
414414
415415 ${contextJson}
416416
417-CRITICAL: You must respond with ONLY valid JSON. No explanations, no markdown, just the JSON command.
417+CRITICAL: You must respond with a SINGLE, VALID JSON OBJECT
418418
419419 JSON Format Rules:
420420 - Actions WITH arguments: {"type": "action_name", "payload": {"arg1": "value1", "arg2": "value2"}}
@@ -424,7 +424,7 @@ Examples:
424424 - {"type": "action_name_without_arguments"} ← Correct (no payload needed)
425425 - {"type": "action_name_with_arguments", "payload": {"target_poi": "sol_belt"}} ← Correct
426426
427-NEVER write "undefined" or "null" as payload value. If an action has no arguments, omit the payload field entirely.
427+If an action has no arguments, omit the payload field entirely.
428428
429429 Your JSON response:`;
430430 const result = await this.ollama.generate(fullPrompt);
packages/client/src/logging.ts+11−8
@@ -221,7 +221,8 @@ function getServerSummary(message: ServerMessage): string {
221221 }
222222 case "logged_in": {
223223 const p = message.payload;
224- return `logged_in (player: ${p.player.username}, empire: ${p.player.empire}, location: ${p.system.name} > ${p.poi.name})`;
224+ const poiName = p.poi?.name ?? "unknown";
225+ return `logged_in (player: ${p.player.username}, empire: ${p.player.empire}, location: ${p.system.name} > ${poiName})`;
225226 }
226227 case "state_update": {
227228 const p = message.payload;
@@ -310,7 +311,7 @@ function getServerDetails(message: ServerMessage, verbose: boolean): unknown {
310311 },
311312 location: {
312313 system: p.system.name,
313- poi: p.poi.name,
314+ poi: p.poi?.name ?? null,
314315 },
315316 ship: {
316317 name: p.ship.name,
@@ -342,12 +343,14 @@ function getServerDetails(message: ServerMessage, verbose: boolean): unknown {
342343 police_level: p.system.police_level,
343344 connections: p.system.connections,
344345 },
345- poi: {
346- name: p.poi.name,
347- type: p.poi.type,
348- base_id: p.poi.base_id,
349- resources: p.poi.resources,
350- },
346+ poi: p.poi
347+ ? {
348+ name: p.poi.name,
349+ type: p.poi.type,
350+ base_id: p.poi.base_id,
351+ resources: p.poi.resources,
352+ }
353+ : null,
351354 ship: {
352355 name: p.ship.name,
353356 class_id: p.ship.class_id,
packages/client/src/types.ts+1−1
@@ -413,7 +413,7 @@ export interface StoredMessage {
413413 export interface ClientConfig {
414414 instanceId?: string;
415415 hint?: string;
416- model: string;
416+ model?: string;
417417 verbose?: boolean;
418418 archetype?: string;
419419 tickRate: number;
packages/client/tests/cli.test.ts+1−1
@@ -39,7 +39,7 @@ describe("CLI Argument Parser", () => {
3939 test("should parse start command with defaults", () => {
4040 const result = parseArgs(["start"]);
4141 expect(result.command).toBe("start");
42- expect(result.config?.model).toBe("lfm-thinking");
42+ expect(result.config?.model).toBeUndefined();
4343 expect(result.config?.contextWindowSize).toBeUndefined();
4444 });
4545
packages/client/tests/json-extraction.test.ts+1−1
@@ -10,7 +10,7 @@ describe("JSON Extraction", () => {
1010 const db = new GameDatabase(testInstanceId);
1111 const config: ClientConfig = {
1212 instanceId: testInstanceId,
13- model: "qwen3",
13+ model: "qwen3-4b",
1414 tickRate: 10000,
1515 ollamaTimeout: 30000,
1616 };
packages/client/tests/model-config.test.ts+27−40
@@ -11,46 +11,35 @@ describe("Model Configuration", () => {
1111 expect(config.ollama.options).toBeDefined();
1212 });
1313
14- test("should load lfm-thinking config by name", () => {
15- const config = loadModelConfig("lfm-thinking");
14+ test("should load qwen3-4b config", () => {
15+ const config = loadModelConfig("qwen3-4b");
1616
17- expect(config.displayName).toBe("LFM 2.5 Thinking (731MB)");
18- expect(config.ollama.model).toBe("lfm2.5-thinking");
19- expect(config.ollama.options).toEqual({ temperature: 1.2 });
20- expect(config.contextWindow).toBe(128000);
21- expect(config.recommendedMessages).toBe(10);
17+ expect(config.displayName).toBe("Qwen3 4B (2.5GB)");
18+ expect(config.ollama.model).toBe("qwen3:4b");
19+ expect(config.ollama.options).toEqual({ temperature: 1.2, thinking: true });
20+ expect(config.contextWindow).toBe(32768);
21+ expect(config.recommendedMessages).toBe(20);
2222 expect(config.recommended).toBe(true);
2323 });
2424
25- test("should load qwen3 config without thinking option", () => {
26- const config = loadModelConfig("qwen3");
25+ test("should load deepseek-r1-1.5b config", () => {
26+ const config = loadModelConfig("deepseek-r1-1.5b");
2727
28- expect(config.displayName).toBe("Qwen3 8B (5.2GB)");
29- expect(config.ollama.model).toBe("qwen3:8b");
30- expect(config.ollama.options).toEqual({ temperature: 1.2 });
31- expect(config.contextWindow).toBe(40960);
28+ expect(config.displayName).toBe("DeepSeek R1 1.5B (1.1GB)");
29+ expect(config.ollama.model).toBe("deepseek-r1:1.5b");
30+ expect(config.ollama.options).toEqual({ temperature: 1.2, thinking: true });
31+ expect(config.contextWindow).toBe(32768);
3232 expect(config.recommendedMessages).toBe(15);
33- expect(config.recommended).toBe(false);
3433 });
3534
36- test("should load ministral-3 config", () => {
37- const config = loadModelConfig("ministral-3");
38-
39- expect(config.displayName).toBe("Ministral 3 8B (6.0GB)");
40- expect(config.ollama.model).toBe("ministral-3:8b");
41- expect(config.ollama.options).toEqual({ temperature: 1.2 });
42- expect(config.contextWindow).toBe(262144);
43- expect(config.recommendedMessages).toBe(20);
44- });
45-
46- test("should load deepseek-r1 config", () => {
47- const config = loadModelConfig("deepseek-r1");
35+ test("should load lfm-thinking config", () => {
36+ const config = loadModelConfig("lfm-thinking");
4837
49- expect(config.displayName).toBe("DeepSeek R1 7B (4.7GB)");
50- expect(config.ollama.model).toBe("deepseek-r1:7b");
51- expect(config.ollama.options).toEqual({ temperature: 1.2 });
52- expect(config.contextWindow).toBe(131072);
53- expect(config.recommendedMessages).toBe(12);
38+ expect(config.displayName).toBe("LFM 2.5 Thinking (731MB)");
39+ expect(config.ollama.model).toBe("lfm2.5-thinking:latest");
40+ expect(config.ollama.options).toEqual({ temperature: 1.2, thinking: true });
41+ expect(config.contextWindow).toBe(32768);
42+ expect(config.recommendedMessages).toBe(10);
5443 });
5544
5645 test("should throw error for non-existent config", () => {
@@ -64,10 +53,9 @@ describe("Model Configuration", () => {
6453 loadModelConfig("invalid");
6554 } catch (error) {
6655 if (error instanceof Error) {
56+ expect(error.message).toContain("qwen3-4b");
57+ expect(error.message).toContain("deepseek-r1-1.5b");
6758 expect(error.message).toContain("lfm-thinking");
68- expect(error.message).toContain("qwen3");
69- expect(error.message).toContain("ministral-3");
70- expect(error.message).toContain("deepseek-r1");
7159 }
7260 }
7361 });
@@ -75,18 +63,17 @@ describe("Model Configuration", () => {
7563 test("should list available models", () => {
7664 const models = listAvailableModels();
7765
66+ expect(models).toContain("qwen3-4b");
67+ expect(models).toContain("deepseek-r1-1.5b");
7868 expect(models).toContain("lfm-thinking");
79- expect(models).toContain("qwen3");
80- expect(models).toContain("ministral-3");
81- expect(models).toContain("deepseek-r1");
82- expect(models).toHaveLength(4);
69+ expect(models).toHaveLength(3);
8370 });
8471
8572 test("should generate model list text", () => {
8673 const text = getModelListText();
8774
88- expect(text).toContain("lfm-thinking");
89- expect(text).toContain("LFM 2.5 Thinking");
75+ expect(text).toContain("qwen3-4b");
76+ expect(text).toContain("Qwen3 4B");
9077 expect(text).toContain("(Recommended)");
9178 });
9279 });
player-models.json+20−79
@@ -1,105 +1,46 @@
11 {
22 "models": {
3- "lfm-thinking": {
4- "displayName": "LFM 2.5 Thinking (731MB)",
5- "description": "Fastest model with built-in thinking. 128K context.",
3+ "qwen3-4b": {
4+ "displayName": "Qwen3 4B (2.5GB)",
5+ "description": "Best balance of speed and quality. 32K context. Thinking supported.",
66 "ollama": {
7- "model": "lfm2.5-thinking:latest",
7+ "model": "qwen3:4b",
88 "options": {
99 "temperature": 1.2
1010 }
1111 },
12- "contextWindow": 128000,
13- "recommendedMessages": 10,
12+ "contextWindow": 32768,
13+ "recommendedMessages": 20,
1414 "recommended": true
1515 },
16- "deepseek-r1": {
17- "displayName": "DeepSeek R1 7B (4.7GB)",
18- "description": "Advanced reasoning with thinking. 131K context.",
19- "ollama": {
20- "model": "deepseek-r1:7b",
21- "options": {
22- "temperature": 1.2
23- }
24- },
25- "contextWindow": 131072,
26- "recommendedMessages": 12,
27- "recommended": false
28- },
29- "mistral-7b": {
30- "displayName": "Mistral 7B (4.4GB)",
31- "description": "General-purpose model. 8K context.",
32- "ollama": {
33- "model": "mistral:7b",
34- "options": {
35- "temperature": 1.2
36- }
37- },
38- "contextWindow": 8192,
39- "recommended": false
40- },
41- "gemma2-9b": {
42- "displayName": "Gemma 2 9B (5.4GB)",
43- "description": "General-purpose model. 8K context.",
44- "ollama": {
45- "model": "gemma2:9b",
46- "options": {
47- "temperature": 1.2
48- }
49- },
50- "contextWindow": 8192,
51- "recommended": false
52- },
53- "qwen2.5-7b": {
54- "displayName": "Qwen2.5 7B (4.7GB)",
55- "description": "General-purpose model. 32K context.",
16+ "deepseek-r1-1.5b": {
17+ "displayName": "DeepSeek R1 1.5B (1.1GB)",
18+ "description": "Fastest model with reasoning. 32K context.",
5619 "ollama": {
57- "model": "qwen2.5:7b",
20+ "model": "deepseek-r1:1.5b",
5821 "options": {
59- "temperature": 1.2
22+ "temperature": 1.2,
23+ "thinking": true
6024 }
6125 },
6226 "contextWindow": 32768,
63- "recommended": false
64- },
65- "qwen3": {
66- "displayName": "Qwen3 8B (5.2GB)",
67- "description": "Strong reasoning + tools + thinking. 40K context.",
68- "ollama": {
69- "model": "qwen3:8b",
70- "options": {
71- "temperature": 1.2
72- }
73- },
74- "contextWindow": 40960,
7527 "recommendedMessages": 15,
7628 "recommended": false
7729 },
78- "starcoder2-15b": {
79- "displayName": "StarCoder2 15B (9.1GB)",
80- "description": "Code-focused model. 32K context.",
30+ "lfm-thinking": {
31+ "displayName": "LFM 2.5 Thinking (731MB)",
32+ "description": "Tiny model with thinking. 32K context.",
8133 "ollama": {
82- "model": "starcoder2:15b",
34+ "model": "lfm2.5-thinking:latest",
8335 "options": {
84- "temperature": 1.2
36+ "temperature": 1.2,
37+ "thinking": true
8538 }
8639 },
8740 "contextWindow": 32768,
88- "recommended": false
89- },
90- "ministral-3": {
91- "displayName": "Ministral 3 8B (6.0GB)",
92- "description": "Largest context window (262K). No thinking mode.",
93- "ollama": {
94- "model": "ministral-3:8b",
95- "options": {
96- "temperature": 1.2
97- }
98- },
99- "contextWindow": 262144,
100- "recommendedMessages": 20,
41+ "recommendedMessages": 10,
10142 "recommended": false
10243 }
10344 },
104- "default": "ministral-3"
45+ "default": "lfm-thinking"
10546 }