commandmate 0.41.1 → 0.42.1

package/dist/lib/verification/verify-config.js

@@ -8,7 +8,7 @@
  * Server-only: reads from disk, so import this from API routes / CLI only.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VerifyConfigError = exports.MAX_RETRY_ON_FAIL = exports.MAX_GATE_MUTEX_LENGTH = exports.GATE_MUTEX_PATTERN = exports.GATE_ID_PATTERN = exports.DEFAULT_MAX_LOG_TAIL_BYTES = exports.DEFAULT_TIMEOUT_SEC = exports.VERIFY_CONFIG_RELATIVE_PATH = exports.RESERVED_GATE_IDS = exports.ENV_CLEAN_GATE_ID = exports.SCOPE_GATE_ID = exports.WORK_EVIDENCE_GATE_ID = void 0;
+exports.VerifyConfigError = exports.MAX_ENV_CLEAN_IGNORE_HOME_ENTRIES = exports.MAX_RETRY_ON_FAIL = exports.MAX_GATE_MUTEX_LENGTH = exports.GATE_MUTEX_PATTERN = exports.GATE_ID_PATTERN = exports.DEFAULT_MAX_LOG_TAIL_BYTES = exports.DEFAULT_TIMEOUT_SEC = exports.VERIFY_CONFIG_RELATIVE_PATH = exports.RESERVED_GATE_IDS = exports.ENV_CLEAN_GATE_ID = exports.SCOPE_GATE_ID = exports.WORK_EVIDENCE_GATE_ID = void 0;
 exports.defaultPlannedGateIds = defaultPlannedGateIds;
 exports.validateGateEntries = validateGateEntries;
 exports.loadVerifyConfig = loadVerifyConfig;
@@ -110,6 +110,11 @@ exports.MAX_GATE_MUTEX_LENGTH = 64;
  * reports the machine's luck, not the work.
  */
 exports.MAX_RETRY_ON_FAIL = 1;
