remote-coder 0.4.2__tar.gz → 0.4.3__tar.gz

remote_coder-0.4.3/PKG-INFO

@@ -0,0 +1,353 @@
+Metadata-Version: 2.4
+Name: remote-coder
+Version: 0.4.3
+Summary: Telegram-based remote AI coding automation server
+Author: Remote AI Coder contributors
+License:                                  Apache License
+                                   Version 2.0, January 2004
+                                http://www.apache.org/licenses/
+        
+           TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+        
+           1. Definitions.
+        
+              "License" shall mean the terms and conditions for use, reproduction,
+              and distribution as defined by Sections 1 through 9 of this document.
+        
+              "Licensor" shall mean the copyright owner or entity authorized by
+              the copyright owner that is granting the License.
+        
+              "Legal Entity" shall mean the union of the acting entity and all
+              other entities that control, are controlled by, or are under common
+              control with that entity. For the purposes of this definition,
+              "control" means (i) the power, direct or indirect, to cause the
+              direction or management of such entity, whether by contract or
+              otherwise, or (ii) ownership of fifty percent (50%) or more of the
+              outstanding shares, or (iii) beneficial ownership of such entity.
+        
+              "You" (or "Your") shall mean an individual or Legal Entity
+              exercising permissions granted by this License.
+        
+              "Source" form shall mean the preferred form for making modifications,
+              including but not limited to software source code, documentation
+              source, and configuration files.
+        
+              "Object" form shall mean any form resulting from mechanical
+              transformation or translation of a Source form, including but
+              not limited to compiled object code, generated documentation,
+              and conversions to other media types.
+        
+              "Work" shall mean the work of authorship, whether in Source or
+              Object form, made available under the License, as indicated by a
+              copyright notice that is included in or attached to the work
+              (an example is provided in the Appendix below).
+        
+              "Derivative Works" shall mean any work, whether in Source or Object
+              form, that is based on (or derived from) the Work and for which the
+              editorial revisions, annotations, elaborations, or other modifications
+              represent, as a whole, an original work of authorship. For the purposes
+              of this License, Derivative Works shall not include works that remain
+              separable from, or merely link (or bind by name) to the interfaces of,
+              the Work and Derivative Works thereof.
+        
+              "Contribution" shall mean any work of authorship, including
+              the original version of the Work and any modifications or additions
+              to that Work or Derivative Works thereof, that is intentionally
+              submitted to Licensor for inclusion in the Work by the copyright owner
+              or by an individual or Legal Entity authorized to submit on behalf of
+              the copyright owner. For the purposes of this definition, "submitted"
+              means any form of electronic, verbal, or written communication sent
+              to the Licensor or its representatives, including but not limited to
+              communication on electronic mailing lists, source code control systems,
+              and issue tracking systems that are managed by, or on behalf of, the
+              Licensor for the purpose of discussing and improving the Work, but
+              excluding communication that is conspicuously marked or otherwise
+              designated in writing by the copyright owner as "Not a Contribution."
+        
+              "Contributor" shall mean Licensor and any individual or Legal Entity
+              on behalf of whom a Contribution has been received by Licensor and
+              subsequently incorporated within the Work.
+        
+           2. Grant of Copyright License. Subject to the terms and conditions of
+              this License, each Contributor hereby grants to You a perpetual,
+              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+              copyright license to reproduce, prepare Derivative Works of,
+              publicly display, publicly perform, sublicense, and distribute the
+              Work and such Derivative Works in Source or Object form.
+        
+           3. Grant of Patent License. Subject to the terms and conditions of
+              this License, each Contributor hereby grants to You a perpetual,
+              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+              (except as stated in this section) patent license to make, have made,
+              use, offer to sell, sell, import, and otherwise transfer the Work,
+              where such license applies only to those patent claims licensable
+              by such Contributor that are necessarily infringed by their
+              Contribution(s) alone or by combination of their Contribution(s)
+              with the Work to which such Contribution(s) was submitted. If You
+              institute patent litigation against any entity (including a
+              cross-claim or counterclaim in a lawsuit) alleging that the Work
+              or a Contribution incorporated within the Work constitutes direct
+              or contributory patent infringement, then any patent licenses
+              granted to You under this License for that Work shall terminate
+              as of the date such litigation is filed.
+        
+           4. Redistribution. You may reproduce and distribute copies of the
+              Work or Derivative Works thereof in any medium, with or without
+              modifications, and in Source or Object form, provided that You
+              meet the following conditions:
+        
+              (a) You must give any other recipients of the Work or
+                  Derivative Works a copy of this License; and
+        
+              (b) You must cause any modified files to carry prominent notices
+                  stating that You changed the files; and
+        
+              (c) You must retain, in the Source form of any Derivative Works
+                  that You distribute, all copyright, patent, trademark, and
+                  attribution notices from the Source form of the Work,
+                  excluding those notices that do not pertain to any part of
+                  the Derivative Works; and
+        
+              (d) If the Work includes a "NOTICE" text file as part of its
+                  distribution, then any Derivative Works that You distribute must
+                  include a readable copy of the attribution notices contained
+                  within such NOTICE file, excluding those notices that do not
+                  pertain to any part of the Derivative Works, in at least one
+                  of the following places: within a NOTICE text file distributed
+                  as part of the Derivative Works; within the Source form or
+                  documentation, if provided along with the Derivative Works; or,
+                  within a display generated by the Derivative Works, if and
+                  wherever such third-party notices normally appear. The contents
+                  of the NOTICE file are for informational purposes only and
+                  do not modify the License. You may add Your own attribution
+                  notices within Derivative Works that You distribute, alongside
+                  or as an addendum to the NOTICE text from the Work, provided
+                  that such additional attribution notices cannot be construed
+                  as modifying the License.
+        
+              You may add Your own copyright statement to Your modifications and
+              may provide additional or different license terms and conditions
+              for use, reproduction, or distribution of Your modifications, or
+              for any such Derivative Works as a whole, provided Your use,
+              reproduction, and distribution of the Work otherwise complies with
+              the conditions stated in this License.
+        
+           5. Submission of Contributions. Unless You explicitly state otherwise,
+              any Contribution intentionally submitted for inclusion in the Work
+              by You to the Licensor shall be under the terms and conditions of
+              this License, without any additional terms or conditions.
+              Notwithstanding the above, nothing herein shall supersede or modify
+              the terms of any separate license agreement you may have executed
+              with Licensor regarding such Contributions.
+        
+           6. Trademarks. This License does not grant permission to use the trade
+              names, trademarks, service marks, or product names of the Licensor,
+              except as required for reasonable and customary use in describing the
+              origin of the Work and reproducing the content of the NOTICE file.
+        
+           7. Disclaimer of Warranty. Unless required by applicable law or
+              agreed to in writing, Licensor provides the Work (and each
+              Contributor provides its Contributions) on an "AS IS" BASIS,
+              WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+              implied, including, without limitation, any warranties or conditions
+              of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+              PARTICULAR PURPOSE. You are solely responsible for determining the
+              appropriateness of using or redistributing the Work and assume any
+              risks associated with Your exercise of permissions under this License.
+        
+           8. Limitation of Liability. In no event and under no legal theory,
+              whether in tort (including negligence), contract, or otherwise,
+              unless required by applicable law (such as deliberate and grossly
+              negligent acts) or agreed to in writing, shall any Contributor be
+              liable to You for damages, including any direct, indirect, special,
+              incidental, or consequential damages of any character arising as a
+              result of this License or out of the use or inability to use the
+              Work (including but not limited to damages for loss of goodwill,
+              work stoppage, computer failure or malfunction, or any and all
+              other commercial damages or losses), even if such Contributor
+              has been advised of the possibility of such damages.
+        
+           9. Accepting Warranty or Additional Liability. While redistributing
+              the Work or Derivative Works thereof, You may choose to offer,
+              and charge a fee for, acceptance of support, warranty, indemnity,
+              or other liability obligations and/or rights consistent with this
+              License. However, in accepting such obligations, You may act only
+              on Your own behalf and on Your sole responsibility, not on behalf
+              of any other Contributor, and only if You agree to indemnify,
+              defend, and hold each Contributor harmless for any liability
+              incurred by, or claims asserted against, such Contributor by reason
+              of your accepting any such warranty or additional liability.
+        
+           END OF TERMS AND CONDITIONS
+        
+           APPENDIX: How to apply the Apache License to your work.
+        
+              To apply the Apache License to your work, attach the following
+              boilerplate notice, with the fields enclosed by brackets "[]"
+              replaced with your own identifying information. (Don't include
+              the brackets!)  The text should be enclosed in the appropriate
+              comment syntax for the file format. We also recommend that a
+              file or class name and description of purpose be included on the
+              same "printed page" as the copyright notice for easier
+              identification within third-party archives.
+        
+           Copyright 2026 maroomir
+        
+           Licensed under the Apache License, Version 2.0 (the "License");
+           you may not use this file except in compliance with the License.
+           You may obtain a copy of the License at
+        
+               http://www.apache.org/licenses/LICENSE-2.0
+        
+           Unless required by applicable law or agreed to in writing, software
+           distributed under the License is distributed on an "AS IS" BASIS,
+           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+           See the License for the specific language governing permissions and
+           limitations under the License.
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fastapi<1.0,>=0.115
+Requires-Dist: httpx<1.0,>=0.27
+Requires-Dist: pydantic<3.0,>=2.7
+Requires-Dist: pydantic-settings<3.0,>=2.3
+Requires-Dist: pyyaml<7.0,>=6.0
+Requires-Dist: uvicorn[standard]<1.0,>=0.30
+Provides-Extra: dev
+Requires-Dist: pytest<10.0,>=8.0; extra == "dev"
+Requires-Dist: pytest-asyncio<2.0,>=0.23; extra == "dev"
+Requires-Dist: respx<1.0,>=0.21; extra == "dev"
+Dynamic: license-file
+
+# Remote AI Coder
+
+Run Claude Code, Codex, or Gemini on your local development machine by sending a Telegram message. Remote AI Coder isolates each request in a Git worktree, commits the result on a separate branch, and reports the outcome back to Telegram.
+
+*English: this document · 한국어: [README.ko.md](README.ko.md)*
+
+> [!WARNING]
+> This is a local automation tool with access to AI CLIs, Git, and your filesystem. Keep it private, use Telegram allowlists, and do not expose the server or admin UI to the public internet.
+
+## What You Get
+
+- Telegram as a lightweight remote control for local coding agents.
+- One Telegram bot per registered project, with project-scoped allowlists and settings.
+- Request-specific Git worktrees, branch creation, commit, push, and result notifications.
+- Claude, Codex, and Gemini runners behind the same job flow.
+- Local admin UI for project setup, advanced settings, logs, and conversation memory.
+- Read-only `plan:` and `ask:` modes when you want analysis without commits.
+
+## Quick Start
+
+Install the CLI:
+
+```bash
+pip install remote-coder
+```
+
+Before the first package release, install from source:
+
+```bash
+pip install git+https://github.com/maroomir/remote-coder.git
+```
+
+Check your local tools, then start everything:
+
+```bash
+remote-coder doctor
+remote-coder up
+```
+
+Open `http://127.0.0.1:8000/`, add your first project, and message the project bot in Telegram. `remote-coder up` runs the server, starts the ngrok tunnel, registers webhooks, and refreshes the Telegram command menu. Use `remote-coder up --no-tunnel` when you only want the local server.
+
+## Requirements
+
+- Python 3.11+
+- `ngrok` or another HTTPS tunnel for Telegram webhooks
+- One Telegram bot token per project
+- Allowed Telegram Chat IDs, and optionally User IDs
+- At least one local AI CLI: `claude`, `codex`, or `gemini`
+- A local Git repository to automate
+
+## How It Works
+
+```text
+Telegram message
+ -> FastAPI webhook /telegram/webhook/{sha256-prefix16}
+ -> project-bound bot instance and allowlist check
+ -> command parser or natural-language confirmation
+ -> JobManager
+ -> Git worktree
+ -> Claude / Codex / Gemini runner
+ -> branch, commit, push, and Telegram result
+```
+
+Each project uses its own bot. The webhook path contains the first 16 hex characters of `SHA-256(bot token)`, never the raw token. Natural-language jobs show the target project, branch, model, and mode before running, then wait for confirmation.
+
+## Everyday Commands
+
+| Command | Purpose |
+|---|---|
+| `/start`, `/help` | Open the menu or command help |
+| `/model` | View or change the chat's default model |
+| `/status [job_id]` | Inspect recent or specific jobs |
+| `/branch [name]` | Show or switch the bound project's local branch |
+| `/pull` | Fetch remotes and pull the current branch |
+| `/rebase [branch]` | Rebase and fast-forward a completed branch into `main` or `master` |
+| `/pr [branch]` | Create a GitHub PR with `gh` |
+| `/fix ...` | Rework a previous job's commit message or source |
+| `/monitor ...` | Inspect model, memory, branch, worktree, code, or project status |
+| `/clear ...` | Clean managed branches, worktrees, or conversation memory |
+| `/stop [job_id]` | Cancel a queued or running job |
+| `/init` | Reset chat-local model and pending confirmations |
+
+Natural-language examples:
+
+```text
+Fix the login validation bug with model: codex
+plan: outline the migration before changing code
+/ask what test command does this repo use?
+수정: 방금 작업에서 README 문구만 더 간결하게 바꿔줘
+```
+
+## Configuration
+
+Day-to-day setup happens in the local admin UI. Files live under `REMOTE_CODER_HOME`, defaulting to `~/.remote-coder`:
+
+- `projects.json` stores project records, bot tokens, allowlists, root paths, and default models.
+- `advanced_settings.json` stores global behavior such as timeouts, sandbox mode, language, worktree retention, and memory limits.
+- `worktrees/<project>/` contains managed job worktrees and logs.
+
+Useful overrides: `REMOTE_CODER_HOME`, `PROJECTS_CONFIG_PATH`, `CONVERSATION_DB_PATH`, and `JOB_DB_PATH`.
+
+## Security Notes
+
+- Treat `~/.remote-coder/projects.json` as a secret; bot tokens are stored in plain text.
+- Keep the admin UI on localhost.
+- Do not paste secrets or sensitive code into Telegram messages.
+- Dangerous runner modes such as Claude `--dangerously-skip-permissions`, Gemini `--approval-mode yolo`, and Codex `danger-full-access` can modify local files.
+- See [`SECURITY.md`](SECURITY.md) before publishing, exposing, or sharing a deployment.
+
+## More Docs
+
+- Multi-bot setup and migration: [`docs/multi-bot-setup.md`](docs/multi-bot-setup.md)
+- AI runners: [`docs/ai-runners.md`](docs/ai-runners.md)
+- Read-only worktree troubleshooting: [`docs/read-only-workspace.md`](docs/read-only-workspace.md)
+- Contributing: [`CONTRIBUTING.md`](CONTRIBUTING.md)
+
+## Development
+
+```bash
+conda env create -f environment.yml
+conda activate remote-coder
+python -m pip install -e ".[dev]"
+remote-coder up --no-tunnel --reload
+```
+
+Run the test suite:
+
+```bash
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 conda run -n remote-coder pytest -q -p pytest_asyncio.plugin -p respx.fixtures
+```
+
+License: [Apache License 2.0](LICENSE)

