@dotdrelle/wiki-manager 0.15.28 → 0.15.32

package/src/shell/repl.test.js

@@ -7,6 +7,7 @@ import {
   applyRuntimeStateToShellSession,
   chatAllowedTools,
   createSession,
+  isProductHelpQuestion,
   runHeadlessChatTurn,
   sanitizeOpenWikiPage,
   sanitizeOpenWikiPages,
@@ -42,23 +43,14 @@ test('ShellUI renders the user header full-width before constraining only its bo
   assert.match(source.slice(userBodyBranch), /justifyContent="flex-start"/);
   assert.doesNotMatch(source.slice(userBodyBranch, source.indexOf(') : line.status ?', userBodyBranch)), /#12263A/);
   assert.doesNotMatch(source, /messageHeaderSegments\(message\.role, contentColumns\)/);
-  // The third argument reserves room for [ redo ]; the width stays `columns`.
-  assert.match(source, /messageHeaderSegments\(message\.role, columns(, canRedo)?\)/);
+  assert.match(source, /messageHeaderSegments\(message\.role, columns\)/);
 });
 
-test('redo is offered on user questions only, next to copy', async () => {
+test('ShellUI exposes copy without a reply or redo action', async () => {
   const source = await readFile(new URL('./LeftPane.tsx', import.meta.url), 'utf8');
-  assert.match(source, /const canRedo = message\.role === 'user' && raw\.trim\(\)\.length > 0;/);
-  assert.match(source, /props\.onRedo\?\.\(line\.redoIndex!, line\.redoContent!\)/);
-
-  const session = await readFile(new URL('./useSession.ts', import.meta.url), 'utf8');
-  // The runtime must be truncated first: its conversation is derived from the
-  // event log and would be merged straight back in otherwise.
-  const truncateIndex = session.indexOf('postRuntimeConversationTruncate(runtimeIndex');
-  const spliceIndex = session.indexOf('full.splice(index)');
-  const submitIndex = session.indexOf('return submitInput(content)');
-  assert.ok(truncateIndex > 0 && spliceIndex > truncateIndex && submitIndex > spliceIndex);
-  assert.match(session, /const windowOffset = Math\.max\(0, full\.length - messages\(\)\.length\);/);
+  assert.match(source, /const COPY_BTN = ' \[ copy \]';/);
+  assert.doesNotMatch(source, /\[\s*(?:reply|redo)\s*\]/i);
+  assert.doesNotMatch(source, /onRedo|redoContent|redoIndex|REDO_BTN/);
 });
 
 test('redo translates the local thread index into a runtime conversation index', async () => {
@@ -388,6 +380,29 @@ test('applyRuntimeStateToShellSession preserves terminal diagnostics when runtim
   assert.deepEqual(session.agentProjection.planPatches, [{ id: 'old-patch' }]);
 });
 
+test('runtime sync does not resurrect a terminal plan dismissed by a newer user turn', () => {
+  const session = createSession();
+  session._dismissedTerminalRunId = 'old-run';
+  applyRuntimeStateToShellSession(session, {
+    runId: 'old-run',
+    status: 'error',
+    conversation: [{ role: 'assistant', content: 'Old failure' }],
+    plan: [{ id: 'old-task', status: 'failed' }],
+    activities: [{ key: 'old-job', status: 'failed', terminal: true }],
+    logs: ['old error'],
+    summary: 'Old run failed',
+    workflow: { nodes: [{ id: 'task:old' }], relations: [] },
+    planPatches: [{ id: 'old-patch' }],
+  });
+
+  assert.equal(session.headlessPlan, null);
+  assert.deepEqual(session.activities, {});
+  assert.equal(session.workflow, null);
+  assert.deepEqual(session.agentProjection.logs, []);
+  assert.equal(session.agentProjection.summary, null);
+  assert.deepEqual(session.agentProjection.conversation, [{ role: 'assistant', content: 'Old failure' }]);
+});
+
 test('legacy runtime sync does not synthesize per-job or canned completion messages', () => {
   const session = createSession();
   applyRuntimeStateToShellSession(session, {
@@ -567,6 +582,53 @@ test('/agent <question> reports an unavailable runtime without leaving chat mode
   assert.match(conversationMessages(session).at(-1).content, /runtime stopped/);
 });
 
+test('every slash-command result is presented by Donna when an agent is available', async () => {
+  const session = createSession();
+  let synthesisInput = '';
+  const agent = {
+    async invoke({ input, session: activeSession }) {
+      synthesisInput = input;
+      assert.equal(activeSession._responseSynthesisOnly, true);
+      return { response: 'Vous utilisez wiki-manager test.' };
+    },
+  };
+
+  const result = await runLine('/version', {
+    agent,
+    packageJson: { version: 'test' },
+    session,
+  });
+
+  assert.equal(result.exit, false);
+  assert.ok(synthesisInput.includes('commande shell /version'));
+  assert.deepEqual(conversationMessages(session).map((message) => message.role), ['user', 'donna']);
+  assert.equal(conversationMessages(session)[0].content, '/version');
+  assert.equal(conversationMessages(session)[1].content, 'Vous utilisez wiki-manager test.');
+  assert.equal(session._responseSynthesisOnly, undefined);
+});
+
+test('/status remains an immediate deterministic display without Donna', async () => {
+  const session = createSession();
+  let invoked = false;
+  const agent = {
+    async invoke() {
+      invoked = true;
+      return { response: 'must not run' };
+    },
+  };
+
+  const result = await runLine('/status', {
+    agent,
+    packageJson: { version: 'test' },
+    session,
+  });
+
+  assert.equal(result.exit, false);
+  assert.equal(invoked, false);
+  assert.equal(conversationMessages(session).at(-1)?.role, 'command');
+  assert.match(conversationMessages(session).at(-1)?.content ?? '', /Workspace · -/);
+});
+
 test('runLine does not update workspace profile before Donna handles the request', async () => {
   const workspacePath = mkdtempSync(join(tmpdir(), 'donna-profile-shell-'));
   mkdirSync(join(workspacePath, '.wiki'), { recursive: true });
@@ -745,9 +807,9 @@ test('chatAllowedTools exposes exactly the declared MCP tools to /chat', () => {
   };
   const names = chatAllowedTools(session).map((item) => item.function.name).sort();
   // cme_setup: not declared. documents_status: server absent from chatAccess.
-  // cme_export_run: declared, so it is offered — the allow-list is the
-  // operator's explicit decision, not a suggestion filtered by a heuristic.
-  assert.deepEqual(names, ['cme__cme_export_run', 'cme__cme_sources_list', 'cme__cme_status']);
+  // cme_export_run is an orchestration bypass and stays hidden even when an
+  // older allow-list still names it.
+  assert.deepEqual(names, ['cme__cme_sources_list', 'cme__cme_status']);
 });
 
 test('chatAllowedTools offers every declared tool, reads and writes alike', () => {
@@ -940,6 +1002,15 @@ test('runHeadlessChatTurn (HTTP /chat) uses the read-tool path and returns text'
   assert.doesNotMatch(reply, /STREAM_FALLBACK/);
 });
 
+test('product-help questions are detected without treating ordinary domain questions as product help', () => {
+  assert.equal(isProductHelpQuestion('À quoi correspond Parallelism & throughput ?'), true);
+  assert.equal(isProductHelpQuestion('Comment fonctionne Donna ?'), true);
+  assert.equal(isProductHelpQuestion('Explique le panneau /status'), true);
+  assert.equal(isProductHelpQuestion('Comment fonctionnent les approbations ?'), true);
+  assert.equal(isProductHelpQuestion('Que dit le wiki sur la météo ?'), false);
+  assert.equal(isProductHelpQuestion('Résume ce document'), false);
+});
+
 test('sanitizeOpenWikiPage accepts wiki and untracked markdown context paths', () => {
   assert.equal(sanitizeOpenWikiPage('wiki/concepts/foo.md'), 'wiki/concepts/foo.md');
   assert.equal(sanitizeOpenWikiPage('  wiki/a.md '), 'wiki/a.md');

package/src/shell/tui.tsx

@@ -150,30 +150,22 @@ function App(props: {
   const [preflightBusy, setPreflightBusy] = createSignal(false);
   let ctrlCTimer: ReturnType<typeof setTimeout> | null = null;
   let exiting = false;
-  // Single exit path: the owned-runtime shutdown MUST happen here, on the
-  // user's actual exit gesture. render() resolves at MOUNT, so code placed
-  // after `await runOpenTuiShell(...)` runs while the shell is still on
-  // screen — 0.12.9 shipped that and killed the runtime mid-session.
+  // The runtime is shared infrastructure: `llm-wiki serve` can still be using
+  // it after this shell closes. Exiting the UI only destroys the renderer;
+  // explicit lifecycle commands own runtime shutdown.
   const exitShell = () => {
     if (exiting) return;
     exiting = true;
     setExitStatus('Fermeture enclenchée…');
-    // Register the complete shutdown before destroying the renderer: onDestroy
-    // resolves runOpenTuiShell, which must still await this cleanup task.
     const task = Promise.resolve().then(async () => {
       renderer.destroy();
-      console.log('[wiki-manager] fermeture enclenchée — nettoyage en cours…');
-      const messages: string[] = [];
-      try {
-        if (props.runtime?.url) {
-          const { shutdownOwnedRuntime } = await import('../runtime/lifecycle.js');
-          await shutdownOwnedRuntime(props.runtime, { log: (message: string) => { messages.push(message); } });
-        }
-      } catch {
-        // Best effort: never block the exit on runtime cleanup.
-      }
-      for (const message of messages) console.log(`[wiki-manager] ${message}`);
-      console.log('[wiki-manager] fermeture terminée — shell clos proprement.');
+      console.log('[wiki-manager] shell closed; shared runtime left running.');
+      // MCP clients, image-refresh probes, and reconnect timers may still own
+      // event-loop handles. They belong to this shell process, not to the
+      // detached shared runtime. Once the renderer is gone there is no useful
+      // foreground work left, so terminate explicitly instead of leaving the
+      // terminal pending indefinitely.
+      process.exit(0);
     });
     if (props.exitRef) props.exitRef.current = task;
   };
@@ -398,7 +390,6 @@ function App(props: {
             scrollConversation={state.scrollConversation}
             spinnerFrame={SPINNER_FRAMES[spinnerIndex()] ?? SPINNER_FRAMES[0]}
             onInputHeightChange={setChatInputHeight}
-            onRedo={(index, content) => { void state.redoMessage(index, content); }}
             onCopy={(content) => showCopyHint(
               copyToClipboard(content, renderer)
                 ? 'Copied.'

package/wiki-workspace

@@ -17,6 +17,7 @@ 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_COMPOSE_DIR="$MANAGER_STATE_DIR/.wiki/compose"
 MANAGER_RUNTIME_DIR="$MANAGER_STATE_DIR/.wiki/runtime"
 LEGACY_MANAGER_RUNTIME_DIR="$MANAGER_STATE_DIR/.wiki-manager"
 if [[ ! -e "$MANAGER_RUNTIME_DIR" && -d "$LEGACY_MANAGER_RUNTIME_DIR" ]]; then
@@ -83,6 +84,7 @@ Usage:
   wiki-workspace [--cacert <path>] <command> ...
   wiki-workspace config <workspace> [path]
   wiki-workspace up <workspace>
+  wiki-workspace refresh
   wiki-workspace wiki <workspace> <command> [args...]
   wiki-workspace list
 
@@ -90,6 +92,7 @@ Commands:
   config <workspace> [path]         Create workspace folder, auto-select ports, run wiki init
   up <workspace> [--open]           Start workspace stack: wiki + production
   list                              List configured workspaces
+  refresh                           Stop runtime/stacks and remove their Compose images
 
   agents up [--pull]                Start all external agents (cme, documents)
   agents down                       Stop all external agents
@@ -120,9 +123,9 @@ Configuration:
   Runtime node: WIKI_MANAGER_NODE_BIN=/path/to/node
   Local CA: --cacert /absolute/path/to/ca.pem (Docker must be able to read this host path)
 
-Compose overrides (next to the manager .env, created once, never regenerated):
-  docker-compose.override.yml         Workspace stack (serve, mcp-http, production-mcp)
-  agents.docker-compose.override.yml  Agents stack (cme, documents, connectors)
+Compose overrides (under .wiki/compose, created once, never regenerated):
+  .wiki/compose/docker-compose.override.yml         Workspace stack
+  .wiki/compose/agents.docker-compose.override.yml  Agents stack
   Use them for proxy passthrough, extra mounts and optional agents.
   Never edit .wiki/runtime/*.compose.yml — that is generated state, rewritten
   on every compose command.
@@ -259,6 +262,31 @@ agents_compose() {
   local compose_env_args=()
   [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
 
+  # Local-iteration build only: the packaged connectors service carries a
+  # `build:` block pointing at the sibling agent-connectors repo, whose OAuth
+  # credentials live in a gitignored .env.build.local. Compose resolves the
+  # value-less build args from *this* process environment, not from
+  # --env-file, so the variables must be exported here or the image ships with
+  # empty WIKILLM_GOOGLE_OAUTH_* and every Google connector stays unusable.
+  local connectors_build_env="$ROOT_DIR/../agent-external/agent-connectors/.env.build.local"
+  if [[ -f "$connectors_build_env" ]]; then
+    local build_key build_value
+    while IFS='=' read -r build_key build_value; do
+      case "$build_key" in
+        WIKILLM_GOOGLE_OAUTH_CLIENT_ID|WIKILLM_GOOGLE_OAUTH_CLIENT_SECRET) ;;
+        *) continue ;;
+      esac
+      [[ -n "${!build_key:-}" ]] || export "$build_key=$build_value"
+    done < <(grep -v '^[[:space:]]*#' "$connectors_build_env" || true)
+  fi
+
+  require_connectors_build_credentials() {
+    local build_key
+    for build_key in WIKILLM_GOOGLE_OAUTH_CLIENT_ID WIKILLM_GOOGLE_OAUTH_CLIENT_SECRET; do
+      [[ -n "${!build_key:-}" ]] || die "cannot build connectors: $build_key is missing from $connectors_build_env"
+    done
+  }
+
   _agents_dc() {
     local cacert_args=()
     local profile_args=()
@@ -266,10 +294,10 @@ agents_compose() {
     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"
     # User-owned override: optional external agents, proxy passthrough and
-    # any local fix live in a file the user maintains NEXT TO the .env —
+    # any local fix live in a file the user maintains under .wiki/compose —
     # scaffolded once by ensure_compose_override, never overwritten afterwards.
     local override_args=()
-    local user_override="$MANAGER_STATE_DIR/agents.docker-compose.override.yml"
+    local user_override="$MANAGER_COMPOSE_DIR/agents.docker-compose.override.yml"
     [[ -f "$user_override" ]] && override_args+=(-f "$user_override")
     WORKSPACES_ROOT="$workspaces_root" AGENTS_DATA_DIR="$agents_data_dir" \
       COMPOSE_PROFILES= \
@@ -287,6 +315,9 @@ agents_compose() {
       [[ $# -eq 0 ]] || die "agents up accepts only --pull"
       ensure_agent_tokens
       ensure_endpoints_file
+      if connectors_enabled && [[ -f "$ROOT_DIR/../agent-external/agent-connectors/Dockerfile" ]]; then
+        require_connectors_build_credentials
+      fi
       # The .env may have just been created above — recompute the env-file
       # flag so freshly generated tokens reach the containers on first run.
       compose_env_args=()
@@ -307,12 +338,16 @@ agents_compose() {
         "${CME_MCP_PORT:-3336}" "${DOCUMENTS_MCP_PORT:-3337}"
       connectors_enabled && printf '  connectors=:%s' "${CONNECTORS_MCP_PORT:-3338}"
       printf '\n'
-      [[ ! -f "$MANAGER_STATE_DIR/agents.docker-compose.override.yml" ]] || printf 'User override: %s\n' "$MANAGER_STATE_DIR/agents.docker-compose.override.yml"
+      [[ ! -f "$MANAGER_COMPOSE_DIR/agents.docker-compose.override.yml" ]] || printf 'User override: %s\n' "$MANAGER_COMPOSE_DIR/agents.docker-compose.override.yml"
       ;;
     down)
       [[ $# -eq 0 ]] || die "agents down does not take arguments"
       _agents_dc down
       ;;
+    purge)
+      [[ $# -eq 0 ]] || die "agents purge does not take arguments"
+      _agents_dc down --rmi all --remove-orphans
+      ;;
     logs)
       local log_args=()
       read_lines_into_array log_args logs_args "$@"
@@ -534,6 +569,13 @@ if (enabled === 'true') {
       Authorization: 'Bearer ${CONNECTORS_MCP_AUTH_TOKEN}',
     },
   };
+  const connectorEndpoint = config.mcpServers.connectors;
+  connectorEndpoint.requireApproval = [
+    ...new Set([
+      ...(Array.isArray(connectorEndpoint.requireApproval) ? connectorEndpoint.requireApproval : []),
+      'connectors_gmail_modify',
+    ]),
+  ];
   config.chatAccess.servers.connectors ??= {};
   const connectorAccess = config.chatAccess.servers.connectors;
   // One shape for every server: a single `allow` list. The legacy
@@ -545,6 +587,9 @@ if (enabled === 'true') {
       ...(Array.isArray(connectorAccess.allowActions) ? connectorAccess.allowActions : []),
       'connectors_google_status',
       'connectors_google_oauth_start',
+      'connectors_gmail_summary',
+      'connectors_gmail_search',
+      'connectors_gmail_labels',
     ]),
   ];
   delete connectorAccess.allowActions;
@@ -676,6 +721,19 @@ runtime_command() {
       ;;
     down|stop)
       [[ $# -eq 0 ]] || die "runtime down does not take arguments"
+      token="$(ensure_manager_runtime_token)"
+      if runtime_health_check; then
+        RUNTIME_URL="$(runtime_health_url)/shutdown" RUNTIME_TOKEN="$token" "$node_bin" --input-type=module -e \
+          "const h=process.env.RUNTIME_TOKEN?{Authorization:'Bearer '+process.env.RUNTIME_TOKEN}:{}; const r=await fetch(process.env.RUNTIME_URL,{method:'POST',headers:h}); process.exit(r.ok?0:1);"
+        local wait_count=0
+        while runtime_health_check && (( wait_count < 40 )); do
+          sleep 0.1
+          (( wait_count++ )) || true
+        done
+        rm -f "$pid_file"
+        printf 'agent-runtime stopped\n'
+        return
+      fi
       if ! runtime_pid_running; then
         printf 'agent-runtime is not running from %s\n' "$pid_file"
         rm -f "$pid_file"
@@ -720,6 +778,23 @@ runtime_command() {
   esac
 }
 
+refresh_project() {
+  printf 'Stopping shared runtime...\n'
+  runtime_command down
+
+  local entry workspace
+  for entry in "$WORKSPACES_DIR"/*; do
+    [[ -f "$entry/.env" ]] || continue
+    workspace="$(basename "$entry")"
+    printf 'Removing workspace stack and images: %s\n' "$workspace"
+    compose_for_workspace "$workspace" down --rmi all --remove-orphans
+  done
+
+  printf 'Removing external-agent stack and images...\n'
+  agents_compose purge
+  printf 'Refresh complete. Persistent workspace and agent data were preserved.\n'
+}
+
 ensure_runtime_up() {
   if [[ "${WIKI_MANAGER_RUNTIME_AUTOSTART:-1}" == "0" ]]; then
     return
@@ -745,10 +820,16 @@ ensure_compose_override() {
   # the generated override and lose the change on the next compose command.
   local example_name="$1"
   local target_name="$2"
-  local target="$MANAGER_STATE_DIR/$target_name"
+  local target="$MANAGER_COMPOSE_DIR/$target_name"
+  local legacy="$MANAGER_STATE_DIR/$target_name"
   [[ -f "$target" ]] && return 0
+  mkdir -p "$MANAGER_COMPOSE_DIR"
+  if [[ -f "$legacy" ]]; then
+    mv "$legacy" "$target"
+    printf 'Migrated user-owned compose override: %s -> %s\n' "$legacy" "$target" >&2
+    return 0
+  fi
   [[ -f "$ROOT_DIR/$example_name" ]] || return 0
-  mkdir -p "$MANAGER_STATE_DIR"
   cp "$ROOT_DIR/$example_name" "$target"
   printf 'Created %s (user-owned compose override, never regenerated)\n' "$target" >&2
 }
@@ -889,11 +970,11 @@ compose_for_workspace() {
   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"
-  # Same contract as the agents stack: a single global user-owned override next
-  # to the .env, merged after the packaged file and before the generated CA
+  # Same contract as the agents stack: a single global user-owned override in
+  # .wiki/compose, merged after the packaged file and before the generated CA
   # override so the operator can still be overruled on CA paths only.
   local override_args=()
-  local user_override="$MANAGER_STATE_DIR/docker-compose.override.yml"
+  local user_override="$MANAGER_COMPOSE_DIR/docker-compose.override.yml"
   [[ -f "$user_override" ]] && override_args+=(-f "$user_override")
 
   WIKI_WORKSPACE_PATH="$ws_path" \
@@ -1149,7 +1230,7 @@ config_workspace() {
   WIKI_MCP_PORT="$mcp_port" \
     read_lines_into_array cacert_args cacert_compose_args "$ROOT_DIR/docker-compose.yml" "cacert.compose.yml"
   local override_args=()
-  local user_override="$MANAGER_STATE_DIR/docker-compose.override.yml"
+  local user_override="$MANAGER_COMPOSE_DIR/docker-compose.override.yml"
   [[ -f "$user_override" ]] && override_args+=(-f "$user_override")
 
   WIKI_WORKSPACE_PATH="$target_path" \
@@ -1197,6 +1278,11 @@ main() {
     exit 0
   fi
 
+  if [[ $# -eq 1 && "$1" == "refresh" ]]; then
+    refresh_project
+    exit 0
+  fi
+
   # config <workspace> [path]
   if [[ $# -ge 2 && "$1" == "config" ]]; then
     local cfg_workspace="$2"