cconnect 2.0.3__tar.gz → 2.0.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {cconnect-2.0.3 → cconnect-2.0.5}/PKG-INFO +1 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/PKG-INFO +1 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/SOURCES.txt +10 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/app.py +4 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/core/cli.py +88 -10
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packages.py +12 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect/themes/cconnect-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect/themes/cconnect-light.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/catppuccin-latte.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/catppuccin-mocha.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/claude-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/claude-light.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/dracula.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/github-dark-hc.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/github-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/github-dimmed.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/github-light-hc.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/github-light.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/gruvbox-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/nord.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/one-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/rose-pine.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/solarized-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/solarized-light.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/tokyo-night.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-dark-modern.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-dark-plus.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-hc-dark.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-hc-light.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-light-modern.json +4 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/themes/vscode-light-plus.json +4 -1
- cconnect-2.0.5/core/packs/schema.json +115 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/paths.py +4 -0
- cconnect-2.0.5/core/process_job.py +89 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/release.py +2 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/core/settings_defs.py +2 -2
- cconnect-2.0.5/core/slugs.py +12 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/ws.py +8 -3
- cconnect-2.0.5/mcps/delegate.py +336 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/packs.py +6 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/accounts.py +9 -1
- cconnect-2.0.5/routers/agents.py +249 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/chat.py +77 -7
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/sessions.py +4 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/system.py +2 -1
- {cconnect-2.0.3 → cconnect-2.0.5}/schemas/accounts.py +5 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/schemas/chat.py +12 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/accounts.py +18 -3
- cconnect-2.0.5/services/acp_events.py +350 -0
- cconnect-2.0.5/services/acp_peer.py +128 -0
- cconnect-2.0.5/services/agent_connections.py +290 -0
- cconnect-2.0.5/services/agent_registry.py +84 -0
- cconnect-2.0.5/services/agent_sessions.py +804 -0
- cconnect-2.0.5/services/agents.py +401 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/attachments.py +2 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/services/chat_list.py +10 -2
- {cconnect-2.0.3 → cconnect-2.0.5}/services/claude_runtime.py +30 -6
- {cconnect-2.0.3 → cconnect-2.0.5}/services/delegate_runner.py +81 -168
- cconnect-2.0.5/services/delegate_runs.py +67 -0
- cconnect-2.0.5/services/delegates.py +103 -0
- cconnect-2.0.5/services/event_rows.py +89 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/live_sessions.py +81 -13
- {cconnect-2.0.3 → cconnect-2.0.5}/services/pack_format.py +7 -12
- {cconnect-2.0.3 → cconnect-2.0.5}/services/persistent_sessions.py +2 -7
- {cconnect-2.0.3 → cconnect-2.0.5}/services/repo.py +9 -7
- {cconnect-2.0.3 → cconnect-2.0.5}/services/sessions.py +35 -13
- {cconnect-2.0.3 → cconnect-2.0.5}/services/terminal.py +42 -10
- {cconnect-2.0.3 → cconnect-2.0.5}/services/visibility.py +6 -0
- cconnect-2.0.3/core/packs/schema.json +0 -79
- cconnect-2.0.3/mcps/delegate.py +0 -234
- cconnect-2.0.3/routers/delegates.py +0 -24
- cconnect-2.0.3/services/delegate_runs.py +0 -113
- cconnect-2.0.3/services/delegates.py +0 -130
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/dependency_links.txt +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/entry_points.txt +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/requires.txt +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/cconnect.egg-info/top_level.txt +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/access.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/cli_manager.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/config.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/data_migration.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/db.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/display.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/models.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/builtin.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect/accents.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect/pack.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect/terminal/black.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/backgrounds/cyberpunk.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/backgrounds/darkwave.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/pack.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/campbell.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/catppuccin-latte.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/catppuccin-mocha.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/claude-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/claude-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/dark-plus.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/dracula.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/github-dark-hc.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/github-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/github-dimmed.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/github-light-hc.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/github-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/gruvbox-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/light-plus.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/monokai.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/nord.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/one-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/one-half-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/one-half-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/rose-pine.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/solarized-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/solarized-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/tango-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/tango-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/tokyo-night.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/ubuntu.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/vscode-dark-modern.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/vscode-hc-dark.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/vscode-hc-light.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/packs/cconnect-extras/terminal/vscode-light-modern.json +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/BLOCKS.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/BROWSER.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/CCONNECT.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/COMMIT.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/MODS.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/prompts/SUGGESTIONS.md +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/rate_limit.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/responses.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/scripts/page_icon.js +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/core/sdk.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/browser.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/check_progress.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/components.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/media.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/session.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/shared_files.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/mcps/terminal.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/middleware/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/middleware/error_handler.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/middleware/public_auth.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/middleware/security.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/pyproject.toml +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/browser.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/capabilities.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/claude.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/cli.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/git.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/health.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/list.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/network.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/packs.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/projects.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/settings.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/shared.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/routers/terminal.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/schemas/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/schemas/network.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/__init__.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/account_login.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/api_errors.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/blocks.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/browser.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/categories.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/claude_assets.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/claude_manage.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/claude_status.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/cli_info.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/cli_settings.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/diffs.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/directories.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/directory_watch.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/files.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/git.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/git_ops.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/mods.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/network.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/packs.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/project_files.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/project_watch.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/projects.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/prompt_cache.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/providers.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/questions.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/rewind.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/settings_store.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/shared.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/shared_links.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/shared_watch.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/speedtest.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/system_monitor.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/system_watch.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/todos.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/tool_calls.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/tool_props.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/trash.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/services/usage.py +0 -0
- {cconnect-2.0.3 → cconnect-2.0.5}/setup.cfg +0 -0
|
@@ -17,11 +17,13 @@ core/display.py
|
|
|
17
17
|
core/models.py
|
|
18
18
|
core/packages.py
|
|
19
19
|
core/paths.py
|
|
20
|
+
core/process_job.py
|
|
20
21
|
core/rate_limit.py
|
|
21
22
|
core/release.py
|
|
22
23
|
core/responses.py
|
|
23
24
|
core/sdk.py
|
|
24
25
|
core/settings_defs.py
|
|
26
|
+
core/slugs.py
|
|
25
27
|
core/ws.py
|
|
26
28
|
core/packs/builtin.json
|
|
27
29
|
core/packs/schema.json
|
|
@@ -109,12 +111,12 @@ middleware/public_auth.py
|
|
|
109
111
|
middleware/security.py
|
|
110
112
|
routers/__init__.py
|
|
111
113
|
routers/accounts.py
|
|
114
|
+
routers/agents.py
|
|
112
115
|
routers/browser.py
|
|
113
116
|
routers/capabilities.py
|
|
114
117
|
routers/chat.py
|
|
115
118
|
routers/claude.py
|
|
116
119
|
routers/cli.py
|
|
117
|
-
routers/delegates.py
|
|
118
120
|
routers/git.py
|
|
119
121
|
routers/health.py
|
|
120
122
|
routers/list.py
|
|
@@ -133,6 +135,12 @@ schemas/network.py
|
|
|
133
135
|
services/__init__.py
|
|
134
136
|
services/account_login.py
|
|
135
137
|
services/accounts.py
|
|
138
|
+
services/acp_events.py
|
|
139
|
+
services/acp_peer.py
|
|
140
|
+
services/agent_connections.py
|
|
141
|
+
services/agent_registry.py
|
|
142
|
+
services/agent_sessions.py
|
|
143
|
+
services/agents.py
|
|
136
144
|
services/api_errors.py
|
|
137
145
|
services/attachments.py
|
|
138
146
|
services/blocks.py
|
|
@@ -151,6 +159,7 @@ services/delegates.py
|
|
|
151
159
|
services/diffs.py
|
|
152
160
|
services/directories.py
|
|
153
161
|
services/directory_watch.py
|
|
162
|
+
services/event_rows.py
|
|
154
163
|
services/files.py
|
|
155
164
|
services/git.py
|
|
156
165
|
services/git_ops.py
|
|
@@ -31,6 +31,8 @@ async def lifespan(app: FastAPI):
|
|
|
31
31
|
init_db()
|
|
32
32
|
settings_store.load()
|
|
33
33
|
cli_settings.migrate()
|
|
34
|
+
from services import delegates
|
|
35
|
+
delegates.migrate()
|
|
34
36
|
from services import accounts
|
|
35
37
|
await asyncio.to_thread(accounts.link_all_shared_dirs)
|
|
36
38
|
paths.RUNTIME_FILE.write_text(f"PORT={PORT}\nPID={os.getpid()}\n", encoding="utf-8")
|
|
@@ -55,8 +57,8 @@ async def lifespan(app: FastAPI):
|
|
|
55
57
|
project_watch.hub.stop()
|
|
56
58
|
system_watch.hub.stop()
|
|
57
59
|
network.watchdog.stop()
|
|
58
|
-
from services import
|
|
59
|
-
await
|
|
60
|
+
from services import live_sessions
|
|
61
|
+
await live_sessions.close_processes()
|
|
60
62
|
paths.RUNTIME_FILE.unlink(missing_ok=True)
|
|
61
63
|
|
|
62
64
|
|
|
@@ -13,16 +13,18 @@ import shutil
|
|
|
13
13
|
import socket
|
|
14
14
|
import subprocess
|
|
15
15
|
import sys
|
|
16
|
+
import time
|
|
16
17
|
from contextlib import suppress
|
|
18
|
+
from datetime import datetime
|
|
17
19
|
from pathlib import Path
|
|
18
20
|
from urllib.parse import urlparse
|
|
19
21
|
|
|
20
22
|
import psutil
|
|
21
23
|
import qrcode
|
|
22
24
|
|
|
23
|
-
from core import data_migration, paths, release
|
|
25
|
+
from core import cli_manager, data_migration, paths, release, sdk
|
|
24
26
|
from core.config import PORT, RESTART_EXIT_CODE
|
|
25
|
-
from services import repo, system_monitor
|
|
27
|
+
from services import agent_registry, repo, system_monitor
|
|
26
28
|
|
|
27
29
|
_ENV_PATH = paths.ENV_FILE
|
|
28
30
|
_TOKEN_VAR = "PUBLIC_ACCESS_TOKEN"
|
|
@@ -34,7 +36,8 @@ _STOP_TIMEOUT = 10
|
|
|
34
36
|
_POLL_SECONDS = 0.5
|
|
35
37
|
_MODULE = "core.cli"
|
|
36
38
|
_APP = "core.app:app"
|
|
37
|
-
_COMMANDS = ("run", "expose", "stop", "status", "update", "migrate", "key")
|
|
39
|
+
_COMMANDS = ("run", "expose", "stop", "restart", "status", "logs", "doctor", "update", "migrate", "key")
|
|
40
|
+
_TOP_FLAGS = ("-h", "--help", "-v", "--version")
|
|
38
41
|
|
|
39
42
|
|
|
40
43
|
def _abort(msg: str) -> None:
|
|
@@ -408,21 +411,23 @@ def _flag_parser() -> argparse.ArgumentParser:
|
|
|
408
411
|
f"{_HOSTNAME_VAR}, then to <user>-<ip>.sslip.io.")
|
|
409
412
|
parser.add_argument("--detach", action="store_true",
|
|
410
413
|
help="Run in the background and return; the server outlives the terminal.")
|
|
414
|
+
parser.add_argument("--port", type=int, default=None, help=f"Port to serve on instead of {PORT}.")
|
|
411
415
|
parser.add_argument("--stop", action="store_true",
|
|
412
416
|
help="Stop a backend previously started with --detach.")
|
|
413
417
|
parser.add_argument("--security-key", action="store_true",
|
|
414
418
|
help="Print the key that unlocks the terminal and ignored files, generating it the first time.")
|
|
415
419
|
parser.add_argument("--rotate", action="store_true",
|
|
416
420
|
help="With --security-key, replace the existing key instead of printing it.")
|
|
417
|
-
parser.set_defaults(command="", source="", force=False, json=False)
|
|
421
|
+
parser.set_defaults(command="", source="", force=False, json=False, follow=False)
|
|
418
422
|
return parser
|
|
419
423
|
|
|
420
424
|
|
|
421
425
|
def _command_parser() -> argparse.ArgumentParser:
|
|
422
426
|
parser = argparse.ArgumentParser(prog="cconnect", description="CConnect backend.")
|
|
427
|
+
parser.add_argument("-v", "--version", action="version", version=f"cconnect {release.VERSION}")
|
|
423
428
|
parser.set_defaults(
|
|
424
|
-
production=False, expose="", public_host="", detach=False,
|
|
425
|
-
security_key=False, rotate=False, source="", force=False, json=False,
|
|
429
|
+
production=False, expose="", public_host="", detach=False, port=None,
|
|
430
|
+
security_key=False, rotate=False, source="", force=False, json=False, follow=False,
|
|
426
431
|
)
|
|
427
432
|
commands = parser.add_subparsers(dest="command")
|
|
428
433
|
|
|
@@ -431,6 +436,7 @@ def _command_parser() -> argparse.ArgumentParser:
|
|
|
431
436
|
help="No reload, multi-worker (Linux/macOS only).")
|
|
432
437
|
run.add_argument("--detach", action="store_true",
|
|
433
438
|
help="Run in the background; the server outlives the terminal.")
|
|
439
|
+
run.add_argument("--port", type=int, default=None, help=f"Port to serve on instead of {PORT}.")
|
|
434
440
|
|
|
435
441
|
expose = commands.add_parser("expose", help="Serve over the internet, token-gated.")
|
|
436
442
|
expose.add_argument("provider", choices=list(_PROVIDERS))
|
|
@@ -441,12 +447,20 @@ def _command_parser() -> argparse.ArgumentParser:
|
|
|
441
447
|
help="Run in the background; the server outlives the terminal.")
|
|
442
448
|
expose.add_argument("--production", action="store_true",
|
|
443
449
|
help="No reload, multi-worker (Linux/macOS only).")
|
|
450
|
+
expose.add_argument("--port", type=int, default=None, help=f"Port to serve on instead of {PORT}.")
|
|
444
451
|
|
|
445
452
|
commands.add_parser("stop", help="Stop a backend started with --detach.")
|
|
446
453
|
|
|
454
|
+
commands.add_parser("restart", help="Restart the backend that is running.")
|
|
455
|
+
|
|
447
456
|
status = commands.add_parser("status", help="Version, where the data lives and what is running.")
|
|
448
457
|
status.add_argument("--json", action="store_true", help="Print it as JSON, for other programs.")
|
|
449
458
|
|
|
459
|
+
logs = commands.add_parser("logs", help="Print the server log.")
|
|
460
|
+
logs.add_argument("-f", "--follow", action="store_true", help="Keep printing new entries as they arrive.")
|
|
461
|
+
|
|
462
|
+
commands.add_parser("doctor", help="Check what the backend needs on this machine.")
|
|
463
|
+
|
|
450
464
|
commands.add_parser("update", help="Upgrade this install to the latest release.")
|
|
451
465
|
|
|
452
466
|
migrate = commands.add_parser("migrate", help="Copy a previous data folder into this one.")
|
|
@@ -462,7 +476,7 @@ def _command_parser() -> argparse.ArgumentParser:
|
|
|
462
476
|
|
|
463
477
|
|
|
464
478
|
def _parse(argv: list[str]) -> argparse.Namespace:
|
|
465
|
-
legacy = bool(argv) and argv[0].startswith("-") and argv[0] not in
|
|
479
|
+
legacy = bool(argv) and argv[0].startswith("-") and argv[0] not in _TOP_FLAGS
|
|
466
480
|
if legacy:
|
|
467
481
|
args = _flag_parser().parse_args(argv)
|
|
468
482
|
args.command = "key" if args.security_key else "stop" if args.stop else "run"
|
|
@@ -511,6 +525,56 @@ def _print_status(as_json: bool) -> None:
|
|
|
511
525
|
_print_rows(rows)
|
|
512
526
|
|
|
513
527
|
|
|
528
|
+
def _print_entries(page: dict) -> int:
|
|
529
|
+
for entry in page["items"]:
|
|
530
|
+
stamp = datetime.fromtimestamp(entry["ts"]).strftime("%H:%M:%S")
|
|
531
|
+
print(f"{stamp} {entry['level']:<8} {entry['message']}", flush=True)
|
|
532
|
+
return page["offset"]
|
|
533
|
+
|
|
534
|
+
|
|
535
|
+
def _print_logs(follow: bool) -> None:
|
|
536
|
+
offset = _print_entries(system_monitor.logs())
|
|
537
|
+
with suppress(KeyboardInterrupt):
|
|
538
|
+
while follow:
|
|
539
|
+
time.sleep(_POLL_SECONDS)
|
|
540
|
+
offset = _print_entries(system_monitor.logs(offset))
|
|
541
|
+
|
|
542
|
+
|
|
543
|
+
def _restart() -> None:
|
|
544
|
+
live = _runtime()
|
|
545
|
+
if not live:
|
|
546
|
+
_abort("No backend is running.")
|
|
547
|
+
paths.RESTART_FLAG.touch()
|
|
548
|
+
print(f"Restarting the backend (pid {live['PID']}).")
|
|
549
|
+
|
|
550
|
+
|
|
551
|
+
def _port_state(port: int) -> str:
|
|
552
|
+
live = _runtime()
|
|
553
|
+
if live and int(live.get("PORT") or 0) == port:
|
|
554
|
+
return f"{port}, this backend (pid {live['PID']})"
|
|
555
|
+
with socket.socket() as probe:
|
|
556
|
+
probe.settimeout(1)
|
|
557
|
+
taken = probe.connect_ex(("127.0.0.1", port)) == 0
|
|
558
|
+
return f"{port}, taken by another program" if taken else f"{port}, free"
|
|
559
|
+
|
|
560
|
+
|
|
561
|
+
def _doctor(port: int) -> None:
|
|
562
|
+
system = cli_manager.system_cli()
|
|
563
|
+
tools = agent_registry.node_tools()
|
|
564
|
+
tailscale = (_tailscale_status().get("BackendState") or "installed, not running") if shutil.which("tailscale") else None
|
|
565
|
+
_print_rows([
|
|
566
|
+
("Version", release.VERSION),
|
|
567
|
+
("Data", str(paths.DATA_DIR)),
|
|
568
|
+
("Claude CLI", f"{system} ({cli_manager.cli_version(system) or 'version unknown'})" if system else "not on PATH"),
|
|
569
|
+
("Bundled CLI", cli_manager.bundled_version() or "missing"),
|
|
570
|
+
("Agent SDK", sdk.installed_version() or "missing"),
|
|
571
|
+
("Node.js", " and ".join(tools) if tools else "node or npm missing, agents from npm cannot install"),
|
|
572
|
+
("Tailscale", tailscale or "not installed"),
|
|
573
|
+
("Port", _port_state(port)),
|
|
574
|
+
("Security key", "set" if os.environ.get(_SECURITY_KEY_VAR) else f"not set, run {_invocation()} key"),
|
|
575
|
+
])
|
|
576
|
+
|
|
577
|
+
|
|
514
578
|
def _update() -> None:
|
|
515
579
|
if not paths.INSTALLED:
|
|
516
580
|
_abort("this is a git checkout, not an installed release: update it with git pull.")
|
|
@@ -553,6 +617,8 @@ def _migrate(source: str, force: bool) -> None:
|
|
|
553
617
|
|
|
554
618
|
def main():
|
|
555
619
|
args = _parse(sys.argv[1:])
|
|
620
|
+
port = args.port or PORT
|
|
621
|
+
os.environ["PORT"] = str(port)
|
|
556
622
|
|
|
557
623
|
try:
|
|
558
624
|
moved = data_migration.migrate()
|
|
@@ -571,6 +637,18 @@ def main():
|
|
|
571
637
|
_print_status(args.json)
|
|
572
638
|
return
|
|
573
639
|
|
|
640
|
+
if args.command == "logs":
|
|
641
|
+
_print_logs(args.follow)
|
|
642
|
+
return
|
|
643
|
+
|
|
644
|
+
if args.command == "doctor":
|
|
645
|
+
_doctor(port)
|
|
646
|
+
return
|
|
647
|
+
|
|
648
|
+
if args.command == "restart":
|
|
649
|
+
_restart()
|
|
650
|
+
return
|
|
651
|
+
|
|
574
652
|
if args.command == "update":
|
|
575
653
|
_update()
|
|
576
654
|
return
|
|
@@ -592,7 +670,7 @@ def main():
|
|
|
592
670
|
system_monitor.reset_log_file()
|
|
593
671
|
key_generated = _ensure_security_key()
|
|
594
672
|
if args.expose:
|
|
595
|
-
_expose(args.expose,
|
|
673
|
+
_expose(args.expose, port, args.public_host, keep_running=True, key_generated=key_generated)
|
|
596
674
|
paths.DETACHED_PROVIDER_FILE.write_text(args.expose, encoding="utf-8")
|
|
597
675
|
else:
|
|
598
676
|
_print_security_key(key_generated)
|
|
@@ -608,14 +686,14 @@ def main():
|
|
|
608
686
|
system_monitor.reset_log_file()
|
|
609
687
|
key_generated = _ensure_security_key()
|
|
610
688
|
if args.expose:
|
|
611
|
-
_expose(args.expose,
|
|
689
|
+
_expose(args.expose, port, args.public_host, key_generated=key_generated)
|
|
612
690
|
else:
|
|
613
691
|
_print_security_key(key_generated)
|
|
614
692
|
|
|
615
693
|
reload = not args.production and not is_windows
|
|
616
694
|
workers = int(os.environ.get("WEB_CONCURRENCY", "2")) if (args.production and not is_windows) else 1
|
|
617
695
|
|
|
618
|
-
cmd = [sys.executable, "-m", "uvicorn", _APP, "--host", "0.0.0.0", "--port", str(
|
|
696
|
+
cmd = [sys.executable, "-m", "uvicorn", _APP, "--host", "0.0.0.0", "--port", str(port)]
|
|
619
697
|
if reload:
|
|
620
698
|
cmd += ["--reload", "--reload-exclude", str(paths.DATA_DIR)]
|
|
621
699
|
elif workers > 1:
|
|
@@ -5,6 +5,8 @@ import subprocess
|
|
|
5
5
|
import sys
|
|
6
6
|
from pathlib import Path
|
|
7
7
|
|
|
8
|
+
NO_WINDOW = getattr(subprocess, "CREATE_NO_WINDOW", 0)
|
|
9
|
+
|
|
8
10
|
|
|
9
11
|
def uv_tool() -> str:
|
|
10
12
|
parts = Path(sys.prefix).parts
|
|
@@ -27,7 +29,15 @@ def upgrade_command(distribution: str) -> list[str]:
|
|
|
27
29
|
return [sys.executable, "-m", "pip", "install", "--upgrade", distribution]
|
|
28
30
|
|
|
29
31
|
|
|
30
|
-
def run(command: list[str], timeout: int) -> subprocess.CompletedProcess:
|
|
32
|
+
def run(command: list[str], timeout: int, cwd: Path | None = None, env: dict[str, str] | None = None) -> subprocess.CompletedProcess:
|
|
31
33
|
return subprocess.run(
|
|
32
|
-
command,
|
|
34
|
+
command,
|
|
35
|
+
capture_output=True,
|
|
36
|
+
text=True,
|
|
37
|
+
timeout=timeout,
|
|
38
|
+
encoding="utf-8",
|
|
39
|
+
errors="replace",
|
|
40
|
+
cwd=cwd,
|
|
41
|
+
env=env,
|
|
42
|
+
creationflags=NO_WINDOW,
|
|
33
43
|
)
|