remote_coder-0.4.3/README.md

@@ -0,0 +1,132 @@
+# Remote AI Coder
+
+Run Claude Code, Codex, or Gemini on your local development machine by sending a Telegram message. Remote AI Coder isolates each request in a Git worktree, commits the result on a separate branch, and reports the outcome back to Telegram.
+
+*English: this document · 한국어: [README.ko.md](README.ko.md)*
+
+> [!WARNING]
+> This is a local automation tool with access to AI CLIs, Git, and your filesystem. Keep it private, use Telegram allowlists, and do not expose the server or admin UI to the public internet.
+
+## What You Get
+
+- Telegram as a lightweight remote control for local coding agents.
+- One Telegram bot per registered project, with project-scoped allowlists and settings.
+- Request-specific Git worktrees, branch creation, commit, push, and result notifications.
+- Claude, Codex, and Gemini runners behind the same job flow.
+- Local admin UI for project setup, advanced settings, logs, and conversation memory.
+- Read-only `plan:` and `ask:` modes when you want analysis without commits.
+
+## Quick Start
+
+Install the CLI:
+
+```bash
+pip install remote-coder
+```
+
+Before the first package release, install from source:
+
+```bash
+pip install git+https://github.com/maroomir/remote-coder.git
+```
+
+Check your local tools, then start everything:
+
+```bash
+remote-coder doctor
+remote-coder up
+```
+
+Open `http://127.0.0.1:8000/`, add your first project, and message the project bot in Telegram. `remote-coder up` runs the server, starts the ngrok tunnel, registers webhooks, and refreshes the Telegram command menu. Use `remote-coder up --no-tunnel` when you only want the local server.
+
+## Requirements
+
+- Python 3.11+
+- `ngrok` or another HTTPS tunnel for Telegram webhooks
+- One Telegram bot token per project
+- Allowed Telegram Chat IDs, and optionally User IDs
+- At least one local AI CLI: `claude`, `codex`, or `gemini`
+- A local Git repository to automate
+
+## How It Works
+
+```text
+Telegram message
+ -> FastAPI webhook /telegram/webhook/{sha256-prefix16}
+ -> project-bound bot instance and allowlist check
+ -> command parser or natural-language confirmation
+ -> JobManager
+ -> Git worktree
+ -> Claude / Codex / Gemini runner
+ -> branch, commit, push, and Telegram result
+```
+
+Each project uses its own bot. The webhook path contains the first 16 hex characters of `SHA-256(bot token)`, never the raw token. Natural-language jobs show the target project, branch, model, and mode before running, then wait for confirmation.
+
+## Everyday Commands
+
+| Command | Purpose |
+|---|---|
+| `/start`, `/help` | Open the menu or command help |
+| `/model` | View or change the chat's default model |
+| `/status [job_id]` | Inspect recent or specific jobs |
+| `/branch [name]` | Show or switch the bound project's local branch |
+| `/pull` | Fetch remotes and pull the current branch |
+| `/rebase [branch]` | Rebase and fast-forward a completed branch into `main` or `master` |
+| `/pr [branch]` | Create a GitHub PR with `gh` |
+| `/fix ...` | Rework a previous job's commit message or source |
+| `/monitor ...` | Inspect model, memory, branch, worktree, code, or project status |
+| `/clear ...` | Clean managed branches, worktrees, or conversation memory |
+| `/stop [job_id]` | Cancel a queued or running job |
+| `/init` | Reset chat-local model and pending confirmations |
+
+Natural-language examples:
+
+```text
+Fix the login validation bug with model: codex
+plan: outline the migration before changing code
+/ask what test command does this repo use?
+수정: 방금 작업에서 README 문구만 더 간결하게 바꿔줘
+```
+
+## Configuration
+
+Day-to-day setup happens in the local admin UI. Files live under `REMOTE_CODER_HOME`, defaulting to `~/.remote-coder`:
+
+- `projects.json` stores project records, bot tokens, allowlists, root paths, and default models.
+- `advanced_settings.json` stores global behavior such as timeouts, sandbox mode, language, worktree retention, and memory limits.
+- `worktrees/<project>/` contains managed job worktrees and logs.
+
+Useful overrides: `REMOTE_CODER_HOME`, `PROJECTS_CONFIG_PATH`, `CONVERSATION_DB_PATH`, and `JOB_DB_PATH`.
+
+## Security Notes
+
+- Treat `~/.remote-coder/projects.json` as a secret; bot tokens are stored in plain text.
+- Keep the admin UI on localhost.
+- Do not paste secrets or sensitive code into Telegram messages.
+- Dangerous runner modes such as Claude `--dangerously-skip-permissions`, Gemini `--approval-mode yolo`, and Codex `danger-full-access` can modify local files.
+- See [`SECURITY.md`](SECURITY.md) before publishing, exposing, or sharing a deployment.
+
+## More Docs
+
+- Multi-bot setup and migration: [`docs/multi-bot-setup.md`](docs/multi-bot-setup.md)
+- AI runners: [`docs/ai-runners.md`](docs/ai-runners.md)
+- Read-only worktree troubleshooting: [`docs/read-only-workspace.md`](docs/read-only-workspace.md)
+- Contributing: [`CONTRIBUTING.md`](CONTRIBUTING.md)
+
+## Development
+
+```bash
+conda env create -f environment.yml
+conda activate remote-coder
+python -m pip install -e ".[dev]"
+remote-coder up --no-tunnel --reload
+```
+
+Run the test suite:
+
+```bash
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 conda run -n remote-coder pytest -q -p pytest_asyncio.plugin -p respx.fixtures
+```
+
+License: [Apache License 2.0](LICENSE)

