@dotdrelle/wiki-manager 0.6.34 → 0.7.3

package/wiki-workspace

@@ -225,9 +225,14 @@ agents_compose() {
       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
-      _agents_dc up -d
+      local up_args=(up -d)
+      if [[ -n "$CACERT_PATH" ]]; then
+        up_args+=(--force-recreate)
+      fi
+      _agents_dc "${up_args[@]}"
       printf 'Workspaces root: %s\n' "$workspaces_root"
       printf 'Agents data:     %s\n' "$agents_data_dir"
+      [[ -z "$CACERT_PATH" ]] || printf 'CA cert:         %s -> /wiki-manager-ca.pem\n' "$CACERT_PATH"
       printf 'Agents: cme=:%s  documents=:%s  mailer=:%s\n' \
         "${CME_MCP_PORT:-3336}" "${DOCUMENTS_MCP_PORT:-3337}" "${MAILER_MCP_PORT:-3335}"
       ;;
@@ -473,13 +478,14 @@ compose_for_workspace() {
   local workspace="$1"
   shift
   need_workspace_env "$workspace"
-  local workspace_env ws_path serve_port mcp_port prod_port project
+  local workspace_env ws_path serve_port mcp_port prod_port project agents_data_dir
   workspace_env="$(workspace_env_file "$workspace")"
   ws_path="$(normalize_path "$(workspace_value "$workspace" WIKI_WORKSPACE_PATH)")"
   serve_port="$(workspace_value "$workspace" WIKI_SERVE_PORT 3100)"
   mcp_port="$(workspace_value "$workspace" WIKI_MCP_PORT 3101)"
   prod_port="$(workspace_value "$workspace" PRODUCTION_MCP_PORT 3102)"
   project="$(compose_project "$workspace")"
+  agents_data_dir="$(absolute_path "${AGENTS_DATA_DIR:-.agents-data}" "$DEFAULT_MANAGER_DIR")"
 
   local compose_env_args=()
   [[ -f "$MANAGER_ENV_FILE" ]] && compose_env_args+=(--env-file "$MANAGER_ENV_FILE")
@@ -495,6 +501,7 @@ compose_for_workspace() {
   WIKI_SERVE_PORT="$serve_port" \
   WIKI_MCP_PORT="$mcp_port" \
   PRODUCTION_MCP_PORT="$prod_port" \
+  AGENTS_DATA_DIR="$agents_data_dir" \
   docker compose --project-directory "$DEFAULT_MANAGER_DIR" \
     ${compose_env_args[@]+"${compose_env_args[@]}"} -f "$ROOT_DIR/docker-compose.yml" ${cacert_args[@]+"${cacert_args[@]}"} -p "$project" "$@"
 }
@@ -524,41 +531,41 @@ 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
+    awk '
+      /^[[:space:]]*services:[[:space:]]*$/ { in_services=1; next }
+      in_services && /^[^[:space:]#]/ { exit }
+      in_services && /^  [A-Za-z0-9_.-]+:[[:space:]]*$/ {
+        line=$0
+        sub(/^  /, "", line)
+        sub(/:[[:space:]]*$/, "", line)
+        print line
+      }
+    ' "$compose_file"
   )"
   [[ -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"
+  if [[ ! -f "$override_path" ]]; then
+    {
+      printf '# Generated by wiki-manager. Edit freely; delete to regenerate.\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"
+  fi
   printf '%s\n' -f "$override_path"
 }
 
@@ -685,7 +692,8 @@ config_workspace() {
   local env_file="$target_path/.env"
   [[ -f "$env_file" ]] && die "workspace already configured: $env_file"
 
-  local port_base serve_port mcp_port prod_port wiki_token prod_token
+  local port_base serve_port mcp_port prod_port wiki_token prod_token agents_data_dir
+  agents_data_dir="$(absolute_path "${AGENTS_DATA_DIR:-.agents-data}" "$DEFAULT_MANAGER_DIR")"
   port_base="$(find_free_workspace_port_base 3100)"
   serve_port="$port_base"
   mcp_port=$((port_base + 1))
@@ -720,6 +728,7 @@ config_workspace() {
   WIKI_WORKSPACE_PATH="$target_path" \
   WIKI_SERVE_PORT="$serve_port" \
   WIKI_MCP_PORT="$mcp_port" \
+  AGENTS_DATA_DIR="$agents_data_dir" \
     docker compose --project-directory "$DEFAULT_MANAGER_DIR" \
       ${compose_env_args[@]+"${compose_env_args[@]}"} -f "$ROOT_DIR/docker-compose.yml" ${cacert_args[@]+"${cacert_args[@]}"} run --rm wiki init