@dotdrelle/wiki-manager 0.6.30 → 0.6.34

package/src/shell/SlashDialog.tsx

@@ -24,14 +24,15 @@ export function SlashDialog(props: { context: any }) {
             {(item: any, index) => (
               <text
                 height={1}
-                fg={index() === context().selected ? '#111318' : '#D6DEE8'}
-                bg={index() === context().selected ? '#8BD5CA' : '#111318'}
+                fg={index() === context().visibleSelected ? '#111318' : '#D6DEE8'}
+                bg={index() === context().visibleSelected ? '#8BD5CA' : '#111318'}
               >
                 {item.value.padEnd(16, ' ')} {item.description}
               </text>
             )}
           </For>
-          <text fg="#7F8C8D">[up/down navigate  Tab complete  Enter confirm  Esc clear]</text>
+          <text height={1} />
+          <text fg="#7F8C8D">[up/down navigate, Tab complete, Enter confirm, Esc clear]</text>
         </box>
       )}
     </Show>

package/src/shell/repl.js

@@ -54,8 +54,8 @@ const COMMAND_COMPLETION_DESCRIPTIONS = {
   '/help': 'Show shell commands.',
   '/version': 'Print the wiki-manager version.',
   '/exit': 'Exit the shell.',
-  '/workspaces': 'List configured workspaces.',
-  '/new': 'Create or configure a new workspace.',
+  '/workspace': 'List, create, or delete workspaces.',
+  '/new': 'Open the setup wizard in the interactive TUI.',
   '/use': 'Load a workspace and its default config.',
   '/config': 'Inspect or switch .wikirc.yaml profiles.',
   '/status': 'Show the current workspace and session state.',
@@ -89,7 +89,9 @@ const SUBCOMMAND_COMPLETION_DESCRIPTIONS = {
   '/queue': 'Inspect or cancel queued MCP jobs.',
   '/queue:cancel': 'Cancel a queued or running queue item.',
   '/queue:clear': 'Clear finished queue items.',
-  '/workspace:init': 'Legacy form of /new.',
+  '/workspace:init': 'Low-level workspace creation.',
+  '/workspace:list': 'List configured workspaces.',
+  '/workspace:delete': 'Delete one workspace after confirmation.',
   '/wiki:run': 'Use the low-level llm-wiki CLI fallback.',
   '/skills:edit': 'Edit one workspace skill file.',
   '/skills:list': 'List workspace skills.',
@@ -106,7 +108,7 @@ export function createSession() {
     wikircConfig: null,
     language: null,
     mcp: null,
-    commands: ['help', 'version', 'exit', 'workspaces', 'new', 'use', 'config', 'status', 'services', 'start', 'stop', 'logs', 'mcp', 'wiki', 'skills', 'upload', 'uploads', 'clear', 'chat', 'agent', 'openui', 'queue'],
+    commands: ['help', 'version', 'exit', 'workspace', 'new', 'use', 'config', 'status', 'services', 'start', 'stop', 'logs', 'mcp', 'wiki', 'skills', 'upload', 'uploads', 'clear', 'chat', 'agent', 'openui', 'queue'],
     chatMode: true,
     llm: null,
     activities: {},
@@ -216,11 +218,16 @@ function completionValuesFor(parts, inputBuffer, session) {
       .filter((item) => ['waiting', 'starting', 'running'].includes(item.status))
       .map((item) => item.id);
   }
-  if (command === '/workspace' && tokenIndex === 1) return ['init'];
+  if (command === '/workspace') {
+    if (tokenIndex === 1) return ['delete', 'init', 'list'];
+    if (previousToken === 'delete') return workspaceNames();
+    if (parts[1] === 'delete' && tokenIndex === 3) return ['--confirm'];
+  }
   if (command === '/wiki' && tokenIndex === 1) return ['run'];
   if (command === '/skills' && tokenIndex === 1) return ['edit', 'list', 'run', 'show'];
   if (command === '/skills' && ['edit', 'run', 'show'].includes(previousToken ?? '')) return skillNames(session);
-  if ((command === '/start' || command === '/stop' || command === '/logs') && tokenIndex === 1) return serviceNames();
+  if ((command === '/start' || command === '/stop') && tokenIndex === 1) return ['agents', ...serviceNames()];
+  if (command === '/logs' && tokenIndex === 1) return serviceNames();
   return [];
 }
 
@@ -289,6 +296,11 @@ export function completionDescription(value, parts) {
   if (command === '/start') return serviceDescription(value) ?? 'Start this Docker Compose service.';
   if (command === '/stop') return serviceDescription(value) ?? 'Stop this Docker Compose service.';
   if (command === '/logs') return serviceDescription(value) ?? 'Show logs for this Docker Compose service.';
+  if (command === '/workspace') {
+    if (parts[1] === 'delete' && value === '--confirm') return 'Confirm workspace deletion.';
+    if (parts.at(-1) === 'delete') return 'Delete this workspace.';
+    return 'Choose a workspace action.';
+  }
   if (command === '/mcp') return parts[1] === 'call' ? 'Use this MCP server.' : 'Filter tools to this MCP server.';
   if (command === '/skills') {
     if (parts.at(-1) === 'edit') return 'Edit this skill.';
@@ -1174,7 +1186,7 @@ async function runTuiShell({ agent, packageJson, session }) {
   rerender();
 
   try {
-    const { output: wsOutput } = await handleSlashCommand('/workspaces', { packageJson, session });
+    const { output: wsOutput } = await handleSlashCommand('/workspace list', { packageJson, session });
     if (wsOutput) messages.push({ role: 'command', content: wsOutput });
   } finally {
     clearInterval(spinnerInterval);
@@ -1316,7 +1328,7 @@ async function runTuiShell({ agent, packageJson, session }) {
       }
       return;
     }
-    if (key?.ctrl && key.name === 'c') {
+    if ((key?.ctrl || key?.meta) && key.name === 'c') {
       if (busy) {
         currentAbortController?.abort();
         spinnerLabel = 'Interrupting…';

package/src/shell/tui.tsx

@@ -6,6 +6,7 @@ import { FileEditorDialog } from './FileEditorDialog';
 import { LeftPane } from './LeftPane';
 import { RightPane } from './RightPane';
 import { SlashDialog } from './SlashDialog';
+import { SetupWizard } from './SetupWizard';
 import { useSession } from './useSession';
 
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
@@ -37,7 +38,10 @@ function copyToClipboard(text: string, renderer: unknown) {
   }
 }
 
-function App(props: { agent: unknown; packageJson: Record<string, unknown> }) {
+function App(props: {
+  agent: unknown;
+  packageJson: Record<string, unknown>;
+}) {
   const renderer = useRenderer();
   const dimensions = useTerminalDimensions();
   const [spinnerIndex, setSpinnerIndex] = createSignal(0);
@@ -100,11 +104,12 @@ function App(props: { agent: unknown; packageJson: Record<string, unknown> }) {
   });
 
   useKeyboard((key) => {
+    const keyName = String(key.name ?? '').toLowerCase();
     if (state.activeEditor()) {
-      if (key.name === 'escape') state.closeEditor();
+      if (keyName === 'escape') state.closeEditor();
       return;
     }
-    if (key.ctrl && key.name === 'c') {
+    if ((key.ctrl || key.meta) && keyName === 'c') {
       if (state.busy()) {
         state.abort();
         return;
@@ -121,19 +126,19 @@ function App(props: { agent: unknown; packageJson: Record<string, unknown> }) {
       }, 1600);
       return;
     }
-    if (key.ctrl && key.name === 'q') {
+    if (key.ctrl && keyName === 'q') {
       state.toggleRightTab();
       return;
     }
     if (state.busy()) return;
-    if (key.name === 'tab') state.completeSelected();
-    if (key.name === 'pageup') state.scrollConversation(conversationRows());
-    else if (key.name === 'pagedown') state.scrollConversation(-conversationRows());
-    if (key.name === 'up' && state.slash()) state.moveCompletion(-1);
-    else if (key.name === 'down' && state.slash()) state.moveCompletion(1);
-    else if (key.name === 'up' && !state.input().includes('\n')) state.historyUp();
-    else if (key.name === 'down' && !state.input().includes('\n')) state.historyDown();
-    else if (key.name === 'escape') {
+    if (keyName === 'tab') state.completeSelected();
+    if (keyName === 'pageup') state.scrollConversation(conversationRows());
+    else if (keyName === 'pagedown') state.scrollConversation(-conversationRows());
+    if (keyName === 'up' && state.slash()) state.moveCompletion(-1);
+    else if (keyName === 'down' && state.slash()) state.moveCompletion(1);
+    else if (keyName === 'up' && !state.input().includes('\n')) state.historyUp();
+    else if (keyName === 'down' && !state.input().includes('\n')) state.historyDown();
+    else if (keyName === 'escape') {
       if (state.slash()) state.dismissSlash();
       else state.setInput('');
     }
@@ -196,10 +201,77 @@ function App(props: { agent: unknown; packageJson: Record<string, unknown> }) {
   );
 }
 
-export async function runOpenTuiShell({ agent, packageJson }: { agent: unknown; packageJson: Record<string, unknown> }) {
+export async function runOpenTuiShell({
+  agent,
+  packageJson,
+}: {
+  agent: unknown;
+  packageJson: Record<string, unknown>;
+}) {
   await render(() => <App agent={agent} packageJson={packageJson} />, {
     exitOnCtrlC: false,
     useMouse: true,
     targetFps: 30,
   });
+  return {};
+}
+
+function WizardApp(props: {
+  mode: 'startup' | 'setup';
+  gaps?: any[];
+  initialWorkspaceName?: string;
+  initialWorkspacePath?: string | null;
+  onDone: () => void;
+}) {
+  const renderer = useRenderer();
+  const dimensions = useTerminalDimensions();
+  const close = () => {
+    props.onDone();
+    renderer.destroy();
+  };
+  return (
+    <box width="100%" height="100%" backgroundColor="#0B0D12">
+      <SetupWizard
+        mode={props.mode}
+        session={{}}
+        gaps={props.gaps}
+        width={dimensions().width}
+        height={dimensions().height}
+        initialRoute={props.mode === 'setup' ? 'workspace-name' : undefined}
+        initialWorkspaceName={props.initialWorkspaceName}
+        initialWorkspacePath={props.initialWorkspacePath ?? null}
+        closeOnDone={props.mode === 'setup'}
+        onComplete={close}
+        onClose={close}
+      />
+    </box>
+  );
+}
+
+export async function runStartupWizard(gaps: any[]) {
+  if (!gaps.length) return;
+  await new Promise<void>((resolve, reject) => {
+    render(() => <WizardApp mode="startup" gaps={gaps} onDone={resolve} />, {
+      exitOnCtrlC: false,
+      useMouse: true,
+      targetFps: 30,
+    }).catch(reject);
+  });
+}
+
+export async function runSetupWizard(options: { workspaceName?: string; workspacePath?: string | null } = {}) {
+  await new Promise<void>((resolve, reject) => {
+    render(() => (
+      <WizardApp
+        mode="setup"
+        initialWorkspaceName={options.workspaceName}
+        initialWorkspacePath={options.workspacePath ?? null}
+        onDone={resolve}
+      />
+    ), {
+      exitOnCtrlC: false,
+      useMouse: true,
+      targetFps: 30,
+    }).catch(reject);
+  });
 }

package/src/shell/useSession.ts

@@ -86,14 +86,22 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
       session.llm ? 'llm ready' : 'llm limited',
     ].join('  ');
   });
-  const slash = createMemo(() => {
+  const matchContext = createMemo(() => {
     if (input() === dismissedSlashInput()) return null;
-    const context = completionContext(input(), session);
+    return completionContext(input(), session);
+  });
+  const slash = createMemo(() => {
+    const context = matchContext();
     if (!context) return null;
+    const selected = Math.min(selectedCompletion(), Math.max(0, context.matches.length - 1));
+    const visibleCount = 10;
+    const start = Math.max(0, Math.min(selected - Math.floor(visibleCount / 2), Math.max(0, context.matches.length - visibleCount)));
+    const visibleMatches = context.matches.slice(start, start + visibleCount);
     return {
       ...context,
-      selected: Math.min(selectedCompletion(), Math.max(0, context.matches.length - 1)),
-      items: context.matches.slice(0, 10).map((value: string) => ({
+      selected,
+      visibleSelected: selected - start,
+      items: visibleMatches.map((value: string) => ({
         value,
         description: completionDescription(value, context.parts),
       })),
@@ -249,8 +257,8 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
 
   function completeSelected() {
     const context = slash();
-    if (!context || context.items.length === 0) return;
-    const selected = context.items[context.selected]?.value;
+    if (!context || context.matches.length === 0) return;
+    const selected = context.matches[context.selected];
     if (!selected) return;
     const lastSpace = input().lastIndexOf(' ');
     const base = input().endsWith(' ') ? input() : input().slice(0, lastSpace + 1);
@@ -259,7 +267,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
   }
 
   function moveCompletion(delta: number) {
-    const count = slash()?.items.length ?? 0;
+    const count = slash()?.matches.length ?? 0;
     if (!count) return;
     setSelectedCompletion((value) => (value + delta + count) % count);
   }

package/wiki-workspace

@@ -16,10 +16,66 @@ DEFAULT_MANAGER_DIR="$PWD"
 WORKSPACES_DIR="${WIKI_WORKSPACES_DIR:-$DEFAULT_MANAGER_DIR/workspaces}"
 MANAGER_ENV_FILE="${WIKI_MANAGER_ENV_FILE:-$DEFAULT_MANAGER_DIR/.env}"
 MANAGER_ENDPOINTS_FILE="${WIKI_MANAGER_ENDPOINTS_FILE:-$DEFAULT_MANAGER_DIR/mcp.endpoints.json}"
+MANAGER_STATE_DIR="$(cd "$(dirname "$MANAGER_ENV_FILE")" && pwd)"
+MANAGER_RUNTIME_DIR="$MANAGER_STATE_DIR/.wiki-manager"
+CACERT_PATH="${WIKI_MANAGER_CACERT_PATH:-}"
+
+normalize_path() {
+  local value="$1"
+  if command -v wslpath >/dev/null 2>&1 && [[ "$value" =~ ^[A-Za-z]:[\\/] ]]; then
+    wslpath -u "$value"
+    return
+  fi
+  printf '%s\n' "$value"
+}
+
+absolute_path() {
+  local value="$1"
+  local base="${2:-$ROOT_DIR}"
+  value="$(normalize_path "$value")"
+  if [[ "$value" = /* ]]; then
+    printf '%s\n' "$value"
+  else
+    printf '%s\n' "$base/$value"
+  fi
+}
+
+parse_global_options() {
+  local parsed=()
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --cacert)
+        [[ $# -ge 2 ]] || { printf 'Error: --cacert requires a file path\n' >&2; exit 2; }
+        CACERT_PATH="$2"
+        shift 2
+        ;;
+      *)
+        parsed+=("$1")
+        shift
+        ;;
+    esac
+  done
+  if [[ -n "$CACERT_PATH" ]]; then
+    CACERT_PATH="$(absolute_path "$CACERT_PATH" "$PWD")"
+    [[ -f "$CACERT_PATH" ]] || { printf 'Error: --cacert file not found: %s\n' "$CACERT_PATH" >&2; exit 2; }
+    export WIKI_MANAGER_CACERT_PATH="$CACERT_PATH"
+    export NODE_EXTRA_CA_CERTS="$CACERT_PATH"
+    export SSL_CERT_FILE="$CACERT_PATH"
+    export REQUESTS_CA_BUNDLE="$CACERT_PATH"
+    export CURL_CA_BUNDLE="$CACERT_PATH"
+  fi
+  set -- "${parsed[@]}"
+  PARSED_ARGS=("$@")
+}
+
+PARSED_ARGS=()
+parse_global_options "$@"
+set -- "${PARSED_ARGS[@]}"
 
 usage() {
   cat <<'EOF'
 Usage:
+  wiki-workspace [--cacert <path>] <command> ...
   wiki-workspace config <workspace> [path]
   wiki-workspace up <workspace>
   wiki-workspace wiki <workspace> <command> [args...]
@@ -50,6 +106,7 @@ Commands:
 Configuration:
   workspaces/<workspace>/.env
   Override directory: WIKI_WORKSPACES_DIR=/path/to/dir
+  Local CA: --cacert /absolute/path/to/ca.pem (Docker must be able to read this host path)
 EOF
 }
 
@@ -58,26 +115,6 @@ die() {
   exit 1
 }
 
-normalize_path() {
-  local value="$1"
-  if command -v wslpath >/dev/null 2>&1 && [[ "$value" =~ ^[A-Za-z]:[\\/] ]]; then
-    wslpath -u "$value"
-    return
-  fi
-  printf '%s\n' "$value"
-}
-
-absolute_path() {
-  local value="$1"
-  local base="${2:-$ROOT_DIR}"
-  value="$(normalize_path "$value")"
-  if [[ "$value" = /* ]]; then
-    printf '%s\n' "$value"
-  else
-    printf '%s\n' "$base/$value"
-  fi
-}
-
 workspace_env_file() {
   local workspace="$1"
   printf '%s/%s/.env\n' "$WORKSPACES_DIR" "$workspace"
@@ -169,9 +206,12 @@ agents_compose() {
   [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
 
   _agents_dc() {
+    local cacert_args=()
+    WORKSPACES_ROOT="$workspaces_root" AGENTS_DATA_DIR="$agents_data_dir" \
+      read_lines_into_array cacert_args cacert_compose_args "$agents_compose_file" "agents.cacert.compose.yml"
     WORKSPACES_ROOT="$workspaces_root" AGENTS_DATA_DIR="$agents_data_dir" \
       docker compose --project-directory "$DEFAULT_MANAGER_DIR" \
-        "${compose_env_args[@]}" -f "$agents_compose_file" -p wiki-agents "$@"
+        ${compose_env_args[@]+"${compose_env_args[@]}"} -f "$agents_compose_file" ${cacert_args[@]+"${cacert_args[@]}"} -p wiki-agents "$@"
   }
 
   case "$subcommand" in
@@ -444,13 +484,19 @@ compose_for_workspace() {
   local compose_env_args=()
   [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
   compose_env_args+=(--env-file "$workspace_env")
+  local cacert_args=()
+  WIKI_WORKSPACE_PATH="$ws_path" \
+  WIKI_SERVE_PORT="$serve_port" \
+  WIKI_MCP_PORT="$mcp_port" \
+  PRODUCTION_MCP_PORT="$prod_port" \
+    read_lines_into_array cacert_args cacert_compose_args "$ROOT_DIR/docker-compose.yml" "cacert.compose.yml"
 
   WIKI_WORKSPACE_PATH="$ws_path" \
   WIKI_SERVE_PORT="$serve_port" \
   WIKI_MCP_PORT="$mcp_port" \
   PRODUCTION_MCP_PORT="$prod_port" \
   docker compose --project-directory "$DEFAULT_MANAGER_DIR" \
-    "${compose_env_args[@]}" -f "$ROOT_DIR/docker-compose.yml" -p "$project" "$@"
+    ${compose_env_args[@]+"${compose_env_args[@]}"} -f "$ROOT_DIR/docker-compose.yml" ${cacert_args[@]+"${cacert_args[@]}"} -p "$project" "$@"
 }
 
 logs_args() {
@@ -474,6 +520,48 @@ read_lines_into_array() {
   done < <("$@")
 }
 
+cacert_compose_args() {
+  local compose_file="$1"
+  local override_name="$2"
+  [[ -n "$CACERT_PATH" ]] || return 0
+  command -v node >/dev/null 2>&1 || die "--cacert requires node to generate Docker Compose overrides"
+
+  local services
+  services="$(
+    ROOT_DIR="$ROOT_DIR" _WIKI_COMPOSE_FILE_PATH="$compose_file" node <<'NODE'
+const { createRequire } = require('node:module');
+const fs = require('node:fs');
+const requireFromPackage = createRequire(`${process.env.ROOT_DIR}/package.json`);
+const YAML = requireFromPackage('yaml');
+const parsed = YAML.parse(fs.readFileSync(process.env._WIKI_COMPOSE_FILE_PATH, 'utf8')) ?? {};
+for (const service of Object.keys(parsed.services ?? {})) {
+  console.log(service);
+}
+NODE
+  )"
+  [[ -n "$services" ]] || return 0
+
+  mkdir -p "$MANAGER_RUNTIME_DIR"
+  local override_path="$MANAGER_RUNTIME_DIR/$override_name"
+  {
+    printf '# Generated by wiki-manager. Safe to delete.\n'
+    printf '# Rewritten when --cacert is used with a Docker Compose command.\n'
+    printf 'services:\n'
+    while IFS= read -r service || [[ -n "$service" ]]; do
+      [[ -n "$service" ]] || continue
+      printf '  %s:\n' "$service"
+      printf '    volumes:\n'
+      printf '      - %s:/wiki-manager-ca.pem:ro\n' "$CACERT_PATH"
+      printf '    environment:\n'
+      printf '      NODE_EXTRA_CA_CERTS: /wiki-manager-ca.pem\n'
+      printf '      SSL_CERT_FILE: /wiki-manager-ca.pem\n'
+      printf '      REQUESTS_CA_BUNDLE: /wiki-manager-ca.pem\n'
+      printf '      CURL_CA_BUNDLE: /wiki-manager-ca.pem\n'
+    done <<< "$services"
+  } > "$override_path"
+  printf '%s\n' -f "$override_path"
+}
+
 run_wiki() {
   local workspace="$1"
   shift
@@ -623,12 +711,17 @@ config_workspace() {
   local compose_env_args=()
   [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
   compose_env_args+=(--env-file "$env_file")
+  local cacert_args=()
+  WIKI_WORKSPACE_PATH="$target_path" \
+  WIKI_SERVE_PORT="$serve_port" \
+  WIKI_MCP_PORT="$mcp_port" \
+    read_lines_into_array cacert_args cacert_compose_args "$ROOT_DIR/docker-compose.yml" "cacert.compose.yml"
 
   WIKI_WORKSPACE_PATH="$target_path" \
   WIKI_SERVE_PORT="$serve_port" \
   WIKI_MCP_PORT="$mcp_port" \
     docker compose --project-directory "$DEFAULT_MANAGER_DIR" \
-      "${compose_env_args[@]}" -f "$ROOT_DIR/docker-compose.yml" run --rm wiki init
+      ${compose_env_args[@]+"${compose_env_args[@]}"} -f "$ROOT_DIR/docker-compose.yml" ${cacert_args[@]+"${cacert_args[@]}"} run --rm wiki init
 
   printf 'Workspace ready: %s\n' "$target_path"
   printf 'Start with:      wiki-workspace up %s\n' "$workspace"