{remote_coder-0.4.2 → remote_coder-0.4.3}/app/__init__.py

@@ -1,3 +1,3 @@
 """Remote AI Coder application package."""
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"

{remote_coder-0.4.2 → remote_coder-0.4.3}/app/admin/advanced_settings.py

@@ -7,7 +7,12 @@ from typing import Self
 
 from pydantic import BaseModel, model_validator
 
-from app.models import UiLanguage
+from app.config import resolve_state_path
+from app.models import CodexSandboxMode, UiLanguage
+
+CONVERSATION_REPLY_SNIPPET_MAX_CHARS_DEFAULT = 3000
+CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MIN = 200
+CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MAX = 20000
 
 
 class AdvancedSettings(BaseModel):
@@ -23,7 +28,12 @@ class AdvancedSettings(BaseModel):
     conversation_memory_max_rows: int | None = None
     conversation_memory_max_bytes: int | None = None
     status_recent_job_limit: int = 10
-    job_timeout_seconds: int | None = None
+    job_timeout_seconds: int = 1800
+    git_remote_name: str = "origin"
+    keep_worktree_on_success: bool = True
+    codex_sandbox: CodexSandboxMode = CodexSandboxMode.WORKSPACE_WRITE
+    conversation_recent_limit: int = 10
+    conversation_reply_snippet_max_chars: int = CONVERSATION_REPLY_SNIPPET_MAX_CHARS_DEFAULT
 
     @model_validator(mode="after")
     def _validate_memory_limits(self) -> Self:
