npm - commandmate - Versions diffs - 0.33.0 → 0.33.1 - Mend

commandmate 0.33.0 → 0.33.1

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.

Files changed (564) hide show

package/dist/server/src/lib/db/migrations/runner.js CHANGED Viewed

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
  * Current schema version
  * Increment this when adding new migrations
  */
-exports.CURRENT_SCHEMA_VERSION = 60;
+exports.CURRENT_SCHEMA_VERSION = 61;
 /**
  * Get current schema version from database
  */

package/dist/server/src/lib/db/migrations/v61-session-notes.js ADDED Viewed

@@ -0,0 +1,85 @@
+"use strict";
+/**
+ * Migration v61: the one-line note an operator keeps beside a session (#2427).
+ *
+ * ## What a row is, and what it is emphatically not
+ *
+ * One row is a free-text reminder of what THIS session was last asked to do —
+ * "#2427 の DB 層", "レビュー待ち" — rewritten every time the operator hands the
+ * session a new instruction. It exists because a four-way split shows four
+ * terminals whose headers all read `claude`, and the pane that is three
+ * scrollbacks deep gives no answer to "which one was doing the migration".
+ *
+ * It is **not** an alias. `agent_instances.alias` is a *resolution key*: since
+ * Issue #2376 `--instance レビュー担当` finds the roster row whose alias matches,
+ * so an alias is a name the routing layer reads. A note is read by human eyes
+ * only, and nothing in `resolveInstanceSelector` (the `/resolve-target` route)
+ * or in `resolveInstanceCliTool` looks at this table. That separation is the
+ * point of storing it apart from the roster rather than widening the alias: a
+ * memo the operator rewrites hourly must never be able to change where the next
+ * `send` lands.
+ *
+ * ## Why a table of its own rather than a column on `agent_instances`
+ *
+ * The reason v59 gives, unchanged: `setAgentInstances` is a full REPLACE —
+ * `PATCH /api/worktrees/[id]` posts the whole roster and the write deletes every
+ * row for the worktree and re-inserts from the payload, which is
+ * `AgentInstance[]` (id, tool, alias, order) and nothing else. A `note` column
+ * there would be silently emptied every time somebody renamed an instance or
+ * dragged one up the list — i.e. by the two operations most likely to happen
+ * while a note is worth keeping. A separate table survives the replace, and
+ * `pruneSessionNotes` removes the rows whose instance genuinely went away.
+ *
+ * It also keeps `AgentInstance` — which is the roster PATCH's *input* shape, not
+ * merely its output — free of a field the writer would have to echo back to
+ * avoid erasing it.
+ *
+ * ## Column notes
+ *
+ * - **`note` is NOT NULL and a row means a note exists.** Clearing the text
+ *   deletes the row (see `setSessionNote`) rather than storing `''`: an empty
+ *   note and no note are indistinguishable to every reader, and the delete keeps
+ *   the table to the sessions somebody actually annotated. That is also what
+ *   makes "the note is empty" renderable as *absence* in the split header, which
+ *   the Issue asks for.
+ * - **`updated_at` is displayed, not just bookkeeping.** The Issue's acceptance
+ *   condition is that the note carries the time it was written, so the column is
+ *   part of the payload rather than an audit field. Epoch milliseconds, matching
+ *   v44 onward.
+ * - **`worktree_id` is spelled conventionally** so `getWorktreeChildTables()`
+ *   finds it by introspection: the row then follows a worktree id rename
+ *   (v54/v55) and is swept when the worktree is deleted, which is exactly as
+ *   long as a note about one of that worktree's sessions can mean anything.
+ *
+ * The primary key is `(worktree_id, instance_id)` — the identity
+ * `agent_instances` uses and the identity a note is about. `cli_tool_id` is
+ * deliberately absent for v59's reason: an instance id belongs to one tool by
+ * construction (`resolveInstanceCliTool`), so a composite including it would let
+ * one session hold two contradictory notes.
+ *
+ * The rollback drops the table, which is the whole of what this migration adds.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.v61_migrations = void 0;
+exports.v61_migrations = [
+    {
+        version: 61,
+        name: 'session-notes',
+        up: (db) => {
+            db.exec(`
+        CREATE TABLE IF NOT EXISTS session_notes (
+          worktree_id TEXT NOT NULL,
+          instance_id TEXT NOT NULL,
+          note TEXT NOT NULL,
+          updated_at INTEGER NOT NULL,
+          PRIMARY KEY (worktree_id, instance_id),
+          FOREIGN KEY (worktree_id) REFERENCES worktrees(id) ON DELETE CASCADE
+        );
+      `);
+        },
+        down: (db) => {
+            db.exec('DROP TABLE IF EXISTS session_notes;');
+        },
+    },
+];

package/dist/server/src/lib/push/failure-push-notifier.js CHANGED Viewed

@@ -12,6 +12,7 @@
  * | verification failed | `lib/verification/gate-runner`              | event  |
  * | upstream API fault  | `lib/polling/response-checker` (#1839 match)| level  |
  * | session start failed| `lib/cli-tools/start-availability` (#2009/#2022)| event |
+ * | stale hook URL      | `lib/cli-tools/start-availability` (#2429)  | event  |
  *
  * The shape column is the whole design. An **event** fires once by construction
  * — a run closes once, a start attempt throws once — so its only guard is the
@@ -60,6 +61,7 @@ exports.formatWorktreeWideAgentLabel = formatWorktreeWideAgentLabel;
 exports.notifyVerificationFailurePush = notifyVerificationFailurePush;
 exports.notifyUpstreamFaultPush = notifyUpstreamFaultPush;
 exports.notifySessionStartFailurePush = notifySessionStartFailurePush;
+exports.notifyStaleHookUrlPush = notifyStaleHookUrlPush;
 const db_instance_1 = require("../../lib/db/db-instance");
 const worktree_db_1 = require("../../lib/db/worktree-db");
 const logger_1 = require("../../lib/logger");
@@ -194,7 +196,11 @@ async function raiseFailurePush(input) {
             agentName: input.agentLabel ?? input.instanceId,
             instanceId: input.instanceId,
             excerpt: input.excerpt,
-            failure: { reason: input.reason, signature: input.signature },
+            failure: {
+                reason: input.reason,
+                signature: input.signature,
+                ...(input.body ? { body: input.body } : {}),
+            },
             ...(input.subject ? { url: input.subject.url } : {}),
         });
     }
@@ -444,3 +450,64 @@ async function notifySessionStartFailurePush(input) {
         subject: input.subject,
     });
 }
+// ===========================================================================
+// 4. Stale hook URL on an adopted session
+// ===========================================================================
+/**
+ * The sentence a stale hook URL gets, per locale (Issue #2429).
+ *
+ * Written here rather than in the `locales/<lang>/notifications.json`
+ * dictionaries, for the reason `push-sender`'s
+ * {@link ProducerWordedFailureReason} gives: the body is a
+ * relation between two numbers and a remedy, not a template plus a name, and
+ * this is the layer that holds the numbers. `Record<SupportedLocale, string>`
+ * is what makes a new locale a type error here instead of an English card in a
+ * Japanese notification tray.
+ *
+ * Both wordings name the remedy — restarting the session — because the fact on
+ * its own is not actionable: an operator who is told only that two ports differ
+ * has no way to know that CommandMate will not repair it by itself, and it will
+ * not, deliberately (see `BaseCLITool.warnIfHookUrlIsStale`).
+ */
+function staleHookUrlBody(report) {
+    const { toolName, sessionPort, serverPort } = report;
+    return {
+        en: `${toolName} is still posting its hooks to port ${sessionPort}, but this server is on ` +
+            `${serverPort}. Restart the session to reconnect it.`,
+        ja: `${toolName} のフックが古いポート ${sessionPort} 宛のままです（このサーバーは ` +
+            `${serverPort}）。セッションを再起動すると直ります。`,
+    };
+}
+/**
+ * Notify that an adopted session's hooks are addressed to another server.
+ * Never throws.
+ *
+ * Called from exactly one place — `reportStaleHookUrl` in
+ * `lib/cli-tools/start-availability`, which is also where the "once" lives.
+ * This function therefore has no edge of its own, exactly like
+ * {@link notifySessionStartFailurePush}: the rate is bounded by how often a
+ * session is started, and the caller has already decided that this particular
+ * (instance, port pair) has not been reported before.
+ *
+ * `kind: 'failure'` rather than `'completion'` because the reader has to act —
+ * until they restart the session, `commandmate wait` on it cannot complete on
+ * the agent's own word and every turn pays #1975's 60 s hold before falling
+ * back to the frame.
+ */
+async function notifyStaleHookUrlPush(report) {
+    const instanceId = report.instanceId ?? report.cliToolId;
+    await raiseFailurePush({
+        reason: 'hook-url-stale',
+        worktreeId: report.worktreeId,
+        instanceId,
+        // The two ports, so a pane that later points at a THIRD server is a second
+        // incident rather than a repeat of this one.
+        signature: `hook-url-stale:${instanceId}:${report.sessionPort}:${report.serverPort}`,
+        body: staleHookUrlBody(report),
+        logContext: {
+            cliToolId: report.cliToolId,
+            sessionPort: report.sessionPort,
+            serverPort: report.serverPort,
+        },
+    });
+}