+/**
+ * Most names `options.envCleanIgnoreHomeEntries` may list (Issue #2890). A list
+ * this long is already a repository papering over a machine it should fix.
+ */
+exports.MAX_ENV_CLEAN_IGNORE_HOME_ENTRIES = 32;
 const TOP_LEVEL_KEYS = ['version', 'gates', 'options'];
 const GATE_KEYS = ['id', 'command', 'timeoutSec', 'mutex', 'retryOnFail', 'flakyIsPass'];
 const OPTION_KEYS = [
@@ -118,6 +123,7 @@ const OPTION_KEYS = [
     'maxLogTailBytes',
     'requireCommit',
     'requireEnvClean',
+    'envCleanIgnoreHomeEntries',
 ];
 class VerifyConfigError extends Error {
     issues;
@@ -316,6 +322,47 @@ function validateGates(value, issues) {
     }
     return validateGateEntries(value, 'gates', issues);
 }
+/**
+ * Validate `options.envCleanIgnoreHomeEntries` (Issue #2890).
+ *
+ * Each item must be usable as one exact `$HOME` directory-entry name: a string,
+ * non-empty, not `.` / `..`, and free of `/` and NUL. Anything with a separator
+ * could never equal a `readdir` result, so accepting it would be a rule that
+ * silently matches nothing.
+ *
+ * @returns the names, or null when the value was invalid (issues were pushed)
+ */
+function validateHomeEntryNames(value, issues) {
+    const label = 'options.envCleanIgnoreHomeEntries';
+    if (!Array.isArray(value)) {
+        issues.push(`${label}: must be a list of $HOME entry names (got ${describe(value)})`);
+        return null;
+    }
+    const before = issues.length;
+    if (value.length > exports.MAX_ENV_CLEAN_IGNORE_HOME_ENTRIES) {
+        issues.push(`${label}: at most ${exports.MAX_ENV_CLEAN_IGNORE_HOME_ENTRIES} entries (got ${value.length})`);
+    }
+    const names = [];
+    value.forEach((item, index) => {
+        const at = `${label}[${index}]`;
+        if (typeof item !== 'string') {
+            issues.push(`${at}: must be a string (got ${describe(item)})`);
+        }
+        else if (item === '') {
+            issues.push(`${at}: must not be empty`);
+        }
+        else if (item === '.' || item === '..') {
+            issues.push(`${at}: must be an entry name, not ${JSON.stringify(item)}`);
+        }
+        else if (item.includes('/') || item.includes('\0')) {
+            issues.push(`${at}: must be a single $HOME entry name without "/" or NUL (got ${describe(item)})`);
+        }
+        else {
+            names.push(item);
+        }
+    });
+    return issues.length === before ? names : null;
+}
 function validateOptions(value, issues) {
     const options = {
         baseRef: null,
@@ -323,6 +370,7 @@ function validateOptions(value, issues) {
         maxLogTailBytes: exports.DEFAULT_MAX_LOG_TAIL_BYTES,
         requireCommit: false,
         requireEnvClean: false,
+        envCleanIgnoreHomeEntries: [],
     };
     // A childless `options:` key parses as null and means "all defaults".
     if (value === undefined || value === null)
@@ -367,6 +415,11 @@ function validateOptions(value, issues) {
             options.requireEnvClean = parsed;
         }
     }
+    if (value.envCleanIgnoreHomeEntries !== undefined) {
+        const names = validateHomeEntryNames(value.envCleanIgnoreHomeEntries, issues);
+        if (names)
+            options.envCleanIgnoreHomeEntries = names;
+    }
     if (value.maxLogTailBytes !== undefined) {
         const parsed = asInteger(value.maxLogTailBytes);
         if (parsed === null) {

package/dist/server/locales/en/worktree.json

@@ -114,7 +114,8 @@
                 "codex": "Sign out from Codex",
                 "claude": "Sign out of your Anthropic account",
                 "copilot": "Log out of the current OAuth session",
-                "command-code": "Log out of Command Code or a provider"
+                "command-code": "Log out of Command Code or a provider",
+                "antigravity": "Log out"
             },
             "quit": "Exit Codex CLI",
             "diff": "Show Git diff (including untracked files)",
@@ -131,7 +132,8 @@
                 "codex": "Send feedback to Codex team",
                 "claude": "Send feedback about Claude Code",
                 "copilot": "Provide feedback about the CLI",
-                "command-code": "Report a bug or share feedback on GitHub"
+                "command-code": "Report a bug or share feedback on GitHub",
+                "antigravity": "Submit qualitative feedback to improve the agent"
             },
             "plan": "Toggle plan mode",
             "goal": "Set goal for current session",
@@ -146,7 +148,8 @@
                 "claude": "Manage Claude Code skills",
                 "copilot": "Manage skills for enhanced capabilities",
                 "opencode": "Browse and run available skills",
-                "command-code": "Browse and open agent skills"
+                "command-code": "Browse and open agent skills",
+                "antigravity": "List available skills"
             },
             "hooks": "View or manage hook configurations",
             "sessions": "Browse conversation history",
@@ -156,14 +159,16 @@
                 "claude": "Exit the CLI",
                 "codex": "Exit the CLI",
                 "copilot": "Exit the CLI",
-                "command-code": "Exit Command Code"
+                "command-code": "Exit Command Code",
+                "antigravity": "Exit the CLI"
             },
             "models": "Switch AI model",
             "agents": {
                 "opencode": "List and manage available agents",
                 "claude": "Show a reminder to ask Claude to create or manage subagents, or to edit .claude/agents/ directly",
                 "codex": "view and switch between all active agent sessions",
-                "command-code": "Manage agent configurations"
+                "command-code": "Manage agent configurations",
+                "antigravity": "List available custom agents"
             },
             "themes": "Change TUI theme",
             "editor": "Open editor for long messages",
@@ -199,7 +204,10 @@
             "insights": "Generate a report analyzing your Claude Code sessions, including project areas, interaction patterns, and friction points",
             "install-github-app": "Install the Claude GitHub App for a repository, with an optional step to set up GitHub Actions workflows and secrets",
             "install-slack-app": "Install the Claude Slack app",
