kimaki 0.1.0 → 0.1.2

package/bin.js

@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+import { spawn } from 'node:child_process'
+import { fileURLToPath } from 'node:url'
+import { dirname, join } from 'node:path'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+const NODE_PATH = process.execPath
+const CLI_PATH = join(__dirname, 'dist', 'cli.js')
+
+let lastStart = 0
+
+async function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+async function run() {
+  while (true) {
+    const now = Date.now()
+    const elapsed = now - lastStart
+    if (elapsed < 5000) {
+      await sleep(5000 - elapsed)
+    }
+    lastStart = Date.now()
+
+    try {
+      const code = await new Promise((resolve) => {
+        const child = spawn(NODE_PATH, [CLI_PATH, ...process.argv.slice(2)], {
+          stdio: 'inherit'
+        })
+
+        child.on('exit', (code, signal) => {
+          if (signal) {
+            // Map signals to exit codes similar to bash
+            if (signal === 'SIGINT') resolve(130)
+            else if (signal === 'SIGTERM') resolve(143)
+            else resolve(1)
+          } else {
+            resolve(code || 0)
+          }
+        })
+
+        child.on('error', (err) => {
+          console.error('Failed to start process:', err)
+          resolve(1)
+        })
+      })
+
+      // Exit cleanly if the app ended OK or via SIGINT/SIGTERM
+      if (code === 0 || code === 130 || code === 143 || code === 64) {
+        process.exit(code)
+      }
+      // otherwise loop; the 5s throttle above will apply
+    } catch (err) {
+      console.error('Unexpected error:', err)
+      // Continue looping after error
+    }
+  }
+}
+
+run().catch(err => {
+  console.error('Fatal error:', err)
+  process.exit(1)
+})

package/dist/cli.js

@@ -197,22 +197,13 @@ async function run({ restart, addChannels }) {
         note(channelList, 'Existing Kimaki Channels');
     }
     s.start('Starting OpenCode server...');
-    let client;
-    try {
-        const currentDir = process.cwd();
-        client = await initializeOpencodeForDirectory(currentDir);
-        s.stop('OpenCode server started!');
-    }
-    catch (error) {
-        s.stop('Failed to start OpenCode');
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
-        discordClient.destroy();
-        process.exit(EXIT_NO_RESTART);
-    }
+    const currentDir = process.cwd();
+    let getClient = await initializeOpencodeForDirectory(currentDir);
+    s.stop('OpenCode server started!');
     s.start('Fetching OpenCode projects...');
     let projects = [];
     try {
-        const projectsResponse = await client.project.list();
+        const projectsResponse = await getClient().project.list();
         if (!projectsResponse.data) {
             throw new Error('Failed to fetch projects');
         }

package/dist/discordBot.js

@@ -14,7 +14,7 @@ import { PassThrough, Transform } from 'node:stream';
 import * as prism from 'prism-media';
 import dedent from 'string-dedent';
 import { transcribeAudio } from './voice.js';
-import { extractTagsArrays } from './xml.js';
+import { extractTagsArrays, extractNonXmlContent } from './xml.js';
 import prettyMilliseconds from 'pretty-ms';
 import { createLogger } from './logger.js';
 const discordLogger = createLogger('DISCORD');
@@ -28,6 +28,8 @@ const opencodeServers = new Map();
 const abortControllers = new Map();
 // Map of guild ID to voice connection and GenAI worker
 const voiceConnections = new Map();
+// Map of directory to retry count for server restarts
+const serverRetryCount = new Map();
 let db = null;
 function convertToMono16k(buffer) {
     // Parameters
@@ -551,29 +553,19 @@ function getKimakiMetadata(textChannel) {
     const channelAppId = extracted['kimaki.app']?.[0]?.trim();
     return { projectDirectory, channelAppId };
 }
-function getFileAutocompleteState(value) {
-    const input = value ?? '';
-    const match = input.match(/([^,\s]*)$/);
-    const token = match ? match[1] || '' : '';
-    const prefix = input.slice(0, input.length - token.length);
-    const parts = input
-        .split(/[\s,]+/)
-        .map((part) => part.trim())
-        .filter(Boolean);
-    const selected = new Set(parts);
-    const trimmedToken = token.trim();
-    if (trimmedToken) {
-        selected.delete(trimmedToken);
-    }
-    return { prefix, token, selected };
-}
 export async function initializeOpencodeForDirectory(directory) {
     // console.log(`[OPENCODE] Initializing for directory: ${directory}`)
     // Check if we already have a server for this directory
     const existing = opencodeServers.get(directory);
     if (existing && !existing.process.killed) {
         opencodeLogger.log(`Reusing existing server on port ${existing.port} for directory: ${directory}`);
-        return existing.client;
+        return () => {
+            const entry = opencodeServers.get(directory);
+            if (!entry?.client) {
+                throw new Error(`OpenCode server for directory "${directory}" is in an error state (no client available)`);
+            }
+            return entry.client;
+        };
     }
     const port = await getOpenPort();
     // console.log(
@@ -589,17 +581,34 @@ export async function initializeOpencodeForDirectory(directory) {
         },
     });
     serverProcess.stdout?.on('data', (data) => {
-        opencodeLogger.log(`Port ${port}: ${data.toString().trim()}`);
+        opencodeLogger.log(`opencode ${directory}: ${data.toString().trim()}`);
     });
     serverProcess.stderr?.on('data', (data) => {
-        opencodeLogger.error(`Port  error: ${data.toString().trim()}`);
+        opencodeLogger.error(`opencode ${directory}: ${data.toString().trim()}`);
     });
     serverProcess.on('error', (error) => {
-        opencodeLogger.error(`Failed to start server on port :`, error);
+        opencodeLogger.error(`Failed to start server on port :`, port, error);
     });
     serverProcess.on('exit', (code) => {
-        opencodeLogger.log(`Server on port  exited with code:`, code);
+        opencodeLogger.log(`Opencode server on ${directory} exited with code:`, code);
         opencodeServers.delete(directory);
+        if (code !== 0) {
+            const retryCount = serverRetryCount.get(directory) || 0;
+            if (retryCount < 5) {
+                serverRetryCount.set(directory, retryCount + 1);
+                opencodeLogger.log(`Restarting server for directory: ${directory} (attempt ${retryCount + 1}/5)`);
+                initializeOpencodeForDirectory(directory).catch((e) => {
+                    opencodeLogger.error(`Failed to restart opencode server:`, e);
+                });
+            }
+            else {
+                opencodeLogger.error(`Server for ${directory} crashed too many times (5), not restarting`);
+            }
+        }
+        else {
+            // Reset retry count on clean exit
+            serverRetryCount.delete(directory);
+        }
     });
     await waitForServer(port);
     const client = createOpencodeClient({ baseUrl: `http://localhost:${port}` });
@@ -608,7 +617,13 @@ export async function initializeOpencodeForDirectory(directory) {
         client,
         port,
     });
