agent-shim 8.31.0 → 8.33.0

package/dist/index.cjs

@@ -368,6 +368,7 @@ var categories_default_default = {
 // src/config/schema.ts
 var import_node_path2 = __toESM(require("node:path"), 1);
 var import_zod = require("zod");
+var import_trilean = require("trilean");
 
 // src/versionDiscovery.ts
 var import_node_os = __toESM(require("node:os"), 1);
@@ -498,13 +499,14 @@ var CategoryMapSchema = import_zod.z.strictObject({
 }).transform((input) => expandAllCategoryKey(input));
 var DURATION_RE = /^(?:0|[1-9][0-9]*)(?:ms|s|m|h|d|w)$/;
 var DurationSchema = import_zod.z.string().regex(DURATION_RE);
-var WhenSchema = import_zod.z.strictObject({
+var WhenConditionObjectSchema = import_zod.z.strictObject({
   newerThan: DurationSchema.optional(),
   olderThan: DurationSchema.optional(),
   maxSizeBytes: import_zod.z.int().positive().optional(),
   branch: import_zod.z.string().min(1).optional(),
   env: import_zod.z.record(import_zod.z.string().min(1), import_zod.z.string()).optional()
 });
+var WhenSchema = import_zod.z.union([WhenConditionObjectSchema, import_trilean.PredicateNodeSchema]);
 var EntryValueSchema = import_zod.z.union([
   import_zod.z.boolean(),
   import_zod.z.strictObject({ value: import_zod.z.boolean(), when: WhenSchema })
@@ -969,6 +971,7 @@ function classifyEntries(names, options) {
 
 // src/resolve/conditions.ts
 var import_picomatch2 = __toESM(require("picomatch"), 1);
+var import_trilean2 = require("trilean");
 var MILLISECONDS_PER_UNIT = Object.freeze({
   ms: 1,
   s: 1e3,
@@ -999,52 +1002,81 @@ function matchBranch(pattern, branch, detached = false) {
   }
   return (0, import_picomatch2.default)(pattern, { dot: true, nocase: false })(branch);
 }
+var evaluator = (0, import_trilean2.createSyncEvaluator)({});
+function resolversOf(context) {
+  const values = {
+    now: context.nowMs,
+    ...context.fact?.latestMtimeMs === void 0 ? {} : { "entry.latestMtimeMs": context.fact.latestMtimeMs },
+    ...context.fact?.totalSizeBytes === void 0 ? {} : { "entry.totalSizeBytes": context.fact.totalSizeBytes },
+    ...context.branch === void 0 ? {} : { "repo.branch": context.branch },
+    "repo.detached": context.branchDetached ?? false
+  };
+  return {
+    resolveValue: (key) => {
+      const wrap = (value2) => ({ found: true, value: typeof value2 === "number" ? { kind: "number", value: value2 } : typeof value2 === "string" ? { kind: "text", value: value2 } : { kind: "boolean", value: value2 } });
+      if (typeof key !== "string") {
+        return { found: false };
+      }
+      if (key.startsWith("env.")) {
+        const value2 = context.env[key.slice("env.".length)];
+        return value2 === void 0 ? { found: false } : wrap(value2);
+      }
+      const value = values[key];
+      return value === void 0 ? { found: false } : wrap(value);
+    },
+    // This embedding provides the reference namespace only: a tree that asks for a lookup or a collection finds neither, which the evaluator carries as indeterminate rather than letting the tree pretend an answer.
+    resolveLookup: () => ({ found: false }),
+    resolveCollection: () => []
+  };
+}
+function fieldPredicate(field, when, context) {
+  switch (field) {
+    case "newerThan": {
+      const window = parseDuration(when.newerThan ?? "");
+      return { kind: "compare", op: "gte", left: { kind: "reference", key: "entry.latestMtimeMs" }, right: { kind: "numberLiteral", value: context.nowMs - window } };
+    }
+    case "olderThan": {
+      const window = parseDuration(when.olderThan ?? "");
+      return { kind: "compare", op: "lt", left: { kind: "reference", key: "entry.latestMtimeMs" }, right: { kind: "numberLiteral", value: context.nowMs - window } };
+    }
+    case "maxSizeBytes":
+      return { kind: "compare", op: "lte", left: { kind: "reference", key: "entry.totalSizeBytes" }, right: { kind: "numberLiteral", value: when.maxSizeBytes ?? 0 } };
+    case "branch":
+      return { kind: "allOf", operands: [{ kind: "textCompare", op: "portableMatches", left: { kind: "reference", key: "repo.branch" }, right: { kind: "textLiteral", value: when.branch ?? "" } }, { kind: "compare", op: "eq", left: { kind: "reference", key: "repo.detached" }, right: { kind: "booleanLiteral", value: false } }] };
+    case "env": {
+      const entries = Object.entries(when.env ?? {});
+      return { kind: "allOf", operands: entries.map(([name, expected]) => ({ kind: "textCompare", op: "equals", left: { kind: "reference", key: `env.${name}` }, right: { kind: "textLiteral", value: expected } })) };
+    }
+  }
+  return { kind: "allOf", operands: [] };
+}
 function evaluateWhen(when, context) {
   if (when === void 0) {
-    return { passed: true, checked: [], failed: [] };
+    return { status: "definite", passed: true, checked: [], failed: [] };
+  }
+  if ("kind" in when) {
+    const result = evaluator.evaluatePredicate(when, void 0, resolversOf(context));
+    return result.status === "indeterminate" ? { status: "indeterminate", reason: result.reason.message, checked: ["predicate"] } : { status: "definite", passed: result.value, checked: ["predicate"], failed: result.value ? [] : ["predicate"] };
   }
   const checked = [];
   const failed = [];
-  if (when.newerThan !== void 0) {
-    checked.push("newerThan");
-    const window = parseDuration(when.newerThan);
-    const latest = context.fact?.latestMtimeMs;
-    if (latest === void 0 || context.nowMs - latest > window) {
-      failed.push("newerThan");
-    }
-  }
-  if (when.olderThan !== void 0) {
-    checked.push("olderThan");
-    const window = parseDuration(when.olderThan);
-    const latest = context.fact?.latestMtimeMs;
-    if (latest === void 0 || context.nowMs - latest <= window) {
-      failed.push("olderThan");
-    }
-  }
-  if (when.maxSizeBytes !== void 0) {
-    checked.push("maxSizeBytes");
-    const total = context.fact?.totalSizeBytes;
-    if (total === void 0 || total > when.maxSizeBytes) {
-      failed.push("maxSizeBytes");
+  for (const field of ["newerThan", "olderThan", "maxSizeBytes", "branch", "env"]) {
+    if (when[field] === void 0) {
+      continue;
     }
-  }
-  if (when.branch !== void 0) {
-    checked.push("branch");
-    if (!matchBranch(when.branch, context.branch, context.branchDetached ?? false)) {
-      failed.push("branch");
+    checked.push(field);
+    const result = evaluator.evaluatePredicate(fieldPredicate(field, when, context), void 0, resolversOf(context));
+    if (result.status === "indeterminate") {
+      return { status: "indeterminate", reason: result.reason.message, checked };
     }
-  }
-  if (when.env !== void 0) {
-    checked.push("env");
-    const mismatch = Object.entries(when.env).some(([name, expected]) => context.env[name] !== expected);
-    if (mismatch) {
-      failed.push("env");
+    if (!result.value) {
+      failed.push(field);
     }
   }
-  return { passed: failed.length === 0, checked, failed };
+  return { status: "definite", passed: failed.length === 0, checked, failed };
 }
 function isVacuousWhen(when) {
-  return when !== void 0 && Object.keys(when).length === 0;
+  return when !== void 0 && !("kind" in when) && Object.keys(when).length === 0;
 }
 
 // src/resolve/match.ts
@@ -1415,10 +1447,10 @@ function selectRule(relPath, flattened, context) {
       ...context.branchDetached === void 0 ? {} : { branchDetached: context.branchDetached },
       env: context.env
     });
-    if (evaluation.passed) {
+    if (evaluation.status === "definite" && evaluation.passed) {
       return { rule, eliminated };
     }
-    eliminated.push({ rule, failed: evaluation.failed });
+    eliminated.push({ rule, failed: evaluation.status === "definite" ? evaluation.failed : [`${evaluation.checked.join(", ")} could not be decided: ${evaluation.reason}`] });
   }
   return { eliminated };
 }
@@ -1652,7 +1684,10 @@ function planFarm(params) {
 var ENTER_EVERYTHING = () => true;
 function readsSubtreeAggregates(rule) {
   const when = rule.when;
-  return when !== void 0 && (when.newerThan !== void 0 || when.olderThan !== void 0 || when.maxSizeBytes !== void 0);
+  if (when === void 0) {
+    return false;
+  }
+  return "kind" in when || when.newerThan !== void 0 || when.olderThan !== void 0 || when.maxSizeBytes !== void 0;
 }
 function hasUnboundedDepth(pattern) {
   return pattern.includes("**") || /[{(]/.test(pattern);
@@ -5355,7 +5390,7 @@ var import_undici = require("undici");
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.31.0",
+  version: "8.33.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -5411,6 +5446,7 @@ var package_default = {
     commander: "^15.0.0",
     cosmiconfig: "^10.0.1",
     picomatch: "^4.0.7",
+    trilean: "1.7.1",
     undici: "7.29.1",
     zod: "^4.6.1"
   },
@@ -6537,10 +6573,10 @@ function windowBlockedUntil(windows) {
   const resets = windows.flatMap((window) => window.status === "rejected" && window.resetsAtMs !== void 0 ? [window.resetsAtMs] : []);
   return resets.length === 0 ? void 0 : Math.max(...resets);
 }
-function fiveHourBurn(records) {
+function windowBurn(records, which) {
   const points = [];
   for (const record of records) {
-    const window = record.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record.rateLimitHeaders)?.fiveHour;
+    const window = record.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record.rateLimitHeaders)?.[which];
     if (window?.utilization !== void 0 && window.resetsAt !== void 0) {
       points.push({ resetsAt: window.resetsAt, point: { atMs: Date.parse(record.at), utilization: window.utilization } });
     }
@@ -6634,11 +6670,16 @@ function assessIdentity(member, nowMs) {
   const score = remaining * plan.capacity / (untilResetMs / MS_PER_HOUR);
   const fiveRemaining = five?.utilization === void 0 ? void 0 : Math.max(0, 1 - five.utilization);
   const fiveUntil = five?.resetsAtMs === void 0 ? FIVE_HOUR_WINDOW_MS : Math.max(five.resetsAtMs - nowMs, MS_PER_SECOND4);
-  const burn = fiveHourBurn(member.records);
+  const burn = windowBurn(member.records, "fiveHour");
+  const sevenRemaining = seven?.utilization === void 0 ? void 0 : Math.max(0, 1 - seven.utilization);
+  const sevenUntil = seven?.resetsAtMs === void 0 ? SEVEN_DAY_WINDOW_MS : Math.max(seven.resetsAtMs - nowMs, MS_PER_SECOND4);
+  const sevenDayBurn = windowBurn(member.records, "sevenDay");
   return {
     candidate: { ...base, class: "scored", score, reasons: [...windowReasons.map((reason, index) => index === windowReasons.length - 1 ? `${reason}${observedAgo}` : reason), ...planReasons] },
     ...fiveRemaining === void 0 ? {} : { fiveHour: { remaining: fiveRemaining, untilResetMs: fiveUntil } },
-    ...burn === void 0 ? {} : { burn }
+    ...burn === void 0 ? {} : { burn },
+    ...sevenRemaining === void 0 ? {} : { sevenDay: { remaining: sevenRemaining, untilResetMs: sevenUntil } },
+    ...sevenDayBurn === void 0 ? {} : { sevenDayBurn }
   };
 }
 function rankPool(input) {
@@ -6649,14 +6690,27 @@ function rankPool(input) {
   const candidates = assessments.map((assessment) => {
     const { candidate, fiveHour, burn } = assessment;
     const pace = burn ?? (sharedDemand === void 0 ? void 0 : sharedDemand / capacityOf(candidate.plan));
-    if (candidate.class !== "scored" || fiveHour === void 0 || pace === void 0) {
+    const { sevenDay, sevenDayBurn } = assessment;
+    if (candidate.class !== "scored") {
       return { ...candidate, feasible: true };
     }
-    const runsDryInMs = fiveHour.remaining / pace;
-    if (runsDryInMs >= fiveHour.untilResetMs) {
+    const drySpots = [];
+    if (fiveHour !== void 0 && pace !== void 0) {
+      const runsDryInMs = fiveHour.remaining / pace;
+      if (runsDryInMs < fiveHour.untilResetMs) {
+        drySpots.push(`5h window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(fiveHour.untilResetMs)}`);
+      }
+    }
+    if (sevenDay !== void 0 && sevenDayBurn !== void 0) {
+      const runsDryInMs = sevenDay.remaining / sevenDayBurn;
+      if (runsDryInMs < sevenDay.untilResetMs) {
+        drySpots.push(`7d window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(sevenDay.untilResetMs)}`);
+      }
+    }
+    if (drySpots.length === 0) {
       return { ...candidate, feasible: true };
     }
-    return { ...candidate, feasible: false, reasons: [`5h window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(fiveHour.untilResetMs)}`, ...candidate.reasons] };
+    return { ...candidate, feasible: false, reasons: [...drySpots, ...candidate.reasons] };
   });
   const ordered = input.preference === "listed" ? [...candidates] : [...candidates].sort(
     (left, right) => CLASS_ORDER[left.class] - CLASS_ORDER[right.class] || Number(right.feasible) - Number(left.feasible) || (right.score ?? 0) - (left.score ?? 0) || left.identity.localeCompare(right.identity)
@@ -6664,7 +6718,8 @@ function rankPool(input) {
   const sticky = input.sticky;
   const stickyIndex = sticky === void 0 ? -1 : ordered.findIndex((candidate) => candidate.identity === sticky.identity);
   const stickyCandidate = ordered[stickyIndex];
-  if (sticky !== void 0 && stickyCandidate?.class === "scored" && stickyCandidate.feasible) {
+  const keepSticky = stickyCandidate?.class === "scored" && stickyCandidate.feasible;
+  if (sticky !== void 0 && keepSticky) {
     const ageMs = nowMs - Date.parse(sticky.at);
     const warm = ageMs <= PROMPT_CACHE_TTL_MS;
     if (input.resuming || warm) {
@@ -6673,12 +6728,14 @@ function rankPool(input) {
       ordered.unshift({ ...stickyCandidate, reasons: [why, ...stickyCandidate.reasons] });
     }
   }
+  const movedOff = sticky !== void 0 && input.resuming && !keepSticky ? { identity: sticky.identity, reason: stickyCandidate?.reasons[0] ?? "no longer among the pool's members" } : void 0;
   const pick = ordered.find((candidate) => candidate.class !== "ineligible");
   const returns = ordered.flatMap((candidate) => candidate.blockedUntilMs === void 0 ? [] : [{ identity: candidate.identity, atMs: candidate.blockedUntilMs }]);
   const earliestReturn = returns.length === 0 ? void 0 : returns.reduce((soonest, entry) => entry.atMs < soonest.atMs ? entry : soonest);
   return {
     candidates: ordered,
-    ...pick === void 0 ? { ...earliestReturn === void 0 ? {} : { earliestReturn } } : { pick }
+    ...pick === void 0 ? { ...earliestReturn === void 0 ? {} : { earliestReturn } } : { pick },
+    ...movedOff === void 0 || pick === void 0 ? {} : { movedOff }
   };
 }
 
@@ -6936,6 +6993,7 @@ function collectPoolPick(params) {
     candidates: ranking.candidates.map(candidateView),
     missing: missing.map(({ identity }) => identity),
     ...ranking.earliestReturn === void 0 ? {} : { earliestReturn: { identity: ranking.earliestReturn.identity, at: new Date(ranking.earliestReturn.atMs).toISOString() } },
+    ...ranking.movedOff === void 0 ? {} : { movedOff: ranking.movedOff },
     ...sticky.problem === void 0 ? {} : { stickyProblem: sticky.problem }
   };
 }
@@ -9207,6 +9265,8 @@ var PoolPickReportSchema = import_zod13.z.strictObject({
   missing: import_zod13.z.array(import_zod13.z.string()),
   /** When nothing can be picked, the soonest any member returns. */
   earliestReturn: import_zod13.z.strictObject({ identity: import_zod13.z.string(), at: import_zod13.z.iso.datetime() }).optional(),
+  /** The member a resumed conversation started on but moved off, and why, when the ranking could not keep it. */
+  movedOff: import_zod13.z.strictObject({ identity: import_zod13.z.string(), reason: import_zod13.z.string() }).optional(),
   /** Why the last-pick record could not be read, when that is the case. */
   stickyProblem: import_zod13.z.string().optional()
 });
@@ -12953,10 +13013,11 @@ function resolvePoolLaunch(params) {
     if (graph.ranking.candidates.length === 0) {
       return { ok: false, message: `agent-shim: no member of pool "${poolName}" is an existing identity.` };
     }
-    const { pick, earliestReturn } = graph.ranking;
+    const { pick, earliestReturn, movedOff } = graph.ranking;
     if (pick !== void 0) {
       recordStickyPick(params.usageFs, params.paths.usagePicksFile, params.cwd, pick.identity, nowMs);
-      return { ok: true, identity: pick.identity, explanation: `pool ${poolName}: ${pick.reasons.slice(0, REASONS_LOGGED).join("; ")}` };
+      const move = movedOff === void 0 ? "" : `moved off ${movedOff.identity} (${movedOff.reason}); `;
+      return { ok: true, identity: pick.identity, explanation: `pool ${poolName}: ${move}${pick.reasons.slice(0, REASONS_LOGGED).join("; ")}` };
     }
     if (earliestReturn === void 0) {
       return { ok: false, message: `agent-shim: no member of pool "${poolName}" can be picked.` };

package/dist/index.mjs

@@ -56,6 +56,7 @@ var categories_default_default = {
 // src/config/schema.ts
 import path2 from "node:path";
 import { z } from "zod";
+import { PredicateNodeSchema } from "trilean";
 
 // src/versionDiscovery.ts
 import os from "node:os";
@@ -186,13 +187,14 @@ var CategoryMapSchema = z.strictObject({
 }).transform((input) => expandAllCategoryKey(input));
 var DURATION_RE = /^(?:0|[1-9][0-9]*)(?:ms|s|m|h|d|w)$/;
 var DurationSchema = z.string().regex(DURATION_RE);
-var WhenSchema = z.strictObject({
+var WhenConditionObjectSchema = z.strictObject({
   newerThan: DurationSchema.optional(),
   olderThan: DurationSchema.optional(),
   maxSizeBytes: z.int().positive().optional(),
   branch: z.string().min(1).optional(),
   env: z.record(z.string().min(1), z.string()).optional()
 });
+var WhenSchema = z.union([WhenConditionObjectSchema, PredicateNodeSchema]);
 var EntryValueSchema = z.union([
   z.boolean(),
   z.strictObject({ value: z.boolean(), when: WhenSchema })
@@ -657,6 +659,7 @@ function classifyEntries(names, options) {
 
 // src/resolve/conditions.ts
 import picomatch2 from "picomatch";
+import { createSyncEvaluator } from "trilean";
 var MILLISECONDS_PER_UNIT = Object.freeze({
   ms: 1,
   s: 1e3,
@@ -687,52 +690,81 @@ function matchBranch(pattern, branch, detached = false) {
   }
   return picomatch2(pattern, { dot: true, nocase: false })(branch);
 }
+var evaluator = createSyncEvaluator({});
+function resolversOf(context) {
+  const values = {
+    now: context.nowMs,
+    ...context.fact?.latestMtimeMs === void 0 ? {} : { "entry.latestMtimeMs": context.fact.latestMtimeMs },
+    ...context.fact?.totalSizeBytes === void 0 ? {} : { "entry.totalSizeBytes": context.fact.totalSizeBytes },
+    ...context.branch === void 0 ? {} : { "repo.branch": context.branch },
+    "repo.detached": context.branchDetached ?? false
+  };
+  return {
+    resolveValue: (key) => {
+      const wrap = (value2) => ({ found: true, value: typeof value2 === "number" ? { kind: "number", value: value2 } : typeof value2 === "string" ? { kind: "text", value: value2 } : { kind: "boolean", value: value2 } });
+      if (typeof key !== "string") {
+        return { found: false };
+      }
+      if (key.startsWith("env.")) {
+        const value2 = context.env[key.slice("env.".length)];
+        return value2 === void 0 ? { found: false } : wrap(value2);
+      }
+      const value = values[key];
+      return value === void 0 ? { found: false } : wrap(value);
+    },
+    // This embedding provides the reference namespace only: a tree that asks for a lookup or a collection finds neither, which the evaluator carries as indeterminate rather than letting the tree pretend an answer.
+    resolveLookup: () => ({ found: false }),
+    resolveCollection: () => []
+  };
+}
+function fieldPredicate(field, when, context) {
+  switch (field) {
+    case "newerThan": {
+      const window = parseDuration(when.newerThan ?? "");
+      return { kind: "compare", op: "gte", left: { kind: "reference", key: "entry.latestMtimeMs" }, right: { kind: "numberLiteral", value: context.nowMs - window } };
+    }
+    case "olderThan": {
+      const window = parseDuration(when.olderThan ?? "");
+      return { kind: "compare", op: "lt", left: { kind: "reference", key: "entry.latestMtimeMs" }, right: { kind: "numberLiteral", value: context.nowMs - window } };
+    }
+    case "maxSizeBytes":
+      return { kind: "compare", op: "lte", left: { kind: "reference", key: "entry.totalSizeBytes" }, right: { kind: "numberLiteral", value: when.maxSizeBytes ?? 0 } };
+    case "branch":
+      return { kind: "allOf", operands: [{ kind: "textCompare", op: "portableMatches", left: { kind: "reference", key: "repo.branch" }, right: { kind: "textLiteral", value: when.branch ?? "" } }, { kind: "compare", op: "eq", left: { kind: "reference", key: "repo.detached" }, right: { kind: "booleanLiteral", value: false } }] };
+    case "env": {
+      const entries = Object.entries(when.env ?? {});
+      return { kind: "allOf", operands: entries.map(([name, expected]) => ({ kind: "textCompare", op: "equals", left: { kind: "reference", key: `env.${name}` }, right: { kind: "textLiteral", value: expected } })) };
+    }
+  }
+  return { kind: "allOf", operands: [] };
+}
 function evaluateWhen(when, context) {
   if (when === void 0) {
-    return { passed: true, checked: [], failed: [] };
+    return { status: "definite", passed: true, checked: [], failed: [] };
+  }
+  if ("kind" in when) {
+    const result = evaluator.evaluatePredicate(when, void 0, resolversOf(context));
+    return result.status === "indeterminate" ? { status: "indeterminate", reason: result.reason.message, checked: ["predicate"] } : { status: "definite", passed: result.value, checked: ["predicate"], failed: result.value ? [] : ["predicate"] };
   }
   const checked = [];
   const failed = [];
-  if (when.newerThan !== void 0) {
-    checked.push("newerThan");
-    const window = parseDuration(when.newerThan);
-    const latest = context.fact?.latestMtimeMs;
-    if (latest === void 0 || context.nowMs - latest > window) {
-      failed.push("newerThan");
-    }
-  }
-  if (when.olderThan !== void 0) {
-    checked.push("olderThan");
-    const window = parseDuration(when.olderThan);
-    const latest = context.fact?.latestMtimeMs;
-    if (latest === void 0 || context.nowMs - latest <= window) {
-      failed.push("olderThan");
-    }
-  }
-  if (when.maxSizeBytes !== void 0) {
-    checked.push("maxSizeBytes");
-    const total = context.fact?.totalSizeBytes;
-    if (total === void 0 || total > when.maxSizeBytes) {
-      failed.push("maxSizeBytes");
+  for (const field of ["newerThan", "olderThan", "maxSizeBytes", "branch", "env"]) {
+    if (when[field] === void 0) {
+      continue;
     }
-  }
-  if (when.branch !== void 0) {
-    checked.push("branch");
-    if (!matchBranch(when.branch, context.branch, context.branchDetached ?? false)) {
-      failed.push("branch");
+    checked.push(field);
+    const result = evaluator.evaluatePredicate(fieldPredicate(field, when, context), void 0, resolversOf(context));
+    if (result.status === "indeterminate") {
+      return { status: "indeterminate", reason: result.reason.message, checked };
     }
-  }
-  if (when.env !== void 0) {
-    checked.push("env");
-    const mismatch = Object.entries(when.env).some(([name, expected]) => context.env[name] !== expected);
-    if (mismatch) {
-      failed.push("env");
+    if (!result.value) {
+      failed.push(field);
     }
   }
-  return { passed: failed.length === 0, checked, failed };
+  return { status: "definite", passed: failed.length === 0, checked, failed };
 }
 function isVacuousWhen(when) {
-  return when !== void 0 && Object.keys(when).length === 0;
+  return when !== void 0 && !("kind" in when) && Object.keys(when).length === 0;
 }
 
 // src/resolve/match.ts
@@ -1103,10 +1135,10 @@ function selectRule(relPath, flattened, context) {
       ...context.branchDetached === void 0 ? {} : { branchDetached: context.branchDetached },
       env: context.env
     });
-    if (evaluation.passed) {
+    if (evaluation.status === "definite" && evaluation.passed) {
       return { rule, eliminated };
     }
-    eliminated.push({ rule, failed: evaluation.failed });
+    eliminated.push({ rule, failed: evaluation.status === "definite" ? evaluation.failed : [`${evaluation.checked.join(", ")} could not be decided: ${evaluation.reason}`] });
   }
   return { eliminated };
 }
@@ -1340,7 +1372,10 @@ function planFarm(params) {
 var ENTER_EVERYTHING = () => true;
 function readsSubtreeAggregates(rule) {
   const when = rule.when;
-  return when !== void 0 && (when.newerThan !== void 0 || when.olderThan !== void 0 || when.maxSizeBytes !== void 0);
+  if (when === void 0) {
+    return false;
+  }
+  return "kind" in when || when.newerThan !== void 0 || when.olderThan !== void 0 || when.maxSizeBytes !== void 0;
 }
 function hasUnboundedDepth(pattern) {
   return pattern.includes("**") || /[{(]/.test(pattern);
@@ -5043,7 +5078,7 @@ import { Agent as Agent3, fetch as undiciFetch } from "undici";
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.31.0",
+  version: "8.33.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -5099,6 +5134,7 @@ var package_default = {
     commander: "^15.0.0",
     cosmiconfig: "^10.0.1",
     picomatch: "^4.0.7",
+    trilean: "1.7.1",
     undici: "7.29.1",
     zod: "^4.6.1"
   },
@@ -6225,10 +6261,10 @@ function windowBlockedUntil(windows) {
   const resets = windows.flatMap((window) => window.status === "rejected" && window.resetsAtMs !== void 0 ? [window.resetsAtMs] : []);
   return resets.length === 0 ? void 0 : Math.max(...resets);
 }
-function fiveHourBurn(records) {
+function windowBurn(records, which) {
   const points = [];
   for (const record of records) {
-    const window = record.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record.rateLimitHeaders)?.fiveHour;
+    const window = record.rateLimitHeaders === void 0 ? void 0 : parseUnifiedRateLimit(record.rateLimitHeaders)?.[which];
     if (window?.utilization !== void 0 && window.resetsAt !== void 0) {
       points.push({ resetsAt: window.resetsAt, point: { atMs: Date.parse(record.at), utilization: window.utilization } });
     }
@@ -6322,11 +6358,16 @@ function assessIdentity(member, nowMs) {
   const score = remaining * plan.capacity / (untilResetMs / MS_PER_HOUR);
   const fiveRemaining = five?.utilization === void 0 ? void 0 : Math.max(0, 1 - five.utilization);
   const fiveUntil = five?.resetsAtMs === void 0 ? FIVE_HOUR_WINDOW_MS : Math.max(five.resetsAtMs - nowMs, MS_PER_SECOND4);
-  const burn = fiveHourBurn(member.records);
+  const burn = windowBurn(member.records, "fiveHour");
+  const sevenRemaining = seven?.utilization === void 0 ? void 0 : Math.max(0, 1 - seven.utilization);
+  const sevenUntil = seven?.resetsAtMs === void 0 ? SEVEN_DAY_WINDOW_MS : Math.max(seven.resetsAtMs - nowMs, MS_PER_SECOND4);
+  const sevenDayBurn = windowBurn(member.records, "sevenDay");
   return {
     candidate: { ...base, class: "scored", score, reasons: [...windowReasons.map((reason, index) => index === windowReasons.length - 1 ? `${reason}${observedAgo}` : reason), ...planReasons] },
     ...fiveRemaining === void 0 ? {} : { fiveHour: { remaining: fiveRemaining, untilResetMs: fiveUntil } },
-    ...burn === void 0 ? {} : { burn }
+    ...burn === void 0 ? {} : { burn },
+    ...sevenRemaining === void 0 ? {} : { sevenDay: { remaining: sevenRemaining, untilResetMs: sevenUntil } },
+    ...sevenDayBurn === void 0 ? {} : { sevenDayBurn }
   };
 }
 function rankPool(input) {
@@ -6337,14 +6378,27 @@ function rankPool(input) {
   const candidates = assessments.map((assessment) => {
     const { candidate, fiveHour, burn } = assessment;
     const pace = burn ?? (sharedDemand === void 0 ? void 0 : sharedDemand / capacityOf(candidate.plan));
-    if (candidate.class !== "scored" || fiveHour === void 0 || pace === void 0) {
+    const { sevenDay, sevenDayBurn } = assessment;
+    if (candidate.class !== "scored") {
       return { ...candidate, feasible: true };
     }
-    const runsDryInMs = fiveHour.remaining / pace;
-    if (runsDryInMs >= fiveHour.untilResetMs) {
+    const drySpots = [];
+    if (fiveHour !== void 0 && pace !== void 0) {
+      const runsDryInMs = fiveHour.remaining / pace;
+      if (runsDryInMs < fiveHour.untilResetMs) {
+        drySpots.push(`5h window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(fiveHour.untilResetMs)}`);
+      }
+    }
+    if (sevenDay !== void 0 && sevenDayBurn !== void 0) {
+      const runsDryInMs = sevenDay.remaining / sevenDayBurn;
+      if (runsDryInMs < sevenDay.untilResetMs) {
+        drySpots.push(`7d window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(sevenDay.untilResetMs)}`);
+      }
+    }
+    if (drySpots.length === 0) {
       return { ...candidate, feasible: true };
     }
-    return { ...candidate, feasible: false, reasons: [`5h window would run dry in ${formatAge(runsDryInMs)}, before it resets in ${formatAge(fiveHour.untilResetMs)}`, ...candidate.reasons] };
+    return { ...candidate, feasible: false, reasons: [...drySpots, ...candidate.reasons] };
   });
   const ordered = input.preference === "listed" ? [...candidates] : [...candidates].sort(
     (left, right) => CLASS_ORDER[left.class] - CLASS_ORDER[right.class] || Number(right.feasible) - Number(left.feasible) || (right.score ?? 0) - (left.score ?? 0) || left.identity.localeCompare(right.identity)
@@ -6352,7 +6406,8 @@ function rankPool(input) {
   const sticky = input.sticky;
   const stickyIndex = sticky === void 0 ? -1 : ordered.findIndex((candidate) => candidate.identity === sticky.identity);
   const stickyCandidate = ordered[stickyIndex];
-  if (sticky !== void 0 && stickyCandidate?.class === "scored" && stickyCandidate.feasible) {
+  const keepSticky = stickyCandidate?.class === "scored" && stickyCandidate.feasible;
+  if (sticky !== void 0 && keepSticky) {
     const ageMs = nowMs - Date.parse(sticky.at);
     const warm = ageMs <= PROMPT_CACHE_TTL_MS;
     if (input.resuming || warm) {
@@ -6361,12 +6416,14 @@ function rankPool(input) {
       ordered.unshift({ ...stickyCandidate, reasons: [why, ...stickyCandidate.reasons] });
     }
   }
+  const movedOff = sticky !== void 0 && input.resuming && !keepSticky ? { identity: sticky.identity, reason: stickyCandidate?.reasons[0] ?? "no longer among the pool's members" } : void 0;
   const pick = ordered.find((candidate) => candidate.class !== "ineligible");
   const returns = ordered.flatMap((candidate) => candidate.blockedUntilMs === void 0 ? [] : [{ identity: candidate.identity, atMs: candidate.blockedUntilMs }]);
   const earliestReturn = returns.length === 0 ? void 0 : returns.reduce((soonest, entry) => entry.atMs < soonest.atMs ? entry : soonest);
   return {
     candidates: ordered,
-    ...pick === void 0 ? { ...earliestReturn === void 0 ? {} : { earliestReturn } } : { pick }
+    ...pick === void 0 ? { ...earliestReturn === void 0 ? {} : { earliestReturn } } : { pick },
+    ...movedOff === void 0 || pick === void 0 ? {} : { movedOff }
   };
 }
 
@@ -6624,6 +6681,7 @@ function collectPoolPick(params) {
     candidates: ranking.candidates.map(candidateView),
     missing: missing.map(({ identity }) => identity),
     ...ranking.earliestReturn === void 0 ? {} : { earliestReturn: { identity: ranking.earliestReturn.identity, at: new Date(ranking.earliestReturn.atMs).toISOString() } },
+    ...ranking.movedOff === void 0 ? {} : { movedOff: ranking.movedOff },
     ...sticky.problem === void 0 ? {} : { stickyProblem: sticky.problem }
   };
 }
@@ -8895,6 +8953,8 @@ var PoolPickReportSchema = z13.strictObject({
   missing: z13.array(z13.string()),
   /** When nothing can be picked, the soonest any member returns. */
   earliestReturn: z13.strictObject({ identity: z13.string(), at: z13.iso.datetime() }).optional(),
+  /** The member a resumed conversation started on but moved off, and why, when the ranking could not keep it. */
+  movedOff: z13.strictObject({ identity: z13.string(), reason: z13.string() }).optional(),
   /** Why the last-pick record could not be read, when that is the case. */
   stickyProblem: z13.string().optional()
 });
@@ -12641,10 +12701,11 @@ function resolvePoolLaunch(params) {
     if (graph.ranking.candidates.length === 0) {
       return { ok: false, message: `agent-shim: no member of pool "${poolName}" is an existing identity.` };
     }
-    const { pick, earliestReturn } = graph.ranking;
+    const { pick, earliestReturn, movedOff } = graph.ranking;
     if (pick !== void 0) {
       recordStickyPick(params.usageFs, params.paths.usagePicksFile, params.cwd, pick.identity, nowMs);
-      return { ok: true, identity: pick.identity, explanation: `pool ${poolName}: ${pick.reasons.slice(0, REASONS_LOGGED).join("; ")}` };
+      const move = movedOff === void 0 ? "" : `moved off ${movedOff.identity} (${movedOff.reason}); `;
+      return { ok: true, identity: pick.identity, explanation: `pool ${poolName}: ${move}${pick.reasons.slice(0, REASONS_LOGGED).join("; ")}` };
     }
     if (earliestReturn === void 0) {
       return { ok: false, message: `agent-shim: no member of pool "${poolName}" can be picked.` };