pushary 1.9.77 → 1.9.78

package/dist/{chunk-7CU7OGWP.js → chunk-WHTWHHE3.js}

@@ -5,19 +5,19 @@ import {
   hermesAppWiringRecord,
   hermesConfigReceipt,
   hermesSetupReceipt
-} from "./chunk-PZXQUV3P.js";
+} from "./chunk-TQYSBYYZ.js";
 import {
   readJsonSafe,
   resolvePathBinary,
   writeJsonAtomic
-} from "./chunk-ABAWD6QM.js";
+} from "./chunk-Y4I5YX3L.js";
 import {
   isNewerVersion,
   isReleaseVersion
 } from "./chunk-QTOLNRET.js";
 import {
   isRecord
-} from "./chunk-INBG473K.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/hermes/plugin-payload.ts
 import { createHash } from "crypto";
@@ -1928,6 +1928,8 @@ var HERMES_INSTALL_MARKER_OWNER = "pushary";
 var HERMES_LOAD_RECORDS_PATH = "plugin-data/pushary/loaded";
 var HERMES_LEGACY_PIP_PACKAGE = "hermes-plugin-pushary";
 var HERMES_QUESTION_TOOLSET = "clarify";
+var HERMES_PLUGINS_SECTION = "plugins";
+var HERMES_APPROVAL_SECTION = "security.approval";
 var HERMES_APPROVAL_TRANSPORT_KEY = "security.approval.transport";
 var HERMES_APPROVAL_FALLBACK_KEY = "security.approval.transport_fallback";
 var HERMES_PLUGINS_ENABLED_KEY = "plugins.enabled";
@@ -1965,15 +1967,113 @@ var shippedHermesPlugin = (files = HERMES_PLUGIN_FILES) => {
 };
 
 // src/hermes/runtime.ts
