@dotdrelle/wiki-manager 0.7.3 → 0.9.3

package/src/shell/useSession.ts

@@ -5,7 +5,7 @@ import { formatMcpToolResult, callMcpTool } from '../core/mcp.js';
 import { extractActivity, parseJsonText, sessionActivities } from '../core/activity.js';
 import { formatPlanStatus, formatCompletedActivities } from '../core/plan.js';
 import { createAgentEvent, dispatchAgentEvent } from '../core/agentEvents.js';
-import { queueCounts, startNextQueuedJob, syncQueueWithActivity } from '../core/jobQueue.js';
+import { projectQueue, queueCounts, startNextQueuedJob, syncQueueWithActivity } from '../core/jobQueue.js';
 import { queueStoreFor } from '../core/queueStore.js';
 import { fetchRuntimeState, streamRuntimeEvents } from '../runtime/client.js';
 import type { ActiveFileEditor } from './FileEditorDialog';
@@ -186,14 +186,15 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     version();
     const runtimeQueue = nonEmptyRuntimeArray(runtimeState()?.queue);
     if (runtimeQueue) return runtimeQueue.map((item: any) => ({ ...item, _runtime: true }));
-    return ((session as any).jobQueue ?? []).map((item: any) => ({ ...item }));
+    return projectQueue((session as any).headlessPlan, (session as any).jobQueue ?? [], { workspace: (session as any).workspace ?? null })
+      .map((item: any) => ({ ...item }));
   });
   const queueInfo = createMemo(() => {
     version();
     const runtimeQueue = runtimeState()?.queue;
     if (Array.isArray(runtimeQueue)) {
       return {
-        active: runtimeQueue.filter((item: any) => ['waiting', 'starting', 'running', 'queued', 'pending'].includes(String(item.status ?? '').toLowerCase())).length,
+        active: runtimeQueue.filter((item: any) => ['waiting', 'starting', 'running', 'queued', 'pending', 'pending_approval'].includes(String(item.status ?? '').toLowerCase())).length,
         current: runtimeQueue.filter((item: any) => ['starting', 'running'].includes(String(item.status ?? '').toLowerCase())).length,
         frozen: 0,
       };
@@ -229,7 +230,7 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
   });
 
   function syncRuntimeState() {
-    void fetchRuntimeState({ url: props.runtime.url })
+    void fetchRuntimeState({ url: props.runtime.url, workspace: (session as any).workspace ?? null })
       .then((state) => {
         setRuntimeState(state);
         setRuntimeStatus('connected');
@@ -254,7 +255,11 @@ export function useSession(props: { agent: unknown; packageJson: Record<string,
     if (!props.runtime?.url || runtimeStreamStopped) return;
     runtimeStreamAbort = new AbortController();
     try {
-      for await (const _event of streamRuntimeEvents({ url: props.runtime.url, signal: runtimeStreamAbort.signal })) {
+      for await (const _event of streamRuntimeEvents({
+        url: props.runtime.url,
+        signal: runtimeStreamAbort.signal,
+        workspace: (session as any).workspace ?? null,
+      })) {
         setRuntimeStatus('connected');
         debouncedSyncRuntimeState();
       }

package/wiki-workspace

@@ -92,6 +92,11 @@ Commands:
   agents pull                       Pull latest external agent images
   agents status                     Check reachability of configured MCP endpoints
 
+  runtime up                        Start the single host agent-runtime on Node.js 22
+  runtime down                      Stop the host agent-runtime
+  runtime status                    Check host agent-runtime health
+  runtime logs [args...]            Show host agent-runtime logs
+
   wiki <workspace> init             Initialize the workspace with wiki init
   wiki <workspace> up               Start llm-wiki serve + mcp-http + production-mcp
   wiki <workspace> down             Stop all services for this workspace
@@ -106,6 +111,7 @@ Commands:
 Configuration:
   workspaces/<workspace>/.env
   Override directory: WIKI_WORKSPACES_DIR=/path/to/dir
+  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)
 EOF
 }
@@ -362,6 +368,179 @@ NODE
   esac
 }
 
+runtime_node_bin() {
+  printf '%s\n' "${WIKI_MANAGER_NODE_BIN:-node}"
+}
+
+ensure_runtime_node() {
+  local node_bin
+  node_bin="$(runtime_node_bin)"
+  command -v "$node_bin" >/dev/null 2>&1 || die "runtime requires Node.js 22+: command not found: $node_bin (set WIKI_MANAGER_NODE_BIN)"
+  local version major
+  version="$("$node_bin" -p 'process.versions.node' 2>/dev/null)" || die "could not execute Node runtime: $node_bin"
+  major="${version%%.*}"
+  [[ "$major" =~ ^[0-9]+$ && "$major" -ge 22 ]] || die "runtime requires Node.js 22+ for node:sqlite; $node_bin is Node $version"
+}
+
+ensure_manager_runtime_token() {
+  local token
+  token="$(env_value "$MANAGER_ENV_FILE" WIKI_MANAGER_RUNTIME_TOKEN "")"
+  if [[ -z "$token" ]]; then
+    token="$(generate_token)"
+    mkdir -p "$(dirname "$MANAGER_ENV_FILE")"
+    set_env_value "$MANAGER_ENV_FILE" WIKI_MANAGER_RUNTIME_TOKEN "$token"
+  fi
+  printf '%s\n' "$token"
+}
+
+runtime_pid_file() {
+  printf '%s/runtime.pid\n' "$MANAGER_RUNTIME_DIR"
+}
+
+runtime_log_file() {
+  printf '%s/runtime.log\n' "$MANAGER_RUNTIME_DIR"
+}
+
+runtime_pid_running() {
+  local pid_file pid
+  pid_file="$(runtime_pid_file)"
+  [[ -f "$pid_file" ]] || return 1
+  pid="$(cat "$pid_file" 2>/dev/null || true)"
+  [[ "$pid" =~ ^[0-9]+$ ]] || return 1
+  kill -0 "$pid" >/dev/null 2>&1
+}
+
+runtime_pid_command() {
+  local pid="$1"
+  ps -p "$pid" -o command= 2>/dev/null || ps -p "$pid" -o args= 2>/dev/null || true
+}
+
+runtime_pid_matches() {
+  local pid command
+  pid="$(cat "$(runtime_pid_file)" 2>/dev/null || true)"
+  [[ "$pid" =~ ^[0-9]+$ ]] || return 1
+  command="$(runtime_pid_command "$pid")"
+  [[ "$command" == *"/bin/wiki-manager.js runtime"* || "$command" == *" bin/wiki-manager.js runtime"* ]]
+}
+
+runtime_health_url() {
+  printf 'http://127.0.0.1:%s/health\n' "${WIKI_MANAGER_RUNTIME_PORT:-7788}"
+}
+
+runtime_health_check() {
+  local token url
+  token="$(env_value "$MANAGER_ENV_FILE" WIKI_MANAGER_RUNTIME_TOKEN "")"
+  url="$(runtime_health_url)"
+  if command -v curl >/dev/null 2>&1; then
+    if [[ -n "$token" ]]; then
+      curl -fsS -H "Authorization: Bearer $token" "$url" >/dev/null 2>&1
+    else
+      curl -fsS "$url" >/dev/null 2>&1
+    fi
+    return
+  fi
+  local node_bin
+  node_bin="$(runtime_node_bin)"
+  RUNTIME_URL="$url" 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,{headers:h}); process.exit(r.ok?0:1);"
+}
+
+runtime_command() {
+  local subcommand="$1"
+  shift
+  local host="${WIKI_MANAGER_RUNTIME_HOST:-0.0.0.0}"
+  local port="${WIKI_MANAGER_RUNTIME_PORT:-7788}"
+  local pid_file log_file node_bin token
+  pid_file="$(runtime_pid_file)"
+  log_file="$(runtime_log_file)"
+  node_bin="$(runtime_node_bin)"
+
+  case "$subcommand" in
+    up)
+      [[ $# -eq 0 ]] || die "runtime up does not take arguments"
+      mkdir -p "$MANAGER_RUNTIME_DIR"
+      ensure_runtime_node
+      token="$(ensure_manager_runtime_token)"
+      export WIKI_MANAGER_RUNTIME_TOKEN="$token"
+      if runtime_health_check; then
+        printf 'agent-runtime already healthy at %s\n' "$(runtime_health_url)"
+        return
+      fi
+      if runtime_pid_running; then
+        printf 'agent-runtime process is already running (pid %s), but health is not ready yet.\n' "$(cat "$pid_file")"
+        return
+      fi
+      WIKI_WORKSPACES_DIR="$WORKSPACES_DIR" \
+      WIKI_MANAGER_ENV_FILE="$MANAGER_ENV_FILE" \
+      WIKI_MANAGER_STATE_DIR="$MANAGER_RUNTIME_DIR" \
+      WIKI_MANAGER_RUNTIME_TOKEN="$token" \
+      nohup "$node_bin" "$ROOT_DIR/bin/wiki-manager.js" runtime --host "$host" --port "$port" --state-dir "$MANAGER_RUNTIME_DIR" > "$log_file" 2>&1 &
+      printf '%s\n' "$!" > "$pid_file"
+      sleep 0.5
+      printf 'agent-runtime started on http://127.0.0.1:%s (pid %s)\n' "$port" "$(cat "$pid_file")"
+      printf 'state: %s\nlog:   %s\n' "$MANAGER_RUNTIME_DIR" "$log_file"
+      ;;
+    down|stop)
+      [[ $# -eq 0 ]] || die "runtime down does not take arguments"
+      if ! runtime_pid_running; then
+        printf 'agent-runtime is not running from %s\n' "$pid_file"
+        rm -f "$pid_file"
+        return
+      fi
+      if ! runtime_pid_matches; then
+        printf 'refusing to stop pid %s: command does not look like wiki-manager runtime\n' "$(cat "$pid_file")" >&2
+        printf 'command: %s\n' "$(runtime_pid_command "$(cat "$pid_file")")" >&2
+        rm -f "$pid_file"
+        exit 1
+      fi
+      kill "$(cat "$pid_file")"
+      rm -f "$pid_file"
+      printf 'agent-runtime stopped\n'
+      ;;
+    status)
+      [[ $# -eq 0 ]] || die "runtime status does not take arguments"
+      if runtime_health_check; then
+        printf 'agent-runtime healthy at %s\n' "$(runtime_health_url)"
+      elif runtime_pid_running; then
+        printf 'agent-runtime process running (pid %s), health check failed\n' "$(cat "$pid_file")"
+        exit 1
+      else
+        printf 'agent-runtime is not running\n'
+        exit 1
+      fi
+      ;;
+    logs)
+      if [[ ! -f "$log_file" ]]; then
+        printf 'No runtime log found at %s\n' "$log_file" >&2
+        exit 1
+      fi
+      if [[ $# -eq 0 ]]; then
+        tail -100 -f "$log_file"
+      else
+        tail "$@" "$log_file"
+      fi
+      ;;
+    *)
+      die "unknown runtime command: $subcommand (expected: up, down, status, logs)"
+      ;;
+  esac
+}
+
+ensure_runtime_up() {
+  if [[ "${WIKI_MANAGER_RUNTIME_AUTOSTART:-1}" == "0" ]]; then
+    return
+  fi
+  if runtime_health_check; then
+    return
+  fi
+  printf 'Starting host agent-runtime...\n'
+  runtime_command up
+}
+
+start_workspace_services() {
+  ensure_runtime_up
+  compose_for_workspace "$1" up -d serve mcp-http production-mcp
+}
+
 ensure_manager_endpoints_file() {
   if [[ ! -f "$MANAGER_ENDPOINTS_FILE" && -f "$ROOT_DIR/mcp.endpoints.example.json" ]]; then
     mkdir -p "$(dirname "$MANAGER_ENDPOINTS_FILE")"
@@ -743,8 +922,7 @@ up_workspace() {
   local ws_path
   ws_path="$(normalize_path "$(workspace_value "$workspace" WIKI_WORKSPACE_PATH)")"
   ensure_workspace_dirs "$ws_path"
-
-  compose_for_workspace "$workspace" up -d serve mcp-http production-mcp
+  start_workspace_services "$workspace"
 
   local serve_port prod_port
   serve_port="$(workspace_value "$workspace" WIKI_SERVE_PORT 3100)"
@@ -752,6 +930,7 @@ up_workspace() {
   printf 'Workspace UI: http://localhost:%s\n' "$serve_port"
   printf 'Chat:         http://localhost:%s/chat\n' "$serve_port"
   printf 'Production:   http://localhost:%s/mcp/\n' "$prod_port"
+  printf 'Runtime:      %s\n' "$(runtime_health_check && printf 'healthy at %s' "$(runtime_health_url)" || printf 'start with: wiki-workspace runtime up')"
   printf 'External MCPs: see %s\n' "$MANAGER_ENDPOINTS_FILE"
 
   if [[ "$open_browser" == "1" ]]; then
@@ -802,10 +981,22 @@ main() {
     exit 0
   fi
 
+  # runtime <subcommand> [args...]
+  if [[ $# -ge 1 && "$1" == "runtime" ]]; then
+    local runtime_sub="${2:-status}"
+    if [[ $# -ge 2 ]]; then
+      shift 2
+    else
+      shift 1
+    fi
+    runtime_command "$runtime_sub" "$@"
+    exit 0
+  fi
+
   [[ $# -ge 2 ]] || { usage; exit 2; }
 
   local scope="$1"
-  [[ "$scope" == "wiki" ]] || die "unknown scope: $scope (expected: wiki, agents, up, config, or list)"
+  [[ "$scope" == "wiki" ]] || die "unknown scope: $scope (expected: wiki, agents, runtime, up, config, or list)"
   shift
   [[ $# -ge 2 ]] || die "wiki requires a workspace and a command"
 
@@ -818,13 +1009,14 @@ main() {
       run_wiki "$workspace" init "$@"
       ;;
     up)
-      compose_for_workspace "$workspace" up -d serve mcp-http production-mcp
+      start_workspace_services "$workspace"
       local serve_port production_port
       serve_port="$(workspace_value "$workspace" WIKI_SERVE_PORT 3100)"
       production_port="$(workspace_value "$workspace" PRODUCTION_MCP_PORT 3102)"
       printf 'Workspace UI: http://localhost:%s\n' "$serve_port"
       printf 'Chat MCP:     http://localhost:%s/chat\n' "$serve_port"
       printf 'Production:   http://localhost:%s/mcp/\n' "$production_port"
+      printf 'Runtime:      %s\n' "$(runtime_health_check && printf 'healthy at %s' "$(runtime_health_url)" || printf 'start with: wiki-workspace runtime up')"
       ;;
     down)
       compose_for_workspace "$workspace" down
@@ -842,6 +1034,7 @@ main() {
         die "serve accepts only --open as optional flag; port is configured in the workspace .env"
       fi
 
+      ensure_runtime_up
       printf 'Starting mcp-http...\n'
       compose_for_workspace "$workspace" up -d mcp-http
       printf 'Starting production-mcp...\n'
@@ -852,6 +1045,7 @@ main() {
       printf 'Workspace UI: http://localhost:%s\n' "$serve_port"
       printf 'Chat MCP:     http://localhost:%s/chat\n' "$serve_port"
       printf 'Production:   http://localhost:%s/mcp/\n' "$production_port"
+      printf 'Runtime:      %s\n' "$(runtime_health_check && printf 'healthy at %s' "$(runtime_health_url)" || printf 'start with: wiki-workspace runtime up')"
       printf 'Note: compose logs may show http://localhost:3000, which is the container port.\n'
       if [[ $open_browser -eq 1 ]]; then
         wait_and_open "http://localhost:${serve_port}" &