@united-workforce/cli 0.2.1-rc.9 → 0.4.0

package/src/validate-semantic.ts

@@ -1,21 +1,11 @@
 import type { WorkflowPayload } from "@united-workforce/protocol";
+import { Liquid } from "liquidjs";
 
 type SchemaObj = Record<string, unknown>;
 
 const RESERVED_NAMES = new Set(["$START", "$END", "$SUSPEND"]);
-const PSEUDO_TARGETS = new Set(["$END", "$SUSPEND"]);
-
-/** Extract mustache variable names from a prompt string. */
-function extractMustacheVars(prompt: string): string[] {
-  const vars: string[] = [];
-  const re = /\{\{\{?([^}]+)\}\}\}?/g;
-  let m: RegExpExecArray | null = re.exec(prompt);
-  while (m !== null) {
-    vars.push(m[1]);
-    m = re.exec(prompt);
-  }
-  return vars;
-}
+const PSEUDO_TARGETS = new Set(["$END"]);
+const SUSPEND_TARGET = "$SUSPEND";
 
 /** Check if a frontmatter schema is a oneOf (multi-exit) type. */
 function isOneOfSchema(fm: unknown): fm is SchemaObj & { oneOf: SchemaObj[] } {
@@ -42,13 +32,6 @@ function getConstStatuses(fm: SchemaObj): string[] {
   return [];
 }
 
-/** Get property names from a schema object. */
-function getPropertyNames(schema: SchemaObj): Set<string> {
-  const props = schema.properties;
-  if (typeof props !== "object" || props === null) return new Set();
-  return new Set(Object.keys(props as Record<string, unknown>));
-}
-
 /** Extract $status const values from oneOf variants. */
 function getOneOfStatuses(variants: SchemaObj[]): string[] {
   const statuses: string[] = [];
@@ -64,6 +47,83 @@ function getOneOfStatuses(variants: SchemaObj[]): string[] {
   return statuses;
 }
 
+/** Generate mock data from schema property names for template rendering. */
+function generateMockData(schema: SchemaObj): Record<string, string> {
+  const mock: Record<string, string> = {};
+  const props = schema.properties as Record<string, SchemaObj> | undefined;
+  if (!props) return mock;
+  for (const key of Object.keys(props)) {
+    mock[key] = `mock_${key}`;
+  }
+  return mock;
+}
+
+/**
+ * Pre-process a template to replace `$`-prefixed variables (like `$status`)
+ * which are invalid in LiquidJS syntax but always valid at runtime.
+ * Replaces `{{ $varName }}` with a literal placeholder so the strict render
+ * does not reject them.
+ */
+function sanitizeReservedVars(template: string): string {
+  return template.replace(/\{\{\s*\$\w+\s*\}\}/g, "RESERVED");
+}
+
+/** Extract variable name from a LiquidJS UndefinedVariableError message. */
+function extractVarName(err: unknown): string {
+  const msg = String(err);
+  const match = msg.match(/undefined variable: ([^,\s]+)/);
+  return match ? match[1] : "unknown";
+}
+
+/** Validate edge templates using LiquidJS strict-render for a multi-exit role. */
+function validateMultiExitTemplates(
+  roleName: string,
+  graphEntry: Record<string, { role: string; prompt: string }>,
+  variants: SchemaObj[],
+  errors: string[],
+): void {
+  const strictEngine = new Liquid({ strictVariables: true });
+
+  for (const [status, target] of Object.entries(graphEntry)) {
+    const variant = variants.find((v) => {
+      const props = v.properties as Record<string, SchemaObj> | undefined;
+      return props?.$status?.const === status;
+    });
+    if (!variant) continue;
+    const mockData = generateMockData(variant);
+    try {
+      strictEngine.parseAndRenderSync(sanitizeReservedVars(target.prompt), mockData);
+    } catch (err) {
+      const varName = extractVarName(err);
+      errors.push(
+        `template variable "${varName}" not found in role "${roleName}" variant "${status}"`,
+      );
+    }
+  }
+}
+
+/** Validate edge templates using LiquidJS strict-render for a flat schema. */
+function validateFlatTemplates(
+  roleName: string,
+  graphEntry: Record<string, { role: string; prompt: string }>,
+  fm: SchemaObj,
+  errors: string[],
+): void {
+  const strictEngine = new Liquid({ strictVariables: true });
+  const mockData = generateMockData(fm);
+
+  for (const [status, target] of Object.entries(graphEntry)) {
+    try {
+      strictEngine.parseAndRenderSync(sanitizeReservedVars(target.prompt), mockData);
+    } catch (err) {
+      const varName = extractVarName(err);
+      errors.push(
+        `template variable "${varName}" in graph[${roleName}][${status}] not found in role "${roleName}" frontmatter`,
+      );
+    }
+  }
+}
+
 /** Check reserved names and role/graph reference integrity. */
 function checkRoleReferences(payload: WorkflowPayload, errors: string[]): void {
   const roleNames = new Set(Object.keys(payload.roles));
@@ -89,6 +149,27 @@ function checkRoleReferences(payload: WorkflowPayload, errors: string[]): void {
   }
 }
 
+/** Validate each graph edge's target role, including the removed $SUSPEND target. */
+function checkEdgeTargets(
+  payload: WorkflowPayload,
+  roleNames: Set<string>,
+  errors: string[],
+): void {
+  for (const [node, statusMap] of Object.entries(payload.graph)) {
+    for (const [status, target] of Object.entries(statusMap)) {
+      if (target.role === SUSPEND_TARGET) {
+        errors.push(
+          `edge ${node}→${status}: "${SUSPEND_TARGET}" is no longer a valid graph target. Emit $status: "${SUSPEND_TARGET}" from the "${node}" role output instead.`,
+        );
+        continue;
+      }
+      if (!PSEUDO_TARGETS.has(target.role) && !roleNames.has(target.role)) {
+        errors.push(`edge ${node}→${status}: unknown target role "${target.role}"`);
+      }
+    }
+  }
+}
+
 /** Check $START/$END constraints, edge targets, and reachability. */
 function checkGraphStructure(payload: WorkflowPayload, errors: string[]): void {
   const roleNames = new Set(Object.keys(payload.roles));
@@ -107,17 +188,13 @@ function checkGraphStructure(payload: WorkflowPayload, errors: string[]): void {
     errors.push("$END must not have outgoing edges");
   }
 
-  if (graphNodes.has("$SUSPEND")) {
-    errors.push("$SUSPEND must not have outgoing edges");
+  if (graphNodes.has(SUSPEND_TARGET)) {
+    errors.push(
+      `"${SUSPEND_TARGET}" is no longer a valid graph node — it is now an engine-level reserved $status. Emit $status: "${SUSPEND_TARGET}" from a role output instead.`,
+    );
   }
 
-  for (const [node, statusMap] of Object.entries(payload.graph)) {
-    for (const [status, target] of Object.entries(statusMap)) {
-      if (!PSEUDO_TARGETS.has(target.role) && !roleNames.has(target.role)) {
-        errors.push(`edge ${node}→${status}: unknown target role "${target.role}"`);
-      }
-    }
-  }
+  checkEdgeTargets(payload, roleNames, errors);
 
   checkReachability(roleNames, collectReachableRoles(payload.graph), errors);
 }
@@ -207,31 +284,7 @@ function checkStatusEdges(
   }
 }
 
-/** Check mustache variables for multi-exit role. */
-function checkMultiExitMustache(
-  roleName: string,
-  graphEntry: Record<string, { role: string; prompt: string }>,
-  variants: SchemaObj[],
-  errors: string[],
-): void {
-  for (const [status, target] of Object.entries(graphEntry)) {
-    const vars = extractMustacheVars(target.prompt);
-    const variant = variants.find((v) => {
-      const props = v.properties as Record<string, SchemaObj> | undefined;
-      return props?.$status?.const === status;
-    });
-    if (!variant) continue;
-    const propNames = getPropertyNames(variant);
-    for (const v of vars) {
-      if (v === "$status") continue;
-      if (!propNames.has(v)) {
-        errors.push(`prompt variable "${v}" not found in role "${roleName}" variant "${status}"`);
-      }
-    }
-  }
-}
-
-/** Check status-edge consistency and mustache for each role. */
+/** Check status-edge consistency and template vars for each role. */
 function checkRoleConsistency(payload: WorkflowPayload, errors: string[]): void {
   for (const [roleName, role] of Object.entries(payload.roles)) {
     if (RESERVED_NAMES.has(roleName)) continue;
@@ -247,12 +300,11 @@ function checkRoleConsistency(payload: WorkflowPayload, errors: string[]): void
 
       checkOneOfDiscriminant(roleName, variants, statuses, errors);
       checkStatusEdges(roleName, graphKeys, new Set(statuses), errors);
-      checkMultiExitMustache(roleName, graphEntry, variants, errors);
+      validateMultiExitTemplates(roleName, graphEntry, variants, errors);
     } else if (hasStatusConst(fm)) {
       const statuses = getConstStatuses(fm as SchemaObj);
       checkStatusEdges(roleName, graphKeys, new Set(statuses), errors);
-      // For const-based flat schemas, mustache vars come from the flat properties
-      checkFlatMustache(roleName, graphEntry, fm as SchemaObj, errors);
+      validateFlatTemplates(roleName, graphEntry, fm as SchemaObj, errors);
     } else {
       errors.push(
         `role "${roleName}" must define "$status" as const (or oneOf with const) in frontmatter`,
@@ -261,27 +313,6 @@ function checkRoleConsistency(payload: WorkflowPayload, errors: string[]): void
   }
 }
 
-/** Check mustache vars in all edge prompts against flat schema properties. */
-function checkFlatMustache(
-  roleName: string,
-  graphEntry: Record<string, { role: string; prompt: string }>,
-  fm: SchemaObj,
-  errors: string[],
-): void {
-  const propNames = getPropertyNames(fm);
-  for (const [status, target] of Object.entries(graphEntry)) {
-    const vars = extractMustacheVars(target.prompt);
-    for (const v of vars) {
-      if (v === "$status") continue;
-      if (!propNames.has(v)) {
-        errors.push(
-          `prompt variable "${v}" in graph[${roleName}][${status}] not found in role "${roleName}" frontmatter`,
-        );
-      }
-    }
-  }
-}
-
 /**
  * Validate a parsed WorkflowPayload for semantic correctness.
  * Returns an array of error messages. Empty array = valid.

package/src/validate.ts

@@ -1,5 +1,6 @@
 import { basename, dirname } from "node:path";
 import type { CasRef, WorkflowPayload } from "@united-workforce/protocol";
+import { CURRENT_WORKFLOW_VERSION } from "@united-workforce/protocol";
 
 const CAS_REF_PATTERN = /^[0-9A-HJKMNP-TV-Z]{13}$/;
 
@@ -113,12 +114,26 @@ export function parseWorkflowPayload(raw: unknown): WorkflowPayload | null {
   if (typeof raw.name !== "string" || typeof raw.description !== "string") {
     return null;
   }
+  // version is optional in legacy YAML — falls back to CURRENT_WORKFLOW_VERSION.
+  // When present, it MUST be an integer (booleans, strings, floats are rejected).
+  if (raw.version !== undefined) {
+    if (
+      typeof raw.version !== "number" ||
+      !Number.isInteger(raw.version) ||
+      typeof raw.version === "boolean"
+    ) {
+      return null;
+    }
+  }
   if (!isStringRecord(raw.roles, isRoleDefinition) || !isGraph(raw.graph)) {
     return null;
   }
 
   // Normalize location field: undefined → null
   const normalized = { ...raw } as WorkflowPayload;
+  if (normalized.version === undefined || normalized.version === null) {
+    normalized.version = CURRENT_WORKFLOW_VERSION;
+  }
   for (const roleName of Object.keys(normalized.graph)) {
     const statusMap = normalized.graph[roleName];
     if (statusMap !== undefined) {
@@ -135,3 +150,15 @@ export function parseWorkflowPayload(raw: unknown): WorkflowPayload | null {
 
   return normalized;
 }
+
+/**
+ * Returns true when the parsed YAML document had no top-level `version` field.
+ * Used by `uwf workflow add` to emit a deprecation warning while still
+ * accepting legacy workflow YAML.
+ */
+export function isMissingVersion(raw: unknown): boolean {
+  if (!isRecord(raw)) {
+    return false;
+  }
+  return raw.version === undefined;
+}

package/dist/__tests__/setup-validate.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=setup-validate.test.d.ts.map

package/dist/__tests__/setup-validate.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup-validate.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/setup-validate.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/setup-validate.test.js

@@ -1,108 +0,0 @@
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { cmdSetup, validateModel } from "../commands/setup.js";
-describe("validateModel", () => {
-    const BASE_URL = "https://api.example.com/v1";
-    const API_KEY = "sk-test-key";
-    const MODEL = "test-model";
-    afterEach(() => {
-        vi.restoreAllMocks();
-    });
-    test("success path — returns ok on 200", async () => {
-        const mockFetch = vi
-            .spyOn(globalThis, "fetch")
-            .mockResolvedValue(new Response(JSON.stringify({}), { status: 200 }));
-        const result = await validateModel(BASE_URL, API_KEY, MODEL);
-        expect(result).toEqual({ ok: true, value: undefined });
-        expect(mockFetch).toHaveBeenCalledTimes(1);
-        const [url, opts] = mockFetch.mock.calls[0];
-        expect(url).toBe(`${BASE_URL}/chat/completions`);
-        expect(opts.headers).toEqual(expect.objectContaining({ Authorization: `Bearer ${API_KEY}` }));
-        const body = JSON.parse(opts.body);
-        expect(body).toEqual({
-            model: MODEL,
-            messages: [{ role: "user", content: "hi" }],
-            max_tokens: 1,
-        });
-    });
-    test("HTTP 401 — returns error containing 401", async () => {
-        vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response("Unauthorized", { status: 401, statusText: "Unauthorized" }));
-        const result = await validateModel(BASE_URL, API_KEY, MODEL);
-        expect(result.ok).toBe(false);
-        if (!result.ok) {
-            expect(result.error).toContain("401");
-        }
-    });
-    test("HTTP 404 — returns error containing 404", async () => {
-        vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response("Not Found", { status: 404, statusText: "Not Found" }));
-        const result = await validateModel(BASE_URL, API_KEY, MODEL);
-        expect(result.ok).toBe(false);
-        if (!result.ok) {
-            expect(result.error).toContain("404");
-        }
-    });
-    test("network timeout — returns error mentioning timeout", async () => {
-        const err = new DOMException("signal timed out", "AbortError");
-        vi.spyOn(globalThis, "fetch").mockRejectedValue(err);
-        const result = await validateModel(BASE_URL, API_KEY, MODEL);
-        expect(result.ok).toBe(false);
-        if (!result.ok) {
-            expect(result.error.toLowerCase()).toMatch(/timeout|timed out/);
-        }
-    });
-    test("network error (DNS/connection) — returns error mentioning connectivity", async () => {
-        vi.spyOn(globalThis, "fetch").mockRejectedValue(new TypeError("fetch failed"));
-        const result = await validateModel(BASE_URL, API_KEY, MODEL);
-        expect(result.ok).toBe(false);
-        if (!result.ok) {
-            expect(result.error.toLowerCase()).toMatch(/connect|reach|network/);
-        }
-    });
-    test("request body correctness", async () => {
-        const mockFetch = vi
-            .spyOn(globalThis, "fetch")
-            .mockResolvedValue(new Response(JSON.stringify({}), { status: 200 }));
-        await validateModel(BASE_URL, API_KEY, "my-special-model");
-        const body = JSON.parse(mockFetch.mock.calls[0][1].body);
-        expect(body).toEqual({
-            model: "my-special-model",
-            messages: [{ role: "user", content: "hi" }],
-            max_tokens: 1,
-        });
-    });
-});
-describe("cmdSetup with validation", () => {
-    let storageRoot;
-    beforeEach(async () => {
-        storageRoot = await mkdtemp(join(tmpdir(), "uwf-setup-validate-"));
-    });
-    afterEach(async () => {
-        vi.restoreAllMocks();
-        await rm(storageRoot, { recursive: true, force: true });
-    });
-    const setupArgs = () => ({
-        provider: "testprovider",
-        baseUrl: "https://api.test.com/v1",
-        apiKey: "sk-test",
-        model: "test-model",
-        storageRoot,
-    });
-    test("includes validation result on success", async () => {
-        vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response(JSON.stringify({}), { status: 200 }));
-        const result = await cmdSetup(setupArgs());
-        expect(result.validation).toEqual({ ok: true, value: undefined });
-        // Config file should still be written
-        expect(result.configPath).toBeTruthy();
-    });
-    test("includes validation failure — config still saved", async () => {
-        vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response("Unauthorized", { status: 401, statusText: "Unauthorized" }));
-        const result = await cmdSetup(setupArgs());
-        expect(result.validation).toBeDefined();
-        expect(result.validation.ok).toBe(false);
-        // Config file should still be written despite validation failure
-        expect(result.configPath).toBeTruthy();
-    });
-});
-//# sourceMappingURL=setup-validate.test.js.map