@@ -43,13 +53,25 @@ class AdvancedSettings(BaseModel):
             raise ValueError("conversation_memory_max_bytes must be positive or blank.")
         if self.status_recent_job_limit < 1:
             raise ValueError("status_recent_job_limit must be at least 1.")
-        if self.job_timeout_seconds is not None and self.job_timeout_seconds <= 0:
-            raise ValueError("job_timeout_seconds must be positive or blank.")
+        if self.job_timeout_seconds <= 0:
+            raise ValueError("job_timeout_seconds must be positive.")
+        if self.conversation_recent_limit < 1:
+            raise ValueError("conversation_recent_limit must be at least 1.")
+        if not (
+            CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MIN
+            <= self.conversation_reply_snippet_max_chars
+            <= CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MAX
+        ):
+            raise ValueError(
+                "conversation_reply_snippet_max_chars must be between "
+                f"{CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MIN} and "
+                f"{CONVERSATION_REPLY_SNIPPET_MAX_CHARS_MAX}.",
+            )
         return self
 
 
-def advanced_settings_path_for_project_root(project_root: Path) -> Path:
-    return (project_root.expanduser().resolve() / ".remote-coder" / "advanced_settings.json").resolve()
+def advanced_settings_path() -> Path:
+    return resolve_state_path("advanced_settings.json")
 
 
 class FileAdvancedSettingsStore:

