@poe-platform/safe-bash 0.1.821 → 0.1.823

package/dist/safe-bash/command-chunks/{chunk-RKAL5VFP.js → chunk-PLVFJ6FF.js}

@@ -1,17 +1,22 @@
 import {
   pythonRepr
-} from "./chunk-MCUDSE4H.js";
+} from "./chunk-EWECMOQ5.js";
 import {
+  chatOptionSuggestion,
+  chatOptions,
+  commandArguments,
   createLlmConfiguration,
   embeddingCommand,
-  publishConfiguration
-} from "./chunk-WOT2YXBT.js";
+  loadLlmHelp,
+  publishConfiguration,
+  unicodeOrder
+} from "./chunk-7ZQVMPSB.js";
 import {
   createLlmSpool,
   fileSource,
   isPythonWhitespace,
   stripPythonWhitespace
-} from "./chunk-BZLLQWRK.js";
+} from "./chunk-E5CDHXFA.js";
 import {
   createLlmService,
   validateModelOptions
@@ -36,7 +41,7 @@ import {
 import {
   sourceBytes,
   waitForSource
-} from "./chunk-QX3WKBLI.js";
+} from "./chunk-36FV6BAG.js";
 import {
   jsonValue
 } from "./chunk-GNPPPYDF.js";
@@ -46,46 +51,10 @@ import {
 } from "./chunk-VMA3NJXU.js";
 
 // packages/safe-bash-command-llm/src/plugins-command.ts
-var usage = "Usage: llm plugins [OPTIONS]\n";
-var help = usage + "\n  List installed plugins\n\nOptions:\n  --all        Include built-in default plugins\n  --hook TEXT  Filter for plugins that implement this hook\n  -h, --help   Show this message and exit.\n";
 async function pluginsCommand(args, output, diagnostic, step, signal, load) {
-  const error = async (message, withUsage = false) => {
-    await diagnostic((withUsage ? usage + "Try 'llm plugins -h' for help.\n\n" : "") + "Error: " + message + "\n");
-    return 2;
-  };
-  const hooks = [], extra = [];
-  let all = false, showHelp = false, ended = false;
-  for (let index = 0; index < args.length; index++) {
-    await step();
-    const token = args[index];
-    if (ended || !token.startsWith("-") || token === "-") {
-      extra.push(token);
-      continue;
-    }
-    if (token === "--") {
-      ended = true;
-      continue;
-    }
-    const equals = token.indexOf("="), flag = equals < 0 ? token : token.slice(0, equals);
-    if (flag === "--all" || flag === "--help") {
-      if (equals >= 0) return error(`Option '${flag}' does not take a value.`);
-      if (flag === "--all") all = true;
-      else showHelp = true;
-    } else if (flag === "--hook") {
-      if (equals < 0 && args[++index] === void 0) return error("Option '--hook' requires an argument.");
-      hooks.push(equals < 0 ? args[index] : token.slice(equals + 1));
-    } else if (!token.startsWith("--")) {
-      for (const letter of token.slice(1)) {
-        if (letter !== "h") return error(`No such option: -${letter}`, true);
-        showHelp = true;
-      }
-    } else return error(`No such option: ${flag}`, true);
-  }
-  if (showHelp) {
-    await output(help);
-    return 0;
-  }
-  if (extra.length) return error(`Got unexpected extra argument${extra.length === 1 ? "" : "s"} (${extra.join(" ")})`, true);
+  const parsed = await commandArguments("plugins", args, [], output, diagnostic, step);
+  if (typeof parsed === "number") return parsed;
+  const all = parsed.values.has("--all"), hooks = parsed.values.get("--hook") ?? [];
   if (!load) {
     await diagnostic("Error: Python plugin discovery is not configured\n");
     return 1;
@@ -99,83 +68,6 @@ async function pluginsCommand(args, output, diagnostic, step, signal, load) {
   return 0;
 }
 
-// packages/safe-bash-command-llm/src/chat-options.ts
-var chatOptions = [
-  "-h",
-  "--help",
-  "--td",
-  "--tools-debug",
-  "--ta",
-  "--tools-approve",
-  "--no-stream",
-  "--functions",
-  "-T",
-  "--tool",
-  "--cl",
-  "--chain-limit",
-  "-f",
-  "--fragment",
-  "--sf",
-  "--system-fragment",
-  "-m",
-  "--model",
-  "-s",
-  "--system",
-  "-o",
-  "--option",
-  "-t",
-  "--template",
-  "-p",
-  "--param",
-  "--key"
-];
-async function chatOptionSuggestion(value, step) {
-  if (!value.startsWith("--")) return "";
-  const options = chatOptions.filter((option) => option.startsWith("--"));
-  const cutoff = 0.6;
-  const maximum = Math.floor(Math.max(...options.map((option) => option.length)) * (2 / cutoff - 1));
-  const input = [];
-  for (const char of value) {
-    await step();
-    input.push(char);
-    if (input.length > maximum) return "";
-  }
-  const matches = [];
-  for (const option of options) {
-    if (2 * Math.min(option.length, input.length) / (option.length + input.length) < cutoff) continue;
-    const pending = [[0, option.length, 0, input.length]];
-    let matched = 0;
-    while (pending.length) {
-      const [aStart, aEnd, bStart, bEnd] = pending.pop();
-      let bestA = aStart, bestB = bStart, size = 0;
-      for (let a = aStart; a < aEnd; a++) {
-        await step();
-        for (let b = bStart; b < bEnd; b++) {
-          let length = 0;
-          while (a + length < aEnd && b + length < bEnd && option[a + length] === input[b + length]) length++;
-          if (length > size) {
-            bestA = a;
-            bestB = b;
-            size = length;
-          }
-        }
-      }
-      if (!size) continue;
-      matched += size;
-      if (aStart < bestA && bStart < bestB) pending.push([aStart, bestA, bStart, bestB]);
-      if (bestA + size < aEnd && bestB + size < bEnd) pending.push([bestA + size, aEnd, bestB + size, bEnd]);
-    }
-    const score = 2 * matched / (option.length + input.length);
-    if (score >= cutoff) matches.push({ option, score });
-  }
-  matches.sort((left, right) => right.score - left.score || (left.option < right.option ? 1 : left.option > right.option ? -1 : 0));
-  const suggestions = matches.slice(0, 3).map((match) => match.option).sort();
-  return !suggestions.length ? "" : suggestions.length === 1 ? ` Did you mean ${suggestions[0]}?` : ` (Possible options: ${suggestions.join(", ")})`;
-}
-
-// packages/safe-bash-command-llm/src/chat-help.ts
-var chatHelp = "Usage: llm chat [OPTIONS]\n\n  Hold an ongoing chat with a model.\n\nOptions:\n  -s, --system TEXT             System prompt to use\n  -m, --model TEXT              Model to use\n  -f, --fragment TEXT           Fragment (alias, URL, hash or file path) to\n                                add to the prompt\n  --sf, --system-fragment TEXT  Fragment to add to system prompt\n  -t, --template TEXT           Template to use\n  -p, --param <TEXT TEXT>...    Parameters for template\n  -o, --option <TEXT TEXT>...   key/value options for the model\n  --no-stream                   Do not stream output\n  --key TEXT                    API key to use\n  -T, --tool TEXT               Name of a tool to make available to the model\n  --functions TEXT              Python code block or file path defining\n                                functions to register as tools\n  --td, --tools-debug           Show full details of tool executions\n  --ta, --tools-approve         Manually approve every tool execution\n  --cl, --chain-limit INTEGER   How many chained tool responses to allow,\n                                default 5, set 0 for unlimited\n  -h, --help                    Show this message and exit.\n";
-
 // packages/safe-bash-command-llm/src/chat-editor.ts
 import { FsError } from "../../safe-bash-contracts/index.js";
 var serial = 0;
@@ -987,7 +879,7 @@ async function* promptToolChain(options) {
         const write = options.debugWrite;
         diagnostics = diagnostics.then(async () => {
           signal.throwIfAborted();
-          const { debugToolResult } = await import("./prompt-tool-debug-ERJKK3XZ.js");
+          const { debugToolResult } = await import("./prompt-tool-debug-3POFNRYP.js");
           await debugToolResult({ context: { ...context, signal }, result, output: content.spool, attachments, write });
         });
         await diagnostics;
@@ -1110,132 +1002,56 @@ function selectLlmTools(registry, names) {
   return names.map((name) => registry.get(name));
 }
 
-// packages/safe-bash-command-llm/src/fragment-loader-command.ts
-async function fragmentLoaderCommand(tokens, loaders, output, diagnostic) {
-  const usage3 = "Usage: llm fragments loaders [OPTIONS]\n";
-  let failure, help2 = false, ended = false;
-  const operands = [];
-  for (const token of tokens) {
-    if (!ended && token === "--") ended = true;
-    else if (!ended && (token === "--help" || token === "-h")) help2 = true;
-    else if (!ended && token.startsWith("-") && token !== "-") {
-      failure = `No such option: ${token.split("=")[0]}`;
-      break;
-    } else operands.push(token);
-  }
-  if (help2 && !failure) {
-    await output(usage3 + "\n  Show fragment loaders registered by plugins\n\nOptions:\n  -h, --help  Show this message and exit.\n");
-    return 0;
-  }
-  failure ??= operands.length ? `Got unexpected extra argument (${operands[0]})` : void 0;
-  if (failure) {
-    await diagnostic(usage3 + "Try 'llm fragments loaders --help' for help.\n\nError: " + failure + "\n");
-    return 2;
+// packages/safe-bash-command-llm/src/loader-provider.ts
+var LlmLoaderLookupError = class extends Error {
+};
+async function discoverLlmLoaders(loaders, context, provider) {
+  if (!provider) return loaders ?? /* @__PURE__ */ new Map();
+  const result = await waitForSource(() => provider.discover(context), context.signal);
+  return new Map([...result[context.kind === "fragments" ? "fragmentLoaders" : "templateLoaders"], ...loaders ?? []]);
+}
+
+// packages/safe-bash-command-llm/src/loader-description.ts
+function formatLoaderDescription(value) {
+  const lines = (value || "Undocumented").split("\n");
+  let common;
+  for (const line of lines) {
+    if (!line.trim()) continue;
+    let width = 0;
+    while (line[width] === " " || line[width] === "	") width++;
+    const indent = line.slice(0, width);
+    if (common === void 0) common = indent;
+    else {
+      let i = 0;
+      while (i < common.length && common[i] === indent[i]) i++;
+      common = common.slice(0, i);
+    }
   }
+  const description = lines.map((line) => line.trim() ? line.slice(common?.length ?? 0) : "").join("\n").trim();
+  return description.split("\n").map((line) => line ? `  ${line}` : line);
+}
+
+// packages/safe-bash-command-llm/src/fragment-loader-command.ts
+async function fragmentLoaderCommand(tokens, loaders, output, diagnostic, step, discover) {
+  const parsed = await commandArguments("fragments loaders", tokens, [], output, diagnostic, step);
+  if (typeof parsed === "number") return parsed;
   let found = false;
-  for (const [prefix, loader] of loaders) {
+  for (const [prefix, loader] of discover ? await discover() : loaders) {
     if (found) await output("\n");
     found = true;
     await output(`${prefix}:
 `);
-    const lines = (loader.description || "Undocumented").split("\n");
-    let common;
-    for (const line of lines) {
-      if (!line.trim()) continue;
-      let width = 0;
-      while (line[width] === " " || line[width] === "	") width++;
-      const indent = line.slice(0, width);
-      if (common === void 0) common = indent;
-      else {
-        let i = 0;
-        while (i < common.length && common[i] === indent[i]) i++;
-        common = common.slice(0, i);
-      }
-    }
-    const description = lines.map((line) => line.trim() ? line.slice(common?.length ?? 0) : "").join("\n").trim();
-    for (const line of description.split("\n")) await output((line.trim() ? `  ${line}` : line) + "\n");
+    for (const line of formatLoaderDescription(loader.description)) await output(line + "\n");
   }
   if (!found) await output("No fragment loaders found\n");
   return 0;
 }
 
 // packages/safe-bash-command-llm/src/tools-command.ts
-var usage2 = "Usage: llm tools list [OPTIONS] [TOOL_DEFS]...\n";
-var groupHelp = "Usage: llm tools [OPTIONS] COMMAND [ARGS]...\n\n  Manage tools that can be made available to LLMs\n\nOptions:\n  -h, --help  Show this message and exit.\n\nCommands:\n  list*  List available tools that have been provided by plugins\n";
-var listHelp = usage2 + "\n  List available tools that have been provided by plugins\n\nOptions:\n  --json            Output as JSON\n  --functions TEXT  Python code block or file path defining functions to\n                    register as tools\n  -h, --help        Show this message and exit.\n";
-function compareNames(left, right) {
-  let a = 0, b = 0;
-  while (a < left.length && b < right.length) {
-    const x = left.codePointAt(a), y = right.codePointAt(b);
-    if (x !== y) return x - y;
-    a += x > 65535 ? 2 : 1;
-    b += y > 65535 ? 2 : 1;
-  }
-  return left.length - a - (right.length - b);
-}
 async function toolsCommand(tokens, registry, output, diagnostic, step, signal, load) {
-  let groupEager = false, separator = -1;
-  const error = async (message, withUsage = false) => {
-    await diagnostic(
-      (withUsage ? usage2 + "Try 'llm tools list --help' for help.\n\n" : "") + "Error: " + message + "\n"
-    );
-    return 2;
-  };
-  for (let index = 0; index < tokens.length; index++) {
-    await step();
-    const token = tokens[index];
-    if (token === "--") {
-      separator = index;
-      break;
-    }
-    if (!token.startsWith("-") || token === "-") break;
-    if (token.startsWith("--help=")) return error("Option '--help' does not take a value.");
-    if (token === "--help" || !token.startsWith("--") && token.slice(1).includes("h"))
-      groupEager = true;
-  }
-  if (groupEager) {
-    await output(groupHelp);
-    return 0;
-  }
-  const groupArgs = tokens.filter((_, index) => index !== separator);
-  const args = groupArgs[0] === "list" ? groupArgs.slice(1) : groupArgs;
-  const names = [];
-  let json = false, help2 = false, ended = false;
-  const functions = [];
-  for (let index = 0; index < args.length; index++) {
-    await step();
-    const token = args[index];
-    if (ended || !token.startsWith("-") || token === "-") {
-      names.push(token);
-      continue;
-    }
-    if (token === "--") {
-      ended = true;
-      continue;
-    }
-    const equals = token.indexOf("="), flag = equals < 0 ? token : token.slice(0, equals);
-    if (["--json", "--help"].includes(flag) && equals >= 0)
-      return error(`Option '${flag}' does not take a value.`);
-    if (token === "--json") {
-      json = true;
-      continue;
-    }
-    if (token === "--help" || token === "-h") {
-      help2 = true;
-      continue;
-    }
-    if (flag === "--functions") {
-      if (equals < 0 && args[++index] === void 0)
-        return error("Option '--functions' requires an argument.");
-      functions.push(equals < 0 ? args[index] : token.slice(equals + 1));
-      continue;
-    }
-    return error(`No such option '${flag}'.`, true);
-  }
-  if (help2) {
-    await output(listHelp);
-    return 0;
-  }
+  const parsed = await commandArguments("tools", tokens, ["list"], output, diagnostic, step);
+  if (typeof parsed === "number") return parsed;
+  const names = parsed.operands, functions = parsed.values.get("--functions") ?? [], json = parsed.values.has("--json");
   if (functions.length && !load) {
     await diagnostic("Error: Python tool loading is not configured\n");
     return 1;
@@ -1245,13 +1061,13 @@ async function toolsCommand(tokens, registry, output, diagnostic, step, signal,
   try {
     const dynamicNames = names.filter((name) => !registry.has(name));
     const loaded = load && (!names.length || functions.length || dynamicNames.length) ? await load(functions, dynamicNames, !names.length || dynamicNames.length > 0) : { tools: [] };
-    toolboxes = [...loaded.toolboxes ?? []].sort((left, right) => compareNames(left.name, right.name));
+    toolboxes = [...loaded.toolboxes ?? []].sort((left, right) => unicodeOrder(left.name, right.name));
     selected = new Map(names.length ? [...loaded.tools, ...selectLlmTools(registry, load ? names.filter((name) => registry.has(name)) : names)].map((tool) => [tool.name, tool]) : [...registry, ...loaded.tools.map((tool) => [tool.registryKey ?? tool.name, tool])]);
   } catch (failure) {
     await diagnostic("Error: " + (failure instanceof Error ? failure.message : String(failure)) + "\n");
     return 1;
   }
-  const entries = [...selected].sort(([left], [right]) => compareNames(left, right));
+  const entries = [...selected].sort(([left], [right]) => unicodeOrder(left, right));
   if (json) {
     const tools = entries.map(([name, tool]) => ({
       name,
@@ -1316,8 +1132,9 @@ function createLlmFragmentLoaders(entries) {
   }
   return loaders;
 }
-async function* loadLlmPluginFragments(reference, loaders, context, allowAttachments = true) {
-  const prefix = getLlmFragmentPrefix(reference), loader = prefix === void 0 ? void 0 : loaders.get(prefix);
+async function* loadLlmPluginFragments(reference, loaders, context, allowAttachments = true, provider) {
+  context.signal.throwIfAborted();
+  const prefix = getLlmFragmentPrefix(reference), loader = prefix === void 0 ? void 0 : loaders.get(prefix) ?? provider?.fragments(prefix);
   if (!loader) throw new Error(`Unknown fragment prefix: ${prefix ?? reference}`);
   const { signal } = context;
   let iterator, ended = false;
@@ -1352,6 +1169,7 @@ async function* loadLlmPluginFragments(reference, loaders, context, allowAttachm
     }
   } catch (error) {
     signal.throwIfAborted();
+    if (error instanceof LlmLoaderLookupError) throw error;
     throw new Error(`Could not load fragment ${reference}: ${error instanceof Error ? error.message : String(error)}`);
   } finally {
     if (iterator && !ended) {
@@ -1672,78 +1490,11 @@ async function createLlmFragmentSource(options) {
 }
 
 // packages/safe-bash-command-llm/src/embed-models-command.ts
-var groupHelp2 = "Usage: llm embed-models [OPTIONS] COMMAND [ARGS]...\n\n  Manage available embedding models\n\nOptions:\n  -h, --help  Show this message and exit.\n\nCommands:\n  list*    List available embedding models\n  default  Show or set the default embedding model\n";
 async function embeddingModelsCommand(context, service, tokens, emit, diagnostic, step, maxConfigurationBytes = Infinity) {
-  if (tokens[0] === "--" && ["list", "default"].includes(tokens[1] ?? "")) tokens = tokens.slice(1);
-  const defaults = tokens[0] === "default", explicit = tokens[0] === "list" || defaults;
-  const command = defaults ? "default" : "list";
-  const usage3 = `Usage: llm embed-models ${command} [OPTIONS]${defaults ? " [MODEL]" : ""}
-`;
-  const fail = async (message, withUsage = true) => {
-    await diagnostic((withUsage ? usage3 + `Try 'llm embed-models ${command} -h' for help.
-
-` : "") + `Error: ${message}
-`);
-    return 2;
-  };
-  const terminator = tokens.indexOf("--");
-  const groupFlags = terminator < 0 ? tokens : tokens.slice(0, terminator);
-  if (!explicit && groupFlags.some((token) => token === "--help" || token.startsWith("-") && !token.startsWith("--") && token.slice(1).includes("h"))) {
-    await emit(groupHelp2);
-    return 0;
-  }
-  const args = explicit ? tokens.slice(1) : tokens.filter((_, index) => index !== terminator);
-  const queries = [], operands = [];
-  let ended = false, help2 = false, remove = false;
-  for (let index = 0; index < args.length; index++) {
-    await step();
-    const token = args[index];
-    if (!ended && token === "--") {
-      ended = true;
-      continue;
-    }
-    if (ended || !token.startsWith("-") || token === "-") {
-      operands.push(token);
-      continue;
-    }
-    if (token === "--help" || token === "-h") {
-      help2 = true;
-      continue;
-    }
-    if (defaults && token === "--remove-default") {
-      remove = true;
-      continue;
-    }
-    if (!token.startsWith("--")) {
-      for (let cursor = 1; cursor < token.length; cursor++) {
-        const flag2 = "-" + token[cursor];
-        if (flag2 === "-h") {
-          help2 = true;
-          continue;
-        }
-        if (defaults || flag2 !== "-q") return fail(`No such option: ${flag2}`);
-        const value2 = token.slice(cursor + 1) || args[++index];
-        if (value2 === void 0) return fail(`Option '${flag2}' requires an argument.`, false);
-        queries.push(value2.toLowerCase());
-        break;
-      }
-      continue;
-    }
-    const equals = token.indexOf("=");
-    const flag = token.slice(0, equals < 0 ? void 0 : equals);
-    if (equals >= 0 && (flag === "--help" || defaults && flag === "--remove-default")) return fail(`Option '${flag}' does not take a value.`, false);
-    if (defaults || flag !== "--query") return fail(`No such option: ${flag}`);
-    const attached = equals < 0 ? void 0 : token.slice(equals + 1);
-    const value = attached ?? args[++index];
-    if (value === void 0) return fail(`Option '${flag}' requires an argument.`, false);
-    queries.push(value.toLowerCase());
-  }
-  if (help2) {
-    await emit(usage3 + (defaults ? "\n  Show or set the default embedding model\n\nOptions:\n  --remove-default  Reset to specifying no default model\n  -h, --help        Show this message and exit.\n" : "\n  List available embedding models\n\nOptions:\n  -q, --query TEXT  Search for embedding models matching these strings\n  -h, --help        Show this message and exit.\n"));
-    return 0;
-  }
-  const extra = operands.slice(defaults ? 1 : 0);
-  if (extra.length) return fail(`Got unexpected extra argument${extra.length === 1 ? "" : "s"} (${extra.join(" ")})`);
+  const parsed = await commandArguments("embed-models", tokens, ["list", "default"], emit, diagnostic, step);
+  if (typeof parsed === "number") return parsed;
+  const { command, operands, values } = parsed, defaults = command === "default";
+  const queries = (values.get("--query") ?? []).map((value) => value.toLowerCase()), remove = values.has("--remove-default");
   const configuration = createLlmConfiguration(context, maxConfigurationBytes);
   if (defaults) {
     const selected = operands[0];
@@ -1789,18 +1540,18 @@ async function embeddingModelsCommand(context, service, tokens, emit, diagnostic
 }
 
 // packages/safe-bash-command-llm/src/usage.ts
-async function* serializeLlmTokenUsage(usage3, signal) {
+async function* serializeLlmTokenUsage(usage, signal) {
   signal.throwIfAborted();
   const encoder = new TextEncoder();
   let separator = "";
   for (const name of ["input", "output"]) {
-    const value = usage3?.[name];
+    const value = usage?.[name];
     if (value === void 0 || value === null) continue;
     if (typeof value !== "number" || !Number.isFinite(value)) throw new TypeError(`Invalid LLM ${name} token count`);
     yield encoder.encode(`${separator}${value.toLocaleString("en-US", { maximumFractionDigits: 20 })} ${name}`);
     separator = ", ";
   }
-  const details = usage3?.details;
+  const details = usage?.details;
   if (!details || typeof details !== "object") return;
   let nonempty = false;
   for (const key in details) if (Object.hasOwn(details, key)) {
@@ -1864,16 +1615,6 @@ import { pathOf as pathOf3 } from "../../safe-bash-contracts/path.js";
 // packages/safe-bash-command-llm/src/templates.ts
 import { FsError as FsError4 } from "../../safe-bash-contracts/index.js";
 import { pathOf } from "../../safe-bash-contracts/path.js";
-function unicodeOrder(left, right) {
-  let a = 0, b = 0;
-  while (a < left.length && b < right.length) {
-    const x = left.codePointAt(a), y = right.codePointAt(b);
-    if (x !== y) return x - y;
-    a += x > 65535 ? 2 : 1;
-    b += y > 65535 ? 2 : 1;
-  }
-  return (a < left.length ? 1 : 0) - (b < right.length ? 1 : 0);
-}
 var templateFields = ["name", "prompt", "system", "model", "defaults", "options", "attachments", "attachment_types", "extract", "extract_last", "schema_object", "fragments", "system_fragments", "tools", "functions"];
 function template(value, name) {
   if (typeof value === "string") return { name, prompt: value };
@@ -1960,30 +1701,6 @@ function evaluateLlmTemplate(value, input, params, admitText) {
   if (!value.prompt) admitText?.(input);
   return { prompt: value.prompt ? interpolate(value.prompt, variables, false, admitText) : input, ...value.system === void 0 ? {} : { system: interpolate(value.system, variables, false, admitText) } };
 }
-function abortLoader(start, signal, late) {
-  signal.throwIfAborted();
-  return new Promise((resolve, reject) => {
-    const abort = () => {
-      signal.removeEventListener("abort", abort);
-      reject(signal.reason);
-    };
-    signal.addEventListener("abort", abort, { once: true });
-    Promise.resolve().then(() => {
-      signal.throwIfAborted();
-      return start();
-    }).then((value) => {
-      signal.removeEventListener("abort", abort);
-      if (signal.aborted) {
-        if (late) void Promise.resolve().then(() => late(value)).catch(() => void 0);
-        reject(signal.reason);
-      } else resolve(value);
-    }, (error) => {
-      signal.removeEventListener("abort", abort);
-      reject(signal.aborted ? signal.reason : error);
-    });
-    if (signal.aborted) abort();
-  });
-}
 function createLlmTemplateStore(context, loaders) {
   const directory = `${createLlmConfiguration(context).directory}/templates`;
   const filename = (name) => {
@@ -2005,7 +1722,7 @@ function createLlmTemplateStore(context, loaders) {
           });
         };
         try {
-          response = await abortLoader(() => fetch(name, { signal: context.signal }), context.signal, async (response2) => {
+          response = await waitForSource(() => fetch(name, { signal: context.signal }), context.signal, async (response2) => {
             await response2.body?.cancel();
           });
           if (!response.ok) {
@@ -2021,7 +1738,7 @@ For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/St
           let total = 0;
           while (reader) {
             context.signal.throwIfAborted();
-            const next = await abortLoader(() => reader.read(), context.signal);
+            const next = await waitForSource(() => reader.read(), context.signal);
             context.signal.throwIfAborted();
             if (next.done) break;
             total += next.value.byteLength;
@@ -2068,34 +1785,27 @@ For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/St
         await context.fs.stat(path, { signal: context.signal });
       } catch (error) {
         if (!(error instanceof FsError4) || error.code !== "ENOENT") throw error;
-        const colon = name.indexOf(":");
-        if (colon > 0) {
-          const prefix = name.slice(0, colon);
-          let valid = true;
-          for (const letter of prefix) if (!"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-".includes(letter)) {
-            valid = false;
-            break;
-          }
-          if (valid) {
-            const loader = loaders?.loaders?.get(prefix);
-            if (!loader) throw new Error(`Unknown template prefix: ${prefix}`);
-            try {
-              const loaded = await abortLoader(() => loader(name.slice(colon + 1), context.signal), context.signal);
-              context.signal.throwIfAborted();
-              const materializedLimit = loaders?.maxBytes ?? Infinity;
-              let loadedBytes = 0;
-              if (loaders?.admitBytes || materializedLimit !== Infinity) for await (const bytes2 of jsonValue(loaded, context.signal)) {
-                loadedBytes += bytes2.byteLength;
-                if (loadedBytes > materializedLimit) throw new FsError4("EFBIG", { message: "llm buffered input byte limit exceeded" });
-                loaders?.admitBytes?.(bytes2.byteLength);
-              }
-              const value = template(loaded, loaded.name);
-              Object.defineProperty(value, "functionsTrusted", { value: false });
-              return value;
-            } catch (error2) {
-              context.signal.throwIfAborted();
-              throw new Error(`Could not load template ${name}: ${error2 instanceof Error ? error2.message : String(error2)}`);
+        const prefix = getLlmFragmentPrefix(name);
+        if (prefix !== void 0) {
+          const loader = loaders?.loaders?.get(prefix) ?? loaders?.provider?.templates(prefix);
+          if (!loader) throw new Error(`Unknown template prefix: ${prefix}`);
+          try {
+            const materializedLimit = loaders?.maxBytes ?? Infinity;
+            const loaded = await waitForSource(() => loader(name.slice(prefix.length + 1), context.signal, { ...context, maxBytes: materializedLimit }), context.signal);
+            context.signal.throwIfAborted();
+            let loadedBytes = 0;
+            if (loaders?.admitBytes || materializedLimit !== Infinity) for await (const bytes2 of jsonValue(loaded, context.signal)) {
+              loadedBytes += bytes2.byteLength;
+              if (loadedBytes > materializedLimit) throw new FsError4("EFBIG", { message: "llm buffered input byte limit exceeded" });
+              loaders?.admitBytes?.(bytes2.byteLength);
             }
+            const value = template(loaded, loaded.name);
+            Object.defineProperty(value, "functionsTrusted", { value: false });
+            return value;
+          } catch (error2) {
+            context.signal.throwIfAborted();
+            if (error2 instanceof LlmLoaderLookupError) throw error2;
+            throw new Error(`Could not load template ${name}: ${error2 instanceof Error ? error2.message : String(error2)}`);
           }
         }
         path = filename(name);
@@ -2131,90 +1841,18 @@ For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/St
       await publish(name, new TextEncoder().encode(stringify(value, { indent: 4, lineWidth: 0 })));
     },
     async command(args, output, diagnostic) {
-      const actions = ["list", "edit", "loaders", "path", "show"];
-      const grouped = args.length === 1 && ["--help", "-h"].includes(args[0]);
-      const routed = args[0] === "--" ? args.slice(1) : args;
-      const explicit = actions.includes(routed[0] ?? "");
-      const command = explicit ? routed[0] : "list";
-      const tokens = explicit ? routed.slice(1) : routed;
-      const descriptions = {
-        list: "List available prompt templates",
-        edit: "Edit the specified prompt template using the default $EDITOR",
-        loaders: "Show template loaders registered by plugins",
-        path: "Output the path to the templates directory",
-        show: "Show the specified prompt template"
-      };
-      const usage3 = `Usage: llm templates ${command} [OPTIONS]${["show", "edit"].includes(command) ? " NAME" : ""}
-`;
-      if (grouped) {
-        await output("Usage: llm templates [OPTIONS] COMMAND [ARGS]...\n\n  Manage stored prompt templates\n\nOptions:\n  -h, --help  Show this message and exit.\n\nCommands:\n  list*    List available prompt templates\n  edit     Edit the specified prompt template using the default $EDITOR\n  loaders  Show template loaders registered by plugins\n  path     Output the path to the templates directory\n  show     Show the specified prompt template\n");
-        return 0;
-      }
-      let optionsEnded = false;
-      const operands = [];
-      let failure;
-      let help2 = false, showUsage = true;
-      for (const token of tokens) {
+      const parsed = await commandArguments("templates", args, ["list", "edit", "loaders", "path", "show"], output, diagnostic, async () => {
         context.signal.throwIfAborted();
-        if (!optionsEnded && token === "--") optionsEnded = true;
-        else if (!optionsEnded && token === "--help") help2 = true;
-        else if (!optionsEnded && token.startsWith("--help=")) {
-          failure = "Option '--help' does not take a value.";
-          showUsage = false;
-          break;
-        } else if (!optionsEnded && token.startsWith("-") && !token.startsWith("--") && token !== "-") {
-          for (const letter of token.slice(1)) {
-            if (letter === "h") help2 = true;
-            else {
-              failure = `No such option: -${letter}`;
-              break;
-            }
-          }
-          if (failure) break;
-        } else if (!optionsEnded && token.startsWith("-") && token !== "-") {
-          failure = `No such option: ${token.split("=")[0]}`;
-          break;
-        } else operands.push(token);
-      }
-      if (help2 && !failure) {
-        await output(usage3 + `
-  ${descriptions[command]}
-
-Options:
-  -h, --help  Show this message and exit.
-`);
-        return 0;
-      }
-      const needsName = ["show", "edit"].includes(command);
-      failure ??= needsName && !operands.length ? "Missing argument 'NAME'." : operands.length > (needsName ? 1 : 0) ? `Got unexpected extra argument (${operands[needsName ? 1 : 0]})` : void 0;
-      if (failure) {
-        await diagnostic((showUsage ? usage3 + `Try 'llm templates ${command} -h' for help.
-
-` : "") + `Error: ${failure}
-`);
-        return 2;
-      }
+      });
+      if (typeof parsed === "number") return parsed;
+      const { command, operands } = parsed;
       const name = operands[0];
       if (command === "loaders") {
-        if (!loaders?.loaders?.size) await output("No template loaders found\n");
-        else for (const [prefix, loader] of loaders.loaders) {
+        const registered = await discoverLlmLoaders(loaders?.loaders, { ...context, kind: "templates", maxBytes: loaders?.maxBytes ?? Infinity, admitBytes: loaders?.admitBytes }, loaders?.provider);
+        if (!registered.size) await output("No template loaders found\n");
+        else for (const [prefix, loader] of registered) {
           context.signal.throwIfAborted();
-          const lines = (loader.description || "Undocumented").split("\n");
-          let margin;
-          for (const line of lines) {
-            if (!line.trim()) continue;
-            let length = 0;
-            while (length < line.length && (line[length] === " " || line[length] === "	")) length++;
-            const leading = line.slice(0, length);
-            if (margin === void 0) margin = leading;
-            else {
-              let common = 0;
-              while (common < margin.length && common < leading.length && margin[common] === leading[common]) common++;
-              margin = margin.slice(0, common);
-            }
-          }
-          const docs = lines.map((line) => line.trim() ? line.slice(margin?.length ?? 0) : "").join("\n").trim();
-          await output(prefix + ":\n" + docs.split("\n").map((line) => line.trim() ? "  " + line : line).join("\n") + "\n");
+          await output(prefix + ":\n" + formatLoaderDescription(loader.description).join("\n") + "\n");
         }
         return 0;
       }
@@ -2474,25 +2112,48 @@ async function resolveLlmSchemaInput(context, input, options) {
 }
 
 // packages/safe-bash-command-llm/src/configuration-command.ts
-async function configurationCommand(context, service, args, output, diagnostic, admitInput, maxConfigurationBytes = Infinity) {
-  if (args.length === 1 && args[0] === "--version") {
-    await output("llm, version 0.27.1\n");
-    return true;
-  }
+async function configurationCommand(context, service, args, output, diagnostic, admitInput, maxConfigurationBytes = Infinity, step = async () => {
+  context.signal.throwIfAborted();
+}) {
   const keysCmd = args[0] === "keys";
   const aliases = args[0] === "aliases";
   const defaults = args[0] === "models" && args[1] === "default";
-  const options = args[0] === "models" && args[1] === "options";
-  if (!keysCmd && !aliases && !defaults && !options) return false;
+  const group = args.slice(0, keysCmd || aliases ? 1 : 2).join(" ");
+  const parsed = await commandArguments(group, args.slice(keysCmd || aliases ? 1 : 2), defaults ? [] : keysCmd ? ["list", "path", "get", "set"] : aliases ? ["list", "path", "set", "remove"] : ["list", "set", "show", "clear"], output, diagnostic, step, async () => {
+    const decoder = new TextDecoder();
+    let value = "";
+    await output("Enter key: ");
+    const source = context.stdinInput ? { [Symbol.asyncIterator]: () => ({ next: () => context.stdinInput.read(1, context.signal) }) } : context.stdin;
+    for await (const bytes of sourceBytes(source, context.signal)) {
+      await step();
+      for (let offset = 0; offset < bytes.length; ) {
+        const newline = bytes.indexOf(10, offset), end = newline < 0 ? bytes.length : newline;
+        admitInput(end - offset + (newline < 0 ? 0 : 1), true);
+        value += decoder.decode(bytes.subarray(offset, end), { stream: true });
+        if (newline < 0) break;
+        value += decoder.decode();
+        if (value.endsWith("\r")) value = value.slice(0, -1);
+        await output("\n");
+        if (value) return value;
+        await output("Enter key: ");
+        offset = newline + 1;
+      }
+    }
+    await output("\n");
+    return value + decoder.decode() || void 0;
+  });
+  if (typeof parsed === "number") return parsed;
+  const { command, operands, values: flags } = parsed;
+  const tokens = [command, ...operands];
   const configuration = createLlmConfiguration(context, maxConfigurationBytes);
   if (keysCmd) {
-    const tokens2 = args.slice(1), sub = tokens2[0];
-    if (sub === "path" && tokens2.length === 1) {
+    const sub = command;
+    if (sub === "path") {
       await output(`${configuration.directory}/keys.json
 `);
-      return true;
+      return 0;
     }
-    if (sub === void 0 || sub === "list" && tokens2.length === 1) {
+    if (sub === "list") {
       const path = `${configuration.directory}/keys.json`;
       let exists = true;
       try {
@@ -2502,54 +2163,22 @@ async function configurationCommand(context, service, args, output, diagnostic,
       }
       if (!exists) {
         await output("No keys found\n");
-        return true;
+        return 0;
       }
       const stored = await configuration.keys();
       for (const key of Object.keys(stored).sort()) {
         await output(`${key}
 `);
       }
-      return true;
+      return 0;
     }
-    if (sub === "get" && tokens2.length === 2) {
-      await output(`${await configuration.getKey(tokens2[1])}
+    if (sub === "get") {
+      await output(`${await configuration.getKey(tokens[1])}
 `);
-      return true;
-    }
-    if (sub === "set") {
-      let name;
-      let value;
-      for (let i = 1; i < tokens2.length; i++) {
-        const token = tokens2[i];
-        if (token === "--value") {
-          if (++i >= tokens2.length) throw new Error("Option '--value' requires an argument");
-          value = tokens2[i];
-        } else if (token.startsWith("--value=")) {
-          value = token.slice(8);
-        } else if (token.startsWith("-")) {
-          throw new Error(`No such option: ${token}`);
-        } else if (name === void 0) {
-          name = token;
-        } else {
-          throw new Error("Unexpected extra arguments");
-        }
-      }
-      if (!name) throw new Error("Missing argument 'NAME'");
-      if (value === void 0) {
-        let stdinText = "";
-        const decoder = new TextDecoder();
-        for await (const chunk of context.stdin) {
-          context.signal.throwIfAborted();
-          admitInput(chunk.byteLength, true);
-          stdinText += decoder.decode(chunk, { stream: true });
-        }
-        stdinText += decoder.decode();
-        value = stdinText.replace(/\r?\n$/, "");
-      }
-      await configuration.setKey(name, value);
-      return true;
+      return 0;
     }
-    throw new Error("Invalid keys command");
+    await configuration.setKey(operands[0], flags.get("--value").at(-1));
+    return 0;
   }
   const canonical = async (model) => {
     const resolved = await configuration.resolveAlias(model);
@@ -2559,34 +2188,20 @@ async function configurationCommand(context, service, args, output, diagnostic,
       return resolved;
     }
   };
-  const tokens = args.slice(aliases ? 1 : 2), command = tokens[0];
   if (defaults) {
-    if (tokens.length > 1) throw new Error("Unexpected extra arguments");
-    if (command === void 0) await output(`${await configuration.defaultModel() ?? service.resolve().model.id}
+    if (!operands[0]) await output(`${await configuration.defaultModel() ?? service.resolve().model.id}
 `);
     else {
-      const model = service.resolve(await canonical(command)).model.id;
+      const model = service.resolve(await canonical(operands[0])).model.id;
       await configuration.setDefaultModel(model);
     }
-    return true;
+    return 0;
   }
   if (aliases) {
-    if (command === "path" && tokens.length === 1) await output(`${configuration.directory}/aliases.json
+    if (command === "path") await output(`${configuration.directory}/aliases.json
 `);
     else if (command === "set") {
-      const operands = [], queries = [];
-      for (let index = 1; index < tokens.length; index++) {
-        const token = tokens[index];
-        if (token === "-q" || token === "--query") {
-          const query = tokens[++index];
-          if (query === void 0) throw new Error(`Option '${token}' requires an argument`);
-          queries.push(query);
-        } else if (token.startsWith("--query=")) queries.push(token.slice(8));
-        else if (token.startsWith("-q") && token.length > 2) queries.push(token.slice(2));
-        else if (token.startsWith("-")) throw new Error(`No such option: ${token}`);
-        else operands.push(token);
-      }
-      if (!operands.length || operands.length > 2) throw new Error("Invalid aliases set arguments");
+      const queries = flags.get("--query") ?? [];
       let model = operands[1];
       const queried = model === void 0;
       if (model === void 0) {
@@ -2599,45 +2214,43 @@ async function configurationCommand(context, service, args, output, diagnostic,
       await configuration.setAlias(operands[0], await canonical(model));
       if (queried) await diagnostic(`Alias '${operands[0]}' set to model '${model}'
 `);
-    } else if (command === "remove" && tokens.length === 2) await configuration.removeAlias(tokens[1]);
-    else if ((command === void 0 || command === "list" || command === "--json") && tokens.slice(command === void 0 ? 0 : 1).every((token) => token === "--json")) {
+    } else if (command === "remove") await configuration.removeAlias(tokens[1]);
+    else {
       const values = {};
       for (const { model } of service.models) for (const alias of model.aliases ?? []) if (alias !== model.id) Object.defineProperty(values, alias, { value: model.id, enumerable: true, configurable: true, writable: true });
       const entries = Object.entries({ ...values, ...await configuration.aliases() });
-      if (tokens.includes("--json")) await output(JSON.stringify(Object.fromEntries(entries), null, 4) + "\n");
+      if (flags.has("--json")) await output(JSON.stringify(Object.fromEntries(entries), null, 4) + "\n");
       else {
         const width = Math.max(0, ...entries.map(([alias]) => [...alias].length));
         for (const [alias, model] of entries) await output(`${alias}${" ".repeat(width - [...alias].length)} : ${model}
 `);
       }
-    } else throw new Error("Invalid aliases command");
-    return true;
+    }
+    return 0;
   }
-  if (command === "set" && tokens.length === 4) {
+  if (command === "set") {
     const model = await canonical(tokens[1]);
     const entry = service.models.find((entry2) => entry2.model.id === model);
     if (entry) validateModelOptions(entry.model, { [tokens[2]]: tokens[3] });
     await configuration.setModelOption(model, tokens[2], tokens[3]);
     await diagnostic(`Set default option ${tokens[2]}=${tokens[3]} for model ${model}
 `);
-  } else if (command === "show" && tokens.length === 2) {
+  } else if (command === "show") {
     const model = await canonical(tokens[1]), values = await configuration.modelOptions(model);
     if (!Object.keys(values).length) await diagnostic(`No default options set for model '${model}'.
 `);
     else for (const [key, value] of Object.entries(values)) await output(`${key}: ${value}
 `);
-  } else if (command === "clear" && (tokens.length === 2 || tokens.length === 3)) {
+  } else if (command === "clear") {
     const model = await canonical(tokens[1]);
-    const keys = tokens[2] === void 0 ? Object.keys(await configuration.modelOptions(model)) : [tokens[2]];
-    await configuration.clearModelOption(model, tokens[2]);
+    const keys = !tokens[2] ? Object.keys(await configuration.modelOptions(model)) : [tokens[2]];
+    await configuration.clearModelOption(model, tokens[2] || void 0);
     if (keys.length === 1) await output(`Cleared option '${keys[0]}' for model ${model}
 `);
     else if (keys.length > 1) await output(`Cleared ${keys.join(", ")} options for model ${model}
 `);
-  } else if (command === "list" && tokens.length === 1 || command === void 0) {
-    await listOptions(configuration, output, diagnostic);
-  } else throw new Error("Invalid models options command");
-  return true;
+  } else await listOptions(configuration, output, diagnostic);
+  return 0;
 }
 async function listOptions(configuration, output, diagnostic) {
   const entries = Object.entries(await configuration.allModelOptions());
@@ -2676,10 +2289,9 @@ async function selectLlmModelByQuery(models, queries, configuredAliases = {}, si
 }
 
 // packages/safe-bash-command-llm/src/models-list.ts
-var modelsGroupHelp = "Usage: llm models [OPTIONS] COMMAND [ARGS]...\n\n  Manage available models\n\nOptions:\n  -h, --help  Show this message and exit.\n\nCommands:\n  list*    List available models\n  default  Show or set the default model\n  options  Manage default options for models\n";
 var LlmModelsUsageError = class extends Error {
-  constructor(message, usage3 = true) {
-    super((usage3 ? "Usage: llm models list [OPTIONS]\nTry 'llm models list -h' for help.\n\n" : "") + `Error: ${message}`);
+  constructor(message, usage = true) {
+    super((usage ? "Usage: llm models list [OPTIONS]\nTry 'llm models list -h' for help.\n\n" : "") + `Error: ${message}`);
   }
 };
 function wrapDescription(description) {
@@ -2701,11 +2313,11 @@ async function listLlmModels(context, service, tokens, emit, step, maxConfigurat
   const terminator = tokens.indexOf("--");
   const groupFlags = terminator < 0 ? tokens : tokens.slice(0, terminator);
   if (!explicit && groupFlags.some((token) => token === "--help" || token.startsWith("-") && !token.startsWith("--") && token.slice(1).includes("h"))) {
-    await emit(modelsGroupHelp);
+    await emit(await loadLlmHelp("models"));
     return;
   }
   const queries = [], selected = [];
-  let schemas = false, tools = false, asyncModels = false, options = false, help2 = false, ended = false;
+  let schemas = false, tools = false, asyncModels = false, options = false, help = false, ended = false;
   const unexpected = [];
   const args = explicit ? tokens.slice(1) : tokens.filter((_, index) => index !== terminator);
   for (let index = 0; index < args.length; index++) {
@@ -2720,7 +2332,7 @@ async function listLlmModels(context, service, tokens, emit, step, maxConfigurat
       continue;
     }
     if (argument === "--help" || argument === "-h") {
-      help2 = true;
+      help = true;
       continue;
     }
     if (argument === "--options") {
@@ -2753,8 +2365,8 @@ async function listLlmModels(context, service, tokens, emit, step, maxConfigurat
     if (value === void 0) throw new LlmModelsUsageError(`Option '${flag}' requires an argument.`, false);
     (flag === "-q" || flag === "--query" ? queries : selected).push(value);
   }
-  if (help2) {
-    await emit("Usage: llm models list [OPTIONS]\n\n  List available models\n\nOptions:\n  --options         Show options for each model, if available\n  --async           List async models\n  --schemas         List models that support schemas\n  --tools           List models that support tools\n  -q, --query TEXT  Search for models matching these strings\n  -m, --model TEXT  Specific model IDs\n  -h, --help        Show this message and exit.\n");
+  if (help) {
+    await emit(await loadLlmHelp("models-list"));
     return;
   }
   if (unexpected.length) throw new LlmModelsUsageError(`Got unexpected extra argument${unexpected.length === 1 ? "" : "s"} (${unexpected.join(" ")})`);
@@ -2814,8 +2426,42 @@ async function listLlmModels(context, service, tokens, emit, step, maxConfigurat
 var llmReferenceVersion = "0.27.1";
 var LlmPromptUsageError = class extends Error {
 };
+var chatUsage = "Usage: llm chat [OPTIONS]\nTry 'llm chat -h' for help.";
+function optionAliases(groups) {
+  return Object.fromEntries(Object.entries(groups).flatMap(([name, flags]) => flags.split(" ").map((flag) => [flag, name])));
+}
+var promptSwitches = optionAliases({
+  async: "--async",
+  toolsDebug: "--td --tools-debug",
+  toolsApprove: "--ta --tools-approve",
+  noLog: "--no-log -n",
+  extract: "-x --extract",
+  extractLast: "--xl --extract-last",
+  usage: "-u --usage",
+  noStream: "--no-stream"
+});
+var promptValueOptions = optionAliases({
+  functions: "--functions",
+  toolNames: "-T --tool",
+  chainLimit: "--cl --chain-limit",
+  fragments: "-f --fragment",
+  systemFragments: "--sf --system-fragment",
+  queries: "-q --query",
+  template: "-t --template",
+  schema: "--schema",
+  schemaMulti: "--schema-multi",
+  key: "--key",
+  save: "--save",
+  params: "-p --param",
+  model: "-m --model",
+  system: "-s --system",
+  options: "-o --option",
+  attachmentType: "--at --attachment-type",
+  attachment: "-a --attachment"
+});
 async function parse(length, text, step, chat = false, toolsDebugEnv) {
   const parsed = { toolNames: [], functions: [], chainLimit: 5, prompt: "", queries: [], fragments: [], systemFragments: [], params: {}, optionNames: [], options: /* @__PURE__ */ Object.create(null), attachments: [] };
+  const usage = chat ? chatUsage : "Usage: llm prompt [OPTIONS] [PROMPT]\nTry 'llm prompt --help' for help.";
   const operands = [];
   let ended = false, chainLimit;
   for (let index = 0; index < length; index++) {
@@ -2833,65 +2479,51 @@ async function parse(length, text, step, chat = false, toolsDebugEnv) {
     for (let cursor = long ? 0 : 1; cursor < argument.length; cursor++) {
       await step();
       const flag = long ? argument.slice(0, equals < 0 ? void 0 : equals) : "-" + argument[cursor];
+      if (flag === "-h" || flag === "--help") {
+        if (long && equals >= 0) throw new LlmPromptUsageError(`Error: Option '${flag}' does not take a value.`);
+        parsed.help = true;
+        if (long) break;
+        continue;
+      }
       if (chat) {
-        if (flag === "-h" || flag === "--help") {
-          if (long && equals >= 0) throw new LlmPromptUsageError(`Error: Option '${flag}' does not take a value.`);
-          parsed.help = true;
-          if (long) break;
-          continue;
-        }
         if (!chatOptions.includes(flag))
-          throw new LlmPromptUsageError(`Usage: llm chat [OPTIONS]
-Try 'llm chat -h' for help.
+          throw new LlmPromptUsageError(`${usage}
 
 Error: No such option: ${flag}${await chatOptionSuggestion(flag, step)}`);
       }
-      const boolean = ["--async", "--td", "--tools-debug", "--ta", "--tools-approve", "--no-log", "-n", "-x", "--extract", "--xl", "--extract-last", "-u", "--usage", "--no-stream"].includes(flag);
+      const boolean = promptSwitches[flag];
       if (boolean) {
         if (long && equals >= 0) throw new LlmPromptUsageError(`Error: Option '${flag}' does not take a value.`);
-        if (["-x", "--extract", "--xl", "--extract-last"].includes(flag)) {
-          parsed.extract = flag === "--xl" || flag === "--extract-last" ? "last" : parsed.extract ?? "first";
+        if (boolean === "extract" || boolean === "extractLast") {
+          parsed.extract = boolean === "extractLast" ? "last" : parsed.extract ?? "first";
           parsed.noStream = true;
-        } else if (flag === "-u" || flag === "--usage") parsed.usage = true;
-        else if (flag === "--no-stream") parsed.noStream = true;
-        else if (flag === "--async") parsed.async = true;
-        else if (flag === "--ta" || flag === "--tools-approve") parsed.toolsApprove = true;
-        else if (flag === "--td" || flag === "--tools-debug") parsed.toolsDebug = true;
+        } else if (boolean !== "noLog") parsed[boolean] = true;
         if (long) break;
         continue;
       }
-      if (!["--functions", "-T", "--tool", "--cl", "--chain-limit", "-f", "--fragment", "--sf", "--system-fragment", "-q", "--query", "-m", "--model", "-s", "--system", "-o", "--option", "-a", "--attachment", "--at", "--attachment-type", "-t", "--template", "--save", "-p", "--param", "--key", "--schema", "--schema-multi"].includes(flag)) throw new Error(`Unknown option: ${flag}`);
+      const option = promptValueOptions[flag];
+      if (!option) throw new Error(`Unknown option: ${flag}`);
       const attached = long ? equals < 0 ? void 0 : argument.slice(equals + 1) : argument.slice(cursor + 1) || void 0;
-      const arity = ["-o", "--option", "-p", "--param", "--at", "--attachment-type"].includes(flag) ? 2 : 1;
+      const arity = ["options", "params", "attachmentType"].includes(option) ? 2 : 1;
       if (length - index - 1 < arity - (attached === void 0 ? 0 : 1)) throw new LlmPromptUsageError(`Error: Option '${flag}' requires ${arity === 2 ? "2 arguments" : "an argument"}.`);
       const value = attached ?? text(++index);
-      if (flag === "--functions") parsed.functions.push(value);
-      else if (flag === "-T" || flag === "--tool") parsed.toolNames.push(value);
-      else if (flag === "--cl" || flag === "--chain-limit") chainLimit = value;
-      else if (flag === "-f" || flag === "--fragment") parsed.fragments.push(value);
-      else if (flag === "--sf" || flag === "--system-fragment") parsed.systemFragments.push(value);
-      else if (flag === "-q" || flag === "--query") parsed.queries.push(value);
-      else if (flag === "-t" || flag === "--template") parsed.template = value;
-      else if (flag === "--schema") parsed.schema = value;
-      else if (flag === "--schema-multi") parsed.schemaMulti = value;
-      else if (flag === "--key") parsed.key = value;
-      else if (flag === "--save") parsed.save = value;
-      else if (flag === "-p" || flag === "--param") Object.defineProperty(parsed.params, value, { value: text(++index), enumerable: true, configurable: true, writable: true });
-      else if (flag === "-m" || flag === "--model") parsed.model = value;
-      else if (flag === "-s" || flag === "--system") parsed.system = value;
-      else if (flag === "-o" || flag === "--option") {
+      if (["functions", "toolNames", "fragments", "systemFragments", "queries"].includes(option))
+        parsed[option].push(value);
+      else if (option === "chainLimit") chainLimit = value;
+      else if (option === "params") Object.defineProperty(parsed.params, value, { value: text(++index), enumerable: true, configurable: true, writable: true });
+      else if (option === "options") {
         if (!Object.hasOwn(parsed.options, value)) parsed.optionNames.push(value);
         parsed.options[value] = text(++index);
-      } else if (flag === "--at" || flag === "--attachment-type") parsed.attachments.push({ path: value, mimeType: text(++index) });
-      else parsed.attachments.push({ path: value });
+      } else if (option === "attachmentType") parsed.attachments.push({ path: value, mimeType: text(++index) });
+      else if (option === "attachment") parsed.attachments.push({ path: value });
+      else parsed[option] = value;
       break;
     }
   }
   if (parsed.help) return parsed;
-  const usage3 = chat ? "Usage: llm chat [OPTIONS]\nTry 'llm chat -h' for help." : "Usage: llm prompt [OPTIONS] [PROMPT]\nTry 'llm prompt --help' for help.";
   if (chainLimit !== void 0) {
     const integer = tokenInteger(chainLimit);
-    if (integer === void 0) throw new LlmPromptUsageError(`${usage3}
+    if (integer === void 0) throw new LlmPromptUsageError(`${usage}
 
 Error: Invalid value for '--cl' / '--chain-limit': '${chainLimit}' is not a valid integer.`);
     parsed.chainLimit = BigInt(integer);
@@ -2901,19 +2533,15 @@ Error: Invalid value for '--cl' / '--chain-limit': '${chainLimit}' is not a vali
     if (["1", "true", "t", "yes", "y", "on"].includes(value)) parsed.toolsDebug = true;
     else if (!["", "0", "false", "f", "no", "n", "off"].includes(value)) {
       const detail = chat ? "" : " Recognized values: , 0, 1, f, false, n, no, off, on, t, true, y, yes";
-      throw new LlmPromptUsageError(`${usage3}
+      throw new LlmPromptUsageError(`${usage}
 
 Error: Invalid value for '--td' / '--tools-debug': '${raw}' is not a valid boolean.${detail}`);
     }
   }
-  if (chat && operands.length) throw new LlmPromptUsageError(`Usage: llm chat [OPTIONS]
-Try 'llm chat -h' for help.
-
-Error: Got unexpected extra argument${operands.length === 1 ? "" : "s"} (${operands.join(" ")})`);
-  if (operands.length > 1) throw new LlmPromptUsageError(`Usage: llm prompt [OPTIONS] [PROMPT]
-Try 'llm prompt --help' for help.
+  const unexpected = chat ? operands : operands.slice(1);
+  if (unexpected.length) throw new LlmPromptUsageError(`${usage}
 
-Error: Got unexpected extra argument${operands.length === 2 ? "" : "s"} (${operands.slice(1).join(" ")})`);
+Error: Got unexpected extra argument${unexpected.length === 1 ? "" : "s"} (${unexpected.join(" ")})`);
   parsed.prompt = operands[0] ?? "";
   parsed.promptSupplied = operands.length > 0;
   return parsed;
@@ -2938,7 +2566,7 @@ async function interrupted(start, signal) {
     );
   });
 }
-async function execute(context, service, limits, templateLoaderOptions, collections, fragmentLoaders, tools, loadTools) {
+async function execute(context, service, limits, templateLoaderOptions, collections, fragmentLoaders, tools, loadTools, managePackages) {
   context.signal.throwIfAborted();
   const controller = new AbortController();
   const operation = createOutputOperation(context, context.stdout);
@@ -3008,19 +2636,22 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
   };
   const admitBuffered = (size) => input.admit(size, true);
   const functionSessions = /* @__PURE__ */ new Set();
+  const loaderContext = () => {
+    const diagnostic = operation.child(context.stderr).output;
+    return { ...context, signal, stdout: { write: (bytes) => write(bytes, true) }, stderr: { write: async (bytes) => {
+      admitOutput(bytes.length);
+      await writeOutput(diagnostic, bytes);
+    } } };
+  };
   const loadDefinitions = async (definitions, toolNames = [], discovery = false, pluginQuery) => {
     if (!loadTools) throw new Error("Python tool loading is not configured");
-    const diagnostic = operation.child(context.stderr).output;
     const loaded = await operation.acquire(async () => {
       const value = await loadTools({
         definitions,
         toolNames,
         discovery,
         ...pluginQuery ? { pluginQuery } : {},
-        context: { ...context, signal, stdout: { write: (bytes) => write(bytes, true) }, stderr: { write: async (bytes) => {
-          admitOutput(bytes.length);
-          await writeOutput(diagnostic, bytes);
-        } } },
+        context: loaderContext(),
         maxInputBytes: input.remaining(true),
         maxOutputBytes: limits?.maxOutputBytes ?? Infinity
       });
@@ -3080,7 +2711,7 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
       return { exitCode: 0 };
     }
     if (eager === "help") {
-      await emitText("Usage: llm [prompt] [-m MODEL] [-s SYSTEM] [-o KEY VALUE] [-a PATH] [--at PATH MIMETYPE]\n       llm models\nOptions: --model, --system, --option, --attachment, -u/--usage; -- ends options\n");
+      await emitText(await loadLlmHelp("root"));
       return { exitCode: 0 };
     }
     if (separator !== void 0) {
@@ -3090,9 +2721,17 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
     if (argumentsValue.args.length === 2 && argumentsValue.args[0] === "models" && ["--help", "-h"].includes(argumentsValue.args[1])) {
       argumentText(0);
       argumentText(1);
-      await emitText(modelsGroupHelp);
+      await emitText(await loadLlmHelp("models"));
       return { exitCode: 0 };
     }
+    if (argumentsValue.args[0] === "install" || argumentsValue.args[0] === "uninstall") {
+      const args2 = Array.from({ length: argumentsValue.args.length }, (_, index) => argumentText(index));
+      if (!managePackages) {
+        await writeDiagnostic2(context.stderr, "Error: Python package management is not configured\n", signal);
+        return { exitCode: 1 };
+      }
+      return await managePackages({ args: args2, context: { ...context, signal, stdout: { write: (chunk) => write(chunk, true) }, registerCleanup: operation.registerCleanup } });
+    }
     if (argumentsValue.args[0] === "plugins") {
       argumentText(0);
       const tokens = Array.from({ length: argumentsValue.args.length - 1 }, (_, index) => argumentText(index + 1));
@@ -3120,7 +2759,7 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
         return { exitCode: 2 };
       }
       const tokens = Array.from({ length: argumentsValue.args.length - 2 }, (_, index) => argumentText(index + 2));
-      return { exitCode: await fragmentLoaderCommand(tokens, fragmentLoaders, emitText, (text) => writeDiagnostic2(context.stderr, text, signal)) };
+      return { exitCode: await fragmentLoaderCommand(tokens, fragmentLoaders, emitText, (text) => writeDiagnostic2(context.stderr, text, signal), step, () => discoverLlmLoaders(fragmentLoaders, { ...loaderContext(), kind: "fragments", maxBytes: input.remaining(true), admitBytes: admitBuffered }, templateLoaderOptions.provider)) };
     }
     if (argumentsValue.args[0] === "schemas" && argumentsValue.args[1] !== "dsl") {
       await writeDiagnostic2(context.stderr, "Error: Stored schema history is host-owned. Use an inline schema, file, template, or 'llm schemas dsl'.\n", signal);
@@ -3128,9 +2767,9 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
     }
     if (argumentsValue.args[0] === "schemas" && argumentsValue.args[1] === "dsl") {
       const tokens = Array.from({ length: argumentsValue.args.length - 2 }, (_, index) => argumentText(index + 2));
-      const usage3 = "Usage: llm schemas dsl [OPTIONS] INPUT\n";
+      const usage = "Usage: llm schemas dsl [OPTIONS] INPUT\n";
       if (tokens.includes("--help") || tokens.includes("-h")) {
-        await emitText(usage3 + "\n  Convert LLM's schema DSL to a JSON schema\n\n      llm schema dsl 'name, age int, bio: their bio'\n\nOptions:\n  --multi     Wrap in an array\n  -h, --help  Show this message and exit.\n");
+        await emitText(await loadLlmHelp("schemas-dsl"));
         return { exitCode: 0 };
       }
       let multi = false, optionsEnded = false;
@@ -3147,7 +2786,7 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
       }
       failure ??= inputs.length === 0 ? "Missing argument 'INPUT'." : inputs.length > 1 ? `Got unexpected extra argument (${inputs[1]})` : void 0;
       if (failure) {
-        await writeDiagnostic2(context.stderr, usage3 + "Try 'llm schemas dsl -h' for help.\n\nError: " + failure + "\n", signal);
+        await writeDiagnostic2(context.stderr, usage + "Try 'llm schemas dsl -h' for help.\n\nError: " + failure + "\n", signal);
         return { exitCode: 2 };
       }
       await emitText(JSON.stringify(parseLlmSchemaDsl(inputs[0], multi), null, 2) + "\n");
@@ -3172,17 +2811,17 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
     if (argumentsValue.args[0] === "templates") {
       let exitCode = 0;
       try {
-        exitCode = await createLlmTemplateStore(context, invocationLoaders).command(Array.from({ length: argumentsValue.args.length - 1 }, (_, index) => argumentText(index + 1)), emitText, (text) => writeDiagnostic2(context.stderr, text, signal));
+        exitCode = await createLlmTemplateStore(loaderContext(), invocationLoaders).command(Array.from({ length: argumentsValue.args.length - 1 }, (_, index) => argumentText(index + 1)), emitText, (text) => writeDiagnostic2(context.stderr, text, signal));
       } catch (error) {
         throw new Error(`Error: ${error instanceof Error ? error.message : "Template failed"}`);
       }
       return { exitCode };
     }
-    const configurationInvocation = argumentsValue.args[0] === "keys" || argumentsValue.args[0] === "aliases" || argumentsValue.args[0] === "models" && ["default", "options"].includes(argumentsValue.args[1] ?? "") || argumentsValue.args[0] === "--version";
+    const configurationInvocation = argumentsValue.args[0] === "keys" || argumentsValue.args[0] === "aliases" || argumentsValue.args[0] === "models" && ["default", "options"].includes(argumentsValue.args[1] ?? "");
     if (configurationInvocation) {
       try {
         const tokens = Array.from({ length: argumentsValue.args.length }, (_, index) => argumentText(index));
-        if (await configurationCommand(context, service, tokens, emitText, (text) => writeDiagnostic2(context.stderr, text, signal), admitInput, limits?.maxConfigurationBytes)) return { exitCode: 0 };
+        return { exitCode: await configurationCommand({ ...context, signal }, service, tokens, emitText, (text) => writeDiagnostic2(context.stderr, text, signal), admitInput, limits?.maxConfigurationBytes, step) };
       } catch (error) {
         throw new Error(`Error: ${error instanceof Error ? error.message : "Configuration failed"}`);
       }
@@ -3195,10 +2834,10 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
     const promptOffset = argumentsValue.args[0] === "prompt" || isChat ? 1 : 0;
     let args = await parse(argumentsValue.args.length - promptOffset, (index) => argumentText(index + promptOffset), step, isChat, context.env.LLM_TOOLS_DEBUG);
     if (args.help) {
-      await emitText(chatHelp);
+      await emitText(await loadLlmHelp(isChat ? "chat" : "prompt"));
       return { exitCode: 0 };
     }
-    const configuration = createLlmConfiguration(context, limits?.maxConfigurationBytes, invocationLoaders);
+    const configuration = createLlmConfiguration(loaderContext(), limits?.maxConfigurationBytes, invocationLoaders);
     if (args.model === void 0 && args.queries.length) {
       try {
         args.model = (await selectLlmModelByQuery(service.models, args.queries, await configuration.aliases(), signal)).model.id;
@@ -3206,7 +2845,7 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
         throw new Error(`Error: ${error instanceof Error ? error.message : "Model selection failed"}`);
       }
     }
-    const templateStore = createLlmTemplateStore(context, invocationLoaders);
+    const templateStore = createLlmTemplateStore(loaderContext(), invocationLoaders);
     const schemaInput = args.schemaMulti ?? args.schema;
     let schema = schemaInput ? await resolveLlmSchemaInput({ ...context, signal }, schemaInput, {
       multi: Boolean(args.schemaMulti),
@@ -3250,8 +2889,7 @@ async function execute(context, service, limits, templateLoaderOptions, collecti
     if (!args.save && entry?.model.canStream === false) args.noStream = true;
     const streamed = entry !== void 0 && service.streamSources !== void 0 && entry.provider.completeSources !== void 0 && entry.model.inputSources !== false;
     const stagePrompt = streamed && stored === void 0 && args.save === void 0;
-    if (isChat && args.promptSupplied) throw new LlmPromptUsageError(`Usage: llm chat [OPTIONS]
-Try 'llm chat -h' for help.
+    if (isChat && args.promptSupplied) throw new LlmPromptUsageError(`${chatUsage}
 
 Error: Got unexpected extra argument (${args.prompt})`);
     let chatModelOptions;
@@ -3365,9 +3003,9 @@ Error: Got unexpected extra argument (${args.prompt})`);
         }
         if (getLlmFragmentPrefix(reference) !== void 0) {
           try {
-            for await (const loaded of loadLlmPluginFragments(reference, fragmentLoaders, { fs: context.fs, cwd: context.cwd, signal, capabilities: context.capabilities, get maxBytes() {
+            for await (const loaded of loadLlmPluginFragments(reference, fragmentLoaders, { ...loaderContext(), get maxBytes() {
               return input.remaining(!streamed);
-            } }, !system)) {
+            } }, !system, templateLoaderOptions.provider)) {
               const source2 = await operation.acquire(() => loaded.source, (value) => value.dispose());
               if (loaded.type === "text") {
                 yield source2;
@@ -3874,10 +3512,10 @@ function createLlmCommand(options = {}) {
   const limits = options.limits === void 0 ? void 0 : Object.freeze({ ...options.limits });
   if (options.service && (options.providers !== void 0 || options.defaultModel !== void 0)) throw new TypeError("Configure providers and defaultModel on the injected LLM service");
   const maxRemoteBytes = options.maxRemoteTemplateBytes ?? limits?.maxInputBytes ?? Infinity;
-  const templateLoaderOptions = { maxRemoteBytes, ...options.templateLoaders ? { loaders: options.templateLoaders } : {} };
+  const templateLoaderOptions = { maxRemoteBytes, provider: options.loaderProvider, loaders: options.templateLoaders };
   const service = options.service ?? createLlmService({ ...options, providers: options.providers ?? [] });
   const collections = options.collections;
-  return { name: "llm", description: "Query injected language and media models", execute: (context) => execute(context, service, limits, templateLoaderOptions, collections, options.fragmentLoaders ?? /* @__PURE__ */ new Map(), options.tools ?? /* @__PURE__ */ new Map(), options.loadTools) };
+  return { name: "llm", description: "Query injected language and media models", execute: (context) => execute(context, service, limits, templateLoaderOptions, collections, options.fragmentLoaders ?? /* @__PURE__ */ new Map(), options.tools ?? /* @__PURE__ */ new Map(), options.loadTools, options.managePackages) };
 }
 function createLlmCommands(options = {}) {
   return [createLlmCommand(options)];
@@ -3893,6 +3531,7 @@ function llmCommands(options = {}) {
 
 export {
   serializeLlmTokenUsage,
+  LlmLoaderLookupError,
   createLlmToolRegistry,
   selectLlmTools,
   LlmCancelToolCall,