@wairon/cli 5.0.1 → 5.0.2-dev.1

package/dist/cli/index.js

@@ -65,7 +65,7 @@ var init_defaults = __esm({
       copilot: ".github/prompts",
       codex: ".codex/agents"
     };
-    WAIRON_VERSION = "5.0.1";
+    WAIRON_VERSION = "5.0.2-dev.1";
     GITHUB_REPO = "SYW-Apps/Waffle-AIron";
     ARCHITECT_AGENT_ID = "agent-architect";
     ARCHITECT_TEMPLATE_ID = "architect";
@@ -5139,18 +5139,20 @@ var MODEL = __MODEL_JSON__;
       return markers[id];
     }
     var collapsed = [];
-    // True content overflow in px, measured with FRACTIONAL rect precision:
-    // scrollWidth/clientWidth are rounded integers and scrollWidth never reads
-    // below clientWidth, so a sub-pixel overflow that still paints a scrollbar
-    // is invisible to them. Positive = overflowing; negative = headroom.
+    // Signed fit measure in px: positive = overflowing, negative = headroom.
+    // The header is a flex row whose ONLY flex:1 child is the .spacer, so the
+    // spacer's rendered width IS the free space -- it grows to absorb all slack
+    // and collapses to 0 the instant the row is full. That makes a right-edge
+    // measurement useless (the spacer keeps the trailing controls pinned to the
+    // right padding at every width, so their edge always reads as a bare fit),
+    // and scrollWidth clamps at clientWidth so it can't report headroom either.
+    // So take headroom from the spacer's own (fractional) width, and true
+    // overflow from scrollWidth - clientWidth (only ever > 0 once the spacer has
+    // already collapsed to 0). The two terms are mutually exclusive.
     function overflowPx() {
-      var box = hdr.getBoundingClientRect();
-      var edge = box.left;
-      for (var c = hdr.firstElementChild; c; c = c.nextElementSibling) {
-        var cr = c.getBoundingClientRect();
-        if (cr.width > 0 && cr.right > edge) edge = cr.right;
-      }
-      return edge - (box.right - 14); // 14 = the header's right padding
+      var spacer = hdr.querySelector('.spacer');
+      var slack = spacer ? spacer.getBoundingClientRect().width : 0;
+      return (hdr.scrollWidth - hdr.clientWidth) - slack;
     }
     function reflow() {
       // Not laid out (hidden tab, non-browser DOM) \u2014 measuring would misfire.
@@ -22804,8 +22806,8 @@ function walkForPackages(projectRoot2, currentDir, depth, results) {
   }
 }
 function pathToId(relPath) {
-  const basename13 = path28.basename(relPath);
-  return basename13.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  const basename12 = path28.basename(relPath);
+  return basename12.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
 }
 function pathToName(relPath) {
   const id = pathToId(relPath);
@@ -26413,6 +26415,46 @@ function storeListGlobalPacks() {
   );
   return [...instance, ...image];
 }
