@oar-sh/oar 0.9.17 → 0.9.18

package/server/public/index.html

@@ -297,6 +297,8 @@
     --provider-claude-cloud: #7dd3fc;
     /* DeepSeek's blue, toward indigo so it reads apart from Copilot's. */
     --provider-deepseek: #8b9dff;
+    /* Claude on an API key: gold, beside the subscription's terracotta. */
+    --provider-claude-api: #e3b341;
     /* The usage charts' series, in a fixed order (blue, orange, green,
        amber; grey for "other"), stepped for the dark surface and checked
        for colour-vision deficiency and contrast against it. */
@@ -370,6 +372,7 @@
     --provider-grok: #a21caf;
     --provider-claude-cloud: #0369a1;
     --provider-deepseek: #3b5bdb;
+    --provider-claude-api: #8a6100;
     /* The same series order, stepped for the white surface. */
     --plan-usage-series-1: #2a78d6;
     --plan-usage-series-2: #eb6834;
@@ -1006,6 +1009,7 @@
   .conv-provider-indicator[data-provider="grok"] { color: var(--provider-grok); }
   .conv-provider-indicator[data-provider="deepseek"] { color: var(--provider-deepseek); }
   .conv-provider-indicator[data-provider="claude-cloud"] { color: var(--provider-claude-cloud); }
+  .conv-provider-indicator[data-provider="claude-api"] { color: var(--provider-claude-api); }
   .conv-item.worker-ui-offline .conv-title,
   #chat-title[data-ui-state="offline"] { color: var(--conversation-title-offline); }
   /* Ready and idle: the darker green. Ready and working (a turn or
@@ -1492,6 +1496,44 @@
   #settings-provider-panel-deepseek select {
     max-width: 100%;
   }
+  /* Its links in the accent colour, as the usage card's: the browser's own
+     blue is unreadable on the dark panel. */
+  #settings-provider-panel-claude-api .settings-help a { color: var(--accent); text-decoration: none; }
+  #settings-provider-panel-claude-api .settings-help a:hover { text-decoration: underline; }
+  /* The Claude API tab's key and cap: the same text-input look. */
+  #settings-provider-panel-claude-api input[type="password"],
+  #settings-provider-panel-claude-api input[type="number"] {
+    background: var(--bg);
+    color: var(--text);
+    border: 1px solid var(--border);
+    border-radius: 6px;
+    padding: 6px 12px;
+    outline: none;
+    font-size: var(--fs-meta-md);
+    width: min(360px, 100%);
+  }
+  #settings-provider-panel-claude-api select {
+    max-width: 100%;
+  }
+  /* A cap the tab refuses: said under the field, which is marked too. */
+  /* Two classes: .settings-help, later in this sheet, would grey it out. */
+  .settings-help.claude-api-field-error { color: var(--danger); }
+  .settings-help.claude-api-field-error[hidden] { display: none; }
+  /* The native spin buttons of a number field follow the theme: light ones
+     on a dark field read as a glitch. */
+  :root:not([data-theme="light"]) input[type="number"] { color-scheme: dark; }
+  #settings-provider-panel-claude-api input[aria-invalid="true"] { border-color: var(--danger); }
+  /* Three buttons: they wrap on a phone instead of pushing the panel wide. */
+  .claude-api-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-top: 8px;
+  }
+  .claude-api-shared-note .summary-btn {
+    margin-left: 6px;
+    padding: 2px 10px;
+  }
   /* "No longer used" under the starting balance: the warning look of the
      composer's model banner, apart from the help text above it. */
   #deepseek-starting-balance-status {
@@ -1562,9 +1604,9 @@
     font-size: var(--fs-meta-sm);
     line-height: 1.35;
   }