-import { execFileSync } from "child_process";
+import { execFile } from "child_process";
 import { accessSync, closeSync, constants, existsSync, mkdirSync, openSync, readFileSync, readSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { basename, dirname, isAbsolute, join } from "path";
+import { promisify } from "util";
+
+// src/hermes/setup-receipt.ts
+var HERMES_SETUP_RECEIPT_VERSION = 2;
+var settingSnapshot = (key, reading) => reading.kind === "set" ? { key, wasSet: true, before: reading.value } : { key, wasSet: false, before: null };
+var isSettingSnapshot = (value) => isRecord(value) && typeof value.key === "string" && typeof value.wasSet === "boolean" && Object.hasOwn(value, "before");
+var parseCurrentReceipt = (value) => {
+  const { settings, pluginWasEnabled, questionRoutingAdded } = value;
+  if (!Array.isArray(settings) || !settings.every(isSettingSnapshot)) return null;
+  if (typeof pluginWasEnabled !== "boolean" || typeof questionRoutingAdded !== "boolean") return null;
+  return { settings, pluginWasEnabled, questionRoutingAdded };
+};
+var LEGACY_SNAPSHOT_KEYS = ["security", "approval", "transport", "fallback", "plugins", "enabled", "agent", "disabled"];
+var isLegacySnapshot = (value) => isRecord(value) && typeof value.present === "boolean" && Object.hasOwn(value, "value");
+var legacySetting = (key, snapshot) => ({ key, wasSet: snapshot.present, before: snapshot.present ? snapshot.value : null });
+var parseLegacyReceipt = (value) => {
+  if (!LEGACY_SNAPSHOT_KEYS.every((key) => isLegacySnapshot(value[key]))) return null;
+  if (typeof value.pushary_enabled !== "boolean" || typeof value.clarify_disabled !== "boolean") return null;
+  const transport = value.transport;
+  const fallback = value.fallback;
+  if (!isLegacySnapshot(transport) || !isLegacySnapshot(fallback)) return null;
+  return {
+    settings: [legacySetting(HERMES_APPROVAL_TRANSPORT_KEY, transport), legacySetting(HERMES_APPROVAL_FALLBACK_KEY, fallback)],
+    pluginWasEnabled: value.pushary_enabled,
+    questionRoutingAdded: !value.clarify_disabled
+  };
+};
+var parseHermesSetupReceipt = (value) => {
+  if (!isRecord(value)) return null;
+  return value.version === HERMES_SETUP_RECEIPT_VERSION ? parseCurrentReceipt(value) : parseLegacyReceipt(value);
+};
+var serializeHermesSetupReceipt = (receipt) => ({ version: HERMES_SETUP_RECEIPT_VERSION, ...receipt });
+var receiptWithoutSnapshots = () => ({
+  settings: [
+    { key: HERMES_APPROVAL_TRANSPORT_KEY, wasSet: false, before: null },
+    { key: HERMES_APPROVAL_FALLBACK_KEY, wasSet: false, before: null }
+  ],
+  pluginWasEnabled: false,
+  questionRoutingAdded: false
+});
+var receiptAfterQuestionRoutingReturned = (receipt) => ({ ...receipt, questionRoutingAdded: false });
+var PUSHARY_VALUES = {
+  [HERMES_APPROVAL_TRANSPORT_KEY]: HERMES_PUSHARY_TRANSPORT,
+  [HERMES_APPROVAL_FALLBACK_KEY]: HERMES_PUSHARY_FALLBACK
+};
+var hermesSettingRestore = (snapshot, current) => {
+  const ours = PUSHARY_VALUES[snapshot.key];
+  const stillOurs = current.kind === "set" && current.value === ours;
+  const oursBeforeSetup = snapshot.wasSet && snapshot.before === ours;
+  return stillOurs && !oursBeforeSetup ? { kind: "restore", key: snapshot.key, snapshot } : { kind: "leave", key: snapshot.key };
+};
+var sameSettingValue = (left, right) => JSON.stringify(left) === JSON.stringify(right);
+
+// src/hermes/config-sections.ts
+var HERMES_CONFIG_SECTION_KEYS = [HERMES_PLUGINS_SECTION, HERMES_APPROVAL_SECTION, HERMES_DISABLED_TOOLSETS_KEY];
+var HERMES_SNAPSHOT_KEYS = [HERMES_APPROVAL_TRANSPORT_KEY, HERMES_APPROVAL_FALLBACK_KEY];
+var KEY_SEPARATOR = ".";
+var UNSET = { kind: "unset" };
+var childReading = (reading, name) => reading.kind === "set" && isRecord(reading.value) && Object.hasOwn(reading.value, name) ? { kind: "set", value: reading.value[name] } : UNSET;
+var sectionHolding = (key) => HERMES_CONFIG_SECTION_KEYS.find((section) => key === section || key.startsWith(`${section}${KEY_SEPARATOR}`)) ?? null;
+var readingFromSections = (sections, key) => {
+  const section = sectionHolding(key);
+  if (section === null) return null;
+  const path = key === section ? [] : key.slice(section.length + KEY_SEPARATOR.length).split(KEY_SEPARATOR);
+  return path.reduce(childReading, sections[section]);
+};
+var stringList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+var readingValue = (reading) => reading.kind === "set" ? reading.value : void 0;
+var stringOrNull = (value) => typeof value === "string" ? value : null;
+var hermesSettingsFrom = (sections) => {
+  const plugins = readingValue(sections[HERMES_PLUGINS_SECTION]);
+  const approval = readingValue(sections[HERMES_APPROVAL_SECTION]);
+  const enabled = isRecord(plugins) ? stringList(plugins.enabled) : [];
+  const disabled = isRecord(plugins) ? stringList(plugins.disabled) : [];
+  return {
+    pluginEnabled: enabled.includes(HERMES_PLUGIN_KEY),
+    pluginDisabled: disabled.includes(HERMES_PLUGIN_KEY),
+    approvalTransport: isRecord(approval) ? stringOrNull(approval.transport) : null,
+    approvalFallback: isRecord(approval) ? stringOrNull(approval.transport_fallback) : null,
+    disabledToolsets: stringList(readingValue(sections[HERMES_DISABLED_TOOLSETS_KEY]))
+  };
+};
+var pluginNeedsEnabling = (settings) => !settings.pluginEnabled || settings.pluginDisabled;
+var snapshotFrom = (sections) => (key) => {
+  const reading = readingFromSections(sections, key);
+  return reading === null ? null : settingSnapshot(key, reading);
+};
+var isSnapshot = (snapshot) => snapshot !== null;
+var setupReceiptFrom = (sections) => {
+  const snapshots = HERMES_SNAPSHOT_KEYS.map(snapshotFrom(sections));
+  if (!snapshots.every(isSnapshot)) return null;
+  return { settings: snapshots, pluginWasEnabled: hermesSettingsFrom(sections).pluginEnabled, questionRoutingAdded: false };
+};
+var holdsValue = (reading, value) => reading?.kind === "set" && reading.value === value;
+var pusharySettingsToWrite = (sections) => HERMES_PUSHARY_SETTINGS.filter((setting) => !holdsValue(sections === null ? null : readingFromSections(sections, setting.key), setting.value));
+
+// src/hermes/runtime.ts
 var HERMES_COMMAND_TIMEOUT_MS = 2e4;
+var HERMES_PLUGIN_COMMAND_TIMEOUT_MS = 18e4;
+var HERMES_OUTPUT_LIMIT_BYTES = 1024 * 1024;
 var LEGACY_PIP_TIMEOUT_MS = 6e4;
+var PIP_UNINSTALLED = "Successfully uninstalled";
 var HERMES_SETTING_NOT_SET = "Config key not set";
-var HERMES_PLUGINS_SECTION = "plugins";
-var HERMES_APPROVAL_SECTION = "security.approval";
 var INSTALL_METADATA_FILE = ".install-metadata.json";
 var GATEWAY_STATE_FILE = "gateway_state.json";
 var GATEWAY_PID_FILE = "gateway.pid";
@@ -2001,22 +2101,26 @@ var commandOutput = (error) => {
   if (!isRecord(error)) return String(error);
   return [error.stdout, error.stderr].map((part) => part === void 0 || part === null ? "" : String(part)).join("\n");
 };
-var runHermesCommand = (launcher, args) => {
+var stoppedAtTimeout = (error) => isRecord(error) && error.killed === true;
+var runFileAsync = promisify(execFile);
+var runHermesCommand = async (launcher, args, timeoutMs = HERMES_COMMAND_TIMEOUT_MS) => {
   const shell = needsShell(launcher.path);
   try {
-    const stdout = execFileSync(
+    const running = runFileAsync(
       shell ? quotedForWindowsShell(launcher.path) : launcher.path,
       shell ? args.map(quotedForWindowsShell) : [...args],
-      { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: HERMES_COMMAND_TIMEOUT_MS, shell }
+      { encoding: "utf-8", timeout: timeoutMs, maxBuffer: HERMES_OUTPUT_LIMIT_BYTES, shell, windowsHide: true }
     );
+    running.child.stdin?.end();
+    const { stdout } = await running;
     return { kind: "ok", stdout };
   } catch (error) {
-    return { kind: "failed", output: commandOutput(error) };
+    return { kind: "failed", output: commandOutput(error), timedOut: stoppedAtTimeout(error) };
   }
 };
 var lastLine = (output) => output.trim().split(/\r?\n/).filter((line) => line.trim().length > 0).at(-1)?.trim() ?? "";
-var readHermesHome = (launcher) => {
-  const result = runHermesCommand(launcher, ["config", "path"]);
+var readHermesHome = async (launcher) => {
+  const result = await runHermesCommand(launcher, ["config", "path"]);
   if (result.kind !== "ok") return null;
   const configPath = lastLine(result.stdout);
   return isAbsolute(configPath) ? dirname(configPath) : null;
@@ -2028,42 +2132,35 @@ var parsedJson = (text) => {
     return { ok: false };
   }
 };
-var readHermesSetting = (launcher, key) => {
-  const result = runHermesCommand(launcher, ["config", "get", key, "--json"]);
+var readHermesSetting = async (launcher, key) => {
+  const result = await runHermesCommand(launcher, ["config", "get", key, "--json"]);
   if (result.kind === "failed") return result.output.includes(HERMES_SETTING_NOT_SET) ? { kind: "unset" } : null;
   const parsed = parsedJson(lastLine(result.stdout));
   return parsed.ok ? { kind: "set", value: parsed.value } : null;
 };
 var settingArgument = (value) => typeof value === "string" ? value : JSON.stringify(value);
-var writeHermesSetting = (launcher, key, value) => runHermesCommand(launcher, ["config", "set", key, settingArgument(value)]).kind === "ok";
-var unsetHermesSetting = (launcher, key) => {
-  const result = runHermesCommand(launcher, ["config", "unset", key]);
+var writeHermesSetting = async (launcher, key, value) => (await runHermesCommand(launcher, ["config", "set", key, settingArgument(value)])).kind === "ok";
+var unsetHermesSetting = async (launcher, key) => {
+  const result = await runHermesCommand(launcher, ["config", "unset", key]);
   return result.kind === "ok" || result.output.includes(HERMES_SETTING_NOT_SET);
 };
-var enableHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "enable", HERMES_PLUGIN_KEY]).kind === "ok";
-var disableHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "disable", HERMES_PLUGIN_KEY]).kind === "ok";
-var removeHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "remove", HERMES_PLUGIN_KEY]).kind === "ok";
-var stringList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
-var readingValue = (reading) => reading.kind === "set" ? reading.value : void 0;
-var stringOrNull = (value) => typeof value === "string" ? value : null;
-var readHermesSettings = (launcher) => {
-  const plugins = readHermesSetting(launcher, HERMES_PLUGINS_SECTION);
-  const approval = readHermesSetting(launcher, HERMES_APPROVAL_SECTION);
-  const toolsets = readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
-  if (!plugins || !approval || !toolsets) return null;
-  const pluginSection = readingValue(plugins);
-  const approvalSection = readingValue(approval);
-  const enabled = isRecord(pluginSection) ? stringList(pluginSection.enabled) : [];
-  const disabled = isRecord(pluginSection) ? stringList(pluginSection.disabled) : [];
-  return {
-    pluginEnabled: enabled.includes(HERMES_PLUGIN_KEY),
-    pluginDisabled: disabled.includes(HERMES_PLUGIN_KEY),
-    approvalTransport: isRecord(approvalSection) ? stringOrNull(approvalSection.transport) : null,
-    approvalFallback: isRecord(approvalSection) ? stringOrNull(approvalSection.transport_fallback) : null,
-    disabledToolsets: stringList(readingValue(toolsets))
-  };
+var runHermesPluginCommand = (launcher, verb) => runHermesCommand(launcher, ["plugins", verb, HERMES_PLUGIN_KEY], HERMES_PLUGIN_COMMAND_TIMEOUT_MS);
+var pluginCommandSucceeded = async (launcher, verb) => (await runHermesPluginCommand(launcher, verb)).kind === "ok";
+var pluginEnablingFrom = (result) => {
+  if (result.kind === "ok") return "enabled";
+  return result.timedOut ? "timed_out" : "refused";
+};
+var enableHermesPlugin = async (launcher) => pluginEnablingFrom(await runHermesPluginCommand(launcher, "enable"));
+var disableHermesPlugin = (launcher) => pluginCommandSucceeded(launcher, "disable");
+var removeHermesPlugin = (launcher) => pluginCommandSucceeded(launcher, "remove");
+var readHermesConfigSections = async (launcher) => {
+  const [plugins, approval, disabledToolsets] = await Promise.all([
+    readHermesSetting(launcher, HERMES_PLUGINS_SECTION),
+    readHermesSetting(launcher, HERMES_APPROVAL_SECTION),
+    readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY)
+  ]);
+  return plugins && approval && disabledToolsets ? { [HERMES_PLUGINS_SECTION]: plugins, [HERMES_APPROVAL_SECTION]: approval, [HERMES_DISABLED_TOOLSETS_KEY]: disabledToolsets } : null;
 };