-            "keybindings": "Open your keyboard shortcuts file",
+            "keybindings": {
+                "claude": "Open your keyboard shortcuts file",
+                "antigravity": "Set custom keybindings"
+            },
             "login": {
                 "claude": "Sign in to your Anthropic account",
                 "copilot": "Log in to Copilot",
@@ -221,7 +229,10 @@
             "release-notes": "View the changelog in an interactive version picker",
             "reload-plugins": "Reload all active plugins to apply pending changes without restarting",
             "reload-skills": "Re-scan skill and command directories so skills added or changed on disk during the session become available without restarting",
-            "remote-control": "Make this session available for Remote Control from claude.ai",
+            "remote-control": {
+                "claude": "Make this session available for Remote Control from claude.ai",
+                "antigravity": "Turn on remote control for this session (off to disable)"
+            },
             "remote-env": "Choose the default environment for cloud agents",
             "rename": "Rename the current session or thread",
             "run": "Launch and drive your project's app to see a change working, not only passing tests",
@@ -238,18 +249,25 @@
             "team-onboarding": "Generate a team onboarding guide from your Claude Code usage history",
             "teleport": "Pull a Claude Code on the web session into this terminal: opens a picker, then fetches the branch and conversation",
             "theme": "Choose the color and syntax highlighting theme",
-            "tui": "Set the terminal UI renderer and relaunch into it with your conversation intact",
+            "tui": {
+                "claude": "Set the terminal UI renderer and relaunch into it with your conversation intact",
+                "codex": "Choose the TUI mode for the next launch"
+            },
             "ultrareview": "Run a deep, multi-agent code review in a cloud sandbox with ultrareview",
             "upgrade": "Open the upgrade page in your browser to switch to a higher plan tier",
             "usage-credits": "Configure usage credits, or request them from your admin, when you hit a limit",
             "verify": "Confirm a code change does what it should by building your project's app, running it, and observing the result, rather than relying on tests or type checks",
-            "voice": "Toggle voice dictation, or enable it in a specific mode",
+            "voice": {
+                "claude": "Toggle voice dictation, or enable it in a specific mode",
+                "copilot": "Toggle voice dictation, or enable it in a specific mode",
+                "codex": "Start or stop voice, or choose a voice with /voice settings",
+                "antigravity": "Dictate a prompt using your microphone"
+            },
             "web-setup": "Connect your GitHub account to Claude Code on the web using your local gh CLI credentials",
             "workflows": "Open the workflow progress view to watch, pause, resume, or save running and completed workflows",
             "keymap": "Remap TUI shortcuts",
             "vim": "Toggle Vim mode for the composer",
             "setup-default-sandbox": "Set up elevated agent sandbox",
-            "sandbox-add-read-dir": "Let sandbox read a directory: /sandbox-add-read-dir [absolute-path]",
             "experimental": "Toggle experimental features",
             "approve": "Approve one retry of a recent auto-review denial",
             "import": {
@@ -266,13 +284,15 @@
             "side": "Start a side conversation in an ephemeral fork",
             "raw": "Toggle raw scrollback mode for copy-friendly terminal selection",
             "debug-config": "Show config layers and requirement sources for debugging",
-            "title": "Configure which items appear in the terminal title",
+            "title": {
+                "codex": "Configure which items appear in the terminal title",
+                "antigravity": "Toggle a custom terminal window title"
+            },
             "pets": "Choose or hide the terminal pet",
             "apps": "Manage apps",
             "plugins": "Browse plugins",
             "rollout": "Print the rollout file path",
             "ps": "List background terminals",
-            "personality": "Choose a communication style for Codex",
             "test-approval": "Test approval request",
             "list-agents": "List the subagents and other Claude Code sessions Claude can message, with the name to use for each",
             "allow-all": "Enable all tool, path, and URL permissions",
@@ -322,7 +342,10 @@
             },
             "extra": "Open the billing page to buy on-demand credits",
             "hotkeys": "Show all keyboard shortcuts",
-            "learn": "Open the learn hub in your browser",
+            "learn": {
+                "command-code": "Open the learn hub in your browser",
+                "antigravity": "Reflect on recent successes or corrections and save them as reusable skills or rules"
+            },
             "learn-taste": "Learn coding taste from sessions with other coding agents",
             "mode": "Show or switch the permission mode",
             "plan-review": "Open this session's latest plan in review",
@@ -339,7 +362,24 @@
                 "codex": "Start or continue a conversation in a new worktree",
                 "command-code": "Create, list, or switch git worktrees"
             },
