@falai/agent 4.0.0-alpha.2 → 4.0.0-alpha.20

package/src/core/Prompt.ts

@@ -9,6 +9,7 @@
 
 import type { AgentOptions } from "../types/agent.js";
 import type { FieldDef, Instruction } from "../types/flow.js";
+import { splitPhrases } from "../utils/phrases.js";
 import { isKnown } from "../utils/schema.js";
 import { render, type TemplateScope } from "../utils/template.js";
 
@@ -106,7 +107,12 @@ export function instructionsSection<C, D>(groups: InstructionGroup<C, D>[], scop
       const text = render(item.prompt, scope).trim();
       if (!text) continue;
       const when = item.when === undefined ? [] : Array.isArray(item.when) ? item.when : [item.when];
-      const condition = when.length ? ` (apply only when: ${when.join(" OR ")})` : "";
+      const { counts, excludes } = splitPhrases(when);
+      const clauses = [
+        ...(counts.length ? [`apply only when: ${counts.join(" OR ")}`] : []),
+        ...(excludes.length ? [`never when: ${excludes.join(" OR ")}`] : []),
+      ];
+      const condition = clauses.length ? ` (${clauses.join("; ")})` : "";
       lines.push(`- [${item.kind ?? "should"}] ${group.caption} ${text}${condition}`);
     }
   }
@@ -154,3 +160,43 @@ export function pendingSection(
     ...lines,
   ].join("\n");
 }
+
+/** Gemini rejects any other character in a property name. */
+const SAFE_KEY = /^[a-zA-Z0-9_-]+$/;
+
+/**
+ * Envelope property names for ids the schema cannot carry. A safe id keeps
+ * its own name; anything else (run ids carry `#`, `:` and `/`) or a name the
+ * envelope already uses (`reserved`) gets a short alias, mapped back when the
+ * reply is parsed.
+ */
+export class Aliases {
+  private readonly byReal = new Map<string, string>();
+  private readonly byAlias = new Map<string, string>();
+  private n = 0;
+
+  constructor(reserved: readonly string[] = []) {
+    for (const name of reserved) this.byAlias.set(name, name);
+  }
+
+  of(real: string, prefix = "k"): string {
+    const seen = this.byReal.get(real);
+    if (seen) return seen;
+    const alias = SAFE_KEY.test(real) && !this.byAlias.has(real) ? real : this.fresh(prefix);
+    this.byAlias.set(alias, real);
+    this.byReal.set(real, alias);
+    return alias;
+  }
+
+  /** Unknown aliases come back as they are; Runner drops keys it does not know. */
+  real(alias: string): string {
+    return this.byAlias.get(alias) ?? alias;
+  }
+
+  private fresh(prefix: string): string {
+    let alias: string;
+    do alias = `${prefix}${++this.n}`;
+    while (this.byAlias.has(alias));
+    return alias;
+  }
+}