-    return client;
+    return () => {
+        const entry = opencodeServers.get(directory);
+        if (!entry?.client) {
+            throw new Error(`OpenCode server for directory "${directory}" is in an error state (no client available)`);
+        }
+        return entry.client;
+    };
 }
 function formatPart(part) {
     switch (part.type) {
@@ -746,7 +761,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     const directory = projectDirectory || process.cwd();
     sessionLogger.log(`Using directory: ${directory}`);
     // Note: We'll cancel the existing request after we have the session ID
-    const client = await initializeOpencodeForDirectory(directory);
+    const getClient = await initializeOpencodeForDirectory(directory);
     // Get session ID from database
     const row = getDatabase()
         .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
@@ -756,7 +771,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     if (sessionId) {
         sessionLogger.log(`Attempting to reuse existing session ${sessionId}`);
         try {
-            const sessionResponse = await client.session.get({
+            const sessionResponse = await getClient().session.get({
                 path: { id: sessionId },
             });
             session = sessionResponse.data;
@@ -768,7 +783,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     }
     if (!session) {
         voiceLogger.log(`[SESSION] Creating new session with title: "${prompt.slice(0, 80)}"`);
-        const sessionResponse = await client.session.create({
+        const sessionResponse = await getClient().session.create({
             body: { title: prompt.slice(0, 80) },
         });
         session = sessionResponse.data;
@@ -794,7 +809,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     const abortController = new AbortController();
     // Store this controller for this session
     abortControllers.set(session.id, abortController);
-    const eventsResult = await client.event.subscribe({
+    const eventsResult = await getClient().event.subscribe({
         signal: abortController.signal,
     });
     const events = eventsResult.stream;
@@ -1034,7 +1049,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
         voiceLogger.log(`[PROMPT] Sending prompt to session ${session.id}: "${prompt.slice(0, 100)}${prompt.length > 100 ? '...' : ''}"`);
         // Start the event handler
         const eventHandlerPromise = eventHandler();
-        const response = await client.session.prompt({
+        const response = await getClient().session.prompt({
             path: { id: session.id },
             body: {
                 parts: [{ type: 'text', text: prompt }],
@@ -1322,9 +1337,9 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     }
                     try {
                         // Get OpenCode client for this directory
-                        const client = await initializeOpencodeForDirectory(projectDirectory);
+                        const getClient = await initializeOpencodeForDirectory(projectDirectory);
                         // List sessions
-                        const sessionsResponse = await client.session.list();
+                        const sessionsResponse = await getClient().session.list();
                         if (!sessionsResponse.data) {
                             await interaction.respond([]);
                             return;
@@ -1385,9 +1400,9 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     }
                     try {
                         // Initialize OpenCode client for the directory
-                        const client = await initializeOpencodeForDirectory(projectDirectory);
+                        const getClient = await initializeOpencodeForDirectory(projectDirectory);
                         // Get session title
-                        const sessionResponse = await client.session.get({
+                        const sessionResponse = await getClient().session.get({
                             path: { id: sessionId },
                         });
                         if (!sessionResponse.data) {
@@ -1407,7 +1422,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                             .run(thread.id, sessionId);
                         voiceLogger.log(`[RESUME] Created thread ${thread.id} for session ${sessionId}`);
                         // Fetch all messages for the session
-                        const messagesResponse = await client.session.messages({
+                        const messagesResponse = await getClient().session.messages({
                             path: { id: sessionId },
                         });
                         if (!messagesResponse.data) {
@@ -1423,10 +1438,15 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                             if (message.info.role === 'user') {
                                 // Render user messages
                                 const userParts = message.parts.filter((p) => p.type === 'text');
-                                const userText = userParts
-                                    .map((p) => (typeof p.text === 'string' ? p.text : ''))
-                                    .filter((t) => t.trim())
-                                    .join('\n\n');
+                                const userTexts = userParts
+                                    .map((p) => {
+                                    if (typeof p.text === 'string') {
+                                        return extractNonXmlContent(p.text);
+                                    }
+                                    return '';
+                                })
+                                    .filter((t) => t.trim());
+                                const userText = userTexts.join('\n\n');
                                 if (userText) {
                                     // Escape backticks in user messages to prevent formatting issues
                                     const escapedText = escapeDiscordFormatting(userText);

package/dist/markdown.js

@@ -1,5 +1,6 @@
 import { format } from 'date-fns';
 import * as yaml from 'js-yaml';
+import { extractNonXmlContent } from './xml.js';
 export class ShareMarkdown {
     client;
     constructor(client) {
@@ -73,8 +74,11 @@ export class ShareMarkdown {
             lines.push('');
             for (const part of parts) {
                 if (part.type === 'text' && part.text) {
-                    lines.push(part.text);
-                    lines.push('');
+                    const cleanedText = extractNonXmlContent(part.text);
+                    if (cleanedText.trim()) {
+                        lines.push(cleanedText);
+                        lines.push('');
+                    }
                 }
                 else if (part.type === 'file') {
                     lines.push(`📎 **Attachment**: ${part.filename || 'unnamed file'}`);

package/dist/tools.js

@@ -10,13 +10,14 @@ import { ShareMarkdown } from './markdown.js';
 import pc from 'picocolors';
 import { initializeOpencodeForDirectory } from './discordBot.js';
 export async function getTools({ onMessageCompleted, directory, }) {
-    const client = await initializeOpencodeForDirectory(directory);
+    const getClient = await initializeOpencodeForDirectory(directory);
+    const client = getClient();
     const markdownRenderer = new ShareMarkdown(client);
     const providersResponse = await client.config.providers({});
     const providers = providersResponse.data?.providers || [];
     // Helper: get last assistant model for a session (non-summary)
     const getSessionModel = async (sessionId) => {
-        const res = await client.session.messages({ path: { id: sessionId } });
+        const res = await getClient().session.messages({ path: { id: sessionId } });
         const data = res.data;
         if (!data || data.length === 0)
             return undefined;
@@ -41,8 +42,8 @@ export async function getTools({ onMessageCompleted, directory, }) {
             execute: async ({ sessionId, message }) => {
                 const sessionModel = await getSessionModel(sessionId);
                 // do not await
-                client.session
-                    .prompt({
+                getClient()
+                    .session.prompt({
                     path: { id: sessionId },
                     body: {
                         parts: [{ type: 'text', text: message }],
@@ -99,7 +100,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
                     throw new Error(`message must be a non empty string`);
                 }
                 try {
-                    const session = await client.session.create({
+                    const session = await getClient().session.create({
                         body: {
                             title: title || message.slice(0, 50),
                         },
@@ -108,8 +109,8 @@ export async function getTools({ onMessageCompleted, directory, }) {
                         throw new Error('Failed to create session');
                     }
                     // do not await
-                    client.session
-                        .prompt({
+                    getClient()
+                        .session.prompt({
                         path: { id: session.data.id },
                         body: {
                             parts: [{ type: 'text', text: message }],
@@ -155,7 +156,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
             inputSchema: z.object({}),
             execute: async () => {
                 toolsLogger.log(`Listing opencode sessions`);
-                const sessions = await client.session.list();
+                const sessions = await getClient().session.list();
                 if (!sessions.data) {
                     return { success: false, error: 'No sessions found' };
                 }
@@ -169,7 +170,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
                     const status = await (async () => {
                         if (session.revert)
                             return 'error';
-                        const messagesResponse = await client.session.messages({
+                        const messagesResponse = await getClient().session.messages({
                             path: { id: session.id },
                         });
                         const messages = messagesResponse.data || [];
@@ -208,7 +209,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
                 query: z.string().describe('The search query for files'),
             }),
             execute: async ({ folder, query }) => {
-                const results = await client.find.files({
+                const results = await getClient().find.files({
                     query: {
                         query,
                         directory: folder,
@@ -231,7 +232,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
             }),
             execute: async ({ sessionId, lastAssistantOnly = false }) => {
                 if (lastAssistantOnly) {
-                    const messages = await client.session.messages({
+                    const messages = await getClient().session.messages({
                         path: { id: sessionId },
                     });
                     if (!messages.data) {
@@ -263,7 +264,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
                     const markdown = await markdownRenderer.generate({
                         sessionID: sessionId,
                     });
-                    const messages = await client.session.messages({
+                    const messages = await getClient().session.messages({
                         path: { id: sessionId },
                     });
                     const lastMessage = messages.data?.[messages.data.length - 1];
@@ -288,7 +289,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
             }),
             execute: async ({ sessionId }) => {
                 try {
-                    const result = await client.session.abort({
+                    const result = await getClient().session.abort({
                         path: { id: sessionId },
                     });
                     if (!result.data) {
@@ -316,7 +317,7 @@ export async function getTools({ onMessageCompleted, directory, }) {
             inputSchema: z.object({}),
             execute: async () => {
                 try {
-                    const providersResponse = await client.config.providers({});
+                    const providersResponse = await getClient().config.providers({});
                     const providers = providersResponse.data?.providers || [];
                     const models = [];
                     providers.forEach((provider) => {

package/dist/xml.js

@@ -83,3 +83,7 @@ export function extractTagsArrays({ xml, tags, }) {
     }
     return result;
 }
+export function extractNonXmlContent(xml) {
+    const result = extractTagsArrays({ xml, tags: [] });
+    return result.others.join('\n');
+}

package/dist/xml.test.js

@@ -0,0 +1,32 @@
+import { describe, test, expect } from 'vitest';
+import { extractNonXmlContent } from './xml.js';
+describe('extractNonXmlContent', () => {
+    test('removes xml tags and returns only text content', () => {
+        const xml = 'Hello <tag>content</tag> world <nested><inner>deep</inner></nested> end';
+        expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`
+      "Hello
+      world
+      end"
+    `);
+    });
+    test('handles multiple text segments', () => {
+        const xml = 'Start <a>tag1</a> middle <b>tag2</b> finish';
+        expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`
+      "Start
+      middle
+      finish"
+    `);
+    });
+    test('handles only xml without text', () => {
+        const xml = '<root><child>content</child></root>';
+        expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`""`);
+    });
+    test('handles only text without xml', () => {
+        const xml = 'Just plain text';
+        expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`"Just plain text"`);
+    });
+    test('handles empty string', () => {
+        const xml = '';
+        expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`""`);
+    });
+});

package/package.json

@@ -2,9 +2,9 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "repository": "https://github.com/remorses/kimaki",
-  "bin": "bin.sh",
+  "bin": "bin.js",
   "files": [
     "dist",
     "src",

package/src/cli.ts

@@ -324,28 +324,16 @@ async function run({ restart, addChannels }: CliOptions) {
 
   s.start('Starting OpenCode server...')
 
-  let client: OpencodeClient
-
-  try {
-    const currentDir = process.cwd()
-    client = await initializeOpencodeForDirectory(currentDir)
-    s.stop('OpenCode server started!')
-  } catch (error) {
-    s.stop('Failed to start OpenCode')
-    cliLogger.error(
-      'Error:',
-      error instanceof Error ? error.message : String(error),
-    )
-    discordClient.destroy()
-    process.exit(EXIT_NO_RESTART)
-  }
+  const currentDir = process.cwd()
+  let getClient = await initializeOpencodeForDirectory(currentDir)
+  s.stop('OpenCode server started!')
 
   s.start('Fetching OpenCode projects...')
 
   let projects: Project[] = []
 
   try {
-    const projectsResponse = await client.project.list()
+    const projectsResponse = await getClient().project.list()
     if (!projectsResponse.data) {
       throw new Error('Failed to fetch projects')
     }

package/src/discordBot.ts

@@ -40,7 +40,7 @@ import { PassThrough, Transform, type TransformCallback } from 'node:stream'
 import * as prism from 'prism-media'
 import dedent from 'string-dedent'
 import { transcribeAudio } from './voice.js'
-import { extractTagsArrays } from './xml.js'
+import { extractTagsArrays, extractNonXmlContent } from './xml.js'
 import prettyMilliseconds from 'pretty-ms'
 import type { Session } from '@google/genai'
 import { createLogger } from './logger.js'
@@ -1942,10 +1942,16 @@ export async function startDiscordBot({
                   const userParts = message.parts.filter(
                     (p) => p.type === 'text',
                   )
-                  const userText = userParts
-                    .map((p) => (typeof p.text === 'string' ? p.text : ''))
+                  const userTexts = userParts
+                    .map((p) => {
+                      if (typeof p.text === 'string') {
+                        return extractNonXmlContent(p.text)
+                      }
+                      return ''
+                    })
                     .filter((t) => t.trim())
-                    .join('\n\n')
+                  
+                  const userText = userTexts.join('\n\n')
                   if (userText) {
                     // Escape backticks in user messages to prevent formatting issues
                     const escapedText = escapeDiscordFormatting(userText)

package/src/markdown.ts

@@ -1,6 +1,7 @@
 import type { OpencodeClient } from '@opencode-ai/sdk'
 import { format } from 'date-fns'
 import * as yaml from 'js-yaml'
+import { extractNonXmlContent } from './xml.js'
 
 export class ShareMarkdown {
   constructor(private client: OpencodeClient) {}
@@ -95,8 +96,11 @@ export class ShareMarkdown {
 
       for (const part of parts) {
         if (part.type === 'text' && part.text) {
-          lines.push(part.text)
-          lines.push('')
+          const cleanedText = extractNonXmlContent(part.text)
+          if (cleanedText.trim()) {
+            lines.push(cleanedText)
+            lines.push('')
+          }
         } else if (part.type === 'file') {
           lines.push(`📎 **Attachment**: ${part.filename || 'unnamed file'}`)
           if (part.url) {

package/src/tools.ts

@@ -26,11 +26,12 @@ export async function getTools({
     sessionId: string
     messageId: string
     data?: { info: AssistantMessage }
-    error?: any
+    error?: unknown
     markdown?: string
   }) => void
 }) {
-  const client = await initializeOpencodeForDirectory(directory)
+  const getClient = await initializeOpencodeForDirectory(directory)
+  const client = getClient()
 
   const markdownRenderer = new ShareMarkdown(client)
 
@@ -41,7 +42,7 @@ export async function getTools({
   const getSessionModel = async (
     sessionId: string,
   ): Promise<{ providerID: string; modelID: string } | undefined> => {
-    const res = await client.session.messages({ path: { id: sessionId } })
+    const res = await getClient().session.messages({ path: { id: sessionId } })
     const data = res.data
     if (!data || data.length === 0) return undefined
     for (let i = data.length - 1; i >= 0; i--) {
@@ -68,8 +69,8 @@ export async function getTools({
         const sessionModel = await getSessionModel(sessionId)
 
         // do not await
-        client.session
-          .prompt({
+        getClient()
+          .session.prompt({
             path: { id: sessionId },
 
             body: {
@@ -132,7 +133,7 @@ export async function getTools({
         }
 
         try {
-          const session = await client.session.create({
+          const session = await getClient().session.create({
             body: {
               title: title || message.slice(0, 50),
             },
@@ -143,8 +144,8 @@ export async function getTools({
           }
 
           // do not await
-          client.session
-            .prompt({
+          getClient()
+            .session.prompt({
               path: { id: session.data.id },
               body: {
                 parts: [{ type: 'text', text: message }],
@@ -193,7 +194,7 @@ export async function getTools({
       inputSchema: z.object({}),
       execute: async () => {
         toolsLogger.log(`Listing opencode sessions`)
-        const sessions = await client.session.list()
+        const sessions = await getClient().session.list()
 
         if (!sessions.data) {
           return { success: false, error: 'No sessions found' }
@@ -209,7 +210,7 @@ export async function getTools({
           const finishedAt = session.time.updated
           const status = await (async () => {
             if (session.revert) return 'error'
-            const messagesResponse = await client.session.messages({
+            const messagesResponse = await getClient().session.messages({
               path: { id: session.id },
             })
             const messages = messagesResponse.data || []
@@ -256,7 +257,7 @@ export async function getTools({
         query: z.string().describe('The search query for files'),
       }),
       execute: async ({ folder, query }) => {
-        const results = await client.find.files({
+        const results = await getClient().find.files({
           query: {
             query,
             directory: folder,
@@ -281,7 +282,7 @@ export async function getTools({
       }),
       execute: async ({ sessionId, lastAssistantOnly = false }) => {
         if (lastAssistantOnly) {
-          const messages = await client.session.messages({
+          const messages = await getClient().session.messages({
             path: { id: sessionId },
           })
 
@@ -322,7 +323,7 @@ export async function getTools({
             sessionID: sessionId,
           })
 
-          const messages = await client.session.messages({
+          const messages = await getClient().session.messages({
             path: { id: sessionId },
           })
           const lastMessage = messages.data?.[messages.data.length - 1]
@@ -350,7 +351,7 @@ export async function getTools({
       }),
       execute: async ({ sessionId }) => {
         try {
-          const result = await client.session.abort({
+          const result = await getClient().session.abort({
             path: { id: sessionId },
           })
 
@@ -381,7 +382,7 @@ export async function getTools({
       inputSchema: z.object({}),
       execute: async () => {
         try {
-          const providersResponse = await client.config.providers({})
+          const providersResponse = await getClient().config.providers({})
           const providers: Provider[] = providersResponse.data?.providers || []
 
           const models: Array<{ providerId: string; modelId: string }> = []

package/src/xml.test.ts

@@ -0,0 +1,37 @@
+import { describe, test, expect } from 'vitest'
+import { extractNonXmlContent } from './xml.js'
+
+describe('extractNonXmlContent', () => {
+  test('removes xml tags and returns only text content', () => {
+    const xml = 'Hello <tag>content</tag> world <nested><inner>deep</inner></nested> end'
+    expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`
+      "Hello
+      world
+      end"
+    `)
+  })
+
+  test('handles multiple text segments', () => {
+    const xml = 'Start <a>tag1</a> middle <b>tag2</b> finish'
+    expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`
+      "Start
+      middle
+      finish"
+    `)
+  })
+
+  test('handles only xml without text', () => {
+    const xml = '<root><child>content</child></root>'
+    expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`""`)
+  })
+
+  test('handles only text without xml', () => {
+    const xml = 'Just plain text'
+    expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`"Just plain text"`)
+  })
+
+  test('handles empty string', () => {
+    const xml = ''
+    expect(extractNonXmlContent(xml)).toMatchInlineSnapshot(`""`)
+  })
+})

package/src/xml.ts

@@ -110,3 +110,8 @@ export function extractTagsArrays<T extends string>({
 
   return result as Record<T, string[]> & { others: string[] }
 }
+
+export function extractNonXmlContent(xml: string): string {
+  const result = extractTagsArrays({ xml, tags: [] })
+  return result.others.join('\n')
+}

package/bin.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Restarts dist/cli.js if it exits non-zero.
-# Throttles restarts to at most once every 5 seconds.
-
-set -u -o pipefail
-
-NODE_BIN="${NODE_BIN:-node}"
-
-
-last_start=0
-
-while :; do
-  now=$(date +%s)
-  elapsed=$(( now - last_start ))
-  if (( elapsed < 5 )); then
-    sleep $(( 5 - elapsed ))
-  fi
-  last_start=$(date +%s)
-
-  "$NODE_BIN" "./dist/cli.js" "$@"
-  code=$?
-
-  # Exit cleanly if the app ended OK or via SIGINT/SIGTERM
-  if (( code == 0 || code == 130 || code == 143 || code == 64 )); then
-    exit "$code"
-  fi
-  # otherwise loop; the 5s throttle above will apply
-done