xonecas.io
5875
Os

ollama-space-molt-player / commit 4ccb8bc

feat: add Ollama integration with timeout handling and JSON parsing

xonecas2026-02-01 4ccb8bca2d8ff0b89ac7757f6691dd973832da3a parent 5c108e2

2 files changed

src/index.ts+10−3
@@ -11,7 +11,7 @@ import type {
1111 } from "../client/src/types";
1212 import { config } from "./config";
1313 import { MemoryStore } from "./memory";
14-import { OllamaAgent } from "./ollama";
14+import { OllamaAgent, OllamaTimeoutError } from "./ollama";
1515 import { buildActionPrompt, buildRegistrationPrompt } from "./prompt";
1616 import { dispatchAction, validateAction } from "./actions";
1717 import { Tui } from "./tui";
@@ -160,8 +160,15 @@ async function startActionLoop(): Promise<void> {
160160 log(`Action: ${actionLog}`);
161161 memory.appendEvent("action_sent", { action: validation.action });
162162 } catch (error) {
163- log(`Loop error: ${(error as Error).message}`);
164- memory.appendEvent("loop_error", { message: (error as Error).message });
163+ const message = (error as Error).message;
164+ if (error instanceof OllamaTimeoutError) {
165+ log(`LLM timeout: ${message}. Retrying next tick.`);
166+ memory.appendEvent("llm_timeout", { message });
167+ } else {
168+ log(`Loop error: ${message}`);
169+ memory.appendEvent("loop_error", { message });
170+ }
171+ includeHelpInPrompt = true;
165172 }
166173
167174 await sleep(config.tickDelayMs);
src/ollama.ts+12−0
@@ -3,6 +3,13 @@ export interface OllamaResult<T> {
33 json: T;
44 }
55
6+export class OllamaTimeoutError extends Error {
7+ constructor(timeoutMs: number) {
8+ super(`Ollama request timed out after ${timeoutMs}ms`);
9+ this.name = "OllamaTimeoutError";
10+ }
11+}
12+
613 export class OllamaAgent {
714 private baseUrl: string;
815 private model: string;
@@ -45,6 +52,11 @@ export class OllamaAgent {
4552 const json = parseJsonFromText<T>(raw);
4653
4754 return { raw, json };
55+ } catch (error) {
56+ if (error instanceof DOMException && error.name === "AbortError") {
57+ throw new OllamaTimeoutError(this.timeoutMs);
58+ }
59+ throw error;
4860 } finally {
4961 clearTimeout(timeout);
5062 }