@sickr/cli 0.9.13 → 0.9.15

package/dist/run.js

@@ -24,7 +24,7 @@ import { readFileSync, writeFileSync, appendFileSync, mkdirSync, existsSync, rea
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { execFileSync } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import { setTimeout as sleep } from 'node:timers/promises';
 import { readCredentials } from './auth.js';
 import { runsDir } from './recorder.js';
@@ -160,6 +160,10 @@ export function cleanPtyResponse(input, lastPrompt = '') {
         .join('\n')
         .trim();
 }
+function hasPtyPromptMarker(input) {
+    const clean = stripAnsi(input).replace(/[\u2800-\u28ff]/g, '');
+    return clean.includes('>>> Send a message (/? for help)') || /(?:^|\n)\s*>>>\s*$/.test(clean);
+}
 export class HooklessPtyEventSynth {
     identity;
     send;
@@ -169,7 +173,7 @@ export class HooklessPtyEventSynth {
     lastPrompt = '';
     awaitingResponse = false;
     responseTimer = null;
-    constructor(identity, send, responseDelayMs = 700) {
+    constructor(identity, send, responseDelayMs = 2500) {
         this.identity = identity;
         this.send = send;
         this.responseDelayMs = responseDelayMs;
@@ -191,18 +195,25 @@ export class HooklessPtyEventSynth {
         this.recordPrompt(submitted);
     }
     recordPrompt(text) {
+        this.prepareResponse(text);
+        this.sendEvent('prompt', 'Prompt', this.lastPrompt);
+    }
+    prepareResponse(text) {
         const prompt = stripAnsi(text).replace(/\r/g, '\n').trim();
         if (!prompt)
             return;
         this.lastPrompt = prompt;
         this.outputBuffer = '';
         this.awaitingResponse = true;
-        this.sendEvent('prompt', 'Prompt', prompt);
     }
     observeOutput(chunk) {
         if (!this.awaitingResponse)
             return;
         this.outputBuffer += chunk;
+        if (hasPtyPromptMarker(this.outputBuffer)) {
+            this.flushResponse();
+            return;
+        }
         if (this.responseTimer)
             clearTimeout(this.responseTimer);
         this.responseTimer = setTimeout(() => this.flushResponse(), this.responseDelayMs);
@@ -403,6 +414,40 @@ export function providerArgsFor(agent, existingArgs) {
         return ['run', model, ...existingArgs];
     return existingArgs;
 }
+function ollamaHost() {
+    return process.env.OLLAMA_HOST || 'http://127.0.0.1:11434';
+}
+async function ollamaServerReady() {
+    try {
+        const res = await fetch(`${ollamaHost().replace(/\/$/, '')}/api/tags`, { signal: AbortSignal.timeout(1000) });
+        return res.ok;
+    }
+    catch {
+        return false;
+    }
+}
+export async function ensureOllamaServer(agentBin, opts = {}) {
+    if (await ollamaServerReady())
+        return;
+    const needsShell = process.platform === 'win32' && /\.(cmd|bat)$/i.test(agentBin);
+    const child = spawn(agentBin, ['serve'], {
+        cwd: process.cwd(),
+        env: process.env,
+        detached: true,
+        stdio: 'ignore',
+        windowsHide: true,
+        shell: needsShell,
+    });
+    child.unref();
+    const attempts = opts.attempts ?? 20;
+    const delayMs = opts.delayMs ?? 250;
+    for (let i = 0; i < attempts; i++) {
+        await sleep(delayMs);
+        if (await ollamaServerReady())
+            return;
+    }
+    throw new Error('Ollama server did not start. Try running `ollama serve` in another terminal, then retry `sickr run ollama`.');
+}
 export async function startRun(opts) {
     const creds = readCredentials();
     if (!creds) {
@@ -424,6 +469,8 @@ export async function startRun(opts) {
     ensureRecordingHooks(opts.agent);
     const agentBin = resolveAgent(opts.agent);
     const provider = providerForAgent(opts.agent);
+    if (provider === 'ollama')
+        await ensureOllamaServer(agentBin);
     const agentLabel = provider ? PROVIDERS[provider].recordLabel : opts.agent;
     const runnerId = randomUUID();
     const runnerIdentity = { agent: agentLabel, runner: runnerId, sessions: new Set() };
@@ -604,7 +651,7 @@ export async function startRun(opts) {
                                     pty.write('\r');
                                 }
                                 catch { /* pty exited */ } }, 80);
-                            hooklessSynth?.recordPrompt(m.text);
+                            hooklessSynth?.prepareResponse(m.text);
                         }
                         catch { /* PTY may have exited */ }
                         if (opts.verbose)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sickr/cli",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "type": "module",
   "description": "npx @sickr/cli - replay, live look, and workflow orchestration for AI coding agents.",
   "bin": {