Move utilities out of tools directory

src/mcp-server/tools/deploy-flow.ts

@@ -8,7 +8,7 @@ import type {
     DeployValidation,
 } from "../../shared/deploy-result.ts";
 import { createRedactor, credentialSecrets } from "../../shared/redact.ts";
-import type { ToolFactory } from "./types.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 interface RunnerLogLine {
     type: "log";

src/mcp-server/tools/find-flow-execution.ts

@@ -1,7 +1,11 @@
 import type { ArchitectApi, Models } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { authHint, formatApiError, toApiError } from "./api-error.ts";
-import type { ToolFactory } from "./types.ts";
+import {
+    authHint,
+    formatApiError,
+    toApiError,
+} from "../utilities/api-error.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 /** The API's own ceiling on results per query, per the help centre. */
 const MAX_RESULTS = 200;

src/mcp-server/tools/find-flow.ts

@@ -1,9 +1,12 @@
 import type platformClient from "purecloud-platform-client-v2";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { formatApiError } from "./api-error.ts";
-import { isExactNameMatch, moveExactMatchToTop } from "./name-match.ts";
-import type { ToolFactory } from "./types.ts";
+import { formatApiError } from "../utilities/api-error.ts";
+import {
+    isExactNameMatch,
+    moveExactMatchToTop,
+} from "../utilities/name-match.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 const MAX_RETURNED_FLOWS = 50;
 /**

src/mcp-server/tools/find-queue.ts

@@ -1,10 +1,17 @@
 import type platformClient from "purecloud-platform-client-v2";
 import type { RoutingApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { authHint, formatApiError, toApiError } from "./api-error.ts";
-import { type EntityRef, toEntityRef } from "./entity-ref.ts";
-import { isExactNameMatch, moveExactMatchToTop } from "./name-match.ts";
-import type { ToolFactory } from "./types.ts";
+import {
+    authHint,
+    formatApiError,
+    toApiError,
+} from "../utilities/api-error.ts";
+import { type EntityRef, toEntityRef } from "../utilities/entity-ref.ts";
+import {
+    isExactNameMatch,
+    moveExactMatchToTop,
+} from "../utilities/name-match.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 const MAX_RETURNED_QUEUES = 50;
 const MAX_FETCHED_QUEUES = 200;

src/mcp-server/tools/flow-action.ts

@@ -4,8 +4,8 @@ import {
 } from "@makingchatbots/genesys-cloud-architect-diagram-lib";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { fetchFlowConfiguration } from "./fetch-flow-configuration.ts";
-import type { ToolFactory } from "./types.ts";
+import { fetchFlowConfiguration } from "../utilities/fetch-flow-configuration.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 export interface ToolConfig {
     architectApi: ArchitectApi;

src/mcp-server/tools/flow-dependencies.ts

@@ -1,8 +1,8 @@
 import type platformClient from "purecloud-platform-client-v2";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { formatApiError } from "./api-error.ts";
-import type { ToolFactory } from "./types.ts";
+import { formatApiError } from "../utilities/api-error.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 function flowTypeToObjectType(flowType: string): string {
     const upper = flowType.toUpperCase();

src/mcp-server/tools/flow-execution-data.ts

@@ -9,9 +9,13 @@ import {
 } from "@makingchatbots/genesys-cloud-architect-diagram-lib";
 import type { ArchitectApi, Models } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { authHint, formatApiError, toApiError } from "./api-error.ts";
-import { fetchFlowConfiguration } from "./fetch-flow-configuration.ts";
-import type { ToolFactory } from "./types.ts";
+import {
+    authHint,
+    formatApiError,
+    toApiError,
+} from "../utilities/api-error.ts";
+import { fetchFlowConfiguration } from "../utilities/fetch-flow-configuration.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 /**
  * Retrieval is a job: the first GET registers it and later GETs report its

src/mcp-server/tools/flow-ir.ts

@@ -4,9 +4,9 @@ import {
 } from "@makingchatbots/genesys-cloud-architect-diagram-lib";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { fetchFlowConfiguration } from "./fetch-flow-configuration.ts";
-import { isExactNameMatch } from "./name-match.ts";
-import type { ToolFactory } from "./types.ts";
+import { fetchFlowConfiguration } from "../utilities/fetch-flow-configuration.ts";
+import { isExactNameMatch } from "../utilities/name-match.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 /**
  * Resolve a task by exact id first, then by case-insensitive name. Task names

src/mcp-server/tools/get-prompts.ts

@@ -1,11 +1,15 @@
 import type platformClient from "purecloud-platform-client-v2";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { authHint, formatApiError, toApiError } from "./api-error.ts";
-import { type EntityRef, toEntityRef } from "./entity-ref.ts";
-import { fetchFlowConfiguration } from "./fetch-flow-configuration.ts";
-import { nameKey } from "./name-match.ts";
-import type { ToolFactory } from "./types.ts";
+import {
+    authHint,
+    formatApiError,
+    toApiError,
+} from "../utilities/api-error.ts";
+import { type EntityRef, toEntityRef } from "../utilities/entity-ref.ts";
+import { fetchFlowConfiguration } from "../utilities/fetch-flow-configuration.ts";
+import { nameKey } from "../utilities/name-match.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 /**
  * Applied separately to the ids+names given and to a flow's references, so one

src/mcp-server/tools/search-in-flow.ts

@@ -4,8 +4,8 @@ import {
 } from "@makingchatbots/genesys-cloud-architect-diagram-lib";
 import type { ArchitectApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import { fetchFlowConfiguration } from "./fetch-flow-configuration.ts";
-import type { ToolFactory } from "./types.ts";
+import { fetchFlowConfiguration } from "../utilities/fetch-flow-configuration.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 export interface ToolConfig {
     architectApi: ArchitectApi;

src/mcp-server/tools/test-bot-flow.ts

@@ -1,6 +1,6 @@
 import type { Models, TextbotsApi } from "purecloud-platform-client-v2";
 import { z } from "zod/v3";
-import type { ToolFactory } from "./types.ts";
+import type { ToolFactory } from "../utilities/types.ts";
 
 const sessions = new Map<string, string>();