-            "skill-doctor": "Show what each of your skills costs in context and how often it gets used, so you can find skills to turn off"
+            "skill-doctor": "Show what each of your skills costs in context and how often it gets used, so you can find skills to turn off",
+            "output-style": "List output styles or switch to one, for example /output-style concise",
+            "update-config": "Describe a settings change and have Claude edit the matching settings.json file",
+            "daemon": "Manage the local background server",
+            "warnings": "View retained warnings and diagnostic details",
+            "credits": "Show remaining G1 credits and purchase link",
+            "open": "Open a file or view opened/edited files",
+            "schedule": "Run an instruction on a recurring schedule or as a one-time timer",
+            "browser": "Invoke a browser agent for web tasks",
+            "grill-me": "Have the agent interview you to align on a plan",
+            "teamwork-preview": "Invoke a team of agents to autonomously tackle large projects (preview)",
+            "boost": "Invoke the Boost multi-agent orchestrator for complex tasks",
+            "agy-customizations": "Guide to how Antigravity customizations (skills, rules and more) work",
+            "antigravity-guide": "Guide and quick reference for the Antigravity CLI, IDE and SDK",
+            "automation": "Interactively design and create a scheduled background automation",
+            "migrate-workflows": "Migrate legacy workflows to skills",
+            "artifact": "View and review artifacts",
+            "codesearch": "Search code in the workspace"
         }
     },
     "session": {
@@ -501,7 +541,7 @@
         },
         "jumpToTop": "Jump to the beginning",
         "toolLog": {
-            "summary": "Tool calls \u00b7 {count}",
+            "summary": "Tool calls · {count}",
             "expand": "Show the tool calls",
             "collapse": "Hide the tool calls"
         },
@@ -1020,7 +1060,10 @@
         "caption": "Answer"
     },
     "promptResponse": {
-        "refused": "Your answer was not sent because the dialog has changed. Please check the screen."
+        "refused": "Your answer was not sent because the dialog has changed. Please check the screen.",
+        "stuckHint": "If sending does not work, operate the terminal in direct input mode.",
+        "stuckHintLink": "Switch to direct input",
+        "unanswerable": "CommandMate cannot operate this screen. Use direct input mode instead."
     },
     "dismissPanelKeys": {
         "toolbarLabel": "Close this screen",
@@ -1041,7 +1084,7 @@
         "sessionOnlyAria": "Use the highlighted choice for this session only (s)",
         "setDefault": "Set as default",
         "setDefaultAria": "Set the highlighted choice as the default (Enter)",
-        "defaultWarning": "Enter saves this choice as the default for new sessions. Use \u201cThis session only\u201d to leave your default unchanged.",
+        "defaultWarning": "Enter saves this choice as the default for new sessions. Use “This session only” to leave your default unchanged.",
         "opencodeToolbarLabel": "opencode model keys",
         "opencodeCaption": "Model"
     },

package/dist/server/locales/ja/worktree.json

@@ -114,7 +114,8 @@
                 "codex": "Codex からサインアウト",
                 "claude": "Anthropic アカウントからサインアウト",
                 "copilot": "現在の OAuth ログインセッションからログアウト",
-                "command-code": "Command Code またはプロバイダーからログアウト"
+                "command-code": "Command Code またはプロバイダーからログアウト",
+                "antigravity": "ログアウト"
             },
             "quit": "Codex CLI を終了",
             "diff": "Git の差分を表示（未追跡ファイルを含む）",
@@ -131,7 +132,8 @@
                 "codex": "Codex チームにフィードバックを送信",
                 "claude": "Claude Code についてのフィードバックを送信",
                 "copilot": "CLI についてのフィードバックを送信",
-                "command-code": "GitHub にバグ報告・フィードバックを送信"
+                "command-code": "GitHub にバグ報告・フィードバックを送信",
+                "antigravity": "エージェント改善のためのフィードバックを送信"
             },
             "plan": "プランモードを切り替え",
             "goal": "現在のセッションの目標を設定",
@@ -146,7 +148,8 @@
                 "claude": "Claude Code のスキルを管理",
                 "copilot": "機能を拡張するスキルを管理",
                 "opencode": "利用可能なスキルを一覧・実行",