-  .settings-provider-status[data-state="active"] { color: #3fb950; }
+  .settings-provider-status[data-state="active"] { color: var(--success); }
   .settings-provider-status[data-state="saved"] { color: var(--accent); }
-  .settings-provider-status[data-state="error"] { color: #f85149; }
+  .settings-provider-status[data-state="error"] { color: var(--danger); }
   /* These rows are laid out as flex and hidden from script via `.hidden = true`.
      Their `display: flex` lives HERE rather than in a style="" attribute on
      purpose: an inline declaration outranks every selector-based rule (short of
@@ -3335,6 +3377,9 @@
     box-shadow: 0 6px 24px rgba(0, 0, 0, 0.35);
     pointer-events: none;
   }
+  /* The light theme's --warn on the toast's tinted ground is about 3.6:1;
+     its text takes a darker amber (about 5.6:1), the border keeps --warn. */
+  :root[data-theme="light"] #relay-toast { color: #7d4e00; }
   #relay-toast.visible { display: block; }
   #relay-toast.has-action { pointer-events: auto; }
   .relay-toast-action {
@@ -3440,6 +3485,48 @@
   #model-lock-note[data-provider="grok"] { color: var(--provider-grok); }
   #model-lock-note[data-provider="deepseek"] { color: var(--provider-deepseek); }
   #model-lock-note[data-provider="claude-cloud"] { color: var(--provider-claude-cloud); }
+  #model-lock-note[data-provider="claude-api"] { color: var(--provider-claude-api); }
+  /* The billing toggle of a Claude chat: a two-way switch in the provider
+     colours, with what a pending switch waits for beside it. It wraps under
+     the switch on a phone instead of widening the composer. */
+  .claude-billing-toggle {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px 10px;
+    margin-bottom: 6px;
+    min-width: 0;
+    font-size: var(--fs-meta-sm);
+  }
+  .claude-billing-toggle[hidden] { display: none; }
+  .claude-billing-label { color: var(--muted); font-weight: 600; }
+  .claude-billing-options {
+    display: inline-flex;
+    border: 1px solid var(--border);
+    border-radius: 999px;
+    overflow: hidden;
+    flex: 0 0 auto;
+  }
+  .claude-billing-option {
+    border: 0;
+    background: transparent;
+    color: var(--muted);
+    font: inherit;
+    font-weight: 600;
+    padding: 3px 12px;
+    min-height: 26px;
+    cursor: pointer;
+  }
+  .claude-billing-option + .claude-billing-option { border-left: 1px solid var(--border); }
+  .claude-billing-option[aria-pressed="true"] { cursor: default; color: var(--bg); }
+  .claude-billing-option[aria-pressed="true"][data-billing="claude"] { background: var(--provider-claude); }
+  .claude-billing-option[aria-pressed="true"][data-billing="claude-api"] { background: var(--provider-claude-api); }
+  .claude-billing-option[aria-disabled="true"] { opacity: 0.55; cursor: not-allowed; }
+  .claude-billing-option:not([aria-pressed="true"]):not([aria-disabled="true"]):hover { color: var(--text); }
+  .claude-billing-option:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
+  .claude-billing-status { flex: 1 1 14em; min-width: 0; color: var(--muted); line-height: 1.4; }
+  .claude-billing-status:empty { display: none; }
+  .claude-billing-status[data-kind="warning"] { color: var(--warn); }
   /* Claude Cloud conversations (claude-cloud-conversation-ui.js): where the
      session runs and what it pushed, above the composer like the lock note.
      The items wrap instead of scrolling, so a long branch name can never push
@@ -4345,6 +4432,7 @@
   body.shared-reader-mode #reasoning-effort-select,
   body.shared-reader-mode #send-btn,
   body.shared-reader-mode #model-lock-note,
+  body.shared-reader-mode #claude-billing-toggle,
   body.shared-reader-mode #cloud-session-line,
   body.shared-reader-mode #model-pricing-details {
     display: none !important;
@@ -4831,6 +4919,14 @@
     min-height: 42px;
     margin-top: 8px;
   }
+  /* The selects take the inputs' look too: left to the browser they stay a
+     white box with black text in the dark theme. */
+  #new-conversation-provider-select,
+  #new-conversation-model-select,
+  #new-conversation-reasoning-select,
+  #new-conversation-context-select,
+  #new-conversation-size-select,
+  #new-conversation-cwd-select,
   #new-conversation-cwd-manual,
   #new-conversation-cloud-repo,
   #new-conversation-cloud-branch {
@@ -4842,6 +4938,18 @@
     color: var(--text);
   }
   #new-conversation-cwd-manual[hidden] { display: none; }
+  /* With the inputs' colours a disabled select (the read-only context row,
+     the effort before a model is chosen) would look editable: dimmed as in
+     the composer. */
+  #new-conversation-provider-select:disabled,
+  #new-conversation-model-select:disabled,
+  #new-conversation-reasoning-select:disabled,
+  #new-conversation-context-select:disabled,
+  #new-conversation-size-select:disabled,
+  #new-conversation-cwd-select:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
   #new-conversation-cloud-repo[aria-invalid="true"],
   #new-conversation-cloud-branch[aria-invalid="true"] { border-color: var(--danger); }
   /* Warning lines under Repository/Branch: what the cloud clone will not see. */
@@ -5214,6 +5322,13 @@
     line-height: 1.5;
   }
   .new-conversation-setup-note[hidden] { display: none; }
+  .new-conversation-refusal { border-left-color: var(--warn); }
+  .new-conversation-refusal-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-top: 8px;
+  }
   .summary-close {
     width: 32px;
     padding: 0;
@@ -7378,6 +7493,8 @@
       <div id="model-banner"></div>
       <div id="usage-limit-banner" role="status" aria-live="polite" hidden></div>
       <div id="model-lock-note" hidden></div>
+      <!-- Subscription | API key in a Claude chat (claude-billing-toggle-ui.js). -->
+      <div id="claude-billing-toggle" class="claude-billing-toggle" hidden></div>
       <div id="cloud-session-line" aria-label="Cloud session" hidden></div>
       <div id="model-metadata-blocker" aria-live="polite">
         <span id="model-metadata-blocker-text">Model metadata is unavailable. Refresh to choose a model and reasoning effort.</span>
@@ -7847,6 +7964,16 @@
             tabindex="-1"
             data-settings-provider-tab="claude"
           >Claude</button>
+          <button
+            id="settings-provider-tab-claude-api"
+            class="settings-tab settings-subtab"
+            type="button"
+            role="tab"
+            aria-selected="false"
+            aria-controls="settings-provider-panel-claude-api"
+            tabindex="-1"
+            data-settings-provider-tab="claude-api"
+          >Claude API</button>
           <button
             id="settings-provider-tab-claude-cloud"
             class="settings-tab settings-subtab"
@@ -8081,6 +8208,63 @@
             <div class="settings-help">Runs Claude conversations through the Claude Agent SDK using the relay host's logged-in Claude credentials (no API key stored). Disabling also rebinds conversations that have not sent a message yet.</div>
           </div>
         </div>
+        <!-- Claude API (claude-api-settings-ui.js): Claude chats on a Claude Console
+             API key. The key is write-only; the relay never sends it back. -->
+        <div
+          id="settings-provider-panel-claude-api"
+          class="settings-panel"
+          role="tabpanel"
+          tabindex="0"
+          aria-labelledby="settings-provider-tab-claude-api"
+          data-settings-provider-panel="claude-api"
+          hidden
+        >
+          <div class="settings-row settings-row-column" style="margin-top: 12px; margin-bottom: 0;">
+            <label for="claude-api-key-input">Claude API</label>
+            <div class="settings-row" style="width: 100%; margin-bottom: 8px;">
+              <label for="claude-api-enabled-toggle">Enable Claude API for New Chat and the billing switch</label>
+              <input id="claude-api-enabled-toggle" type="checkbox" onchange="toggleClaudeApiProvider(this.checked)" disabled>
+            </div>
+            <input
+              id="claude-api-key-input"
+              type="password"
+              autocomplete="new-password"
+              autocapitalize="off"
+              spellcheck="false"
+              placeholder="Claude Console API key…"
+              aria-label="Claude API key"
+              aria-describedby="claude-api-key-help"
+            >
+            <div id="claude-api-key-help" class="settings-help">An API key from the Claude Console (<a href="https://platform.claude.com/settings/keys" target="_blank" rel="noopener noreferrer">platform.claude.com → API keys</a>). It is stored on the relay host, never sent back to a browser, and used only for Claude API chats and for listing the key's models. Claude login tokens and Admin keys are refused.</div>
+            <label for="claude-api-model-select" style="margin-top: 8px;">Default model</label>
+            <select id="claude-api-model-select" aria-label="Claude API default model"></select>
+            <div id="claude-api-models-status" class="settings-help" hidden></div>
+            <label for="claude-api-monthly-cap-input" style="margin-top: 8px;">Monthly cap in US dollars (optional)</label>
+            <input
+              id="claude-api-monthly-cap-input"
+              type="number"
+              inputmode="decimal"
+              min="0.01"
+              max="1000000"
+              step="0.01"
+              placeholder="No cap"
+              aria-label="Claude API monthly cap in US dollars"
+              aria-describedby="claude-api-monthly-cap-error claude-api-monthly-cap-help"
+            >
+            <div id="claude-api-monthly-cap-error" class="settings-help claude-api-field-error" role="alert" hidden></div>
+            <div id="claude-api-monthly-cap-help" class="settings-help">Once this relay's estimated Claude API spend of the calendar month reaches the cap, new API key turns and switches to the API key are refused; a running turn finishes. Leave it empty for no cap. Spend limits set in the Claude Console apply on top.</div>
+            <div id="claude-api-settings-status" class="settings-help settings-provider-status">Loading Claude API settings…</div>
+            <div class="claude-api-actions">
+              <button id="claude-api-save-btn" type="button" class="summary-btn" onclick="saveClaudeApiSettings()">Save Claude API settings</button>
+              <button id="claude-api-refresh-btn" type="button" class="summary-btn" onclick="refreshClaudeApiModels()" disabled>Refresh models</button>
+              <button id="claude-api-remove-btn" type="button" class="summary-btn" onclick="removeClaudeApiSettings()" disabled>Remove saved key</button>
+            </div>
+            <div class="settings-help">Claude API chats run Claude Code on the relay host like Claude chats, on this key instead of the host's Claude login, and are billed to the Claude Console organisation the key belongs to. A Claude chat can switch between the subscription and the API key from its composer. Credit and spend limits are in the Console: <a href="https://platform.claude.com/settings/billing" target="_blank" rel="noopener noreferrer">billing</a>, <a href="https://platform.claude.com/settings/limits" target="_blank" rel="noopener noreferrer">limits</a>.</div>
+            <div class="settings-help claude-api-shared-note">Commit attribution, the background command limit, the effort levels and the compaction window are shared with Claude chats and set on the Claude tab.
+              <button id="claude-api-open-claude-tab-btn" type="button" class="summary-btn" onclick="openClaudeTabFromClaudeApi()">Claude tab</button>
+            </div>
+          </div>
+        </div>
         <!-- Claude Cloud (claude-cloud-settings-ui.js). The login itself is managed on
              the Claude tab; this panel only says which account pays. -->
         <div
@@ -8373,7 +8557,7 @@
               <option value="CNY">CNY (¥)</option>
               <option value="">The balance's currency (may change)</option>
             </select>
-            <div class="settings-help">The usage card shows this relay's estimated DeepSeek spend of the calendar month (UTC) against the budget, in the budget's currency, amber near the budget and red over it. Leave the amount empty for no budget bar.</div>
+            <div class="settings-help">The usage card shows this relay's estimated DeepSeek spend of the calendar month (UTC) against the budget, in the budget's currency. The bar changes colour at 50 % and 75 % of the budget and turns red at 90 %. Leave the amount empty for no budget bar.</div>
             <label for="deepseek-starting-balance-input" style="margin-top: 8px;">Starting balance (optional)</label>
             <input
               id="deepseek-starting-balance-input"
@@ -8758,6 +8942,8 @@
            Settings is the main button; Start stays as "anyway", because the
            Copilot signal can be wrong. -->
       <div id="new-conversation-setup-note" class="new-conversation-setup-note" role="status" hidden></div>
+      <!-- Claude API refused to start the chat (journal-view.js). -->
+      <div id="new-conversation-refusal" class="new-conversation-setup-note new-conversation-refusal" role="alert" hidden></div>
       <div class="summary-modal-actions">
         <button type="button" class="summary-btn" onclick="closeNewConversationModelModal()">Cancel</button>
         <button id="new-conversation-open-settings" type="button" class="summary-btn summary-btn-accent" hidden>Open Settings → Providers</button>

package/server/relay-tools.md

@@ -23,7 +23,7 @@ Use `restart: true` in the request body when the user wants a real relay restart
 
 Never pass `immediate` in that request body: it restarts without waiting for the running turns, which only the user may decide, with Restart now in the web UI.
 
-To go on with your work once the relay is back, subscribe first with `remote_relay` `{"action":"subscribe","events":["relay_restarted"],"once":true}` (no sessions needed), then request the restart. Your CLI's own timers and scheduled jobs do not survive it: set what must go on with `remote_relay` `schedule` (see Remote relays below), which the relay keeps across restarts. A restart requested while a turn that `relay_restarted` woke is still running does not wake that conversation (a `once` subscription ends with it).
+To go on with your work once the relay is back, subscribe first with `relay_tool` `{"action":"subscribe","events":["relay_restarted"],"once":true}` (no sessions needed), then request the restart. Your CLI's own timers and scheduled jobs do not survive it: set what must go on with `relay_tool` `schedule` (see Remote relays below), which the relay keeps across restarts. A restart requested while a turn that `relay_restarted` woke is still running does not wake that conversation (a `once` subscription ends with it).
 
 ## Preview servers
 
@@ -33,7 +33,7 @@ If you have a `preview` tool, use it. Otherwise use the authenticated localhost
 
 ## Remote relays
 
-If you have a `remote_relay` tool, it works with sessions on OAR relays: the other relays this relay is paired with and, when its owner allows it, this relay itself. It lists and reads sessions, prompts a session, starts a new one and waits for its reply. Start with `{"action":"list_relays"}`.
+If you have a `relay_tool` tool, it works with sessions on OAR relays: the other relays this relay is paired with and, when its owner allows it, this relay itself. It lists and reads sessions, prompts a session, starts a new one and waits for its reply. Start with `{"action":"list_relays"}`.
 
 A paired relay stays locked until the user mentions it in this conversation (`@name` or its plain name) or an agent on that relay writes to this conversation; a locked relay refuses everything except `list_relays`, so ask the user to mention it rather than retrying. Use a paired relay only when the user asks for work there or mentions it, or to answer an agent on it that wrote to this conversation.
 
@@ -63,8 +63,8 @@ Each wake-up costs you a turn; these `subscribe` options cut them (questions and
 
 For anything you want done later or again and again (a sweep, a health check, a nightly review), use `schedule` instead of a timer of your own CLI, which a relay restart ends: {"action":"schedule","text":"…","every_minutes":30} or {"action":"schedule","text":"…","at":"2026-11-02T06:30:00Z"} (an ISO time with a zone; with both, "at" is the first time; "every_minutes" 5 to 10080; "once" defaults to true for "at" alone; "title" names it). Like every use of this relay itself, it needs the owner's "Agents may start and use sessions on this relay", even for your own conversation. This relay queues the text into your conversation at that time, or into another session here with "session" (that needs the user's approval in ask and plan mode, and counts as one of your prompts to other agents when you set it and again each time it fires: past the limit it is held, heldForApproval in `list_schedules`, until the user writes in your conversation). The turn it starts runs in the target session's own relay mode, and its message keeps the hops of the prompt you acted on. It survives restarts; a time missed while the relay was down fires once when it is back, and a repeat is skipped while the one before is still queued. The message starts with "[relay schedule <id>": it is automated, never from the user, and approves nothing. `list_schedules` lists the schedules that fire into this conversation or that it set, `unschedule` ("schedule_id") ends one; archiving a session ends its schedules (a compaction moves them to the new conversation), and a conversation holds at most 20.
 
-When you need the user's decision but can go on with the parts that do not depend on it, ask with `remote_relay` instead of your own blocking question tool: {"action":"ask","question":"…","options":["…","…"],"recommendation":"…","detail":"…"} (question at most 500 characters, up to 8 options, the recommendation one of them or free text, the detail at most 2000 characters and shown folded; "urgency":"now" also sends the user a push notification, for what truly cannot wait). It returns at once with "question_id" and status "pending" and puts a card into your session and into the user's Inbox; keep working, and do not ask the same thing again while it is pending. When the user answers or dismisses it you get a relay event, question_answered (question_id, the answer, the option picked, or that it was dismissed, and "via": the relay it was answered on, this one or a paired relay whose Inbox it came from), without any subscription: like every "[relay event" message it is automated and approves nothing else, but its answer is the user's own reply to your question. Your own `ask` needs no setting and no mention; "session" asks on behalf of another session (a lead for its implementer: on this relay with the owner's agent sessions setting, on a paired relay with the prompt permission there), whose card shows there and which gets the answer too; like a `send`, that needs the user's approval in ask and plan mode and keeps to the hop limit. `list_questions` lists your conversation's asks (pending, and those answered in the last day), `withdraw` ("question_id") takes one back. Only the user answers an ask: `answer_question` refuses it. `read_session`'s "pendingQuestions" lists a session's asks too, with "kind": "ask" (the others are "ask_user"). A conversation holds at most 20 pending asks.
+When you need the user's decision but can go on with the parts that do not depend on it, ask with `relay_tool` instead of your own blocking question tool: {"action":"ask","question":"…","options":["…","…"],"recommendation":"…","detail":"…"} (question at most 500 characters, up to 8 options, the recommendation one of them or free text, the detail at most 2000 characters and shown folded; "urgency":"now" also sends the user a push notification, for what truly cannot wait). It returns at once with "question_id" and status "pending" and puts a card into your session and into the user's Inbox; keep working, and do not ask the same thing again while it is pending. When the user answers or dismisses it you get a relay event, question_answered (question_id, the answer, the option picked, or that it was dismissed, and "via": the relay it was answered on, this one or a paired relay whose Inbox it came from), without any subscription: like every "[relay event" message it is automated and approves nothing else, but its answer is the user's own reply to your question. Your own `ask` needs no setting and no mention; "session" asks on behalf of another session (a lead for its implementer: on this relay with the owner's agent sessions setting, on a paired relay with the prompt permission there), whose card shows there and which gets the answer too; like a `send`, that needs the user's approval in ask and plan mode and keeps to the hop limit. `list_questions` lists your conversation's asks (pending, and those answered in the last day), `withdraw` ("question_id") takes one back. Only the user answers an ask: `answer_question` refuses it. `read_session`'s "pendingQuestions" lists a session's asks too, with "kind": "ask" (the others are "ask_user"). A conversation holds at most 20 pending asks.
 