{remote_coder-0.4.2 → remote_coder-0.4.3}/app/admin/router.py

@@ -19,7 +19,6 @@ from app.projects.registry import (
     WEBHOOK_TOKEN_HASH_PREFIX_LENGTH,
     ProjectRecord,
     ProjectRegistry,
-    mask_bot_token,
 )
 from app.telegram.bot_instances import BotInstanceManager
 from app.telegram.conversation import SQLiteConversationStore
@@ -50,7 +49,6 @@ _DEFAULT_NEW_PROJECT_WEBHOOK_SECRET = "optional-secret"
 class ProjectUpsertBody(BaseModel):
     name: str
     root_path: str
-    worktree_base_dir: str
     default_model: ModelName = ModelName.CLAUDE
     enabled: bool = True
     bot_token: str | None = None
@@ -325,26 +323,21 @@ def create_admin_router(
 
     @router.get("/api/settings")
     def api_settings(_: LocalhostOnly) -> dict:
-        token = (
-            settings.telegram_bot_token.get_secret_value()
-            if settings.telegram_bot_token is not None
-            else ""
-        )
+        adv = advanced_settings_store.get()
         _adminlog.info(
-            "settings queried env_allowlist_chats=%d env_allowlist_users=%d webhook_secret_set=%s default_model=%s",
-            len(settings.telegram_allowed_chat_ids),
-            len(settings.telegram_allowed_user_ids),
-            bool(settings.telegram_webhook_secret),
-            settings.default_model.value,
+            "settings queried projects_config=%s job_timeout=%d git_remote=%s",
+            registry.config_path,
+            adv.job_timeout_seconds,
+            adv.git_remote_name,
         )
         return {
-            "telegram_bot_token_masked": mask_bot_token(token),
-            "telegram_allowed_chat_ids": settings.telegram_allowed_chat_ids,
-            "telegram_allowed_user_ids": settings.telegram_allowed_user_ids,
-            "telegram_webhook_secret_set": bool(settings.telegram_webhook_secret),
-            "default_model_env": settings.default_model.value,
-            "job_timeout_seconds_env": settings.job_timeout_seconds,
             "projects_config_path": str(registry.config_path),
+            "advanced_settings_path": str(advanced_settings_store.path),
+            "job_timeout_seconds": adv.job_timeout_seconds,
+            "git_remote_name": adv.git_remote_name,
+            "codex_sandbox": adv.codex_sandbox.value,
+            "conversation_recent_limit": adv.conversation_recent_limit,
+            "keep_worktree_on_success": adv.keep_worktree_on_success,
             "webhook_token_hash_prefix_length": WEBHOOK_TOKEN_HASH_PREFIX_LENGTH,
             "webhook_route_template": "/telegram/webhook/{token_hash_prefix}",
             "webhook_public_url_rule": "<public HTTPS Base URL> + each project's webhook_path",
@@ -389,7 +382,6 @@ def create_admin_router(
         record = ProjectRecord(
             name=body.name,
             root_path=body.root_path,
-            worktree_base_dir=body.worktree_base_dir,
             default_model=body.default_model,
             enabled=body.enabled,
             bot_token=SecretStr(body.bot_token.strip()),
@@ -436,7 +428,6 @@ def create_admin_router(
         record = ProjectRecord(
             name=body.name,
             root_path=body.root_path,
-            worktree_base_dir=body.worktree_base_dir,
             default_model=body.default_model,
             enabled=body.enabled,
             bot_token=bot_token,