Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Codex CLI(0.160.0 以上)をアカウント種別から選べます。対話
- トピックの再開。一覧から選ぶとそのトピックが部屋へ戻り、アカウントに `再開コマンド` があればそこに居た CLI セッションも戻ります
- 参加者が自分でトピックの過去発言を引く道具(サイドカーの `read_room_history`)
- 席が自分の利用上限(5 時間と週の使用率とリセット時刻、アプリが受け取った時刻)を読む道具(サイドカーの `my_usage`)
- 参加 AI が自分や他の席を開始・終了・会話を保って再起動する [MCP セッション操作](docs/1-room.md#ai-からのセッション操作415)
- 設定メニュー。アプリ本体が起動するローカル MCP サーバ(同梱の `github-webhook-mcp` ブリッジなど)の一覧・実行状態・コマンドと引数と環境変数の編集・ログを扱い、設定はアプリのデータディレクトリの `mcp-servers.json` に保存します
- Windows 上で `npm ci` と Rust のコンパイル確認を行う CI
- GitHub Release 公開時に Tauri バンドルを作成する CD
Expand Down
2 changes: 2 additions & 0 deletions crates/mcp-config/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/mcp-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ edition = "2021"
# GNU target (see the CI note in docs/5-development.md).

[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1"
chrono = { version = "0.4", default-features = false, features = ["std"] }
toml_edit = "0.20.2"
Expand Down
3 changes: 2 additions & 1 deletion crates/mcp-config/src/codex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pub const NATIVE_URL_ENV: &str = "PULLCEPT_NATIVE_URL";
pub const OUTPUT_STYLE_ENV: &str = "LI_PLUS_OUTPUT_STYLE";
pub const NATIVE_PATH: &str = "/hooks/codex-session";
pub const SIDECAR_ENV: &[&str] = &[
crate::session_control::CAPABILITY_ENV,
LAUNCH_ID_ENV,
admission::REQUIRED_ENV,
ROOM_TOKEN_ENV,
Expand Down Expand Up @@ -54,7 +55,7 @@ pub(crate) fn room_server_definition(own: &str, runner: &str, entry: &str) -> St
.join(",");
// The only registration (#297). The whole table, so it works before project trust
// and an entry left in a trusted project's config cannot override this launch.
format!("mcp_servers.{own}={{command='node',args=[{},{}],env_vars=[{vars}],enabled=true,tools={{say_to_room={{approval_mode='approve'}},read_room_history={{approval_mode='approve'}},my_usage={{approval_mode='approve'}}}}}}", instruction_value(runner), instruction_value(entry))
format!("mcp_servers.{own}={{command='node',args=[{},{}],env_vars=[{vars}],enabled=true,tools={{say_to_room={{approval_mode='approve'}},read_room_history={{approval_mode='approve'}},my_usage={{approval_mode='approve'}},list_account_sessions={{approval_mode='approve'}},account_session_status={{approval_mode='approve'}},control_account_session={{approval_mode='approve'}}}}}}", instruction_value(runner), instruction_value(entry))
}

/// The runner and entry paths as the room server's table carries them, or why
Expand Down
2 changes: 2 additions & 0 deletions crates/mcp-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pub mod claude_resume;
pub mod permission_prompt;
pub mod prompt_hold;
pub mod usage;
pub mod session_control;

/// Prefix of the name the sidecar is registered under in `.mcp.json`.
///
Expand Down Expand Up @@ -801,6 +802,7 @@ pub const ROOM_ID_ENV: &str = "PULLCEPT_ROOM_ID";
/// when the CLI is spawned, so the app's value holds even if that refusal
/// were bypassed.
pub const APP_LAUNCH_ENV: &[&str] = &[
session_control::CAPABILITY_ENV,
ROOM_TOKEN_ENV,
LAUNCHED_AS_ENV,
ROOM_ID_ENV,
Expand Down
Loading
Loading