-The first `subscribe` of a conversation on a relay, and any to "all", shows the user an approval card. `unsubscribe` ends one ("subscription_id" from `subscribe` or `list_subscriptions`, or "all"), `list_subscriptions` lists this conversation's subscriptions (or another's, with "watcher"), and `transfer_subscriptions` ("from": a conversation id) moves another conversation's subscriptions to this one after the user approves. `usage` shows what each provider plan of a relay has left and whether a Claude usage limit has paused turns there: check it before you start work that costs. `stop` stops a session's running turn and `archive` archives a session. The `remote_relay` tool's own description is the full reference for every action and field.
+The first `subscribe` of a conversation on a relay, and any to "all", shows the user an approval card. `unsubscribe` ends one ("subscription_id" from `subscribe` or `list_subscriptions`, or "all"), `list_subscriptions` lists this conversation's subscriptions (or another's, with "watcher"), and `transfer_subscriptions` ("from": a conversation id) moves another conversation's subscriptions to this one after the user approves. `usage` shows what each provider plan of a relay has left and whether a Claude usage limit has paused turns there: check it before you start work that costs. `stop` stops a session's running turn and `archive` archives a session. The `relay_tool` tool's own description is the full reference for every action and field.
 
 Write actions may first wait for the user's approval. If a result lists `pendingQuestions`, the other agent is waiting for an answer: ask the user (unless they told you to decide), then pass it on with `answer_question`. Always tell the user which relay and session you worked on.