package/dist/server/src/lib/push/push-sender.js CHANGED Viewed

@@ -135,15 +135,26 @@ const FAILURE_BODY_KEYS = {
         plain: 'failureAgentSession',
     },
 };
-function buildFailureBody(event, messages, excerpt) {
+function buildFailureBody(event, messages, excerpt, locale) {
+    // Issue #2429: read first, for the same reason `modelChange` is read first in
+    // `buildPushPayload` — a producer that wrote the sentence itself has said
+    // something the dictionary cannot, and appending an excerpt to it would put
+    // half of that sentence twice.
+    const prebuilt = event.failure?.body?.[locale];
+    if (prebuilt)
+        return prebuilt;
     // An event that claims `kind: 'failure'` without saying which failure is a
     // producer bug. Falling back to the verification wording would misreport it,
-    // so the generic "something failed" copy is used instead.
+    // so the generic "something failed" copy is used instead. A
+    // `ProducerWordedFailureReason` that arrived without its body lands here too,
+    // and lands honestly: nothing in the dictionary describes it.
     const reason = event.failure?.reason;
-    if (reason === undefined) {
+    const keys = reason !== undefined
+        ? FAILURE_BODY_KEYS[reason]
+        : undefined;
+    if (keys === undefined) {
         return excerpt ? messages.failureWithExcerpt.replace('{excerpt}', excerpt) : messages.failure;
     }
-    const keys = FAILURE_BODY_KEYS[reason];
     return excerpt
         ? messages[keys.withExcerpt].replace('{excerpt}', excerpt)
         : messages[keys.plain];
@@ -168,7 +179,7 @@ function buildPushPayload(event, locale = i18n_config_1.DEFAULT_LOCALE, now = Da
                     ? messages.promptResolved
                     : buildWaitingBody(event, messages, excerpt, now)
             : event.kind === 'failure'
-                ? buildFailureBody(event, messages, excerpt)
+                ? buildFailureBody(event, messages, excerpt, resolvedLocale)
                 : // Issue #2045: an update notice is a completion by *bucket*, not by
                     // content, so it is the one completion whose body is not "Done".
                     event.updateAvailable

package/dist/server/src/lib/session/current-output-builder.js CHANGED Viewed

@@ -47,6 +47,13 @@ exports.resetChatTurnProgressState = resetChatTurnProgressState;
 exports.buildChatTurnProgress = buildChatTurnProgress;
 exports.emitChatTurnProgress = emitChatTurnProgress;
 const db_1 = require("../../lib/db");
+// Issue #2429: the send ledger, read directly from `chat-db` rather than from
+// the `@/lib/db` barrel because that barrel does not re-export it. It is the
+// SAME row `commandmate wait` asks for over
+// `GET /api/worktrees/:id/messages?limit=1&unit=pairs` (see `readNewestPromptAt`
+// in `cli/commands/wait.ts`), so the server and the CLI cannot disagree about
+// when this instance was last handed a prompt.
+const chat_db_1 = require("../../lib/db/chat-db");
 const unclassified_frame_tracker_1 = require("../../lib/detection/unclassified-frame-tracker");
 const composer_text_1 = require("../../lib/detection/composer-text");
 const upstream_faults_1 = require("../../lib/detection/upstream-faults");
@@ -354,7 +361,7 @@ function summarizeAskUserQuestion(episode) {
  * @param turn - The published turn record for this instance, or null. Read only
  *   for {@link hookClosedTurn}; `structured` remains the status authority.
  */
-function mergeStructuredStatus(scraper, structured, promptWaiting = null, turn = null) {
+function mergeStructuredStatus(scraper, structured, promptWaiting = null, turn = null, lastPromptAt = null) {
     if (scraper.status === 'waiting') {
         return { ...scraper, structuredApplied: false };
     }
@@ -379,6 +386,13 @@ function mergeStructuredStatus(scraper, structured, promptWaiting = null, turn =
     if (structured === null || structured.status === 'waiting') {
         return { ...scraper, structuredApplied: false };
     }
+    // Issue #2429: the structured `ready` is about a turn older than the prompt
+    // this instance is currently answering, and the screen says so. See
+    // {@link structuredReadyPredatesPrompt} for why that combination is the only
+    // one in which the scraper wins a `running`.
+    if (structuredReadyPredatesPrompt(scraper, structured, turn, lastPromptAt)) {
+        return { ...scraper, structuredApplied: false };
+    }
     const thinking = structured.status === 'running';
     // Issue #2011 (対応 2): the agent's own turn close IS positive evidence.
     //
@@ -439,6 +453,135 @@ function hookClosedTurn(turn) {
     const { closedBy, closedAt, openedAt } = turn;
     return closedBy === 'stop' && closedAt !== null && openedAt !== null && closedAt > openedAt;
 }
+/**
+ * Whether a structured `ready` could be about a turn that ended before the
+ * prompt now on screen (Issue #2429).
+ *
+ * The cheap half of {@link structuredReadyPredatesPrompt}, split out because
+ * `buildPayload` asks it FIRST: it is the gate on the one database read this
+ * rule needs, and a session that is not in this state must not pay for the send
+ * ledger on every poll. One expression, two callers — the alternative is the
+ * "two expressions for one fact" the merge's own docblock says is how this
+ * layer drifts.
+ *
+ * Three conjuncts, and all three are about the same instant:
+ *
+ *  - **the screen is positively generating.** `ScraperVerdict.thinking` is
+ *    `isGeneratingStatus`, i.e. `running` with `thinking_indicator` /
+ *    `opencode_processing_indicator` behind it — a spinner, `✻ Thinking…` or
+ *    `esc to interrupt` that a tool's own pattern matched. It is deliberately
+ *    NOT `scraper.status === 'running'`: the `no_recent_output` and
+ *    `unknown_frame` floors are also `running`, and neither is evidence of
+ *    anything. A frame that merely stopped changing must never retire a `Stop`
+ *    the agent actually sent.
+ *  - **the structured layer says `ready`.** `running` and `waiting` already win
+ *    on their own paths and are not in question here.
+ *  - **that `ready` came from the agent's own `Stop`.**
+ *    `getStructuredSessionState` publishes `ready / hook_stop` exactly when the
+ *    turn record carries `closedBy: 'stop'` with a `closedAt`, so the record is
+ *    read rather than the folded reason.
+ *
+ * `openedAt` is deliberately not required, which is what separates this from
+ * {@link hookClosedTurn}. A `Stop` that arrived with no turn open publishes
+ * `openedAt: null`, and for the tool this Issue was reported from that is the
+ * ORDINARY shape: Command Code cannot emit `UserPromptSubmit` (its loader
+ * validates the event name against a closed list) and emits no
+ * `PreToolUse` / `PostToolUse` on a turn that calls no tool, so nothing ever
+ * opens the turn. Requiring an `openedAt` here would exclude precisely the case
+ * this rule exists for.
+ */
+function staleReadyCandidate(scraper, structured, turn) {
+    if (!scraper.thinking)
+        return false;
+    if (structured === null || structured.status !== 'ready')
+        return false;
+    if (turn === null)
+        return false;
+    return turn.closedBy === 'stop' && turn.closedAt !== null;
+}
+/**
+ * Whether the structured layer's `ready` has been outlived by the newest prompt
+ * this instance was handed (Issue #2429).
+ *
+ * ## The defect this closes
+ *
+ * The merge above prefers the agent's own account to the screen, and until this
+ * Issue the only exception was a scraper `waiting` (#1708). That is correct for
+ * every tool that can say when a turn BEGINS — claude, codex, copilot, gemini
+ * and antigravity all post a turn-opening event, so a live turn replaces the
+ * previous turn's `stop` before the first generating frame is ever read.
+ *
+ * Command Code can post neither: no `UserPromptSubmit`, and no `PreToolUse` /
+ * `PostToolUse` on a turn that calls no tool. The previous turn's `ready /
+ * hook_stop` therefore stays the newest structured fact for the whole of the
+ * next turn, and the merge published it over a pane that was visibly generating.
+ * Measured 2026-09-08 on a 19 s turn: `sessionStatus` read `ready / hook_stop`
+ * from 4 s to 18 s while the status row said `esc to interrupt`. `commandmate
+ * wait` reads that field — not the frame — for "is at its composer", so #1975's
+ * 60 s unanswered-prompt hold was the only thing standing between a long turn
+ * and a `basis=scraper_ready` completion reported before the reply existed.
+ *
+ * ## Why a comparison rather than a timer
+ *
+ * The same comparison `wait` already makes (`outstandingPrompt`), against the
+ * same two server-stamped facts: the turn's `closedAt`, and the timestamp of
+ * the newest user row in the chat ledger. A `Stop` that POSTDATES the newest
+ * prompt is this turn's own — the agent finished, the spinner on the frame is a
+ * repaint that has not settled, and the structured `ready` keeps winning. A
+ * `Stop` that predates it has reported neither the start nor the end of the
+ * work now on screen, and about that work it says nothing at all.
+ *
+ * Shortening #1975's hold would have been the other repair, and the Issue rules
+ * it out for a reason worth restating here: the hold is what stops a false
+ * completion during a turn nobody has reported yet, so a shorter one moves the
+ * false completion earlier rather than removing it.
+ *
+ * @param lastPromptAt - Epoch ms of the newest prompt handed to this instance,
+ *   or null when the ledger was not read or holds none. Null decides nothing:
+ *   an unreadable ledger is not evidence that nothing was sent, so the
+ *   structured verdict stands exactly as it did before this Issue.
+ */
+function structuredReadyPredatesPrompt(scraper, structured, turn, lastPromptAt) {
+    if (lastPromptAt === null)
+        return false;
+    if (!staleReadyCandidate(scraper, structured, turn))
+        return false;
+    const closedAt = turn?.closedAt ?? null;
+    return closedAt !== null && closedAt < lastPromptAt;
+}
+/**
+ * When this instance was last handed a prompt, or null (Issue #2429).
+ *
+ * The server's half of the comparison `commandmate wait` makes over HTTP. Both
+ * sides read the same row — the newest `role: 'user'` message scoped to this
+ * (worktree, tool, instance) — so the field this function feeds and the notice
+ * `wait` prints cannot describe different sends.
+ *
+ * Best effort, like {@link recordUnclassifiedFrame} and
+ * {@link recordStructuredPrompt}: the caller is building a payload, and a
+ * ledger that cannot be read must cost this one comparison and nothing else.
+ * Null is reported rather than a guess, and null leaves the pre-#2429
+ * precedence in place — an unreadable ledger is not evidence that nothing was
+ * sent, which is the position `wait` takes on the same read.
+ */
+function readNewestPromptAt(db, worktreeId, cliToolId, instanceId) {
+    try {
+        const row = (0, chat_db_1.getLastUserMessageForInstance)(db, worktreeId, cliToolId, instanceId);
+        if (!row)
+            return null;
+        const at = row.timestamp instanceof Date ? row.timestamp.getTime() : NaN;
+        return Number.isFinite(at) ? at : null;
+    }
+    catch (error) {
+        logger.debug('newest-prompt-read-failed', {
+            worktreeId,
+            cliToolId,
+            instanceId,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return null;
+    }
+}
 /**
  * Build the current-output payload for a worktree session.
  *
@@ -766,19 +909,28 @@ async function buildPayload(db, worktreeId, cliToolId, instanceId) {
         structuredEvents.promptWaitingSince = promptWaiting.at;
         structuredEvents.promptWaitingSource = promptWaiting.source;
     }
-    const merged = mergeStructuredStatus({
+    const scraperVerdict = {
         status: statusResult.status,
         reason: statusResult.reason,
         thinking,
         evidence,
         isUnclassifiedActive,
-    }, structured, promptWaiting,
+    };
+    // Issue #2429: the send ledger, read ONLY when it could change the verdict.
+    // `staleReadyCandidate` is the merge's own first three conjuncts, so the two
+    // cannot disagree about when this read is needed — and every other poll (an
+    // idle pane, a turn the agent has opened, a tool that reports its own start)
+    // costs exactly what it did before this Issue, which is nothing.
+    const lastPromptAt = staleReadyCandidate(scraperVerdict, structured, structuredEvents)
+        ? readNewestPromptAt(db, worktreeId, cliToolId, resolvedInstanceId)
+        : null;
+    const merged = mergeStructuredStatus(scraperVerdict, structured, promptWaiting,
     // Issue #2011: the same record `structuredEvents` publishes, read once. The
     // merge needs `closedBy` / `closedAt` / `openedAt`, which
     // `StructuredSessionState` folds away into `hook_stop` — and the folded form
     // cannot tell a `Stop` that closed a watched turn from one that arrived with
     // no turn open.
-    structuredEvents);
+    structuredEvents, lastPromptAt);
     // The OR rule, computed once for the whole server (Issue #1737): this is the
     // same `resolvePromptWaiting` call the `send` guard makes, so the payload and
     // the guard cannot disagree about whether a prompt is open. What they are

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "description": "A local control plane for agent CLIs — orchestration and visibility for Claude Code, Codex, Gemini CLI, and more across Git worktrees",
   "keywords": [
     "claude-code",

package/.next/static/chunks/app/api/assistant/conversation/route-8bc5b680c5f3eae4.js DELETED Viewed

@@ -1 +0,0 @@

- (self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[11,66,74,219,263,341,532,543,640,836,865,890,960,1099,1123,1158,1164,1274,1295,1310,1317,1327,1337,1360,1363,1377,1421,1437,1490,1517,1523,1645,1652,1745,1796,1972,2017,2046,2117,2132,2149,2207,2260,2344,2360,2464,2548,2609,2786,2852,2893,3002,3175,3298,3350,3657,3685,3792,3797,3845,3965,3969,3990,4016,4035,4042,4199,4225,4240,4260,4275,4468,4476,4594,4614,4748,4767,4779,4907,4961,4985,5004,5286,5332,5522,5580,5657,5683,5832,6067,6140,6194,6248,6393,6451,6564,6635,6680,6734,6824,6839,7e3,7115,7238,7345,7435,7473,7509,7560,7670,7758,7760,7870,7895,7939,8043,8238,8418,8457,8460,8464,8472,8489,8509,8544,8658,8710,8914,8979,9015,9059,9114,9162,9245,9281,9282,9325,9416,9549,9602,9792,9932,9946,9968,9996],{84441:()=>{}},_=>{_.O(0,[8441,1255,7358],()=>_(_.s=84441)),_N_E=_.O()}]);

package/.next/static/chunks/app/api/assistant/current-output/route-8bc5b680c5f3eae4.js DELETED Viewed

@@ -1 +0,0 @@