Merge latest main: resolve conflicts while preserving Ollama support

This merge brings the branch up to date with latest main branch changes.
All conflicts resolved by accepting upstream improvements.
Ollama/LocalAI customizations remain intact in settings.tsx and llm_client.py.

Author: factorydroid

.env.example

@@ -62,6 +62,20 @@ EMBEDDING_API_KEY=
 # API authentication key (for production deployments)
 # CONTEXT_API_KEY=your-secure-api-key
 
+# ============================================
+# Web Server (Backend) Configuration
+# Used by both backend (FastAPI/Uvicorn) and frontend (via Vite env)
+# ============================================
+
+# Host to bind the backend web server
+WEB_HOST=127.0.0.1
+
+# Port to bind the backend web server (frontend will default to this port in dev)
+WEB_PORT=8000
+
+# Note: Frontend reads Vite-prefixed vars. electron-vite is configured to map WEB_HOST/WEB_PORT
+# into VITE_WEB_HOST/VITE_WEB_PORT automatically. Do NOT duplicate values.
+
 # ============================================
 # Example Configurations
 # ============================================

.gitignore

@@ -5,16 +5,22 @@ __pycache__
 /screenshots
 /logs
 /persist
-/debug
 /dist/*
 /venv/*
 /test_storage
 /config/runtime
 /test_script
-/config/user*
+/config/user_setting.yaml
+/config/config.yaml
 .DS_Store
 
 .venv/
 uv.lock
-uv.toml
-.idea
+
+# Environment variables
+.env
+.env.local
+
+⚙️ work_phases/
+🗄️ archive/
+🧠 knowledge_base/

alembic.ini

@@ -0,0 +1,36 @@
+# Alembic configuration file
+[alembic]
+script_location = opencontext/db/migrations
+sqlalchemy.url = sqlite:///./persist/sqlite/app.db
+
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s

docs/ENV_CONFIGURATION.md

@@ -72,6 +72,8 @@ The application will automatically load variables from `.env`!
 | `EMBEDDING_API_KEY` | Embedding API key | Same as `LLM_API_KEY` |
 | `CONTEXT_PATH` | Data storage path | `.` (current directory) |
 | `CONTEXT_API_KEY` | API authentication key | `test` |
+| `WEB_HOST` | Backend web server host | `127.0.0.1` |
+| `WEB_PORT` | Backend web server port | `8000` |
 
 ## Configuration Examples
 
@@ -88,6 +90,10 @@ EMBEDDING_PROVIDER=ollama
 EMBEDDING_MODEL=nomic-embed-text
 EMBEDDING_BASE_URL=http://localhost:11434/v1
 EMBEDDING_API_KEY=
+
+# Backend web server (frontend will consume this too)
+WEB_HOST=127.0.0.1
+WEB_PORT=8000
 ```
 
 **Setup:**

docs/issues/2025-10-19-unified-env-web-config.md

@@ -0,0 +1,32 @@
+Title: Unify backend configuration via .env (WEB_HOST/WEB_PORT) and share with frontend
+
+Date: 2025-10-19
+Author: Droid (Factory AI)
+
+Summary
+- Introduce `.env`-driven backend configuration for host/port so both backend and frontend stay aligned without manual edits.
+
+Scope
+- Backend (FastAPI/Uvicorn): read `WEB_HOST`/`WEB_PORT` from the root `.env` (overridden by CLI args).
+- Frontend (Electron + Vite): load root `.env` and expose them as `VITE_WEB_HOST`/`VITE_WEB_PORT`; default axios baseURL uses these values.
+
+Implementation
+- Backend: `opencontext/cli.py` now respects `WEB_HOST`/`WEB_PORT` if provided (priority: CLI args > ENV > config defaults).
+- Frontend build config: set `envDir: '..'` and `define` Vite vars to map from `process.env.WEB_HOST/WEB_PORT`.
+- Frontend axios: default baseURL built from `VITE_WEB_HOST`/`VITE_WEB_PORT`, still supports runtime override via IPC `backend:get-port`.
+- Docs: Updated `.env.example` and `docs/ENV_CONFIGURATION.md` to include `WEB_HOST`/`WEB_PORT`.
+
+How to Use
+1) Copy example and edit:
+   cp .env.example .env
+2) Set values:
+   WEB_HOST=127.0.0.1
+   WEB_PORT=8000
+3) Start dev:
+   ./start-dev.sh
+
+Notes
+- In packaged app the backend may choose an available port at runtime; the renderer still updates via IPC, so the defaults only affect initial baseURL in dev.
+- This change does not alter security posture; the existing `.env` load applies.
+
+PR: <to be added>

frontend/electron.vite.config.ts

@@ -45,6 +45,8 @@ export default defineConfig({
     }
   },
   renderer: {
+    // Point envDir to repo root so renderer can read root .env
+    envDir: '..',
     resolve: {
       alias: {
         '@renderer': resolve('src/renderer/src'),
@@ -78,7 +80,12 @@ export default defineConfig({
       }),
       ...(isDev ? [CodeInspectorPlugin({ bundler: 'vite' })] : []), // 只在开发环境下启用 CodeInspectorPlugin
       ...visualizerPlugin('renderer')
-    ]
+    ],
+    // Map WEB_HOST/WEB_PORT from process.env into Vite runtime vars
+    define: {
+      'import.meta.env.VITE_WEB_HOST': JSON.stringify(process.env.WEB_HOST || '127.0.0.1'),
+      'import.meta.env.VITE_WEB_PORT': JSON.stringify(process.env.WEB_PORT || '8000')
+    }
     // server: {
     //   proxy: {
     //     // 代理Express服务 (AI Chat)

frontend/package.json

@@ -144,5 +144,6 @@
       "electron",
       "esbuild"
     ]
-  }
+  },
+  "packageManager": "pnpm@10.13.1+sha512.37ebf1a5c7a30d5fabe0c5df44ee8da4c965ca0c5af3dbab28c3a1681b70a256218d05c81c9c0dcf767ef6b8551eb5b960042b9ed4300c59242336377e01cfad"
 }