codemini-cli 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemini-cli",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
   "keywords": [
     "cli",
@@ -47,9 +47,7 @@
   },
   "dependencies": {
     "@cursorless/tree-sitter-wasms": "^0.5.0",
-    "@anthropic-ai/sdk": "^0.82.0",
     "ink": "^6.3.1",
-    "openai": "^6.33.0",
     "react": "^19.0.0",
     "web-tree-sitter": "^0.26.7"
   },

package/src/core/provider/openai-compatible.js

@@ -1,5 +1,3 @@
-import OpenAI from 'openai';
-
 function extractTextContent(content) {
   if (typeof content === 'string') return content;
   if (Array.isArray(content)) {
@@ -23,13 +21,49 @@ function emptyToolCall(index) {
   };
 }
 
-function createClient({ baseUrl, apiKey, timeoutMs, maxRetries }) {
-  return new OpenAI({
-    apiKey,
-    baseURL: baseUrl,
-    timeout: timeoutMs,
-    maxRetries
-  });
+function createHeaders(apiKey) {
+  return {
+    'content-type': 'application/json',
+    authorization: `Bearer ${apiKey}`
+  };
+}
+
+function buildChatCompletionsUrl(baseUrl) {
+  return `${String(baseUrl || '').replace(/\/$/, '')}/chat/completions`;
+}
+
+async function parseJsonResponse(response) {
+  if (!response.ok) {
+    const text = await response.text().catch(() => '');
+    throw new Error(`Gateway error ${response.status}: ${text || response.statusText}`);
+  }
+  return response.json();
+}
+
+async function* iterateSseEvents(stream) {
+  const decoder = new TextDecoder();
+  let buffer = '';
+
+  for await (const chunk of stream) {
+    buffer += decoder.decode(chunk, { stream: true });
+    while (true) {
+      const lfBoundary = buffer.indexOf('\n\n');
+      const crlfBoundary = buffer.indexOf('\r\n\r\n');
+      if (lfBoundary === -1 && crlfBoundary === -1) break;
+      const useCrlf = crlfBoundary !== -1 && (lfBoundary === -1 || crlfBoundary < lfBoundary);
+      const boundary = useCrlf ? crlfBoundary : lfBoundary;
+      const separatorLength = useCrlf ? 4 : 2;
+      const rawEvent = buffer.slice(0, boundary);
+      buffer = buffer.slice(boundary + separatorLength);
+      const dataLines = rawEvent
+        .split(/\r?\n/)
+        .filter((line) => line.startsWith('data:'))
+        .map((line) => line.slice(5).trimStart());
+      const dataText = dataLines.join('\n');
+      if (!dataText || dataText === '[DONE]') continue;
+      yield JSON.parse(dataText);
+    }
+  }
 }
 
 function isMiniMaxModel(model) {
@@ -238,10 +272,14 @@ export async function createChatCompletion({
   timeoutMs = 90000,
   maxRetries = 2
 }) {
-  const client = createClient({ baseUrl, apiKey, timeoutMs, maxRetries });
   const payload = buildPayload({ model, temperature, messages, tools });
-
-  const data = await client.chat.completions.create(payload);
+  const response = await fetch(buildChatCompletionsUrl(baseUrl), {
+    method: 'POST',
+    headers: createHeaders(apiKey),
+    body: JSON.stringify(payload),
+    signal: AbortSignal.timeout(timeoutMs)
+  });
+  const data = await parseJsonResponse(response);
   const message = data?.choices?.[0]?.message || {};
   const text = sanitizeMiniMaxText(model, extractTextContent(message.content));
   const toolCalls = (message.tool_calls || []).map((tc) => ({
@@ -282,16 +320,23 @@ export async function createChatCompletionStream({
   timeoutMs = 90000,
   maxRetries = 2
 }) {
-  const client = createClient({ baseUrl, apiKey, timeoutMs, maxRetries });
   const payload = buildPayload({ model, temperature, messages, tools, stream: true });
-
-  const stream = await client.chat.completions.create(payload);
+  const response = await fetch(buildChatCompletionsUrl(baseUrl), {
+    method: 'POST',
+    headers: createHeaders(apiKey),
+    body: JSON.stringify(payload),
+    signal: AbortSignal.timeout(timeoutMs)
+  });
+  if (!response.ok || !response.body) {
+    const text = await response.text().catch(() => '');
+    throw new Error(`Gateway error ${response.status}: ${text || response.statusText}`);
+  }
   let text = '';
   const toolCallsByIndex = new Map();
   let usage = null;
   let miniMaxStreamState = { rawContent: '', visibleText: '' };
 
-  for await (const chunk of stream) {
+  for await (const chunk of iterateSseEvents(response.body)) {
     usage = chunk?.usage || usage;
     const choice0 = chunk?.choices?.[0] || {};
     const delta = choice0?.delta || {};

package/src/tui/chat-app.js

@@ -1954,7 +1954,7 @@ export function collapseActivityChainRows(inputRows, showToolDetails, copy, maxV
   return collapsed;
 }
 
-function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy) {
+export function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy) {
   const rows = [];
   const pushTextRows = (text) => {
     const lines = String(text || '').split('\n');
@@ -2071,26 +2071,26 @@ function buildMessageRows(msg, showToolDetails, contentWidth = 72, copy) {
 
   const codeGenerationRows = getCodeGenerationActivityRows(msg);
   const generatingCodeRows = getGeneratingCodePlaceholderRows(msg, copy, contentWidth);
-  const syntheticRows = [...codeGenerationRows, ...generatingCodeRows];
+  const trailingRows = [];
   if (msg?.loading && (msg?.liveStatus || msg?.phase)) {
-    const statusRows = [];
     pushWrappedRow(
-      statusRows,
+      trailingRows,
       {
         kind: 'status',
         text: trimText(msg.liveStatus || msg.phase, 144)
       },
       Math.max(8, contentWidth - 2)
     );
-    syntheticRows.push(...statusRows);
   }
 
-  return normalizeActivitySpacingRows(
-    insertRowsAfterLastCodeRow(collapseActivityChainRows(rows, showToolDetails, copy), syntheticRows)
+  const rowsWithCodePreview = insertRowsAfterLastCodeRow(
+    collapseActivityChainRows(rows, showToolDetails, copy),
+    [...codeGenerationRows, ...generatingCodeRows]
   );
+  return normalizeActivitySpacingRows([...rowsWithCodePreview, ...trailingRows]);
 }
 
-function renderMessageRow(msg, row, idx, loaderTick) {
+export function renderMessageRow(msg, row, idx, loaderTick) {
   if (row.kind === 'activity') {
     const activity = { type: row.activityType, name: row.name, status: row.status };
     const display = getActivityDisplayParts(activity);
@@ -2139,7 +2139,7 @@ function renderMessageRow(msg, row, idx, loaderTick) {
     const dimColor = row.status === 'completed';
     return h(
       Box,
-      { key: `row-todo-${msg.id}-${idx}`, marginLeft: 2, marginBottom: 1 },
+      { key: `row-todo-${msg.id}-${idx}`, marginLeft: 2 },
       h(Text, { color: 'gray' }, '  '),
       h(Text, { color }, marker),
       h(Text, { color: 'gray' }, ' '),
@@ -2203,22 +2203,11 @@ function renderMessageRow(msg, row, idx, loaderTick) {
   }
   if (row.kind === 'status') {
     const dots = '.'.repeat((loaderTick % 3) + 1);
-    const phase = msg.phase;
-    const color =
-      phase === 'sending'
-        ? 'yellowBright'
-        : phase === 'queued'
-          ? 'cyanBright'
-          : phase === 'tooling'
-            ? 'magentaBright'
-          : phase === 'generating'
-            ? 'greenBright'
-          : 'cyanBright';
     return h(
       Box,
       { key: `row-status-${msg.id}-${idx}`, marginTop: 1 },
       h(Text, { color: 'gray' }, '  '),
-      h(Text, { color }, `${row.text}${dots}`)
+      h(Text, { color: 'gray', dimColor: true }, `${row.text}${dots}`)
     );
   }
   if (row.kind === 'quote') {