-                "command-code": "エージェントスキルを一覧・表示"
+                "command-code": "エージェントスキルを一覧・表示",
+                "antigravity": "利用できるスキルを一覧表示"
             },
             "hooks": "フック設定を確認・管理",
             "sessions": "会話履歴を閲覧",
@@ -156,14 +159,16 @@
                 "claude": "CLI を終了",
                 "codex": "CLI を終了",
                 "copilot": "CLI を終了",
-                "command-code": "Command Code を終了"
+                "command-code": "Command Code を終了",
+                "antigravity": "CLI を終了"
             },
             "models": "AI モデルを切り替え",
             "agents": {
                 "opencode": "利用可能なエージェントを一覧・管理",
                 "claude": "サブエージェントの作成・管理を Claude に依頼するか .claude/agents/ を直接編集するよう促す案内を表示",
                 "codex": "稼働中のすべてのエージェントセッションを一覧・切り替え",
-                "command-code": "エージェント構成を管理"
+                "command-code": "エージェント構成を管理",
+                "antigravity": "利用できるカスタムエージェントを一覧表示"
             },
             "themes": "TUI のテーマを変更",
             "editor": "長文メッセージ用のエディタを開く",
@@ -199,7 +204,10 @@
             "insights": "セッションを分析し、対象領域・対話パターン・摩擦点のレポートを生成",
             "install-github-app": "リポジトリに Claude GitHub App を導入（GitHub Actions の設定も任意で実施）",
             "install-slack-app": "Claude Slack アプリを導入",
-            "keybindings": "キーボードショートカットの設定ファイルを開く",
+            "keybindings": {
+                "claude": "キーボードショートカットの設定ファイルを開く",
+                "antigravity": "キーバインドを設定"
+            },
             "login": {
                 "claude": "Anthropic アカウントにサインイン",
                 "copilot": "Copilot にログイン",
@@ -221,7 +229,10 @@
             "release-notes": "変更履歴をバージョン選択つきで表示",
             "reload-plugins": "再起動せずに有効なプラグインを再読み込み",
             "reload-skills": "スキル・コマンドのディレクトリを再走査し、再起動せずに反映",
-            "remote-control": "このセッションを claude.ai のリモートコントロール対象にする",
+            "remote-control": {
+                "claude": "このセッションを claude.ai のリモートコントロール対象にする",
+                "antigravity": "このセッションのリモート操作をオン（off で無効化）"
+            },
             "remote-env": "クラウドエージェントの既定環境を選択",
             "rename": "現在のセッション（スレッド）の名前を変更",
             "run": "プロジェクトのアプリを起動・操作し、テストだけでなく実際の動作で変更を確認",
@@ -238,18 +249,25 @@
             "team-onboarding": "利用履歴からチーム向けオンボーディングガイドを生成",
             "teleport": "web の Claude Code セッションをこのターミナルに引き込み（ブランチと会話を取得）",
             "theme": "配色・シンタックスハイライトのテーマを選択",
-            "tui": "端末 UI のレンダラーを設定し、会話を保ったまま再起動",
+            "tui": {
+                "claude": "端末 UI のレンダラーを設定し、会話を保ったまま再起動",
+                "codex": "次回起動時の TUI モードを選択"
+            },
             "ultrareview": "クラウドサンドボックスでマルチエージェントの詳細コードレビューを実行",
             "upgrade": "上位プランへの切り替えページをブラウザで開く",
             "usage-credits": "使用クレジットを設定、または上限到達時に管理者へ申請",
             "verify": "ビルド・実行・観察によって、テストや型検査に頼らず変更の動作を確認",
-            "voice": "音声入力を切り替え、または特定モードで有効化",
+            "voice": {
+                "claude": "音声入力を切り替え、または特定モードで有効化",
+                "copilot": "音声入力を切り替え、または特定モードで有効化",
+                "codex": "音声を開始・停止、または /voice settings で声を選択",
+                "antigravity": "マイクでプロンプトを音声入力"
+            },
             "web-setup": "ローカルの gh CLI 認証を使って GitHub アカウントを Claude Code on the web に接続",
             "workflows": "実行中・完了済みワークフローの進捗ビューを開く（監視・一時停止・再開・保存）",
             "keymap": "TUI のショートカットを再割り当て",
             "vim": "コンポーザーの Vim モードを切り替え",
             "setup-default-sandbox": "昇格エージェント用のサンドボックスを設定",
-            "sandbox-add-read-dir": "サンドボックスに読み取り可能なディレクトリを追加: /sandbox-add-read-dir [絶対パス]",
             "experimental": "実験的機能を切り替え",
             "approve": "直近の自動レビュー拒否に対する再試行を 1 回承認",
             "import": {
@@ -266,13 +284,15 @@
             "side": "一時的なフォークで別の会話を開始",
             "raw": "コピーしやすい raw スクロールバックモードを切り替え",
             "debug-config": "設定の階層と要件の出所をデバッグ用に表示",
-            "title": "ターミナルのタイトルに表示する項目を設定",
+            "title": {
+                "codex": "ターミナルのタイトルに表示する項目を設定",
+                "antigravity": "ターミナルのウィンドウタイトル表示を切り替え"
+            },
             "pets": "ターミナルのペットを選択・非表示",
             "apps": "アプリを管理",
             "plugins": "プラグインを閲覧",
             "rollout": "rollout ファイルのパスを表示",
             "ps": "バックグラウンドのターミナル一覧を表示",
-            "personality": "Codex の応答スタイルを選択",
             "test-approval": "承認リクエストのテスト",
             "list-agents": "Claude がメッセージを送れるサブエージェントと他の Claude Code セッションを宛先名つきで一覧表示",
             "allow-all": "ツール・パス・URL の権限をすべて許可",
@@ -322,7 +342,10 @@
             },
             "extra": "オンデマンドクレジットを購入する請求ページを開く",
             "hotkeys": "すべてのキーボードショートカットを表示",
-            "learn": "学習ハブをブラウザで開く",
+            "learn": {
+                "command-code": "学習ハブをブラウザで開く",
+                "antigravity": "最近の成功や修正を振り返り、再利用できるスキルやルールとして保存"
+            },
             "learn-taste": "他のコーディングエージェントのセッションからコーディングの好みを学習",
             "mode": "権限モードを表示・切り替え",
             "plan-review": "このセッションの最新プランをレビュー表示で開く",
@@ -339,7 +362,24 @@
                 "codex": "新しい worktree で会話を開始・再開する",
                 "command-code": "git worktree の作成・一覧・切り替え"
             },
