lyzno1 67762cf1d8 chore: resolve merge conflict in pnpm-lock.yaml ...

Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.

Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged

2025-10-13 11:53:43 +08:00

..

__init__.py

add more typing (#24949)

2025-09-08 10:40:00 +08:00

account.py

Merge remote-tracking branch 'origin/main' into feat/collaboration

2025-10-11 14:43:20 +08:00

agent_providers.py

refactor: use libs.login current_user in console controllers (#26745)

2025-10-13 10:33:33 +08:00

endpoint.py

refactor: use libs.login current_user in console controllers (#26745)

2025-10-13 10:33:33 +08:00

error.py

fix: drop dead code phase2 unused class (#22042)

2025-07-17 09:33:07 +08:00

load_balancing_config.py

feat: Refactor api.add_resource to @console_ns.route decorator (#26386)

2025-10-10 16:23:39 +08:00

members.py

refactor: use libs.login current_user in console controllers (#26745)

2025-10-13 10:33:33 +08:00

model_providers.py

feat: Refactor api.add_resource to @console_ns.route decorator (#26386)

2025-10-10 16:23:39 +08:00

models.py

feat: Refactor api.add_resource to @console_ns.route decorator (#26386)

2025-10-10 16:23:39 +08:00

plugin.py

feat: Refactor api.add_resource to @console_ns.route decorator (#26386)

2025-10-10 16:23:39 +08:00

tool_providers.py

feat: Refactor api.add_resource to @console_ns.route decorator (#26386)

2025-10-10 16:23:39 +08:00

workspace.py

refactor: use libs.login current_user in console controllers (#26745)

2025-10-13 10:33:33 +08:00