mirror-mind 0.36.1 → 0.36.3

package/ts/src/mirror/mirrorForm.ts

@@ -13,11 +13,14 @@
 //     $mirror-mind:mm:mirror …     the Codex plugin (TS2 L10)
 //     /mm-mirror …                 Grok (TS4 L5)
 //     $mm-mirror …                 Codex's own skill form
+//     /skill:mm-mirror …           Pi's command, which its menu sends (CR160)
 //
 // Three choices, each made by the runtime, not the person: the sigil (`/` or
 // `$`), whether the plugin's name prefixes the skill, and whether the skill's
 // `name: "mm:mirror"` or its directory `mm-mirror` is used. The grammar is
 // their product, so a runtime that combines them differently is covered too.
+// Pi is the exception: it registers every skill as the command `skill:<name>`
+// (CR159 measured it on Pi 1.4.0), so its one form is spelled out whole.
 //
 // The form must open the prompt and end at whitespace or the end of it: a
 // longer skill name (`/mm-mirrors`) is another skill, and a form quoted in the
@@ -32,7 +35,7 @@ export interface MirrorForm {
   readonly query: string;
 }
 
-const FORM = /^([/$])(mirror-mind:)?mm[:-]mirror(?=\s|$)/;
+const FORM = /^(?:\/skill:mm-mirror|[/$](?:mirror-mind:)?mm[:-]mirror)(?=\s|$)/;
 
 /** The explicit Mirror Mode form at the start of a prompt, or null. */
 export function mirrorForm(prompt: string): MirrorForm | null {

package/ts/src/util/strictArgs.ts

@@ -0,0 +1,59 @@
+// argparse-shaped strict parsing: every option declared, anything else refused.
+//
+// Moved from `dbSafetyToolsRoute.ts`, where `backup` and `repair-encoding` use
+// it, when CR154 needed the same strictness for `conversations imported`. The
+// reason is the same in all three: these commands write, and a lenient parser
+// turns a typo into a different command. Under the `conversations` listing's
+// parser, which ignores what it does not know, `remove --all --projet <folder>
+// --apply` would drop the misspelled filter and remove every import in the
+// home. Here the typo is refused, and nothing runs.
+//
+// Positionals are opt-in, for a grammar that takes them (CR154's ids). A token
+// that starts with `-` is never a positional: an option nobody declared is a
+// typo, not a value.
+
+export interface StrictArgsSpec {
+  /** Options that stand alone. */
+  readonly flags: readonly string[];
+  /** Options that take the next token as their value, whatever it looks like. */
+  readonly valued: readonly string[];
+  /** Whether bare tokens are accepted, in order; otherwise they are unrecognized. */
+  readonly positionals?: boolean;
+}
+
+export interface ParsedArgs {
+  flags: Set<string>;
+  values: Map<string, string>;
+  positionals: string[];
+  /** argparse's message for the first problem, or null. */
+  error: string | null;
+}
+
+export function parseArgs(args: readonly string[], spec: StrictArgsSpec): ParsedArgs {
+  const flags = new Set<string>();
+  const values = new Map<string, string>();
+  const positionals: string[] = [];
+  const unrecognized: string[] = [];
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index] as string;
+    if (spec.flags.includes(arg)) {
+      flags.add(arg);
+    } else if (spec.valued.includes(arg)) {
+      const value = args[index + 1];
+      if (value === undefined)
+        return { flags, values, positionals, error: `argument ${arg}: expected one argument` };
+      values.set(arg, value);
+      index += 1;
+    } else if (spec.positionals === true && !arg.startsWith("-")) {
+      positionals.push(arg);
+    } else {
+      unrecognized.push(arg);
+    }
+  }
+  return {
+    flags,
+    values,
+    positionals,
+    error: unrecognized.length > 0 ? `unrecognized arguments: ${unrecognized.join(" ")}` : null,
+  };
+}