@dotdrelle/wiki-manager 0.12.1 → 0.12.8

package/src/shell/useAgent.ts

@@ -1,6 +1,6 @@
 import { createSignal } from 'solid-js';
 import { postRuntimeCancel } from '../runtime/client.js';
-import { conversationMessages, recordRuntimeUnavailableAgentInput, runLine, submitRuntimeRun } from './repl.js';
+import { conversationMessages, recordRuntimeUnavailableAgentInput, runLine, shouldHandleFreeTextLocally, submitRuntimeRun } from './repl.js';
 
 export function useAgent(props: { agent: unknown; packageJson: Record<string, unknown>; session: Record<string, any>; chatMode: () => boolean; runtimeUrl?: string | null; runtimeUnavailableReason?: string | null; refresh: () => void; addLog: (line: string) => void; onRuntimeAccepted?: () => void }) {
   const [busy, setBusy] = createSignal(false);
@@ -18,7 +18,17 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
     props.addLog(`input: ${trimmed}`);
 
     try {
-      if (props.runtimeUrl && !props.chatMode() && !trimmed.startsWith('/')) {
+      // Questions and small talk are answered by the local agent: the reply
+      // shows up in the chat immediately and no runtime run (plan, SQLite
+      // state, replans) is created for a sentence that only needed an answer.
+      // Actions still go to the runtime below.
+      const freeTextRouting = (props.runtimeUrl && !props.chatMode() && !trimmed.startsWith('/'))
+        ? shouldHandleFreeTextLocally(trimmed, props.session)
+        : null;
+      if (props.runtimeUrl && !props.chatMode() && !trimmed.startsWith('/') && !freeTextRouting?.local) {
+        if (freeTextRouting?.fallbackReason) {
+          props.addLog(`runtime: ${freeTextRouting.fallbackReason}, routing to runtime run`);
+        }
         // Marked _pending so mergeRuntimeConversation (useSession.ts) can
         // confirm this exact entry instead of pushing a second copy once the
         // same user message comes back from the runtime's own /state.
@@ -29,6 +39,13 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
         });
         if (outcome.kind === 'accepted') {
           props.onRuntimeAccepted?.();
+          const runId = (outcome as any).result?.runId ?? null;
+          // Light, immediate feedback in the chat: without it an accepted run
+          // is invisible until its first activity lands in the side panels.
+          conversationMessages(props.session).push({
+            role: 'command',
+            content: `▶ Run accepté${runId ? ` (${String(runId).slice(0, 8)})` : ''} — progression dans le panneau Activity, réponse ici à la fin du run.`,
+          });
           props.addLog('runtime: run accepted');
         } else if (outcome.kind === 'queued') {
           // The server localizes control-lane acknowledgements from the
@@ -37,6 +54,11 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
           const explanation = (outcome as any).result?.explanation ?? 'Request added to the queue.';
           conversationMessages(props.session).push({ role: 'command', content: String(explanation) });
           props.addLog('runtime: control queued');
+        } else if ((outcome as any).result?.explanation) {
+          // Control-lane kinds (cancel / approve / observe / modify_run…):
+          // surface the server's localized explanation instead of an error.
+          conversationMessages(props.session).push({ role: 'command', content: String((outcome as any).result.explanation) });
+          props.addLog(`runtime: ${outcome.kind}`);
         } else {
           conversationMessages(props.session).push({ role: 'command', content: `Runtime error: ${outcome.message}` });
           props.addLog(`runtime error: ${outcome.message}`);
@@ -44,7 +66,7 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
         props.refresh();
         return { exit: false, runtime: true };
       }
-      if (!props.chatMode() && !trimmed.startsWith('/')) {
+      if (!props.chatMode() && !trimmed.startsWith('/') && !freeTextRouting?.local) {
         const message = recordRuntimeUnavailableAgentInput(props.session, trimmed, {
           error: props.runtimeUnavailableReason ?? 'runtime introuvable',
         });
@@ -52,6 +74,9 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
         props.refresh();
         return { exit: false, runtimeUnavailable: true };
       }
+      if (freeTextRouting?.local) {
+        props.addLog(`agent: ${freeTextRouting.classification.kind} handled locally`);
+      }
       const result = await runLine(trimmed, {
         agent: props.agent,
         packageJson: props.packageJson,
@@ -59,6 +84,10 @@ export function useAgent(props: { agent: unknown; packageJson: Record<string, un
         onUpdate: props.refresh,
         onStep: props.addLog,
         chatMode: props.chatMode(),
+        // Without this, slash commands that target the runtime (/run kill,
+        // /run cancel, /run status) reported "Runtime unavailable" in the
+        // TUI even while the status bar showed "runtime: connected".
+        runtime: props.runtimeUrl ? { url: props.runtimeUrl } : null,
       });
       props.refresh();
       return result;

package/src/shell/useSession.ts

@@ -2,6 +2,7 @@ import { writeFileSync } from 'node:fs';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
 import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js';
 import { formatMcpToolResult, callMcpTool } from '../core/mcp.js';
+import { versionWithBuild } from '../core/buildInfo.js';
 import { extractActivity, parseJsonText, sessionActivities } from '../core/activity.js';
 import { formatPlanStatus, formatCompletedActivities, formatPlanStep } from '../core/plan.js';
 import { createAgentEvent, dispatchAgentEvent } from '../core/agentEvents.js';
@@ -47,6 +48,12 @@ function buildContinuationPrompt(session: any, completed: any[]): string {
 
 export function useSession(props: { agent: unknown; packageJson: Record<string, unknown>; runtime?: any }) {
   const session = createSession();
+  // Donna's runtime__kill/cancel/status/approve/enqueue tools (graph.js)
+  // read session.runtime.url directly — without this the OpenTUI session
+  // never had it set (only the legacy runShell path did), so those tools
+  // reported "Runtime not connected" even with the runtime up and the
+  // status bar showing "connected".
+  (session as any).runtime = props.runtime ?? null;
   const [version, setVersion] = createSignal(0);
   const [logs, setLogs] = createSignal<string[]>([]);
   const [runtimeState, setRuntimeState] = createSignal<any | null>(null);
@@ -139,7 +146,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
   const statusLine = createMemo(() => {
     version();
     return [
-      `wiki-manager ${props.packageJson.version ?? ''}`.trim(),
+      `wiki-manager ${versionWithBuild(props.packageJson)}`.trim(),
       session.workspace ? session.workspace : 'no workspace',
       session.wikirc?.profile ? session.wikirc.profile : 'no wikirc',
       session.language ? session.language : 'no language',
@@ -337,6 +344,12 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     const target = conversationMessages(session);
     const backed = runtimeConversationRefsByWorkspace.get(workspace) ?? [];
     runtimeConversationRefsByWorkspace.set(workspace, backed);
+    // The merge is index-aligned with the runtime conversation array. If that
+    // array got SHORTER (runtime restart, projection reset), keeping stale
+    // refs would make every new runtime entry silently overwrite an old
+    // backed entry instead of appearing in the chat. Drop the refs and let
+    // the new conversation append cleanly.
+    if (runtimeConversation.length < backed.length) backed.length = 0;
     if (backed.length === 0 && target.length === 0 && !runtimeConversation.some((message: any) => message?._pending)) {
       backed.push(...runtimeConversation.map((message: any) => ({
         role: message.role === 'assistant' ? 'donna' : message.role,

package/wiki-workspace

@@ -228,6 +228,12 @@ agents_compose() {
         shift
       fi
       [[ $# -eq 0 ]] || die "agents up accepts only --pull"
+      ensure_agent_tokens
+      ensure_endpoints_file
+      # 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=()
+      [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
       mkdir -p "$agents_data_dir/cme" "$agents_data_dir/documents/input" "$agents_data_dir/documents/output" "$agents_data_dir/documents/uploads"
       mkdir -p "$workspaces_root"
       $do_pull && _agents_dc pull
@@ -382,6 +388,33 @@ ensure_runtime_node() {
   [[ "$major" =~ ^[0-9]+$ && "$major" -ge 22 ]] || die "runtime requires Node.js 22+ for node:sqlite; $node_bin is Node $version"
 }
 
+ensure_agent_tokens() {
+  # The external agents (cme, documents, mailer) authenticate with tokens
+  # from the manager .env — generate any missing one, exactly like the
+  # workspace and runtime tokens are generated. Leaving them empty made a
+  # fresh install start agents nobody could talk to.
+  local key token
+  for key in CME_MCP_AUTH_TOKEN DOCUMENTS_MCP_AUTH_TOKEN MAILER_MCP_AUTH_TOKEN; do
+    token="$(env_value "$MANAGER_ENV_FILE" "$key" "")"
+    if [[ -z "$token" ]]; then
+      token="$(generate_token)"
+      mkdir -p "$(dirname "$MANAGER_ENV_FILE")"
+      set_env_value "$MANAGER_ENV_FILE" "$key" "$token"
+      printf 'Generated %s in %s\n' "$key" "$MANAGER_ENV_FILE"
+    fi
+  done
+}
+
+ensure_endpoints_file() {
+  # Without mcp.endpoints.json the shell never connects to the agents it
+  # just started (and `agents status` refuses to run). Seed it from the
+  # packaged example; the \${VAR} placeholders resolve against the .env.
+  if [[ ! -f "$MANAGER_ENDPOINTS_FILE" && -f "$ROOT_DIR/mcp.endpoints.example.json" ]]; then
+    cp "$ROOT_DIR/mcp.endpoints.example.json" "$MANAGER_ENDPOINTS_FILE"
+    printf 'Created %s from packaged example\n' "$MANAGER_ENDPOINTS_FILE"
+  fi
+}
+
 ensure_manager_runtime_token() {
   local token
   token="$(env_value "$MANAGER_ENV_FILE" WIKI_MANAGER_RUNTIME_TOKEN "")"