agent-shim 8.32.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.32.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"
   },

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.32.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"
   },