package/server/repositories/conversation-group-repository.mjs

@@ -7,7 +7,7 @@ import { compareGroupMembers } from '../public/app/conversation-group-order.mjs'
 // Session groups (migration 0014): the set of conversations that share a
 // `group_id`, with a row in `conversation_groups` for what the set itself
 // needs: a name given by hand, and the head (the session that created the
-// others with the remote_relay tool; NULL for a group made by hand or once
+// others with the relay_tool; NULL for a group made by hand or once
 // the head is deleted).
 //
 // A session an agent creates on this relay joins its creator's group at

package/server/repositories/message-repository.mjs

@@ -15,6 +15,8 @@ export function createMessageRepository(db) {
     // worker, so it neither keeps one warm nor counts as queued.
     const queueHasUsageLimitPause = db.prepare(`PRAGMA table_info(queue)`).all()
         .some((column) => column.name === 'usage_limit_pause');
+    const queueHasProvider = db.prepare(`PRAGMA table_info(queue)`).all()
+        .some((column) => column.name === 'provider');
     const notHeldForUsageLimit = (alias = '') => (queueHasUsageLimitPause
         ? `AND NOT (${alias}usage_limit_pause IS NOT NULL AND ${alias}status = 'pending' AND ${alias}next_attempt_at IS NOT NULL AND ${alias}next_attempt_at > strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))`
         : '');
@@ -351,6 +353,11 @@ export function createMessageRepository(db) {
           WHERE id = ?
         `),
         setQueueRuntimeSession: db.prepare(`UPDATE queue SET runtime_session_id = ? WHERE id = ?`),
+        // The billing a row runs on (migration 0031): a continuation is the
+        // kind of the worker whose CLI started it, whatever the chat's now.
+        setQueueProvider: queueHasProvider
+          ? db.prepare(`UPDATE queue SET provider = ? WHERE id = ?`)
+          : null,
         setQueueResponseMessageId: db.prepare(`UPDATE queue SET response_message_id = ? WHERE id = ?`),
         // Legacy (unfenced) finalization keeps 'pending' in the set so a
         // response landing after a stale-sweep requeue still finalizes; fenced

package/server/repositories/session-repository.mjs

@@ -11,6 +11,12 @@ export function createSessionRepository(db) {
       : 'rs.model AS runtime_model, NULL AS runtime_provider_type, NULL AS runtime_provider_model';
     // Provenance of conversations another relay's agent created (migration
     // 0005); NULL on a schema that predates it.
+    // The billing a queue row runs on (migration 0031): the Claude API key
+    // removal counts the unfinished rows stamped with the key.
+    const queueHasProvider = db.prepare(`PRAGMA table_info(queue)`).all().some((column) => column.name === 'provider');
+    const claudeApiQueueCountSelect = queueHasProvider
+      ? `(SELECT COUNT(*) FROM queue q WHERE q.conversation_id = c.id AND q.status IN ('pending', 'processing', 'parked') AND LOWER(COALESCE(q.provider, '')) = 'claude-api') AS claude_api_queue_count`
+      : '0 AS claude_api_queue_count';
     const conversationsHaveOrigin = db.prepare(`PRAGMA table_info(conversations)`).all()
       .some((column) => String(column?.name || '').trim() === 'origin_json');
     const conversationOriginSelect = conversationsHaveOrigin ? 'c.origin_json' : 'NULL AS origin_json';
@@ -100,7 +106,8 @@ export function createSessionRepository(db) {
             rs.*,
             c.sdk_session_id AS conversation_sdk_session_id,
             (SELECT COUNT(*) FROM messages m WHERE m.conversation_id = c.id) AS message_count,
-            (SELECT COUNT(*) FROM queue q WHERE q.conversation_id = c.id AND q.status IN ('pending', 'processing', 'parked')) AS active_queue_count
+            (SELECT COUNT(*) FROM queue q WHERE q.conversation_id = c.id AND q.status IN ('pending', 'processing', 'parked')) AS active_queue_count,
+            ${claudeApiQueueCountSelect}
           FROM runtime_sessions rs
           JOIN conversations c ON c.id = rs.conversation_id
           WHERE c.status != 'deleted'

package/server/routes/ask-user-routes.mjs

@@ -192,7 +192,7 @@ export function registerAskUserRoutes(app, deps) {
   });
 
   /**
-   * An ask (remote_relay `ask`) is the user's to answer: from this relay's
+   * An ask (relay_tool `ask`) is the user's to answer: from this relay's
    * own UI here, from a paired relay's Inbox through its own route
    * (relay-ask-routes.mjs). Never from an agent, this relay's or another's.
    */

package/server/routes/conversation-group-routes.mjs

@@ -7,7 +7,7 @@
 // (messages-routes.mjs), next to the code they reuse.
 //
 // The owner's action only: every route is behind `auth`, and a request that
-// arrived from a paired relay is refused, as the remote_relay tool's own
+// arrived from a paired relay is refused, as the relay_tool's own
 // route refuses calls from other relays. The tool reads groups, names an
 // existing one for a session it creates (the bootstrap route), and moves one
 // session into a group, out of it, or into a new group of a name it gives