commandmate 0.27.1 → 0.29.0

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

@@ -3,39 +3,6 @@
  * Base implementation for CLI tools
  * Provides common functionality for all CLI tool implementations
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCLITool = void 0;
 const child_process_1 = require("child_process");
@@ -45,6 +12,8 @@ const tmux_1 = require("../tmux/tmux");
 const composer_spec_1 = require("./composer-spec");
 const capture_spec_1 = require("./capture-spec");
 const graceful_exit_1 = require("./graceful-exit");
+const start_availability_1 = require("./start-availability");
+const terminal_keys_1 = require("../../types/terminal-keys");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 /**
  * Abstract base class for CLI tools
@@ -105,18 +74,15 @@ class BaseCLITool {
      * nothing left to remember: implement {@link launchSession} and the reporting
      * is already wired.
      *
-     * ## Fire-and-forget, and a deferred import
-     *
-     * The notification is NOT awaited. Web push fans out to every registered
-     * device, and holding a 503 open for that would make a failed start slower to
-     * report than a successful one. `notifySessionStartFailurePush` contains its
-     * own failures, and the `.catch` here is the belt for the import itself.
+     * ## Where the reporting itself lives
      *
-     * `await import()` rather than a static import, for the reason Issue #1984
-     * gives on `CLIToolManager.stopPollers`: `push/failure-push-notifier` pulls
-     * the database and `web-push` behind it, and every one of the seven tool
-     * modules loads THIS file. Deferring it to the failure path keeps the
-     * cli-tools graph the size #1984 cut it down to.
+     * In `./start-availability` (Issue #2022), not inline here. It is still the
+     * only line in the repository that calls `notifySessionStartFailurePush`, and
+     * it is still fire-and-forget behind an `await import()` for the reasons that
+     * module's docblock spells out. It moved so that a caller which never creates
+     * a tmux session — Assistant Chat, which spawns `claude -p` directly and so
+     * never reaches this method — can report through the same one窓口 instead of
+     * opening a second.
      *
      * @param worktreeId - Worktree ID
      * @param worktreePath - Worktree path
@@ -129,14 +95,12 @@ class BaseCLITool {
             await this.launchSession(worktreeId, worktreePath, instanceId, model);
         }
         catch (error) {
-            void Promise.resolve().then(() => __importStar(require('../push/failure-push-notifier'))).then(({ notifySessionStartFailurePush }) => notifySessionStartFailurePush({
+            (0, start_availability_1.reportSessionStartFailure)({
                 worktreeId,
                 cliToolId: this.id,
                 instanceId,
                 toolName: this.name,
-                error,
-            }))
-                .catch(() => { });
+            }, error);
             throw error;
         }
     }
@@ -191,5 +155,26 @@ class BaseCLITool {
     captureSpec() {
         return (0, capture_spec_1.resolveCaptureSpec)(this.id);
     }
+    /**
+     * Declare the keys this tool's terminal UI may send (Issue #2046).
+     *
+     * The default IS the pre-#2046 global list, verbatim: the twelve navigation
+     * keys plus the codex pager's `q` that `NAVIGATION_KEY_VALUES` has published
+     * since #1017, and no leader. claude / codex / copilot / gemini / antigravity
+     * / vibe-local all take it unchanged, which is the point of putting it here
+     * rather than copying a literal into six classes — there is no per-tool list
+     * to drift, so "the six existing tools' key sets did not change" is true by
+     * construction and not merely by review.
+     * `tests/unit/cli-tools/navigation-keys-declaration-2046.test.ts` asserts it
+     * against `NAVIGATION_KEY_VALUES` anyway, because a future edit could still
+     * add an override to one of the six.
+     *
+     * opencode overrides it. Nothing else does.
+     *
+     * @returns This tool's {@link NavigationKeySpec}
+     */
+    navigationKeys() {
+        return { keys: terminal_keys_1.NAVIGATION_KEY_VALUES, leaderKey: null };
+    }
 }
 exports.BaseCLITool = BaseCLITool;

package/dist/server/src/lib/cli-tools/opencode-config.js

@@ -21,11 +21,23 @@
  *
  * | layer                                   | read? | on a key collision |
  * |-----------------------------------------|-------|--------------------|
+ * | `$OPENCODE_CONFIG_CONTENT`              | yes   | **beats all four below** (#2053) |
  * | `<worktree>/opencode.jsonc`             | yes   | beats `opencode.json` |
  * | `<worktree>/opencode.json`              | yes   | beats both below   |
  * | `$OPENCODE_CONFIG`                      | yes   | **loses** to the worktree file |
  * | `$XDG_CONFIG_HOME/opencode/opencode.json(c)` | yes | loses to the worktree file |
  *
+ * Issue #2053 re-measured the same way on 1.18.22 and added the top row: an
+ * inline JSON config handed over in `OPENCODE_CONFIG_CONTENT` outranks every
+ * file, `opencode.jsonc` included. It is not a write target either — #2053
+ * measured that injecting a `permission` block through it silently replaces the
+ * operator's own (a string `permission.bash` is *replaced*, not merged, by an
+ * object, turning `"ask"` into the default `allow`), and that rule order beats
+ * pattern specificity, so a broad glob from CommandMate defeats an exact-match
+ * rule the operator wrote. Details and the ruling:
+ * `docs/design/opencode-server-live-verification.md` §26 /
+ * `docs/design/agent-event-source-interface.md` §3.4.
+ *
  * `provider` maps merge across the layers, so the generated file is additive
  * *until* the operator defines the same provider key somewhere else — at which
  * point CommandMate's snapshot silently outranks the config they chose,