@zeroxyz/cli 1.13.0 → 1.14.0

package/dist/index.js

@@ -78576,7 +78576,7 @@ init_esm_shims();
 
 // package.json
 var package_default = {
-  version: "1.13.0"};
+  version: "1.14.0"};
 
 // src/app.ts
 init_esm_shims();
@@ -79584,7 +79584,7 @@ init_esm_shims();
 // ../sdk/dist/index.js
 init_esm_shims();
 
-// ../sdk/dist/chunk-T6JT5NV5.js
+// ../sdk/dist/chunk-AAAVBKT3.js
 init_esm_shims();
 
 // ../../node_modules/.pnpm/viem@2.52.2_bufferutil@4.1.0_typescript@5.9.3_utf-8-validate@6.0.6_zod@4.3.6/node_modules/viem/_esm/index.js
@@ -144966,7 +144966,7 @@ config(en_default2());
 // ../../node_modules/.pnpm/zod@4.3.6/node_modules/zod/index.js
 var zod_default = external_exports3;
 
-// ../sdk/dist/chunk-T6JT5NV5.js
+// ../sdk/dist/chunk-AAAVBKT3.js
 var createManagedAccount = (client, address2) => toAccount({
   address: address2,
   async signMessage({ message: message2 }) {
@@ -147884,6 +147884,10 @@ var searchResultSchema = external_exports3.object({
   url: external_exports3.string(),
   urlTemplate: external_exports3.string().nullable().optional(),
   cost: external_exports3.object({ amount: external_exports3.string(), asset: external_exports3.string() }),
+  // ZERO-199 — the server-resolved price. Prefer `pricing.summary` over
+  // deriving a label from `cost.amount` (which flattens usage-priced caps).
+  // Optional: absent on older API deploys.
+  pricing: external_exports3.object({ kind: external_exports3.string(), summary: external_exports3.string() }).optional(),
   // Payment protocol (x402 | mpp) for this result. The server emits it; the SDK
   // previously stripped it, leaving an agent unable to tell which handshake to
   // engage from a search row. Optional/nullable so older deploys still parse
@@ -149229,12 +149233,12 @@ var formatCost = (capability) => {
     const median = observed.medianCents ? centsToDollars(observed.medianCents) : null;
     const detail = median ? `median $${median}, n=${observed.sampleCount}` : `n=${observed.sampleCount}`;
     lines.push(`  Cost: $${min}\u2013$${max}/call (${detail})`);
-  } else if (capability.priceDynamic && capability.priceHint) {
+  } else if (capability.priceDynamic && capability.priceHint && /\$\d/.test(capability.priceHint)) {
     const ceiling = observed?.maxCents ? centsToDollars(observed.maxCents) : null;
     lines.push(
       `  Cost: ${capability.priceHint} (dynamic${ceiling ? `, up to ~$${ceiling}/call` : ""})`
     );
-  } else if (capability.priceStatus === "unknown_unparsed") {
+  } else if (capability.priceStatus === "unknown_unparsed" && !(Number(capability.displayCostAmount) > 0) && !paidRailAmount(capability)) {
     lines.push(`  Cost: price unknown`);
   } else if (capability.priceDynamic) {
     lines.push(
@@ -149652,16 +149656,20 @@ var agentStandaloneMcpSchema = zod_default.looseObject({
 var agentStandaloneHooksSchema = zod_default.looseObject({
   // Config file to merge the hook declarations into (relative to $HOME).
   file: zod_default.string(),
-  // Names the config schema. The CLI's generic JSON merger handles the shared
-  // `{ hooks: { Event: [...] } }` shape (claude-settings, codex-hooks); other
-  // formats (e.g. kiro-agent) need their own writer and are skipped until one
-  // exists.
-  format: zod_default.string(),
+  // Informational name of the config schema. Registration is driven by `merge`
+  // alone; `format` stays in the matrix because pre-1.14 CLIs require it.
+  format: zod_default.string().optional(),
   sessionStart: zod_default.boolean().optional(),
   // Domains to ensure on this host's sandbox network allowlist
   // (sandbox.network.allowedDomains) after merging — e.g. ["*.zero.xyz"] for
   // Claude. Omitted hosts get no allowlist entry.
-  network: zod_default.array(zod_default.string()).optional()
+  network: zod_default.array(zod_default.string()).optional(),
+  // The literal hook config fragment to deep-merge into `file`, with
+  // ${ZERO_HOOKS_DIR} standing in for the staged ~/.zero/hooks dir. The CLI
+  // derives which hook scripts to fetch+stage by scanning this fragment for
+  // ${ZERO_HOOKS_DIR}/<name> references. Hosts without a fragment get no hook
+  // registration.
+  merge: zod_default.record(zod_default.string(), zod_default.unknown()).optional()
 });
 var agentStandaloneSchema = zod_default.looseObject({
   // Skill install dirs (relative to $HOME) for the standalone fallback.
@@ -149746,6 +149754,57 @@ var loadAgents = async (webBase, cliVersion) => {
   return { entries: filterMatrix(matrix, cliVersion) };
 };
 
+// src/util/hook-fragment.ts
+init_esm_shims();
+var ZERO_HOOKS_DIR_PLACEHOLDER = "${ZERO_HOOKS_DIR}";
+var SCRIPT_REF_PATTERN = /\$\{ZERO_HOOKS_DIR\}\/([a-z0-9][a-z0-9-]*\.sh)/g;
+var isPlainObject3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var fragmentScriptNames = (fragment) => {
+  const names = /* @__PURE__ */ new Set();
+  for (const match of JSON.stringify(fragment).matchAll(SCRIPT_REF_PATTERN)) {
+    if (match[1]) names.add(match[1]);
+  }
+  return [...names];
+};
+var substituteHooksDir = (value, hooksDir) => {
+  if (typeof value === "string") {
+    return value.replaceAll(ZERO_HOOKS_DIR_PLACEHOLDER, hooksDir);
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => substituteHooksDir(item, hooksDir));
+  }
+  if (isPlainObject3(value)) {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, item]) => [
+        key,
+        substituteHooksDir(item, hooksDir)
+      ])
+    );
+  }
+  return value;
+};
+var referencesAnyScript = (element, scriptNames) => {
+  const json3 = JSON.stringify(element) ?? "";
+  return scriptNames.some((name) => json3.includes(name));
+};
+var mergeHookFragment = (target, fragment, scriptNames) => {
+  for (const [key, incoming] of Object.entries(fragment)) {
+    const existing = target[key];
+    if (Array.isArray(incoming)) {
+      const kept = Array.isArray(existing) ? existing.filter(
+        (element) => !referencesAnyScript(element, scriptNames)
+      ) : [];
+      target[key] = [...kept, ...incoming];
+    } else if (isPlainObject3(incoming)) {
+      const base2 = isPlainObject3(existing) ? existing : {};
+      target[key] = base2;
+      mergeHookFragment(base2, incoming, scriptNames);
+    } else {
+      target[key] = incoming;
+    }
+  }
+};
+
 // src/util/install-banner.ts
 init_esm_shims();
 var colorsEnabled = () => {
@@ -149913,8 +149972,6 @@ var fallbackReason = (selection, detections, results) => {
   }
   return "no plugin install succeeded";
 };
-var PLUGIN_HOOKS_ROOT = "${CLAUDE_PLUGIN_ROOT}/hooks";
-var SCRIPT_NAME_PATTERN = /\$\{CLAUDE_PLUGIN_ROOT\}\/hooks\/([a-z0-9][a-z0-9-]*\.sh)/;
 var fetchText = async (url4) => {
   const res = await fetch(url4);
   if (!res.ok) {
@@ -149922,15 +149979,6 @@ var fetchText = async (url4) => {
   }
   return await res.text();
 };
-var entryScriptNames = (entry) => {
-  const names = [];
-  for (const hook of entry.hooks ?? []) {
-    if (typeof hook.command !== "string") continue;
-    const match = hook.command.match(SCRIPT_NAME_PATTERN);
-    if (match?.[1]) names.push(match[1]);
-  }
-  return names;
-};
 var expandHome = (path3, home) => {
   if (path3 === "~") return home;
   if (path3.startsWith("~/")) return join(home, path3.slice(2));
@@ -149954,20 +150002,11 @@ var installSkill = (skillsDirs, skillMd, verbose) => {
   }
   return installed;
 };
-var installHookScripts = async (home, hooksJson, webBase, verbose) => {
-  const names = /* @__PURE__ */ new Set();
-  for (const entries of Object.values(hooksJson.hooks)) {
-    for (const entry of entries ?? []) {
-      for (const name of entryScriptNames(entry)) names.add(name);
-    }
-  }
-  if (names.size === 0) {
-    throw new Error("hooks.json declared no recognizable hook scripts");
-  }
+var installHookScripts = async (home, names, webBase, verbose) => {
   const hooksDir = join(home, ".zero", "hooks");
   mkdirSync(hooksDir, { recursive: true });
   return await Promise.all(
-    [...names].map(async (name) => {
+    names.map(async (name) => {
       const body = await fetchText(`${webBase}/hooks/${name}`);
       const dest = join(hooksDir, name);
       writeFileSync(dest, body);
@@ -149998,53 +150037,17 @@ var ensureSandboxDomains = (settings, domains, verbose) => {
     }
   }
 };
-var registerHooksInJsonFile = (home, hooksJson, target, verbose) => {
+var registerHooksInJsonFile = (home, target, verbose) => {
   const hooksDir = join(home, ".zero", "hooks");
   const configPath = join(home, target.relativePath);
+  const scriptNames = fragmentScriptNames(target.fragment);
+  const fragment = substituteHooksDir(target.fragment, hooksDir);
   const result = updateJsonConfigFile(
     configPath,
     (config2) => {
-      if (!config2.hooks || typeof config2.hooks !== "object") {
-        config2.hooks = {};
-      }
-      const hooks = config2.hooks;
-      for (const [event, entries] of Object.entries(hooksJson.hooks)) {
-        for (const entry of entries ?? []) {
-          const scripts = entryScriptNames(entry);
-          if (scripts.length === 0) {
-            if (verbose) {
-              stepInfo(`${event}: entry has no plugin hook script \u2014 skipped`);
-            }
-            continue;
-          }
-          const rewritten = {
-            ...entry,
-            hooks: (entry.hooks ?? []).map((hook) => ({
-              ...hook,
-              command: typeof hook.command === "string" ? hook.command.replaceAll(PLUGIN_HOOKS_ROOT, hooksDir) : hook.command
-            }))
-          };
-          if (!Array.isArray(hooks[event])) hooks[event] = [];
-          const list2 = hooks[event];
-          const existingIdx = list2.findIndex((existing) => {
-            const existingHooks = existing?.hooks;
-            if (!Array.isArray(existingHooks)) return false;
-            return existingHooks.some(
-              (h2) => typeof h2.command === "string" && scripts.some((s) => h2.command.includes(s))
-            );
-          });
-          if (existingIdx >= 0) {
-            list2[existingIdx] = rewritten;
-            if (verbose) {
-              stepInfo(`${event}: ${scripts.join(", ")} entry replaced`);
-            }
-          } else {
-            list2.push(rewritten);
-            if (verbose) {
-              stepInfo(`${event}: ${scripts.join(", ")} entry appended`);
-            }
-          }
-        }
+      mergeHookFragment(config2, fragment, scriptNames);
+      if (verbose) {
+        stepInfo(`merged hook fragment (${scriptNames.join(", ")})`);
       }
       ensureSandboxDomains(config2, target.network, verbose);
       return true;
@@ -150060,18 +150063,21 @@ var registerHooksInJsonFile = (home, hooksJson, target, verbose) => {
   }
   return true;
 };
-var JSON_HOOK_FORMATS = /* @__PURE__ */ new Set(["claude-settings", "codex-hooks"]);
 var buildHookTargets = (entries) => {
   const byFile = /* @__PURE__ */ new Map();
   for (const entry of entries) {
     const hooks = entry.standalone?.hooks;
-    if (!hooks || !JSON_HOOK_FORMATS.has(hooks.format)) continue;
+    if (!hooks?.merge || Object.keys(hooks.merge).length === 0) continue;
     const existing = byFile.get(hooks.file);
     const network = unique([
       ...existing?.network ?? [],
       ...hooks.network ?? []
     ]);
-    byFile.set(hooks.file, { relativePath: hooks.file, network });
+    byFile.set(hooks.file, {
+      relativePath: hooks.file,
+      fragment: existing?.fragment ?? hooks.merge,
+      network
+    });
   }
   return [...byFile.values()];
 };
@@ -150085,21 +150091,18 @@ var runStandaloneInit = async (appContext, options = {}) => {
   console.log("");
   const home = homedir();
   const webBase = appContext.env.ZERO_WEB_URL;
-  const [skillMd, hooksJsonRaw] = await Promise.all([
-    fetchText(`${webBase}/SKILL.md`),
-    fetchText(`${webBase}/hooks.json`)
-  ]);
-  let hooksJson;
-  try {
-    hooksJson = JSON.parse(hooksJsonRaw);
-  } catch {
-    throw new Error(`${webBase}/hooks.json is not valid JSON`);
-  }
-  if (!hooksJson?.hooks || typeof hooksJson.hooks !== "object") {
-    throw new Error(`${webBase}/hooks.json has no "hooks" object`);
+  const hookTargets = options.hookTargets ?? [];
+  const hookScriptNames = unique(
+    hookTargets.flatMap((target) => fragmentScriptNames(target.fragment))
+  );
+  if (hookScriptNames.length === 0) {
+    throw new Error(
+      "the agent matrix declared no standalone hook scripts to install"
+    );
   }
+  const skillMd = await fetchText(`${webBase}/SKILL.md`);
   if (verbose) {
-    stepInfo(`fetched ${webBase}/SKILL.md and ${webBase}/hooks.json`);
+    stepInfo(`fetched ${webBase}/SKILL.md`);
   }
   options.onStep?.("skill");
   const skillsDirs = unique([
@@ -150114,20 +150117,15 @@ var runStandaloneInit = async (appContext, options = {}) => {
   options.onStep?.("hooks");
   const hookScriptsInstalled = await installHookScripts(
     home,
-    hooksJson,
+    hookScriptNames,
     webBase,
     verbose
   );
   stepSuccess("Hook scripts installed", "~/.zero/hooks");
   options.onStep?.("settings");
   const registeredFiles = /* @__PURE__ */ new Set();
-  for (const target of options.hookTargets ?? []) {
-    const registered = registerHooksInJsonFile(
-      home,
-      hooksJson,
-      target,
-      verbose
-    );
+  for (const target of hookTargets) {
+    const registered = registerHooksInJsonFile(home, target, verbose);
     if (registered) {
       registeredFiles.add(target.relativePath);
       stepSuccess("Hooks registered", `~/${target.relativePath}`);
@@ -150281,8 +150279,11 @@ var runInit = async (appContext, options = {}) => {
       if (dryRun) {
         stepInfo("would install/update ~/.claude/skills/zero");
         stepInfo("would install/update ~/.agents/skills/zero");
+        const targetFiles = buildHookTargets(entries).map(
+          (target) => `~/${target.relativePath}`
+        );
         stepInfo(
-          "would register current standalone hooks in ~/.claude/settings.json and ~/.codex/hooks.json"
+          `would register current standalone hooks in ${targetFiles.join(" and ")}`
         );
       } else {
         standaloneResult = await runStandaloneInit(appContext, {
@@ -150861,7 +150862,7 @@ var formatSearchResults = (results) => {
     const displayDescription = r2.whatItDoes ?? r2.description;
     const ratingBadge = formatRatingBadge(r2.rating);
     const statusBadge = formatStatusBadge(r2.availabilityStatus);
-    const baseCost = r2.cost.amount === "0" ? "Free" : r2.cost.amount === "unknown" ? "variable pricing" : `$${r2.cost.amount}/call`;
+    const baseCost = r2.pricing?.summary ?? (r2.cost.amount === "0" ? "Free" : r2.cost.amount === "unknown" ? "variable pricing" : `$${r2.cost.amount}/call`);
     const costLabel = r2.protocol ? `${baseCost} \xB7 ${r2.protocol}` : baseCost;
     const tokenHint = r2.token ? ` [${r2.token}]` : "";
     return `  ${r2.position}.${tokenHint} ${displayName} \u2014 ${costLabel} \u2014 ${ratingBadge}${statusBadge}
@@ -152648,7 +152649,7 @@ function isErrorEvent(event) {
 function isEvent(candidate) {
   return "undefined" != typeof Event && isInstanceOf(candidate, Event);
 }
-function isPlainObject3(candidate) {
+function isPlainObject4(candidate) {
   return isBuiltin(candidate, "Object");
 }
 function isInstanceOf(candidate, base2) {
@@ -155845,7 +155846,7 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     };
     const personProperties = {};
     const groupProperties = {};
-    for (const [key, value] of Object.entries(eventProperties)) if (isPlainObject3(value) && groups && key in groups) {
+    for (const [key, value] of Object.entries(eventProperties)) if (isPlainObject4(value) && groups && key in groups) {
       const groupProps = {};
       for (const [groupKey, groupValue] of Object.entries(value)) groupProps[String(groupKey)] = String(groupValue);
       groupProperties[String(key)] = groupProps;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "1.13.0",
+	"version": "1.14.0",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",