+function readPackContent(full) {
+  const st = fs36.statSync(full);
+  if (st.isFile()) return fs36.readFileSync(full, "utf8");
+  if (st.isDirectory()) {
+    for (const entry of ["pack.yaml", "pack.yml"]) {
+      const p = path45.join(full, entry);
+      if (fs36.existsSync(p) && fs36.statSync(p).isFile()) return fs36.readFileSync(p, "utf8");
+    }
+  }
+  return null;
+}
+function storeResolveGlobalPacks(names) {
+  const index = /* @__PURE__ */ new Map();
+  const indexTier = (dir, tier) => {
+    for (const full of hostCore.discoverPacks(dir)) {
+      const manifestName = probe(full, path45.dirname(full), "global", path45.basename(full)).name;
+      const candidate = { full, manifestName, tier };
+      for (const key of [manifestName, stem(full), path45.basename(full)]) {
+        if (!index.has(key)) index.set(key, candidate);
+      }
+    }
+  };
+  indexTier(hostCore.globalPacksDir(), "instance");
+  indexTier(imagePacksDir(), "image");
+  const resolved = [];
+  const resolvedCanonical = /* @__PURE__ */ new Set();
+  const unresolved = [];
+  for (const requested of new Set(names)) {
+    const candidate = index.get(requested);
+    const content = candidate ? readPackContent(candidate.full) : null;
+    if (!candidate || content == null) {
+      unresolved.push(requested);
+      continue;
+    }
+    if (resolvedCanonical.has(candidate.manifestName)) continue;
+    resolvedCanonical.add(candidate.manifestName);
+    resolved.push({ requestedName: requested, name: candidate.manifestName, content, tier: candidate.tier });
+  }
+  return { resolved, unresolved };
+}
 function storeInstallGlobalPack(name, content) {
   assertName(name);
   assertDeclarative(content);
@@ -26565,6 +26607,9 @@ function executeApprovedListProjectPacks(cfg, project2) {
 function executeApprovedInstallProjectPack(cfg, project2, name, content) {
   return runWithProjectRoot(boundProject2(cfg, project2), () => storeInstallProjectPack(name, content));
 }
+function executeApprovedResolveGlobalPacks(names) {
+  return storeResolveGlobalPacks(names);
+}
 function removeProjectPack(cfg, credential, project2, name) {
   requireCap(cfg, credential, "project:admin", "project", project2, "Forbidden \u2014 removing a project pack requires project:admin over the project");
   runWithProjectRoot(boundProject2(cfg, project2), () => storeRemoveProjectPack(name));
@@ -27515,27 +27560,16 @@ function tryAppendAudit2(cfg, event) {
     );
   }
 }
-function packStem(ref) {
-  return path47.basename(ref).replace(/\.(ya?ml|cjs|js)$/i, "");
-}
-function readGlobalPackContent(name) {
-  const dir = hostCore.globalPacksDir();
-  for (const candidate of [path47.join(dir, `${name}.yaml`), path47.join(dir, `${name}.yml`)]) {
-    if (fs38.existsSync(candidate) && fs38.statSync(candidate).isFile()) {
-      return fs38.readFileSync(candidate, "utf8");
-    }
-  }
-  const match = hostCore.discoverPacks(dir).find((ref) => packStem(ref) === name || path47.basename(ref) === name);
-  if (match && fs38.statSync(match).isFile()) return fs38.readFileSync(match, "utf8");
-  return null;
+var PACK_ENFORCEMENT_MODES = ["warn", "block", "auto_reconcile"];
+function requiredDefaultNames(policy) {
+  return [.../* @__PURE__ */ new Set([...policy.requiredGlobalPacks, ...policy.defaultProjectPacks])];
 }
 function installedPackNames(cfg, projectId) {
   return executeApprovedListProjectPacks(cfg, projectId).map((d) => d.name);
 }
-function installPacks(cfg, projectId, names) {
-  for (const name of new Set(names)) {
-    const content = readGlobalPackContent(name);
-    if (content) executeApprovedInstallProjectPack(cfg, projectId, name, content);
+function installResolvedPacks(cfg, projectId, resolution) {
+  for (const pack of resolution.resolved) {
+    executeApprovedInstallProjectPack(cfg, projectId, pack.name, pack.content);
   }
 }
 function readProjectProfileSelection(root) {
@@ -27568,10 +27602,25 @@ function resolvedSelection(request, policy, selectedBy) {
   return selection;
 }
 function buildEvaluation(input) {
-  const { policy, presentPackNames, selectedProfileIds, hasSelection, countMissingPacksAsViolation } = input;
+  const {
+    policy,
+    presentPackNames,
+    selectedProfileIds,
+    hasSelection,
+    countMissingPacksAsViolation,
+    requiredDefaultResolution
+  } = input;
   const present = new Set(presentPackNames);
-  const requiredDefault = [.../* @__PURE__ */ new Set([...policy.requiredGlobalPacks, ...policy.defaultProjectPacks])];
-  const missingPackNames = requiredDefault.filter((n) => !present.has(n));
+  let missingPackNames;
+  let unresolvedPacks;
+  if (requiredDefaultResolution) {
+    unresolvedPacks = requiredDefaultResolution.unresolved;
+    const canonical = [...new Set(requiredDefaultResolution.resolved.map((r) => r.name))];
+    missingPackNames = canonical.filter((n) => !present.has(n));
+  } else {
+    missingPackNames = requiredDefaultNames(policy).filter((n) => !present.has(n));
+    unresolvedPacks = [];
+  }
   const blocked = new Set(policy.blockedPackNames ?? []);
   const blockedPackNames = presentPackNames.filter((n) => blocked.has(n));
   const requiredProfileIds = policy.requiredProfileIds ?? [];
@@ -27585,16 +27634,20 @@ function buildEvaluation(input) {
     messages.push("Profile selection is required by policy but none was provided.");
   }
   for (const n of missingPackNames) messages.push(`Required pack "${n}" is not installed.`);
+  for (const n of unresolvedPacks) {
+    messages.push(`Required pack "${n}" is not available on the instance (no matching server-global pack).`);
+  }
   for (const n of blockedPackNames) messages.push(`Pack "${n}" is blocked by policy.`);
   for (const id of missingProfileIds) messages.push(`Required profile "${id}" is not selected.`);
   for (const id of disallowedProfileIds) messages.push(`Profile "${id}" is not permitted by policy.`);
-  const violation = selectionRequiredUnmet || blockedPackNames.length > 0 || missingProfileIds.length > 0 || disallowedProfileIds.length > 0 || countMissingPacksAsViolation && missingPackNames.length > 0;
+  const violation = selectionRequiredUnmet || blockedPackNames.length > 0 || missingProfileIds.length > 0 || disallowedProfileIds.length > 0 || countMissingPacksAsViolation && (missingPackNames.length > 0 || unresolvedPacks.length > 0);
   return {
     compliant: !violation,
     mode: policy.enforcementMode,
     missingPackNames,
     blockedPackNames,
     missingProfileIds,
+    unresolvedPacks,
     messages
   };
 }
@@ -27616,11 +27669,15 @@ function performInit(cfg, request, principal) {
     request.ownerUnitId,
     principal ? principalSubject3(principal) : void 0
   );
-  installPacks(cfg, record2.id, [
-    ...policy.requiredGlobalPacks,
-    ...policy.defaultProjectPacks,
-    ...requestPackNames(request)
-  ]);
+  installResolvedPacks(
+    cfg,
+    record2.id,
+    executeApprovedResolveGlobalPacks([
+      ...policy.requiredGlobalPacks,
+      ...policy.defaultProjectPacks,
+      ...requestPackNames(request)
+    ])
+  );
   const selectedBy = principal ? principalSubject3(principal) : void 0;
   recordProjectProfileSelection(record2.rootPath, resolvedSelection(request, policy, selectedBy));
   const actor = principal ? principalSubject3(principal) : SYSTEM_SUBJECT;
@@ -27678,7 +27735,8 @@ function evaluateProjectPolicy(cfg, credential, projectId) {
     presentPackNames: installedPackNames(cfg, projectId),
     selectedProfileIds: selection?.profileIds ?? [],
     hasSelection: !!selection,
-    countMissingPacksAsViolation: true
+    countMissingPacksAsViolation: true,
+    requiredDefaultResolution: executeApprovedResolveGlobalPacks(requiredDefaultNames(policy))
   });
 }
 function reconcileProjectPolicy(cfg, credential, projectId) {
@@ -27692,11 +27750,12 @@ function reconcileProjectPolicy(cfg, credential, projectId) {
   if (!root) throw new Error(`Unknown project "${projectId}".`);
   const policy = effectivePolicy(cfg.dataDir);
   const selection = readProjectProfileSelection(root);
+  const resolution = executeApprovedResolveGlobalPacks(requiredDefaultNames(policy));
   let installed = installedPackNames(cfg, projectId);
-  const requiredDefault = [.../* @__PURE__ */ new Set([...policy.requiredGlobalPacks, ...policy.defaultProjectPacks])];
-  const missing = requiredDefault.filter((n) => !installed.includes(n));
-  if (policy.enforcementMode === "auto_reconcile" && missing.length > 0) {
-    installPacks(cfg, projectId, missing);
+  const installedSet = new Set(installed);
+  const toApply = resolution.resolved.filter((p) => !installedSet.has(p.name));
+  if (toApply.length > 0) {
+    installResolvedPacks(cfg, projectId, { resolved: toApply, unresolved: [] });
     installed = installedPackNames(cfg, projectId);
   }
   const result = buildEvaluation({
@@ -27704,7 +27763,8 @@ function reconcileProjectPolicy(cfg, credential, projectId) {
     presentPackNames: installed,
     selectedProfileIds: selection?.profileIds ?? [],
     hasSelection: !!selection,
-    countMissingPacksAsViolation: true
+    countMissingPacksAsViolation: true,
+    requiredDefaultResolution: resolution
   });
   tryAppendAudit2(
     cfg,
@@ -27728,6 +27788,11 @@ function setPackPolicy(cfg, credential, policy) {
   if (!carriesInstancePermission(cfg, principal, POLICY_MANAGE_CAPABILITY)) {
     throw new ForbiddenError("policy administration requires instance-level project:admin");
   }
+  if (!PACK_ENFORCEMENT_MODES.includes(policy.enforcementMode)) {
+    throw new Error(
+      `invalid enforcementMode "${policy.enforcementMode}" \u2014 must be one of ${PACK_ENFORCEMENT_MODES.join(", ")}`
+    );
+  }
   const stamped = { ...policy, updatedBy: principalSubject3(principal) };
   const stored = setPackPolicyRecord(cfg.dataDir, stamped);
   tryAppendAudit2(