-            "skill-doctor": "各スキルのコンテキスト消費量と使用頻度を表示し、オフにするスキルを特定"
+            "skill-doctor": "各スキルのコンテキスト消費量と使用頻度を表示し、オフにするスキルを特定",
+            "output-style": "出力スタイルを一覧表示・切り替え（例: /output-style concise）",
+            "update-config": "設定の変更内容を伝えると、Claude が対応する settings.json を編集",
+            "daemon": "ローカルのバックグラウンドサーバを管理",
+            "warnings": "保持されている警告と診断情報を表示",
+            "credits": "残りの G1 クレジットと購入リンクを表示",
+            "open": "ファイルを開く、または開いた・編集したファイルを表示",
+            "schedule": "指示を定期実行、または一度きりのタイマーで実行",
+            "browser": "ブラウザエージェントで Web 上の作業を実行",
+            "grill-me": "計画をすり合わせるために質問してもらう",
+            "teamwork-preview": "エージェントのチームで大きなプロジェクトを自律的に進める（プレビュー）",
+            "boost": "Boost マルチエージェントオーケストレーターで複雑なタスクを実行",
+            "agy-customizations": "Antigravity のカスタマイズ（スキル・ルールなど）の仕組みを解説",
+            "antigravity-guide": "Antigravity の CLI・IDE・SDK のガイドとクイックリファレンス",
+            "automation": "定期実行するバックグラウンド自動処理を対話形式で作成",
+            "migrate-workflows": "旧形式のワークフローをスキルへ移行",
+            "artifact": "アーティファクトを表示・レビュー",
+            "codesearch": "ワークスペース内のコードを検索"
         }
     },
     "session": {
@@ -501,13 +541,13 @@
         },
         "jumpToTop": "会話の先頭へ",
         "toolLog": {
-            "summary": "\u30c4\u30fc\u30eb\u547c\u3073\u51fa\u3057 {count} \u4ef6",
-            "expand": "\u30c4\u30fc\u30eb\u547c\u3073\u51fa\u3057\u3092\u958b\u304f",
-            "collapse": "\u30c4\u30fc\u30eb\u547c\u3073\u51fa\u3057\u3092\u9589\u3058\u308b"
+            "summary": "ツール呼び出し {count} 件",
+            "expand": "ツール呼び出しを開く",
+            "collapse": "ツール呼び出しを閉じる"
         },
         "toolActivity": {
-            "show": "\u30c4\u30fc\u30eb\u6d3b\u52d5\u3092\u958b\u304f",
-            "hide": "\u30c4\u30fc\u30eb\u6d3b\u52d5\u3092\u9589\u3058\u308b"
+            "show": "ツール活動を開く",
+            "hide": "ツール活動を閉じる"
         },
         "toolApproval": {
             "summary": "ツール承認 {count} 件",
@@ -1020,7 +1060,10 @@
         "caption": "回答"
     },
     "promptResponse": {
-        "refused": "ダイアログの状態が変わったため送信できませんでした。画面を確認してください。"
+        "refused": "ダイアログの状態が変わったため送信できませんでした。画面を確認してください。",
+        "stuckHint": "送信がうまくいかない場合は、直接入力モードで操作してください。",
+        "stuckHintLink": "直接入力に切り替える",
+        "unanswerable": "この画面は CommandMate から操作できません。直接入力モードで操作してください。"
     },
     "dismissPanelKeys": {
         "toolbarLabel": "この画面を閉じる",

package/dist/server/server.js

@@ -409,6 +409,19 @@ app.prepare().then(() => {
             catch (error) {
                 console.error('Error reconciling Skill operations:', error);
             }
+            // Issue #2866: this server's tmux session-name namespace. Must precede the
+            // session reconcile below, which renames onto (and attributes against)
+            // names in this namespace. Fail-open in its own try/catch: without a
+            // namespace sessions keep the legacy `mcbd-{cli}-{id}` names. Dynamic
+            // import for the same reason as the reconcilers around it.
+            try {
+                const { initSessionNamespace } = await Promise.resolve().then(() => __importStar(require('./src/lib/cli-tools/session-namespace')));
+                const namespace = initSessionNamespace(db);
+                console.log(`tmux session namespace: ${namespace}`);
+            }
+            catch (error) {
+                console.error('Error initializing tmux session namespace:', error);
+            }
             // Issue #1621 Phase 3/4: make live tmux sessions follow the worktree IDs
             // that migration v54 has just renumbered. Session names are DERIVED from
             // the ID (`mcbd-{cli}-{worktreeId}`), so a running agent would otherwise
@@ -445,6 +458,22 @@ app.prepare().then(() => {
             catch (error) {
                 console.error('Error reconciling worktree sessions:', error);
             }
+            // Issue #2866: keep serving this server's sessions that predate the
+            // namespace under their legacy names (adopted, not renamed). After the
+            // reconcile above, so an ID move has already been applied. Fail-open.
+            try {
+                const { adoptLegacySessions } = await Promise.resolve().then(() => __importStar(require('./src/lib/session/adopt-legacy-sessions')));
+                const adoptReport = await adoptLegacySessions(db);
+                if (adoptReport.adopted.length > 0) {
+                    console.log(`Adopted ${adoptReport.adopted.length} legacy-named tmux session(s)`);
+                }
+                if (adoptReport.errors.length > 0) {
+                    console.warn(`Legacy session adoption warnings: ${adoptReport.errors.join(', ')}`);
+                }
+            }
+            catch (error) {
+                console.error('Error adopting legacy tmux sessions:', error);
+            }
             // Issue #1543: close verification runs that a crash left in `running`.
             // Gate execution lives in process memory, so none of them survived the
             // restart; leaving the rows open would keep their worktrees permanently

package/dist/server/src/lib/auto-yes-poller.js

@@ -69,6 +69,7 @@ const auto_yes_dialog_gate_1 = require("./polling/auto-yes-dialog-gate");
 const task_transition_service_1 = require("./tasks/task-transition-service");
 const db_instance_1 = require("./db/db-instance");
 const chat_db_1 = require("./db/chat-db");
+const worktree_session_ownership_1 = require("./cli-tools/worktree-session-ownership");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -519,6 +520,20 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         const manager = manager_1.CLIToolManager.getInstance();
         const cliTool = manager.getTool(cliToolId);
         const sessionName = cliTool.getSessionName(worktreeId, instanceId);
+        // Issue #2865: never auto-answer a same-named session another CommandMate
+        // server created. The poller keeps running; it just does not type.
+        const ownership = await (0, worktree_session_ownership_1.checkWorktreeSessionOwnership)(worktreeId, sessionName);
+        if (ownership === null || ownership.verdict === 'foreign') {
+            logger.warn('poller:auto-yes-skipped-foreign-session', {
+                worktreeId,
+                cliToolId,
+                instanceId,
+                sessionName,
+                sessionPath: ownership?.sessionPath ?? null,
+                reason: ownership ? 'foreign' : 'worktree_not_found',
+            });
+            return 'no_answer';
+        }
         try {
             await (0, prompt_answer_sender_1.sendPromptAnswer)({
                 sessionName,

package/dist/server/src/lib/cli-tools/antigravity.js

@@ -200,7 +200,7 @@ class AntigravityTool extends base_1.BaseCLITool {
         // Check if session already exists
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070: this branch used to return unconditionally. A tmux session
             // outlives the agent that was launched into it — a quit, a self-update, a
             // crash — and the launch was then skipped for a pane holding nothing but a

package/dist/server/src/lib/cli-tools/base.js

@@ -13,6 +13,7 @@ const child_process_1 = require("child_process");
 const util_1 = require("util");
 const session_name_1 = require("./session-name");
 const tmux_1 = require("../tmux/tmux");
+const session_ownership_1 = require("../tmux/session-ownership");
 const composer_spec_1 = require("./composer-spec");
 const capture_spec_1 = require("./capture-spec");
 const agent_mode_spec_1 = require("./agent-mode-spec");
@@ -235,8 +236,16 @@ class BaseCLITool {
     /**
      * Repair geometry when reusing a tmux session that predates the current
      * defaults, and record that this launch reused one (Issue #2429).
+     *
+     * Issue #2865: only a session created in `worktreePath` is reused. A
+     * same-named session another CommandMate server created is refused with
+     * {@link ForeignSessionError} before anything touches it, and is never
+     * recorded as adopted.
+     *
+     * @throws {ForeignSessionError} When the session's `#{session_path}` is not `worktreePath`
      */
-    async reconcileExistingSession(sessionName, options) {
+    async reconcileExistingSession(sessionName, worktreePath, options) {
+        await (0, session_ownership_1.assertSessionNotForeign)(sessionName, worktreePath);
         adoptedSessions.add(sessionName);
         await (0, tmux_1.reconcileSessionGeometry)(sessionName, options);
     }

package/dist/server/src/lib/cli-tools/codex.js

@@ -204,7 +204,7 @@ class CodexTool extends base_1.BaseCLITool {
         // Check if session already exists
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070: this branch used to return unconditionally, and that is
             // the second half of the reported bug. codex's own "1. Update now"
             // replaces codex with `npm install` and exits; `Ctrl+C` twice quits it; a

package/dist/server/src/lib/cli-tools/command-code.js

@@ -191,7 +191,7 @@ class CommandCodeTool extends base_1.BaseCLITool {
         const sessionName = this.getSessionName(worktreeId, instanceId);
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070's shape: a tmux session outlives the agent that was launched
             // into it, and skipping the launch for a pane holding nothing but a shell
             // prompt leaves `kill-session` by hand as the only recovery.

package/dist/server/src/lib/cli-tools/copilot.js

@@ -307,7 +307,7 @@ class CopilotTool extends base_1.BaseCLITool {
         // Check if session already exists
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070: this branch used to return unconditionally. A tmux session
             // outlives the agent that was launched into it — a quit, a self-update, a
             // crash — and the launch was then skipped for a pane holding nothing but a

package/dist/server/src/lib/cli-tools/gemini.js

@@ -72,7 +72,7 @@ class GeminiTool extends base_1.BaseCLITool {
         // Check if session already exists
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070: this branch used to return unconditionally. A tmux session
             // outlives the agent that was launched into it — a quit, a self-update, a
             // crash — and the launch was then skipped for a pane holding nothing but a