@tuongaz/seeflow 0.1.77 → 0.1.80

package/src/cli-e2e.ts

@@ -43,7 +43,8 @@ export interface ValidationReport {
 }
 
 export interface ValidateOptions {
-  flowId: string;
+  project: string;
+  flow: string;
   url: string;
   hardCeilingMs?: number;
   statusWaitMs?: number;
@@ -71,10 +72,11 @@ interface FlowGetResponse {
   id?: string;
   valid?: boolean;
   error?: string | null;
-  // GET /api/flows/:id returns the resolved flow under the `flow` key (see
-  // FlowGetResponse in operations.ts). Older versions of this file used `demo`,
-  // which left the validator effectively broken (every call returned `ok:false`
-  // with "demo not valid"). Renamed to match the wire format.
+  // GET /api/projects/:project/flows/:flow returns the resolved flow under
+  // the `flow` key (see FlowGetResponse in operations.ts). Older versions of
+  // this file used `demo`, which left the validator effectively broken (every
+  // call returned `ok:false` with "demo not valid"). Renamed to match the wire
+  // format.
   flow?: FlowBody | null;
 }
 
@@ -178,7 +180,7 @@ function hasStatusAction(node: NodeShape): boolean {
 }
 
 export async function validateEndToEnd(options: ValidateOptions): Promise<ValidationReport> {
-  const { url } = options;
+  const { url, project, flow } = options;
   const hardCeilingMs = options.hardCeilingMs ?? DEFAULT_HARD_CEILING_MS;
   const statusWaitMs = options.statusWaitMs ?? DEFAULT_STATUS_WAIT_MS;
   const startedAt = Date.now();
@@ -188,7 +190,8 @@ export async function validateEndToEnd(options: ValidateOptions): Promise<Valida
   const statuses: StatusOutcome[] = [];
   const skipped: SkippedItem[] = [];
 
-  const demoRes = await fetch(`${url}/api/flows/${encodeURIComponent(options.flowId)}`);
+  const flowBase = `${url}/api/projects/${encodeURIComponent(project)}/flows/${encodeURIComponent(flow)}`;
+  const demoRes = await fetch(flowBase);
   if (!demoRes.ok) {
     return {
       ok: false,
@@ -197,7 +200,7 @@ export async function validateEndToEnd(options: ValidateOptions): Promise<Valida
       skipped: [
         {
           nodeId: '<demo>',
-          reason: `GET /api/flows/${options.flowId} returned HTTP ${demoRes.status}`,
+          reason: `GET /api/projects/${project}/flows/${flow} returned HTTP ${demoRes.status}`,
         },
       ],
     };
@@ -216,6 +219,17 @@ export async function validateEndToEnd(options: ValidateOptions): Promise<Valida
       ],
     };
   }
+  // /api/events still keys by the registry's short id — resolved here from
+  // the flow GET response so the SSE subscription matches the broadcasts.
+  const flowId = demoData.id;
+  if (!flowId) {
+    return {
+      ok: false,
+      plays,
+      statuses,
+      skipped: [{ nodeId: '<flow>', reason: 'flow detail missing registry id' }],
+    };
+  }
 
   const nodes = demoData.flow.nodes ?? [];
 
@@ -238,7 +252,7 @@ export async function validateEndToEnd(options: ValidateOptions): Promise<Valida
 
   let channel: SseChannel | undefined;
   try {
-    const sseRes = await fetch(`${url}/api/events?flowId=${encodeURIComponent(options.flowId)}`, {
+    const sseRes = await fetch(`${url}/api/events?flowId=${encodeURIComponent(flowId)}`, {
       headers: { accept: 'text/event-stream' },
     });
     if (sseRes.ok && sseRes.body) {
@@ -274,10 +288,7 @@ export async function validateEndToEnd(options: ValidateOptions): Promise<Valida
     }
     let res: Response;
     try {
-      res = await fetch(
-        `${url}/api/flows/${encodeURIComponent(options.flowId)}/play/${encodeURIComponent(nodeId)}`,
-        { method: 'POST' },
-      );
+      res = await fetch(`${flowBase}/play/${encodeURIComponent(nodeId)}`, { method: 'POST' });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       httpResults.set(nodeId, { httpError: message });

package/src/cli-helpers.ts

@@ -136,6 +136,7 @@ function describeOutcome(outcome: { kind: string } & Record<string, unknown>): s
 export const EXIT_CODE_BY_KIND: Record<string, number> = {
   badSchema: 2,
   badJson: 2,
+  badJq: 2,
   notFound: 3,
   flowNotFound: 3,
   fileNotFound: 3,
@@ -159,3 +160,28 @@ export const drainStdin: StdinReader = async () => {
   }
   return new TextDecoder().decode(Buffer.concat(chunks));
 };
+
+/**
+ * Extract `--project <p>` and `--flow <f>` from a raw argv array. Throws when
+ * either flag is missing — every flow-scoped CLI verb (US-020) routes through
+ * this helper so the addressing convention stays uniform.
+ *
+ * Accepts both `--name value` and `--name=value` forms; the first occurrence
+ * wins (matches the behaviour of cli.ts's internal `flagValue`).
+ */
+export function parseProjectFlow(argv: readonly string[]): { project: string; flow: string } {
+  const project = readArgvFlag(argv, 'project');
+  if (!project) throw new Error('Missing required flag: --project');
+  const flow = readArgvFlag(argv, 'flow');
+  if (!flow) throw new Error('Missing required flag: --flow');
+  return { project, flow };
+}
+
+function readArgvFlag(argv: readonly string[], name: string): string | undefined {
+  const flag = `--${name}`;
+  const eqArg = argv.find((a) => a.startsWith(`${flag}=`));
+  if (eqArg) return eqArg.slice(`${flag}=`.length);
+  const idx = argv.indexOf(flag);
+  if (idx >= 0 && idx + 1 < argv.length) return argv[idx + 1];
+  return undefined;
+}