package/dist/__tests__/setup-validate.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup-validate.test.js","sourceRoot":"","sources":["../../src/__tests__/setup-validate.test.ts"],"names":[],"mappings":"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"}

package/src/__tests__/setup-validate.test.ts

@@ -1,148 +0,0 @@
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { cmdSetup, validateModel } from "../commands/setup.js";
-
-describe("validateModel", () => {
-  const BASE_URL = "https://api.example.com/v1";
-  const API_KEY = "sk-test-key";
-  const MODEL = "test-model";
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  test("success path — returns ok on 200", async () => {
-    const mockFetch = vi
-      .spyOn(globalThis, "fetch")
-      .mockResolvedValue(new Response(JSON.stringify({}), { status: 200 }));
-
-    const result = await validateModel(BASE_URL, API_KEY, MODEL);
-
-    expect(result).toEqual({ ok: true, value: undefined });
-    expect(mockFetch).toHaveBeenCalledTimes(1);
-
-    const [url, opts] = mockFetch.mock.calls[0]!;
-    expect(url).toBe(`${BASE_URL}/chat/completions`);
-    expect((opts as RequestInit).headers).toEqual(
-      expect.objectContaining({ Authorization: `Bearer ${API_KEY}` }),
-    );
-    const body = JSON.parse((opts as RequestInit).body as string);
-    expect(body).toEqual({
-      model: MODEL,
-      messages: [{ role: "user", content: "hi" }],
-      max_tokens: 1,
-    });
-  });
-
-  test("HTTP 401 — returns error containing 401", async () => {
-    vi.spyOn(globalThis, "fetch").mockResolvedValue(
-      new Response("Unauthorized", { status: 401, statusText: "Unauthorized" }),
-    );
-
-    const result = await validateModel(BASE_URL, API_KEY, MODEL);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error).toContain("401");
-    }
-  });
-
-  test("HTTP 404 — returns error containing 404", async () => {
-    vi.spyOn(globalThis, "fetch").mockResolvedValue(
-      new Response("Not Found", { status: 404, statusText: "Not Found" }),
-    );
-
-    const result = await validateModel(BASE_URL, API_KEY, MODEL);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error).toContain("404");
-    }
-  });
-
-  test("network timeout — returns error mentioning timeout", async () => {
-    const err = new DOMException("signal timed out", "AbortError");
-    vi.spyOn(globalThis, "fetch").mockRejectedValue(err);
-
-    const result = await validateModel(BASE_URL, API_KEY, MODEL);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.toLowerCase()).toMatch(/timeout|timed out/);
-    }
-  });
-
-  test("network error (DNS/connection) — returns error mentioning connectivity", async () => {
-    vi.spyOn(globalThis, "fetch").mockRejectedValue(new TypeError("fetch failed"));
-
-    const result = await validateModel(BASE_URL, API_KEY, MODEL);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.toLowerCase()).toMatch(/connect|reach|network/);
-    }
-  });
-
-  test("request body correctness", async () => {
-    const mockFetch = vi
-      .spyOn(globalThis, "fetch")
-      .mockResolvedValue(new Response(JSON.stringify({}), { status: 200 }));
-
-    await validateModel(BASE_URL, API_KEY, "my-special-model");
-
-    const body = JSON.parse((mockFetch.mock.calls[0]![1] as RequestInit).body as string);
-    expect(body).toEqual({
-      model: "my-special-model",
-      messages: [{ role: "user", content: "hi" }],
-      max_tokens: 1,
-    });
-  });
-});
-
-describe("cmdSetup with validation", () => {
-  let storageRoot: string;
-
-  beforeEach(async () => {
-    storageRoot = await mkdtemp(join(tmpdir(), "uwf-setup-validate-"));
-  });
-
-  afterEach(async () => {
-    vi.restoreAllMocks();
-    await rm(storageRoot, { recursive: true, force: true });
-  });
-
-  const setupArgs = () => ({
-    provider: "testprovider",
-    baseUrl: "https://api.test.com/v1",
-    apiKey: "sk-test",
-    model: "test-model",
-    storageRoot,
-  });
-
-  test("includes validation result on success", async () => {
-    vi.spyOn(globalThis, "fetch").mockResolvedValue(
-      new Response(JSON.stringify({}), { status: 200 }),
-    );
-
-    const result = await cmdSetup(setupArgs());
-
-    expect(result.validation).toEqual({ ok: true, value: undefined });
-    // Config file should still be written
-    expect(result.configPath).toBeTruthy();
-  });
-
-  test("includes validation failure — config still saved", async () => {
-    vi.spyOn(globalThis, "fetch").mockResolvedValue(
-      new Response("Unauthorized", { status: 401, statusText: "Unauthorized" }),
-    );
-
-    const result = await cmdSetup(setupArgs());
-
-    expect(result.validation).toBeDefined();
-    expect((result.validation as { ok: boolean }).ok).toBe(false);
-    // Config file should still be written despite validation failure
-    expect(result.configPath).toBeTruthy();
-  });
-});