@dotdrelle/wiki-manager 0.6.30 → 0.6.34

package/src/core/wikirc.test.js

@@ -0,0 +1,111 @@
+import assert from 'node:assert/strict';
+import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+import YAML from 'yaml';
+import { patchWikircProfile } from './wikirc.js';
+import { writeVectorConfig } from './wikiSetup.js';
+
+test('patchWikircProfile merges keys and preserves existing values', () => {
+  const root = mkdtempSync(join(tmpdir(), 'wikirc-patch-'));
+  const file = join(root, '.wikirc.yaml');
+  writeFileSync(file, [
+    '# workspace config',
+    'language: en-US',
+    'llm:',
+    '  provider: openai',
+    '  temperature: 0.2',
+    '',
+  ].join('\n'), 'utf8');
+
+  patchWikircProfile(root, 'default', {
+    llm: {
+      model: 'gpt-5.4-mini',
+      apiKey: 'secret',
+    },
+    retrieval: {
+      vector: {
+        enabled: true,
+        embeddingModel: 'text-embedding-3-small',
+      },
+    },
+  });
+
+  const raw = readFileSync(file, 'utf8');
+  const parsed = YAML.parse(raw);
+  assert.match(raw, /# workspace config/);
+  assert.equal(parsed.language, 'en-US');
+  assert.equal(parsed.llm.provider, 'openai');
+  assert.equal(parsed.llm.temperature, 0.2);
+  assert.equal(parsed.llm.model, 'gpt-5.4-mini');
+  assert.equal(parsed.retrieval.vector.enabled, true);
+});
+
+test('writeVectorConfig writes llm-wiki vector and rerank keys', () => {
+  const root = mkdtempSync(join(tmpdir(), 'wikirc-vector-'));
+  writeFileSync(join(root, '.wikirc.yaml'), [
+    'language: en',
+    'llm:',
+    '  provider: openai-compatible',
+    '  baseUrl: http://localhost:8000/v1',
+    '  apiKey: llm-key',
+    '  model: chat-model',
+    'retrieval:',
+    '  vector:',
+    '    enabled: false',
+    '',
+  ].join('\n'), 'utf8');
+
+  writeVectorConfig(root, 'default', {
+    baseUrl: 'http://localhost:7997/v1',
+    apiKey: 'vector-key',
+    embeddingModel: 'BAAI/bge-m3',
+    rerankEnabled: true,
+    rerankerModel: 'BAAI/bge-reranker-v2-m3',
+  });
+
+  const parsed = YAML.parse(readFileSync(join(root, '.wikirc.yaml'), 'utf8'));
+  assert.equal(parsed.retrieval.vector.enabled, true);
+  assert.equal(parsed.retrieval.vector.baseUrl, 'http://localhost:7997/v1');
+  assert.equal(parsed.retrieval.vector.apiKey, 'vector-key');
+  assert.equal(parsed.retrieval.vector.embeddingModel, 'BAAI/bge-m3');
+  assert.equal(parsed.retrieval.vector.rerankEnabled, true);
+  assert.equal(parsed.retrieval.vector.rerankerModel, 'BAAI/bge-reranker-v2-m3');
+});
+
+test('writeVectorConfig removes commented vector placeholders it replaces', () => {
+  const root = mkdtempSync(join(tmpdir(), 'wikirc-vector-comments-'));
+  writeFileSync(join(root, '.wikirc.yaml'), [
+    'language: en',
+    'llm:',
+    '  provider: openai-compatible',
+    '  baseUrl: http://localhost:8000/v1',
+    '  apiKey: llm-key',
+    '  model: chat-model',
+    'retrieval:',
+    '  vector:',
+    '    enabled: false',
+    '    # Defaults to llm.baseUrl.',
+    '    # baseUrl: http://127.0.0.1:7997/v1',
+    '    # apiKey: your-vector-key',
+    '    embeddingModel: BAAI/bge-m3',
+    '    rerankerModel: BAAI/bge-reranker-v2-m3',
+    '',
+  ].join('\n'), 'utf8');
+
+  writeVectorConfig(root, 'default', {
+    baseUrl: 'http://localhost:7997/v1',
+    apiKey: 'vector-key',
+    embeddingModel: 'BAAI/bge-m3',
+    rerankEnabled: true,
+    rerankerModel: 'custom-reranker',
+  });
+
+  const raw = readFileSync(join(root, '.wikirc.yaml'), 'utf8');
+  const parsed = YAML.parse(raw);
+  assert.doesNotMatch(raw, /^\s*#\s*baseUrl:/m);
+  assert.doesNotMatch(raw, /^\s*#\s*apiKey:/m);
+  assert.equal(parsed.retrieval.vector.baseUrl, 'http://localhost:7997/v1');
+  assert.equal(parsed.retrieval.vector.apiKey, 'vector-key');
+});

package/src/core/workspaces.js

@@ -49,7 +49,7 @@ export function findWorkspace(name) {
   return listWorkspaces().find((workspace) => workspace.name === name);
 }
 
-function isValidWorkspaceName(name) {
+export function isValidWorkspaceName(name) {
   return (
     typeof name === 'string' &&
     /^[a-zA-Z0-9][a-zA-Z0-9_.-]*[a-zA-Z0-9]$|^[a-zA-Z0-9]$/.test(name) &&

package/src/shell/LeftPane.tsx

@@ -1,5 +1,5 @@
 /** @jsxImportSource @opentui/solid */
-import { For, createEffect, createMemo, createSignal } from 'solid-js';
+import { For, createEffect, createMemo, createSignal, onCleanup } from 'solid-js';
 import { colorForRenderedLine, helpCommandParts, keyValueParts, renderPlainMarkdown } from './renderer';
 
 const LEGACY_DONNA_ROLE = 'do' + 't';
@@ -59,12 +59,12 @@ const STATUS_COLUMN_GAP = 2;
 type HelpCard = { title: string; text: string; example: string };
 
 const HELP_CARDS: HelpCard[] = [
+  { title: '/use', text: 'Load one workspace.', example: 'Ex: /use <workspace>' },
   { title: '/new', text: 'Create/configure a workspace.', example: 'Ex: /new <name> [path]' },
-  { title: 'modify wikirc', text: 'Action: edit file.', example: 'File: .wikirc.yaml' },
-  { title: 'configure CME', text: 'Add type, URL, PAT, email.', example: 'Provide source credentials' },
-  { title: 'add MCP', text: 'Inspect and use MCP endpoints.', example: 'Ex: /mcp endpoints' },
-  { title: '/use', text: 'Load one workspace and its tools.', example: 'Ex: /use <workspace>' },
-  { title: 'llm call action', text: 'Ask to LLM.', example: 'Ex: ask to LLM to run an action' },
+  { title: '/config', text: 'Modify LLM configuration.', example: 'Ex: /config edit <profile>' },
+  { title: '/mcp', text: 'View MCP.', example: 'Ex: /mcp status' },
+  { title: 'configure CME', text: 'Add type, URL, PAT, email.', example: 'Ask to donna to set credentials' },
+  { title: '/status', text: 'Check config.', example: 'Ex: /status' },
 ];
 
 function HelpCardPanel(props: { card: HelpCard; width: number }) {
@@ -364,6 +364,7 @@ function conversationLines(messages: Array<{ role: string; content: string }>, c
     if (isStatusOutput(message)) {
       return [
         { segments: messageHeaderSegments(message.role, columns), copyContent: raw },
+        { segments: [{ text: ' ', color: '#D6DEE8' }] },
         ...raw.split('\n').map((line) => {
           const { left, right } = statusColumns(line || ' ');
           return { status: true, statusLeft: left, statusRight: right, segments: [] };
@@ -379,6 +380,7 @@ function conversationLines(messages: Array<{ role: string; content: string }>, c
     }
     return [
       { segments: messageHeaderSegments(message.role, columns), copyContent: raw },
+      { segments: [{ text: ' ', color: '#D6DEE8' }] },
       ...renderMarkdownLines(lines, message.role, columns),
       { segments: [{ text: ' ', color: '#D6DEE8' }] },
     ];
@@ -397,7 +399,7 @@ export function ConversationView(props: {
   const allLines = createMemo(() => conversationLines(props.messages, props.columns));
   const visibleLines = () => {
     const lines = allLines();
-    const rows = Math.max(1, props.rows - 1);
+    const rows = Math.max(1, props.rows - 2);
     const maxScroll = Math.max(0, lines.length - rows);
     const scroll = Math.min(props.scroll, maxScroll);
     const end = lines.length - scroll;
@@ -406,7 +408,7 @@ export function ConversationView(props: {
   };
   const scrollHint = () => {
     const lines = allLines();
-    const rows = Math.max(1, props.rows - 1);
+    const rows = Math.max(1, props.rows - 2);
     const maxScroll = Math.max(0, lines.length - rows);
     const scroll = Math.min(props.scroll, maxScroll);
     if (maxScroll === 0) return '';
@@ -483,6 +485,7 @@ export function ConversationView(props: {
           )
         )}
       </For>
+      <text height={1} />
     </box>
   );
 }
@@ -504,28 +507,34 @@ export function ChatInput(props: {
   const minRows = 1;
   const maxRows = 5;
   const [textareaRows, setTextareaRows] = createSignal(minRows);
+  let disposed = false;
   const idleColor = () => props.chatMode ? '#22C55E' : '#06B6D4';
   const promptText = () => props.busy ? `${props.spinnerFrame} ` : props.prompt;
   const boxHeight = () => textareaRows() + 2;
+  const inputColumns = () => Math.max(8, props.width - promptText().length - 6);
   const textareaColumns = () => {
     const measured = Number(textareaRef?.width ?? 0);
-    if (Number.isFinite(measured) && measured > 0) return Math.max(8, measured - 1);
-    return Math.max(8, props.width - promptText().length - 7);
+    const bounded = Math.min(inputColumns(), Number.isFinite(measured) && measured > 0 ? measured : inputColumns());
+    return Math.max(8, bounded - 1);
   };
   const estimatedVisualRows = (value: string) => {
     const columns = textareaColumns();
     return Math.max(1, value.split('\n').reduce((rows, line) => rows + Math.max(1, Math.ceil(line.length / columns)), 0));
   };
   const measuredVisualRows = (value: string) => {
-    const virtualRows = Number(textareaRef?.virtualLineCount ?? 0);
-    const logicalRows = Number(textareaRef?.lineCount ?? 0);
-    const scrollRows = Number(textareaRef?.scrollHeight ?? 0);
-    return Math.max(
-      estimatedVisualRows(value),
-      Number.isFinite(virtualRows) ? virtualRows : 0,
-      Number.isFinite(logicalRows) ? logicalRows : 0,
-      Number.isFinite(scrollRows) ? scrollRows : 0,
-    );
+    try {
+      const virtualRows = Number(textareaRef?.virtualLineCount ?? 0);
+      const logicalRows = Number(textareaRef?.lineCount ?? 0);
+      const scrollRows = Number(textareaRef?.scrollHeight ?? 0);
+      return Math.max(
+        estimatedVisualRows(value),
+        Number.isFinite(virtualRows) ? virtualRows : 0,
+        Number.isFinite(logicalRows) ? logicalRows : 0,
+        Number.isFinite(scrollRows) ? scrollRows : 0,
+      );
+    } catch {
+      return estimatedVisualRows(value);
+    }
   };
   const applyHeight = (rows: number) => {
     const height = rows + 2;
@@ -533,11 +542,25 @@ export function ChatInput(props: {
     if (containerRef) containerRef.height = height;
     props.onHeightChange(height);
   };
-  const updateRows = (value = String(textareaRef?.plainText ?? props.value ?? '')) => {
-    const rows = Math.min(maxRows, Math.max(minRows, measuredVisualRows(value)));
+  const safePlainText = () => {
+    try {
+      return String(textareaRef?.plainText ?? props.value ?? '');
+    } catch {
+      return String(props.value ?? '');
+    }
+  };
+  const updateRows = (value?: string) => {
+    if (disposed) return;
+    const text = value ?? safePlainText();
+    const rows = Math.min(maxRows, Math.max(minRows, measuredVisualRows(text)));
     setTextareaRows(rows);
     applyHeight(rows);
   };
+  const queueUpdateRows = (value?: string) => {
+    queueMicrotask(() => {
+      if (!disposed) updateRows(value);
+    });
+  };
   const syncTextareaValue = (value: string) => {
     const current = String(textareaRef?.plainText ?? '');
     if (!textareaRef || current === value) return;
@@ -549,16 +572,16 @@ export function ChatInput(props: {
       // Some renderable states reject cursor movement while layout is settling.
     }
     updateRows(value);
-    queueMicrotask(() => updateRows(value));
+    queueUpdateRows(value);
   };
   const handleContentChange = () => {
-    const value = String(textareaRef?.plainText ?? '');
+    const value = safePlainText();
     props.onInput(value);
     updateRows(value);
-    queueMicrotask(() => updateRows(value));
+    queueUpdateRows(value);
   };
   const submitCurrentValue = () => {
-    props.onSubmit(String(textareaRef?.plainText ?? props.value ?? ''));
+    props.onSubmit(safePlainText());
   };
 
   createEffect(() => {
@@ -573,7 +596,10 @@ export function ChatInput(props: {
     props.width;
     props.prompt;
     props.spinnerFrame;
-    queueMicrotask(() => updateRows());
+    queueUpdateRows();
+  });
+  onCleanup(() => {
+    disposed = true;
   });
 
   return (
@@ -590,7 +616,7 @@ export function ChatInput(props: {
       <text height={1} fg={props.busy ? '#FBBF24' : idleColor()}>{promptText()}</text>
       <textarea
         ref={textareaRef}
-        flexGrow={1}
+        width={inputColumns()}
         height={textareaRows()}
         focused={props.focused && !props.busy}
         initialValue={props.value}
@@ -599,7 +625,7 @@ export function ChatInput(props: {
         keyBindings={[
           { name: 'return', action: 'submit' },
           { name: 'kpenter', action: 'submit' },
-          { name: 'linefeed', action: 'newline' },
+          { name: 'linefeed', action: 'submit' },
           { name: 'return', shift: true, action: 'newline' },
           { name: 'kpenter', shift: true, action: 'newline' },
           { name: 'linefeed', shift: true, action: 'newline' },

package/src/shell/RightPane.tsx

@@ -1,5 +1,5 @@
 /** @jsxImportSource @opentui/solid */
-import { Index, Show } from 'solid-js';
+import { createMemo, Index, Show } from 'solid-js';
 
 type PlanStep = { step: number; description: string; status: string };
 type QueueItem = {
@@ -12,6 +12,7 @@ type QueueItem = {
   reason?: string;
 };
 type QueueInfo = { active: number; current: number; frozen: number };
+type LogLineParts = { time: string | null; message: string };
 
 const ACTIVITY_SLOTS = Array.from({ length: 6 }, (_, index) => index);
 const LOG_SLOTS = Array.from({ length: 24 }, (_, index) => index);
@@ -51,6 +52,12 @@ function fit(value: string, width: number) {
   return value.slice(0, max - 1) + '…';
 }
 
+function logLineParts(line: string): LogLineParts {
+  const match = line.match(/^((?:\d{1,2}:\d{2}(?::\d{2})?(?:\s?[AP]M)?|\d{4}-\d{2}-\d{2}[T ][0-9:.]+Z?))\s+(.+)$/i);
+  if (!match) return { time: null, message: line };
+  return { time: match[1], message: match[2] };
+}
+
 function activityColor(status: string) {
   const value = String(status ?? '').toLowerCase();
   if (['done', 'complete', 'completed', 'success'].includes(value)) return '#8BD5CA';
@@ -190,7 +197,23 @@ export function LogPanel(props: { logs: string[]; width: number }) {
       <text width={lineWidth()} fg="#D6DEE8" content="Logs / Trace" />
       <box flexGrow={1} flexDirection="column" overflow="hidden">
         <Index each={LOG_SLOTS}>
-          {(slot) => <text width={lineWidth()} fg="#AAB7C4" content={logLineAt(slot())} />}
+          {(slot) => {
+            const line = () => logLineAt(slot());
+            const parts = createMemo(() => logLineParts(line()));
+            const timeWidth = () => parts().time ? Math.min(parts().time!.length + 1, lineWidth()) : 0;
+            const messageWidth = () => Math.max(1, lineWidth() - timeWidth());
+            return (
+              <Show
+                when={parts().time}
+                fallback={<text width={lineWidth()} fg="#AAB7C4" content={line()} />}
+              >
+                <box height={1} flexDirection="row" overflow="hidden">
+                  <text width={timeWidth()} fg="#89B4FA" content={fit(`${parts().time} `, timeWidth())} />
+                  <text width={messageWidth()} fg="#AAB7C4" content={fit(parts().message, messageWidth())} />
+                </box>
+              </Show>
+            );
+          }}
         </Index>
       </box>
     </box>