@clipboard-health/groundcrew 3.0.1 → 3.0.3

package/README.md

@@ -192,7 +192,7 @@ Agent selection uses Linear labels: `agent-claude`, `agent-codex`, `agent-<name>
 | `models.definitions`                    | `{ claude, codex }` | Agent definitions. Additive merge with shipped defaults.                                                                                                                                                                                                                                  |
 | `models.definitions.<name>.cmd`         | —                   | Shell command launched for the model. Runs in the worktree through the resolved `local.runner`. `{{worktree}}` is replaced before launch; `{{sandbox}}` expands to the sbx sandbox name under the sdx runner and an empty string otherwise.                                               |
 | `models.definitions.<name>.color`       | —                   | Color for the workspace status pill (cmux only; tmux silently drops it).                                                                                                                                                                                                                  |
-| `models.definitions.<name>.usage`       | optional            | If set, codexbar usage is fetched for this model and gated by `sessionLimitPercentage`. Omit to never gate. When `usage.codexbar.source` is omitted, groundcrew uses `auto` on macOS and `cli` elsewhere.                                                                                 |
+| `models.definitions.<name>.usage`       | optional            | If set, codexbar usage is fetched for this model and gated by `sessionLimitPercentage`. Omit to never gate. When `usage.codexbar.source` is omitted, groundcrew uses `oauth` for Codex/Claude on macOS, `auto` for other macOS providers, and `cli` elsewhere.                            |
 | `models.definitions.<name>.sandbox`     | optional            | Docker Sandboxes binding for the model. Required at launch when `local.runner` resolves to `sdx`. Fields: `agent` (required sbx agent name), `template`, `kits`, `setupCommand` (override for the inside-sandbox setup script).                                                           |
 | `models.definitions.<name>.disabled`    | optional            | When set to exactly `true`, drops the named shipped default (`claude` or `codex`). Doctor skips probing it; `agent-<name>` labels fall back to `models.default` with a warning.                                                                                                           |
 | `prompts.initial`                       | (template)          | First message sent to the agent. Placeholders: `{{ticket}}`, `{{worktree}}`, `{{title}}`, `{{description}}`.                                                                                                                                                                              |

package/dist/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2BH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAsHD,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAK1E"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA4BH,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAgHD,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAK1E"}

package/dist/commands/doctor.js

@@ -6,6 +6,7 @@ import { existsSync, statSync } from "node:fs";
 import { loadConfig, } from "../lib/config.js";
 import { detectHostCapabilities, which } from "../lib/host.js";
 import { resolveLocalRunner } from "../lib/localRunner.js";
+import { gatedModels } from "../lib/usage.js";
 import { errorMessage, resolveLinearApiKey, writeOutput } from "../lib/util.js";
 import { resolveWorkspaceKind } from "../lib/workspaces.js";
 import { parseTicketDoctorFlags, runTicketDoctor } from "./ticketDoctor.js";
@@ -104,9 +105,6 @@ function gatherToolTokens(config) {
     }
     return [...all];
 }
-function anyModelUsesUsage(config) {
-    return Object.values(config.models.definitions).some((definition) => definition.usage !== undefined);
-}
 function format(check) {
     let tag;
     if (check.ok) {
@@ -189,8 +187,21 @@ async function doctorHost() {
         const check = await checkCmd(token, required, required ? undefined : "required for local runs");
         checks.push(check);
     }
-    if (anyModelUsesUsage(config)) {
-        checks.push(await checkCmd("codexbar", false, "optional — only used for usage gating"));
+    const usageGatedModels = gatedModels(config);
+    if (usageGatedModels.length > 0) {
+        const codexbarPath = await which("codexbar");
+        if (codexbarPath === undefined) {
+            const modelList = usageGatedModels.map((name) => `\`${name}\``).join(", ");
+            checks.push({
+                name: "codexbar",
+                ok: false,
+                required: true,
+                hint: `required for usage gating on ${modelList} — install codexbar, or set \`models.definitions.<name>.usage\` to disable gating`,
+            });
+        }
+        else {
+            checks.push({ name: "codexbar", ok: true, required: true, hint: codexbarPath });
+        }
     }
     for (const check of checks) {
         if (check === localCapability) {

package/dist/lib/usage.d.ts

@@ -22,6 +22,7 @@ export type UsageByModel = Record<string, NormalizedUsage>;
  * exists to close.
  */
 export declare const EXHAUSTED_USAGE: NormalizedUsage;
+export declare function gatedModels(config: ResolvedConfig): string[];
 export declare function getUsageByModel(config: ResolvedConfig, signal?: AbortSignal): Promise<UsageByModel>;
 export {};
 //# sourceMappingURL=usage.d.ts.map

package/dist/lib/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../src/lib/usage.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAmB,cAAc,EAAE,MAAM,aAAa,CAAC;AA+BnE,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAE3D;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE,eAK7B,CAAC;AAyGF,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,CAAC,CA6BvB"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../src/lib/usage.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAmB,cAAc,EAAE,MAAM,aAAa,CAAC;AA+BnE,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAE3D;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE,eAK7B,CAAC;AA2GF,wBAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CAI5D;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,cAAc,EACtB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,CAAC,CA6BvB"}

package/dist/lib/usage.js

@@ -24,8 +24,16 @@ export const EXHAUSTED_USAGE = {
 const MS_PER_MINUTE = 60_000;
 const PERCENT_FRACTION_DIVISOR = 100;
 const CODEXBAR_TIMEOUT_MS = 30_000;
-function defaultCodexbarSource() {
-    return process.platform === "darwin" ? "auto" : "cli";
+function defaultCodexbarSource(provider) {
+    if (process.platform !== "darwin") {
+        return "cli";
+    }
+    // codexbar's CLI `auto` for Codex/Claude probes browser sessions before OAuth,
+    // while the menu bar app prefers OAuth. Match the app so gates follow the CLI account.
+    if (provider === "codex" || provider === "claude") {
+        return "oauth";
+    }
+    return "auto";
 }
 async function codexbarUsage(definition, signal) {
     /* v8 ignore next 3 @preserve -- callers filter to definitions with usage; this is a defensive guard */
@@ -34,7 +42,7 @@ async function codexbarUsage(definition, signal) {
     }
     const { provider } = definition.usage.codexbar;
     const configuredSource = definition.usage.codexbar.source;
-    const source = configuredSource ?? defaultCodexbarSource();
+    const source = configuredSource ?? defaultCodexbarSource(provider);
     const arguments_ = [
         "usage",
         "--provider",
@@ -103,7 +111,7 @@ function normalize(usage) {
         weekEndDuration: minutesUntil(usage.secondary?.resetsAt),
     };
 }
-function gatedModels(config) {
+export function gatedModels(config) {
     return Object.entries(config.models.definitions)
         .filter(([, definition]) => definition.usage !== undefined)
         .map(([name]) => name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/groundcrew",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Linear-driven orchestrator that launches AI coding agents in git worktrees, with workspace lifecycle and usage tracking.",
   "keywords": [
     "agent",