-var HERMES_SNAPSHOT_KEYS = [HERMES_APPROVAL_TRANSPORT_KEY, HERMES_APPROVAL_FALLBACK_KEY];
 var hermesPluginDirectory = (home) => join(home, "plugins", HERMES_PLUGIN_KEY);
 var HERMES_ROOT_DIRECTORY = ".hermes";
 var HERMES_CONFIG_FILE = "config.yaml";
@@ -2203,10 +2300,16 @@ var legacyHermesPython = (launcher) => {
     return null;
   }
 };
-var removeLegacyPipCopy = (python, distribution) => {
+var removeLegacyPipCopy = async (python, distribution) => {
   try {
-    execFileSync(python, ["-m", "pip", "uninstall", "-y", distribution], { stdio: "ignore", timeout: LEGACY_PIP_TIMEOUT_MS });
-    return true;
+    const running = runFileAsync(
+      python,
+      ["-m", "pip", "uninstall", "-y", distribution],
+      { encoding: "utf-8", timeout: LEGACY_PIP_TIMEOUT_MS, maxBuffer: HERMES_OUTPUT_LIMIT_BYTES, windowsHide: true }
+    );
+    running.child.stdin?.end();
+    const { stdout } = await running;
+    return stdout.includes(PIP_UNINSTALLED);
   } catch {
     return false;
   }
@@ -2287,72 +2390,25 @@ var toolsetsWithoutPusharyQuestionRouting = (disabledToolsets, questionRoutingAd
 
 // src/hermes/install.ts
 import { existsSync as existsSync2, rmSync as rmSync2 } from "fs";
-
-// src/hermes/setup-receipt.ts
-var HERMES_SETUP_RECEIPT_VERSION = 2;
-var settingSnapshot = (key, reading) => reading.kind === "set" ? { key, wasSet: true, before: reading.value } : { key, wasSet: false, before: null };
-var isSettingSnapshot = (value) => isRecord(value) && typeof value.key === "string" && typeof value.wasSet === "boolean" && Object.hasOwn(value, "before");
-var parseCurrentReceipt = (value) => {
-  const { settings, pluginWasEnabled, questionRoutingAdded } = value;
-  if (!Array.isArray(settings) || !settings.every(isSettingSnapshot)) return null;
-  if (typeof pluginWasEnabled !== "boolean" || typeof questionRoutingAdded !== "boolean") return null;
-  return { settings, pluginWasEnabled, questionRoutingAdded };
-};
-var LEGACY_SNAPSHOT_KEYS = ["security", "approval", "transport", "fallback", "plugins", "enabled", "agent", "disabled"];
-var isLegacySnapshot = (value) => isRecord(value) && typeof value.present === "boolean" && Object.hasOwn(value, "value");
-var legacySetting = (key, snapshot) => ({ key, wasSet: snapshot.present, before: snapshot.present ? snapshot.value : null });
-var parseLegacyReceipt = (value) => {
-  if (!LEGACY_SNAPSHOT_KEYS.every((key) => isLegacySnapshot(value[key]))) return null;
-  if (typeof value.pushary_enabled !== "boolean" || typeof value.clarify_disabled !== "boolean") return null;
-  const transport = value.transport;
-  const fallback = value.fallback;
-  if (!isLegacySnapshot(transport) || !isLegacySnapshot(fallback)) return null;
-  return {
-    settings: [legacySetting(HERMES_APPROVAL_TRANSPORT_KEY, transport), legacySetting(HERMES_APPROVAL_FALLBACK_KEY, fallback)],
-    pluginWasEnabled: value.pushary_enabled,
-    questionRoutingAdded: !value.clarify_disabled
-  };
-};
-var parseHermesSetupReceipt = (value) => {
-  if (!isRecord(value)) return null;
-  return value.version === HERMES_SETUP_RECEIPT_VERSION ? parseCurrentReceipt(value) : parseLegacyReceipt(value);
-};
-var serializeHermesSetupReceipt = (receipt) => ({ version: HERMES_SETUP_RECEIPT_VERSION, ...receipt });
-var receiptWithoutSnapshots = () => ({
-  settings: [
-    { key: HERMES_APPROVAL_TRANSPORT_KEY, wasSet: false, before: null },
-    { key: HERMES_APPROVAL_FALLBACK_KEY, wasSet: false, before: null }
-  ],
-  pluginWasEnabled: false,
-  questionRoutingAdded: false
-});
-var receiptAfterQuestionRoutingReturned = (receipt) => ({ ...receipt, questionRoutingAdded: false });
-var PUSHARY_VALUES = {
-  [HERMES_APPROVAL_TRANSPORT_KEY]: HERMES_PUSHARY_TRANSPORT,
-  [HERMES_APPROVAL_FALLBACK_KEY]: HERMES_PUSHARY_FALLBACK
-};
-var hermesSettingRestore = (snapshot, current) => {
-  const ours = PUSHARY_VALUES[snapshot.key];
-  const stillOurs = current.kind === "set" && current.value === ours;
-  const oursBeforeSetup = snapshot.wasSet && snapshot.before === ours;
-  return stillOurs && !oursBeforeSetup ? { kind: "restore", key: snapshot.key, snapshot } : { kind: "leave", key: snapshot.key };
-};
-var sameSettingValue = (left, right) => JSON.stringify(left) === JSON.stringify(right);
-
-// src/hermes/install.ts
 var RECEIPT_MODE = 384;
-var inspectWithLauncher = (launcher) => {
-  const home = readHermesHome(launcher);
-  const settings = home ? readHermesSettings(launcher) : null;
-  if (!home || !settings) return { kind: "unreadable", home };
+var inspectionFrom = (launcher, home, sections) => {
+  const settings = hermesSettingsFrom(sections);
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
   const gateway = readHermesGateway(home);
   const gatewayLoad = gateway.kind === "running" ? readHermesLoadRecord(home, gateway.pid) : null;
   const state = hermesWiringState({ folder, settings, gateway, gatewayLoad });
   return { kind: "inspected", launcher, home, folder, settings, gateway, state };
 };
+var inspectAt = async (launcher, home) => {
+  const sections = await readHermesConfigSections(launcher);
+  return sections ? inspectionFrom(launcher, home, sections) : { kind: "unreadable", home };
+};
+var inspectWithLauncher = async (launcher) => {
+  const [home, sections] = await Promise.all([readHermesHome(launcher), readHermesConfigSections(launcher)]);
+  return home && sections ? inspectionFrom(launcher, home, sections) : { kind: "unreadable", home };
+};
 var findLauncherWhereHermesLives = () => existsSync2(defaultHermesHome()) ? findHermesLauncher() : null;
-var inspectHermesWiring = (launcher) => {
+var inspectHermesWiring = async (launcher) => {
   const resolved = launcher === void 0 ? findLauncherWhereHermesLives() : launcher;
   return resolved ? inspectWithLauncher(resolved) : { kind: "no_launcher" };
 };
@@ -2382,67 +2438,62 @@ var removeSetupReceipts = (receipts) => {
   rmSync2(receipts.receiptPath, { force: true });
   rmSync2(receipts.legacyReceiptPath, { force: true });
 };
-var snapshotSettings = (launcher) => {
-  const settings = readHermesSettings(launcher);
-  if (!settings) return null;
-  const snapshots = [];
-  for (const key of HERMES_SNAPSHOT_KEYS) {
-    const reading = readHermesSetting(launcher, key);
-    if (!reading) return null;
-    snapshots.push(settingSnapshot(key, reading));
-  }
-  return {
-    settings: snapshots,
-    pluginWasEnabled: settings.pluginEnabled,
-    questionRoutingAdded: false
-  };
-};
-var ensureSetupReceipt = (launcher, receipts) => {
-  const existing = readSetupReceipt(receipts);
-  if (existing.kind === "invalid") return { kind: "failed", reason: "receipt_invalid" };
-  const receipt = existing.kind === "ok" ? existing.receipt : snapshotSettings(launcher);
+var ensureSetupReceipt = (receipts, existing, sections) => {
+  const receipt = existing.kind === "ok" ? existing.receipt : sections && setupReceiptFrom(sections);
   if (!receipt) return { kind: "failed", reason: "settings_unreadable" };
   if (!existsSync2(receipts.receiptPath)) writeSetupReceipt(receipts, receipt);
   return { kind: "ok", receipt };
 };
-var settingNeedsWrite = (launcher, key, value) => {
-  const current = readHermesSetting(launcher, key);
-  return !(current?.kind === "set" && current.value === value);
+var ENABLING_FAILURES = {
+  refused: "settings_failed",
+  timed_out: "plugin_load_timed_out"
 };
-var applyPusharySettings = (launcher) => {
-  if (!enableHermesPlugin(launcher)) return false;
-  return HERMES_PUSHARY_SETTINGS.every((setting) => !settingNeedsWrite(launcher, setting.key, setting.value) || writeHermesSetting(launcher, setting.key, setting.value));
+var writeSettingsInTurn = async (launcher, settings) => {
+  for (const setting of settings) {
+    if (!await writeHermesSetting(launcher, setting.key, setting.value)) return false;
+  }
+  return true;
 };
-var writeListSetting = (launcher, key, list) => {
+var applyPusharySettings = async (launcher, sections) => {
+  const enabling = await enableHermesPlugin(launcher);
+  if (enabling !== "enabled") return { kind: "failed", reason: ENABLING_FAILURES[enabling] };
+  const writes = pusharySettingsToWrite(sections);
+  if (!await writeSettingsInTurn(launcher, writes)) return { kind: "failed", reason: "settings_failed" };
+  const enableChangedConfig = sections === null || pluginNeedsEnabling(hermesSettingsFrom(sections));
+  return { kind: "applied", changedHermes: enableChangedConfig || writes.length > 0 };
+};
+var writeListSetting = async (launcher, key, list) => {
   if (list.length > 0) return writeHermesSetting(launcher, key, list);
-  if (!unsetHermesSetting(launcher, key)) return false;
-  const after = readHermesSetting(launcher, key);
+  if (!await unsetHermesSetting(launcher, key)) return false;
+  const after = await readHermesSetting(launcher, key);
   return after?.kind !== "set" || sameSettingValue(after.value, []) || writeHermesSetting(launcher, key, []);
 };
-var returnQuestionsToHermes = (launcher, receipt) => {
-  const toolsets = readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
+var returnQuestionsToHermes = async (launcher, receipt) => {
+  const toolsets = await readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
   if (!toolsets) return false;
   const current = toolsets.kind === "set" && Array.isArray(toolsets.value) ? toolsets.value.filter((item) => typeof item === "string") : [];
   const next = toolsetsWithoutPusharyQuestionRouting(current, receipt.questionRoutingAdded);
   return next === null || writeListSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY, next);
 };
-var removeLegacyCopy = (launcher) => {
+var removeLegacyCopy = async (launcher) => {
   const python = legacyHermesPython(launcher);
   return python !== null && removeLegacyPipCopy(python, HERMES_LEGACY_PIP_PACKAGE);
 };
-var returnQuestionsIfThePluginRoutesThem = (launcher, home, receipts, receipt) => {
+var returnQuestionsIfThePluginRoutesThem = async (launcher, home, receipts, receipt) => {
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
-  if (!receipt.questionRoutingAdded || !routesHermesQuestions(folder)) return true;
-  if (!returnQuestionsToHermes(launcher, receipt)) return false;
+  if (!receipt.questionRoutingAdded || !routesHermesQuestions(folder)) return "unchanged";
+  if (!await returnQuestionsToHermes(launcher, receipt)) return "failed";
   writeSetupReceipt(receipts, receiptAfterQuestionRoutingReturned(receipt));
-  return true;
+  return "returned";
 };
-var installHermesPlugin = (request) => {
+var installHermesPlugin = async (request) => {
   const launcher = request.launcher === void 0 ? findHermesLauncher() : request.launcher;
   if (!launcher) return { kind: "no_launcher" };
-  const home = readHermesHome(launcher);
+  const existingReceipt = readSetupReceipt(request.receipts);
+  if (existingReceipt.kind === "invalid") return { kind: "failed", reason: "receipt_invalid" };
+  const [home, sections] = await Promise.all([readHermesHome(launcher), readHermesConfigSections(launcher)]);
   if (!home) return { kind: "failed", reason: "home_unknown" };
-  const ensured = ensureSetupReceipt(launcher, request.receipts);
+  const ensured = ensureSetupReceipt(request.receipts, existingReceipt, sections);
   if (ensured.kind === "failed") return ensured;
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
   if (folder.kind === "unknown") return { kind: "failed", reason: "plugin_folder_not_ours" };
@@ -2454,12 +2505,14 @@ var installHermesPlugin = (request) => {
       return { kind: "failed", reason: "plugin_write_failed" };
     }
   }
-  if (!applyPusharySettings(launcher)) return { kind: "failed", reason: "settings_failed" };
-  if (!returnQuestionsIfThePluginRoutesThem(launcher, home, request.receipts, ensured.receipt)) {
-    return { kind: "failed", reason: "settings_failed" };
-  }
-  const legacyCopyRemoved = removeLegacyCopy(launcher);
-  return { kind: "installed", folderWritten, legacyCopyRemoved, inspection: inspectWithLauncher(launcher) };
+  const applied = await applyPusharySettings(launcher, sections);
+  if (applied.kind === "failed") return { kind: "failed", reason: applied.reason };
+  const questions = await returnQuestionsIfThePluginRoutesThem(launcher, home, request.receipts, ensured.receipt);
+  if (questions === "failed") return { kind: "failed", reason: "settings_failed" };
+  const legacyCopyRemoved = await removeLegacyCopy(launcher);
+  const configUnchanged = !applied.changedHermes && questions === "unchanged";
+  const inspection = sections !== null && configUnchanged ? inspectionFrom(launcher, home, sections) : await inspectAt(launcher, home);
+  return { kind: "installed", folderWritten, legacyCopyRemoved, inspection };
 };
 var refreshHermesPluginFiles = (installedBy, plugin, home = defaultHermesHome()) => {
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
@@ -2473,9 +2526,9 @@ var refreshHermesPluginFiles = (installedBy, plugin, home = defaultHermesHome())
   }
 };
 var macAppOwnsHermes = (folder, request) => hermesWiringOwner(folder, existsSync2(request.macAppWiringRecord)) === "mac_app";
-var removePluginEntry = (launcher, settings) => {
-  if (!settings.pluginEnabled || disableHermesPlugin(launcher)) return true;
-  const enabled = readHermesSetting(launcher, HERMES_PLUGINS_ENABLED_KEY);
+var removePluginEntry = async (launcher, settings) => {
+  if (!settings.pluginEnabled || await disableHermesPlugin(launcher)) return true;
+  const enabled = await readHermesSetting(launcher, HERMES_PLUGINS_ENABLED_KEY);
   const list = enabled?.kind === "set" && Array.isArray(enabled.value) ? enabled.value : [];
   return writeListSetting(
     launcher,
@@ -2483,32 +2536,38 @@ var removePluginEntry = (launcher, settings) => {
     list.filter((item) => typeof item === "string" && item !== HERMES_PLUGIN_KEY)
   );
 };
-var removePushPlugin = (launcher, home, folder, settings, receipt) => {
-  removeLegacyCopy(launcher);
+var removePushPlugin = async (launcher, home, folder, settings, receipt) => {
+  await removeLegacyCopy(launcher);
   if (folder.kind === "pushary") {
-    if (removeHermesPlugin(launcher)) return true;
+    if (await removeHermesPlugin(launcher)) return true;
     rmSync2(hermesPluginDirectory(home), { recursive: true, force: true });
     return removePluginEntry(launcher, settings);
   }
   return receipt.pluginWasEnabled || removePluginEntry(launcher, settings);
 };
-var restoreSetting = (launcher, snapshot) => {
-  const current = readHermesSetting(launcher, snapshot.key);
+var restoreSetting = async (launcher, snapshot) => {
+  const current = await readHermesSetting(launcher, snapshot.key);
   if (!current) return false;
   if (hermesSettingRestore(snapshot, current).kind === "leave") return true;
-  if (!unsetHermesSetting(launcher, snapshot.key)) return false;
+  if (!await unsetHermesSetting(launcher, snapshot.key)) return false;
   if (!snapshot.wasSet) return true;
-  const after = readHermesSetting(launcher, snapshot.key);
+  const after = await readHermesSetting(launcher, snapshot.key);
   return after?.kind === "set" && sameSettingValue(after.value, snapshot.before) ? true : writeHermesSetting(launcher, snapshot.key, snapshot.before);
 };
 var macAppOwnsTheFolderOnDisk = (request) => macAppOwnsHermes(classifyHermesPluginFolder(readHermesPluginFolderFacts(request.home ?? defaultHermesHome())), request);
-var removeHermesWiring = (request) => {
+var restoreSettingsInTurn = async (launcher, snapshots) => {
+  for (const snapshot of snapshots) {
+    if (!await restoreSetting(launcher, snapshot)) return false;
+  }
+  return true;
+};
+var removeHermesWiring = async (request) => {
   if (request.keepMacAppWiring && macAppOwnsTheFolderOnDisk(request)) return { kind: "kept_for_mac_app" };
   const receiptRead = readSetupReceipt(request.receipts);
   const launcher = request.launcher === void 0 ? receiptRead.kind === "missing" ? findLauncherWhereHermesLives() : findHermesLauncher() : request.launcher;
   if (!launcher) return receiptRead.kind === "missing" ? { kind: "not_found" } : { kind: "runtime_missing" };
   if (receiptRead.kind === "invalid") return { kind: "failed", step: "receipt_invalid" };
-  const inspection = inspectWithLauncher(launcher);
+  const inspection = await inspectWithLauncher(launcher);
   if (inspection.kind !== "inspected") {
     return receiptRead.kind === "missing" ? { kind: "not_found" } : { kind: "failed", step: "home_unknown" };
   }
@@ -2517,8 +2576,8 @@ var removeHermesWiring = (request) => {
   if (state.kind === "not_wired" && receiptRead.kind === "missing") return { kind: "not_found" };
   const receipt = receiptRead.kind === "ok" ? receiptRead.receipt : receiptWithoutSnapshots();
   if (request.dryRun) return { kind: "removed", pluginRemoved: folder.kind === "pushary", settingsRestored: true, dryRun: true };
-  if (!removePushPlugin(launcher, home, folder, settings, receipt)) return { kind: "failed", step: "plugin" };
-  const settingsRestored = receipt.settings.every((snapshot) => restoreSetting(launcher, snapshot)) && returnQuestionsToHermes(launcher, receipt);
+  if (!await removePushPlugin(launcher, home, folder, settings, receipt)) return { kind: "failed", step: "plugin" };
+  const settingsRestored = await restoreSettingsInTurn(launcher, receipt.settings) && await returnQuestionsToHermes(launcher, receipt);
   if (!settingsRestored) return { kind: "failed", step: "settings" };
   removeSetupReceipts(request.receipts);
   return { kind: "removed", pluginRemoved: folder.kind === "pushary", settingsRestored, dryRun: false };

package/dist/{chunk-CU65AFT4.js → chunk-WJTUCQ47.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-KZERVKTD.js";
 import {
   redactSecretsFromContent
-} from "./chunk-INBG473K.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/cli/json.ts
 var writeStdoutFully = (text) => new Promise((resolve, reject) => {

package/dist/{chunk-7AQEWD2J.js → chunk-XCBKGQ6N.js}

@@ -1,9 +1,9 @@
 import {
   readExistingMachineId
-} from "./chunk-LD5LSJ2B.js";
+} from "./chunk-4ZSQPGAU.js";
 import {
   getBaseUrl
-} from "./chunk-IHT33GZN.js";
+} from "./chunk-Q53QJQLY.js";
 import {
   NetworkError
 } from "./chunk-PPY5N2E6.js";
@@ -13,7 +13,7 @@ import {
 import {
   clientContextHeaders,
   redactSecretsFromContent
-} from "./chunk-INBG473K.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/cli/net.ts
 import { createRequire } from "module";

package/dist/{chunk-ABAWD6QM.js → chunk-Y4I5YX3L.js}

@@ -443,9 +443,9 @@ var installGlobally = (options) => {
   }
   const started = (async () => {
     if (!npmIsOnPath()) throw new NpmMissingError();
-    const { withUpgradeLock } = await import("./global-upgrade-EYLSJXXN.js");
-    const { installWithUpgradeLock, ownsUpgradeLock } = await import("./upgrade-lock-A2ALHHUG.js");
-    const { autoUpdateLock } = await import("./paths-XV3FXWOM.js");
+    const { withUpgradeLock } = await import("./global-upgrade-AXTMEH3I.js");
+    const { installWithUpgradeLock, ownsUpgradeLock } = await import("./upgrade-lock-4B3D3OCT.js");
+    const { autoUpdateLock } = await import("./paths-ZHDLQD25.js");
     let result = "skipped";
     const install = async () => {
       const platform = process.platform;

package/dist/{chunk-7HYNAA6B.js → chunk-YH3RAWMV.js}

@@ -1,6 +1,6 @@
 import {
   isSafeReadOnlyCommand
-} from "./chunk-INBG473K.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/ledger.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync } from "fs";

package/dist/{chunk-OJ4EEE2B.js → chunk-YJK3LBAJ.js}

@@ -1,7 +1,7 @@
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "./chunk-GI3PX2JU.js";
+} from "./chunk-74NZ3CJQ.js";
 import {
   AUTO_DECISION_WINDOW_MS,
   DEFAULT_SESSION,
@@ -10,19 +10,19 @@ import {
   permissionDeniedAction,
   releaseThrottle,
   reportEvent
-} from "./chunk-KUI2KGRZ.js";
+} from "./chunk-ZM3ELQPE.js";
 import {
   askUser,
   isDecisionStopped,
   isQuestionLimitRefusal,
   waitForQuestion
-} from "./chunk-ESHMWZXX.js";
+} from "./chunk-PYW7VWVZ.js";
 import {
   SubscriptionRequiredError
-} from "./chunk-GV7FB5L3.js";
+} from "./chunk-5F3L3QOO.js";
 import {
   getMachineId
-} from "./chunk-LD5LSJ2B.js";
+} from "./chunk-4ZSQPGAU.js";
 import {
   ASK_CONTEXT_MAX,
   agentQuestionContext,
@@ -34,7 +34,7 @@ import {
   questionsShownAsASet,
   shouldDeferToNativeMode,
   wireVerdictFor
-} from "./chunk-INBG473K.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/machine-decision-audit.ts
 import { basename } from "path";