@wairon/cli 5.1.1-dev.66 → 5.1.1-dev.68

package/dist/cli/index.js

@@ -65,7 +65,7 @@ var init_defaults = __esm({
       copilot: ".github/prompts",
       codex: ".codex/agents"
     };
-    WAIRON_VERSION = "5.1.1-dev.66";
+    WAIRON_VERSION = "5.1.1-dev.68";
     GITHUB_REPO = "SYW-Apps/Waffle-AIron";
     SUPPORTED_ALIASES = ["wai"];
     SCAN_EXCLUDE_DIRS = /* @__PURE__ */ new Set([
@@ -14394,19 +14394,34 @@ var init_export_conformance = __esm({
           }
         }
         const takenFrom = /* @__PURE__ */ new Map();
+        const take = (consumer, writtenIn, specifier, names) => {
+          const target = resolveImport(writtenIn, specifier, code.paths);
+          if (!target) return;
+          let byName = takenFrom.get(target);
+          if (!byName) takenFrom.set(target, byName = /* @__PURE__ */ new Map());
+          for (const name of names) {
+            if (!name) continue;
+            let takers = byName.get(name);
+            if (!takers) byName.set(name, takers = /* @__PURE__ */ new Set());
+            takers.add(consumer);
+          }
+        };
         for (const consumer of realization.paths) {
           if (!code.exactPaths.has(consumer)) continue;
-          for (const [local, binding] of Object.entries(code.factsAt(consumer)?.importBindings ?? {})) {
+          const facts = code.factsAt(consumer);
+          if (!facts) continue;
+          for (const [local, binding] of Object.entries(facts.importBindings ?? {})) {
             if (binding.namespace) continue;
-            const target = resolveImport(consumer, binding.from, code.paths);
-            if (!target) continue;
-            let names = takenFrom.get(target);
-            if (!names) takenFrom.set(target, names = /* @__PURE__ */ new Map());
-            for (const name of [local, binding.imported]) {
-              if (!name) continue;
-              let takers = names.get(name);
-              if (!takers) names.set(name, takers = /* @__PURE__ */ new Set());
-              takers.add(consumer);
+            take(consumer, consumer, binding.from, [local, binding.imported]);
+          }
+          for (const sites of Object.values(facts.functionCallSites ?? {})) {
+            for (const site of sites) {
+              if (!site.member || !site.via) continue;
+              const writtenIn = site.from ? pathKey(site.from) : consumer;
+              const scope = site.from ? code.factsAt(writtenIn) : facts;
+              if (!scope) continue;
+              const binding = importBindingOf(scope, site.via);
+              if (binding?.namespace) take(consumer, writtenIn, binding.from, [site.name]);
             }
           }
         }
@@ -37582,13 +37597,29 @@ function storeInstallGlobalPackArchive(archive, name) {
   descriptor.tier = "instance";
   return descriptor;
 }
+function declaredName2(loadRef, baseRoot, scope) {
+  const d = probe(loadRef, baseRoot, scope, loadRef);
+  return d.error ? void 0 : d.name;
+}
+function pickByName(candidates, name, fileOf, manifestOf) {
+  const byFile = candidates.find((c) => stem(fileOf(c)) === name || path53.basename(fileOf(c)) === name);
+  if (byFile !== void 0) return byFile;
+  const byManifest = candidates.filter((c) => manifestOf(c) === name);
+  if (byManifest.length > 1) {
+    throw new Error(
+      `Pack name "${name}" is ambiguous: ${byManifest.map((c) => `"${fileOf(c)}"`).join(", ")} all declare it. Remove one by its file name instead.`
+    );
+  }
+  return byManifest[0];
+}
 function storeRemoveGlobalPack(name) {
   assertName(name);
   const dir = hostCore.globalPacksDir();
-  const match = hostCore.discoverPacks(dir).find((ref) => stem(ref) === name || path53.basename(ref) === name);
+  const manifestOf = (ref) => declaredName2(ref, path53.dirname(ref), "global");
+  const match = pickByName(hostCore.discoverPacks(dir), name, path53.basename, manifestOf);
   if (!match) {
     const inImage = hostCore.discoverPacks(imagePacksDir()).some(
-      (ref) => stem(ref) === name || path53.basename(ref) === name
+      (ref) => stem(ref) === name || path53.basename(ref) === name || manifestOf(ref) === name
     );
     throw new Error(
       inImage ? `Pack "${name}" is an immutable image-layer pack (WAIRON_IMAGE_PACKS_DIR) and cannot be removed at runtime; rebuild the extension image without it.` : `No server-global instance pack named "${name}".`
@@ -37650,7 +37681,12 @@ function boundProject2(cfg, project2) {
 }
 function findPackRegistration(config, name) {
   const relRef = `.wai/packs/${name}.yaml`;
-  return (config?.extensions?.packs ?? []).find((entry) => typeof entry === "string" ? entry === relRef || stem(entry) === name || path53.basename(entry) === name : entry.name === name);
+  const entries = config?.extensions?.packs ?? [];
+  const direct = entries.find((entry) => typeof entry === "string" ? entry === relRef || stem(entry) === name || path53.basename(entry) === name : entry.name === name);
+  if (direct !== void 0) return direct;
+  const root = getProjectRoot();
+  const refs = entries.filter((entry) => typeof entry === "string");
+  return pickByName(refs, name, (ref) => ref, (ref) => declaredName2(ref, root, "project"));
 }
 function listGlobalPacks(cfg, credential) {
   requireCap(cfg, credential, "project:admin", "instance", "", "Forbidden \u2014 managing server-global packs requires instance-level project:admin");
@@ -42453,6 +42489,10 @@ function removeUnit(cfg, sessionId, unitId, disposition) {
   }
   const units = listOrganizationUnits(cfg.dataDir);
   const subtree = subtreeUnitIds2(units, unitId);
+  const kind = disposition?.kind;
+  if (kind !== "migrate" && kind !== "alternative" && kind !== "absorb" && kind !== "cascade") {
+    throw new Error("A disposition kind is required: migrate, alternative, absorb or cascade");
+  }
   if (disposition.kind === "cascade") {
     for (const placement of listProjectPlacements(cfg.dataDir)) {
       if (subtree.has(placement.unitId)) {
@@ -45703,7 +45743,8 @@ async function handleWebRequest(cfg, req, res, body, url, ctx) {
         return sendJson(res, 200, { ok: true });
       }
       if (req.method === "POST" && parts.length === 4 && parts[2] === "producers" && parts[3] === "run") {
-        return opsRunProducer(cfg, sessionId, String(body?.projectId ?? ""), String(body?.target ?? "")).then(() => sendJson(res, 200, { ok: true }));
+        await opsRunProducer(cfg, sessionId, String(body?.projectId ?? ""), String(body?.target ?? ""));
+        return sendJson(res, 200, { ok: true });
       }
       if (req.method === "GET" && parts.length === 3 && parts[2] === "git") {
         return sendJson(res, 200, opsGitStatus(cfg, sessionId, q(url, "projectId") ?? ""));