Unified · Split
| @@ -7,7 +7,7 @@ import type { · 6 unmodified lines | ||
| 7 | 7 | GoogleDiscoveryMethodParameter, |
| 8 | 8 | GoogleDiscoverySchemaRefTable, |
| 9 | 9 | GoogleDiscoveryToolManifest, |
| 10 | −} from "./google-discovery-types"; | |
| 10 | +} from "./types"; | |
| 11 | 11 | |
| 12 | 12 | type JsonObject = Record<string, unknown>; |
| 13 | 13 | |
| @@ -1,14 +1,14 @@ | ||
| 1 | 1 | export { |
| 2 | 2 | extractGoogleDiscoveryManifest, |
| 3 | 3 | compileGoogleDiscoveryToolDefinitions, |
| 4 | −} from "./google-discovery-document"; | |
| 4 | +} from "./document"; | |
| 5 | 5 | export { |
| 6 | 6 | buildGoogleDiscoveryToolPresentation, |
| 7 | 7 | createGoogleDiscoveryToolFromDefinition, |
| 8 | 8 | decodeGoogleDiscoverySchemaRefTableJson, |
| 9 | 9 | googleDiscoveryProviderDataFromDefinition, |
| 10 | 10 | type CreateGoogleDiscoveryToolFromDefinitionInput, |
| 11 | −} from "./google-discovery-tools"; | |
| 11 | +} from "./tools"; | |
| 12 | 12 | export { |
| 13 | 13 | GoogleDiscoveryHttpMethodSchema, |
| 14 | 14 | GoogleDiscoveryParameterLocationSchema, |
| @@ -27,4 +27,4 @@ export { · 12 unmodified lines | ||
| 27 | 27 | type GoogleDiscoveryToolDefinition, |
| 28 | 28 | type GoogleDiscoverySchemaRefTable, |
| 29 | 29 | type GoogleDiscoveryToolManifest, |
| 30 | −} from "./google-discovery-types"; | |
| 30 | +} from "./types"; | |
File renamed without changes.
| @@ -22,10 +22,10 @@ import type { · 21 unmodified lines | ||
| 22 | 22 | GoogleDiscoveryManifestMethod, |
| 23 | 23 | GoogleDiscoverySchemaRefTable, |
| 24 | 24 | GoogleDiscoveryToolDefinition, |
| 25 | −} from "./google-discovery-types"; | |
| 25 | +} from "./types"; | |
| 26 | 26 | import { |
| 27 | 27 | GoogleDiscoveryToolProviderDataSchema, |
| 28 | −} from "./google-discovery-types"; | |
| 28 | +} from "./types"; | |
| 29 | 29 | |
| 30 | 30 | const decodeGoogleDiscoveryToolProviderDataJson = Schema.decodeUnknownEither( |
| 31 | 31 | GoogleDiscoveryToolProviderDataSchema, |
File renamed without changes.
| @@ -3,7 +3,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js"; · 2 unmodified lines | ||
| 3 | 3 | import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; |
| 4 | 4 | import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"; |
| 5 | 5 | |
| 6 | −import type { McpConnection, McpConnector } from "./mcp-tools"; | |
| 6 | +import type { McpConnection, McpConnector } from "./tools"; | |
| 7 | 7 | |
| 8 | 8 | export type McpTransportPreference = "auto" | "streamable-http" | "sse"; |
| 9 | 9 | |
File renamed without changes.
| @@ -11,7 +11,7 @@ import { makeSesExecutor } from "@executor/runtime-ses"; · 10 unmodified lines | ||
| 11 | 11 | import { |
| 12 | 12 | createMcpConnectorFromClient, |
| 13 | 13 | discoverMcpToolsFromConnector, |
| 14 | −} from "./mcp-tools"; | |
| 14 | +} from "./tools"; | |
| 15 | 15 | |
| 16 | 16 | type McpTestPair = { |
| 17 | 17 | server: McpServer; |
| @@ -11,8 +11,8 @@ import { z } from "zod/v4"; · 10 unmodified lines | ||
| 11 | 11 | import { makeToolInvokerFromTools } from "@executor/codemode-core"; |
| 12 | 12 | import { makeSesExecutor } from "@executor/runtime-ses"; |
| 13 | 13 | |
| 14 | −import { createSdkMcpConnector } from "./mcp-connection"; | |
| 15 | −import { discoverMcpToolsFromConnector } from "./mcp-tools"; | |
| 14 | +import { createSdkMcpConnector } from "./connection"; | |
| 15 | +import { discoverMcpToolsFromConnector } from "./tools"; | |
| 16 | 16 | |
| 17 | 17 | type UrlMcpServer = { |
| 18 | 18 | endpoint: string; |
| @@ -2,7 +2,7 @@ export { · 1 unmodified line | ||
| 2 | 2 | createSdkMcpConnector, |
| 3 | 3 | type CreateSdkMcpConnectorInput, |
| 4 | 4 | type McpTransportPreference, |
| 5 | −} from "./mcp-connection"; | |
| 5 | +} from "./connection"; | |
| 6 | 6 | export { |
| 7 | 7 | McpToolsError, |
| 8 | 8 | createMcpConnectorFromClient, |
| @@ -16,7 +16,7 @@ export { · 7 unmodified lines | ||
| 16 | 16 | type McpDiscoveryElicitationContext, |
| 17 | 17 | type McpToolManifest, |
| 18 | 18 | type McpToolManifestEntry, |
| 19 | −} from "./mcp-tools"; | |
| 19 | +} from "./tools"; | |
| 20 | 20 | export type { |
| 21 | 21 | McpListToolsMetadata, |
| 22 | 22 | McpServerCapabilities, |
| @@ -24,4 +24,4 @@ export type { · 1 unmodified line | ||
| 24 | 24 | McpServerMetadata, |
| 25 | 25 | McpToolAnnotations, |
| 26 | 26 | McpToolExecution, |
| 27 | −} from "./mcp-manifest"; | |
| 27 | +} from "./manifest"; | |
File renamed without changes.
| @@ -15,12 +15,12 @@ import type { · 14 unmodified lines | ||
| 15 | 15 | ToolPath, |
| 16 | 16 | } from "@executor/codemode-core"; |
| 17 | 17 | |
| 18 | −import { createSdkMcpConnector } from "./mcp-connection"; | |
| 18 | +import { createSdkMcpConnector } from "./connection"; | |
| 19 | 19 | import { |
| 20 | 20 | McpToolsError, |
| 21 | 21 | discoverMcpToolsFromConnector, |
| 22 | 22 | extractMcpToolManifestFromListToolsResult, |
| 23 | −} from "./mcp-tools"; | |
| 23 | +} from "./tools"; | |
| 24 | 24 | |
| 25 | 25 | const resolveToolDefinition = (value: ToolInput): ToolDefinition => |
| 26 | 26 | typeof value === "object" && value !== null && "tool" in value |
| @@ -26,13 +26,13 @@ import { · 25 unmodified lines | ||
| 26 | 26 | readMcpElicitationRequest, |
| 27 | 27 | readUnknownRecord, |
| 28 | 28 | toMcpElicitationResponse, |
| 29 | −} from "./mcp-elicitation-bridge"; | |
| 29 | +} from "./elicitation-bridge"; | |
| 30 | 30 | import { |
| 31 | 31 | extractMcpToolManifestFromListToolsResult, |
| 32 | 32 | joinToolPath, |
| 33 | 33 | type McpToolManifest, |
| 34 | 34 | type McpToolManifestEntry, |
| 35 | −} from "./mcp-manifest"; | |
| 35 | +} from "./manifest"; | |
| 36 | 36 | |
| 37 | 37 | export type { McpToolManifest, McpToolManifestEntry }; |
| 38 | 38 | export { extractMcpToolManifestFromListToolsResult }; |
| @@ -12,7 +12,7 @@ import { · 11 unmodified lines | ||
| 12 | 12 | OpenApiToolProviderDataSchema, |
| 13 | 13 | type OpenApiExtractedTool, |
| 14 | 14 | type OpenApiToolManifest, |
| 15 | −} from "./openapi-types"; | |
| 15 | +} from "./types"; | |
| 16 | 16 | |
| 17 | 17 | const VERSION_SEGMENT_REGEX = /^v\d+(?:[._-]\d+)?$/i; |
| 18 | 18 | const IGNORED_PATH_SEGMENTS = new Set(["api"]); |
| @@ -2,7 +2,7 @@ import { describe, expect, it } from "@effect/vitest"; · 1 unmodified line | ||
| 2 | 2 | import { assertInclude, assertTrue } from "@effect/vitest/utils"; |
| 3 | 3 | import * as Effect from "effect/Effect"; |
| 4 | 4 | |
| 5 | −import { parseOpenApiDocument } from "./openapi-document"; | |
| 5 | +import { parseOpenApiDocument } from "./document"; | |
| 6 | 6 | |
| 7 | 7 | describe("openapi-document", () => { |
| 8 | 8 | it.effect("parses JSON OpenAPI document text", () => |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | import { parse as parseYaml } from "yaml"; |
| 2 | 2 | |
| 3 | −import type { OpenApiJsonObject } from "./openapi-types"; | |
| 3 | +import type { OpenApiJsonObject } from "./types"; | |
| 4 | 4 | |
| 5 | 5 | const isOpenApiJsonObject = (value: unknown): value is OpenApiJsonObject => |
| 6 | 6 | typeof value === "object" && value !== null && !Array.isArray(value); |
| @@ -2,9 +2,9 @@ import { describe, expect, it } from "@effect/vitest"; · 1 unmodified line | ||
| 2 | 2 | import * as Effect from "effect/Effect"; |
| 3 | 3 | import type { ToolDefinition, ToolInput } from "@executor/codemode-core"; |
| 4 | 4 | |
| 5 | −import { extractOpenApiManifest } from "./openapi-extraction"; | |
| 6 | −import { createOpenApiToolsFromManifest } from "./openapi-tools"; | |
| 7 | −import type { OpenApiJsonObject } from "./openapi-types"; | |
| 5 | +import { extractOpenApiManifest } from "./extraction"; | |
| 6 | +import { createOpenApiToolsFromManifest } from "./tools"; | |
| 7 | +import type { OpenApiJsonObject } from "./types"; | |
| 8 | 8 | |
| 9 | 9 | const VERCEL_OPENAPI_SPEC_URL = "https://openapi.vercel.sh/"; |
| 10 | 10 | |
| @@ -4,8 +4,8 @@ import { pipe } from "effect/Function"; · 3 unmodified lines | ||
| 4 | 4 | import * as ParseResult from "effect/ParseResult"; |
| 5 | 5 | import * as Schema from "effect/Schema"; |
| 6 | 6 | |
| 7 | −import { parseOpenApiDocument } from "./openapi-document"; | |
| 8 | −import { extractOpenApiManifestJsonWithWasm } from "./openapi-extractor-wasm"; | |
| 7 | +import { parseOpenApiDocument } from "./document"; | |
| 8 | +import { extractOpenApiManifestJsonWithWasm } from "./extractor-wasm"; | |
| 9 | 9 | import { |
| 10 | 10 | OpenApiToolManifestSchema, |
| 11 | 11 | type OpenApiExtractedTool, |
| @@ -15,7 +15,7 @@ import { · 3 unmodified lines | ||
| 15 | 15 | type OpenApiJsonObject, |
| 16 | 16 | type OpenApiSpecInput, |
| 17 | 17 | type OpenApiToolManifest, |
| 18 | −} from "./openapi-types"; | |
| 18 | +} from "./types"; | |
| 19 | 19 | |
| 20 | 20 | type OpenApiExtractionStage = "validate" | "extract"; |
| 21 | 21 | |
File renamed without changes.
File renamed without changes.
| @@ -1,22 +1,22 @@ | ||
| 1 | 1 | export { |
| 2 | 2 | fetchOpenApiDocument, |
| 3 | 3 | parseOpenApiDocument, |
| 4 | −} from "./openapi-document"; | |
| 4 | +} from "./document"; | |
| 5 | 5 | export { |
| 6 | 6 | OpenApiExtractionError, |
| 7 | 7 | extractOpenApiManifest, |
| 8 | −} from "./openapi-extraction"; | |
| 8 | +} from "./extraction"; | |
| 9 | 9 | export { |
| 10 | 10 | compileOpenApiToolDefinitions, |
| 11 | 11 | openApiProviderDataFromDefinition, |
| 12 | 12 | OpenApiToolDefinitionSchema, |
| 13 | 13 | type OpenApiToolDefinition, |
| 14 | −} from "./openapi-definitions"; | |
| 14 | +} from "./definitions"; | |
| 15 | 15 | export { |
| 16 | 16 | buildOpenApiToolPresentation, |
| 17 | 17 | openApiOutputTypeSignatureFromSchema, |
| 18 | 18 | type OpenApiToolPresentation, |
| 19 | −} from "./openapi-tool-presentation"; | |
| 19 | +} from "./tool-presentation"; | |
| 20 | 20 | export { |
| 21 | 21 | httpBodyModeFromContentType, |
| 22 | 22 | isJsonMediaType, |
| @@ -31,14 +31,14 @@ export { · 8 unmodified lines | ||
| 31 | 31 | type SerializedOpenApiRequestBody, |
| 32 | 32 | type SerializedOpenApiParameterValue, |
| 33 | 33 | type SerializedOpenApiQueryEntry, |
| 34 | −} from "./openapi-http-serialization"; | |
| 34 | +} from "./http-serialization"; | |
| 35 | 35 | export { |
| 36 | 36 | OpenApiToolInvocationError, |
| 37 | 37 | createOpenApiToolFromDefinition, |
| 38 | 38 | createOpenApiToolsFromManifest, |
| 39 | 39 | createOpenApiToolsFromSpec, |
| 40 | −} from "./openapi-tools"; | |
| 41 | −export { resolveSchemaWithRefHints, resolveTypingSchemasWithRefHints } from "./openapi-schema-refs"; | |
| 40 | +} from "./tools"; | |
| 41 | +export { resolveSchemaWithRefHints, resolveTypingSchemasWithRefHints } from "./schema-refs"; | |
| 42 | 42 | export { |
| 43 | 43 | OPEN_API_HTTP_METHODS, |
| 44 | 44 | OPEN_API_PARAMETER_LOCATIONS, |
| @@ -89,11 +89,11 @@ export { · 44 unmodified lines | ||
| 89 | 89 | type OpenApiSecuritySchemeType, |
| 90 | 90 | type OpenApiOAuthFlow, |
| 91 | 91 | type OpenApiSecurityScheme, |
| 92 | −} from "./openapi-types"; | |
| 92 | +} from "./types"; | |
| 93 | 93 | export type { |
| 94 | 94 | OpenApiExample, |
| 95 | 95 | OpenApiParameterDocumentation, |
| 96 | 96 | OpenApiRequestBodyDocumentation, |
| 97 | 97 | OpenApiResponseDocumentation, |
| 98 | 98 | OpenApiToolDocumentation, |
| 99 | −} from "./openapi-types"; | |
| 99 | +} from "./types"; | |
| @@ -3,15 +3,15 @@ import { readFileSync } from "node:fs"; · 2 unmodified lines | ||
| 3 | 3 | import { describe, expect, it } from "@effect/vitest"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | |
| 6 | −import { compileOpenApiToolDefinitions } from "./openapi-definitions"; | |
| 7 | −import { parseOpenApiDocument } from "./openapi-document"; | |
| 8 | −import { extractOpenApiManifest } from "./openapi-extraction"; | |
| 9 | −import { buildOpenApiToolPresentation } from "./openapi-tool-presentation"; | |
| 6 | +import { compileOpenApiToolDefinitions } from "./definitions"; | |
| 7 | +import { parseOpenApiDocument } from "./document"; | |
| 8 | +import { extractOpenApiManifest } from "./extraction"; | |
| 9 | +import { buildOpenApiToolPresentation } from "./tool-presentation"; | |
| 10 | 10 | import type { |
| 11 | 11 | OpenApiExtractedTool, |
| 12 | 12 | OpenApiJsonObject, |
| 13 | 13 | OpenApiToolManifest, |
| 14 | −} from "./openapi-types"; | |
| 14 | +} from "./types"; | |
| 15 | 15 | |
| 16 | 16 | const readFixture = (name: string): string => |
| 17 | 17 | readFileSync( |
File renamed without changes.
| @@ -3,10 +3,10 @@ import { readFileSync } from "node:fs"; · 2 unmodified lines | ||
| 3 | 3 | import { describe, expect, it } from "@effect/vitest"; |
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | |
| 6 | −import type { OpenApiToolDefinition } from "./openapi-definitions"; | |
| 7 | −import { compileOpenApiToolDefinitions } from "./openapi-definitions"; | |
| 8 | −import { extractOpenApiManifest } from "./openapi-extraction"; | |
| 9 | −import { buildOpenApiToolPresentation } from "./openapi-tool-presentation"; | |
| 6 | +import type { OpenApiToolDefinition } from "./definitions"; | |
| 7 | +import { compileOpenApiToolDefinitions } from "./definitions"; | |
| 8 | +import { extractOpenApiManifest } from "./extraction"; | |
| 9 | +import { buildOpenApiToolPresentation } from "./tool-presentation"; | |
| 10 | 10 | |
| 11 | 11 | const readFixture = (name: string): string => |
| 12 | 12 | readFileSync( |
| @@ -9,15 +9,15 @@ import type { · 8 unmodified lines | ||
| 9 | 9 | OpenApiResponseVariant, |
| 10 | 10 | OpenApiToolDocumentation, |
| 11 | 11 | OpenApiToolProviderData, |
| 12 | −} from "./openapi-types"; | |
| 12 | +} from "./types"; | |
| 13 | 13 | import { |
| 14 | 14 | openApiProviderDataFromDefinition, |
| 15 | 15 | type OpenApiToolDefinition, |
| 16 | −} from "./openapi-definitions"; | |
| 16 | +} from "./definitions"; | |
| 17 | 17 | import { |
| 18 | 18 | resolveSchemaWithRefHints, |
| 19 | 19 | resolveTypingSchemasWithRefHints, |
| 20 | −} from "./openapi-schema-refs"; | |
| 20 | +} from "./schema-refs"; | |
| 21 | 21 | |
| 22 | 22 | const asRecord = (value: unknown): Record<string, unknown> => |
| 23 | 23 | typeof value === "object" && value !== null && !Array.isArray(value) |
| @@ -20,8 +20,8 @@ import { Schema } from "effect"; · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | import type { ToolDefinition, ToolInput, ToolMap } from "@executor/codemode-core"; |
| 22 | 22 | |
| 23 | −import { extractOpenApiManifest } from "./openapi-extraction"; | |
| 24 | −import { createOpenApiToolsFromManifest, createOpenApiToolsFromSpec } from "./openapi-tools"; | |
| 23 | +import { extractOpenApiManifest } from "./extraction"; | |
| 24 | +import { createOpenApiToolsFromManifest, createOpenApiToolsFromSpec } from "./tools"; | |
| 25 | 25 | |
| 26 | 26 | type TestServer = { |
| 27 | 27 | baseUrl: string; |
| @@ -21,26 +21,26 @@ import { · 20 unmodified lines | ||
| 21 | 21 | import { |
| 22 | 22 | compileOpenApiToolDefinitions, |
| 23 | 23 | type OpenApiToolDefinition, |
| 24 | −} from "./openapi-definitions"; | |
| 24 | +} from "./definitions"; | |
| 25 | 25 | import { |
| 26 | 26 | httpBodyModeFromContentType, |
| 27 | 27 | serializeOpenApiParameterValue, |
| 28 | 28 | serializeOpenApiRequestBody, |
| 29 | 29 | withSerializedQueryEntries, |
| 30 | 30 | type SerializedOpenApiQueryEntry, |
| 31 | −} from "./openapi-http-serialization"; | |
| 32 | −import { buildOpenApiToolPresentation } from "./openapi-tool-presentation"; | |
| 33 | −import { resolveSchemaWithRefHints } from "./openapi-schema-refs"; | |
| 31 | +} from "./http-serialization"; | |
| 32 | +import { buildOpenApiToolPresentation } from "./tool-presentation"; | |
| 33 | +import { resolveSchemaWithRefHints } from "./schema-refs"; | |
| 34 | 34 | import { |
| 35 | 35 | extractOpenApiManifest, |
| 36 | 36 | type OpenApiExtractionError, |
| 37 | −} from "./openapi-extraction"; | |
| 37 | +} from "./extraction"; | |
| 38 | 38 | import { |
| 39 | 39 | type OpenApiRefHintTable, |
| 40 | 40 | type OpenApiInvocationPayload, |
| 41 | 41 | type OpenApiSpecInput, |
| 42 | 42 | type OpenApiToolManifest, |
| 43 | −} from "./openapi-types"; | |
| 43 | +} from "./types"; | |
| 44 | 44 | |
| 45 | 45 | type OpenApiToolArgs = Record<string, unknown>; |
| 46 | 46 | type OpenApiToolParameter = OpenApiInvocationPayload["parameters"][number]; |
File renamed without changes.
| @@ -4,7 +4,7 @@ import { · 3 unmodified lines | ||
| 4 | 4 | createExecution, |
| 5 | 5 | getExecution, |
| 6 | 6 | resumeExecution, |
| 7 | −} from "../../runtime/execution/execution-service"; | |
| 7 | +} from "../../runtime/execution/service"; | |
| 8 | 8 | |
| 9 | 9 | import { ControlPlaneApi } from "../api"; |
| 10 | 10 | import { resolveRequestedLocalWorkspace } from "../local-context"; |
| @@ -3,8 +3,8 @@ import * as Effect from "effect/Effect"; · 2 unmodified lines | ||
| 3 | 3 | |
| 4 | 4 | import { |
| 5 | 5 | RuntimeLocalWorkspaceMismatchError, |
| 6 | −} from "../runtime/local/local-errors"; | |
| 7 | −import { requireRuntimeLocalWorkspace } from "../runtime/local/local-runtime-context"; | |
| 6 | +} from "../runtime/local/errors"; | |
| 7 | +import { requireRuntimeLocalWorkspace } from "../runtime/local/runtime-context"; | |
| 8 | 8 | import { ControlPlaneForbiddenError } from "./errors"; |
| 9 | 9 | |
| 10 | 10 | export const resolveRequestedLocalWorkspace = ( |
| @@ -7,8 +7,8 @@ import * as Option from "effect/Option"; · 6 unmodified lines | ||
| 7 | 7 | import { SecretMaterialIdSchema } from "#schema"; |
| 8 | 8 | import { |
| 9 | 9 | getLocalInstallation, |
| 10 | −} from "../../runtime/local/local-operations"; | |
| 11 | −import { requireRuntimeLocalWorkspace } from "../../runtime/local/local-runtime-context"; | |
| 10 | +} from "../../runtime/local/operations"; | |
| 11 | +import { requireRuntimeLocalWorkspace } from "../../runtime/local/runtime-context"; | |
| 12 | 12 | import { |
| 13 | 13 | createDefaultSecretMaterialDeleter, |
| 14 | 14 | createDefaultSecretMaterialStorer, |
| @@ -22,7 +22,7 @@ import { · 21 unmodified lines | ||
| 22 | 22 | completeSourceCredentialSetup, |
| 23 | 23 | getSourceCredentialInteraction, |
| 24 | 24 | submitSourceCredentialInteraction, |
| 25 | −} from "../../runtime/local/local-operations"; | |
| 25 | +} from "../../runtime/local/operations"; | |
| 26 | 26 | import { discoverSource } from "../../runtime/sources/source-discovery"; |
| 27 | 27 | import { hasSourceAdapterFamily } from "../../runtime/sources/source-adapters"; |
| 28 | 28 | import { RuntimeSourceAuthServiceTag } from "../../runtime/sources/source-auth-service"; |
| @@ -33,12 +33,12 @@ import { · 32 unmodified lines | ||
| 33 | 33 | formatTypeNameSegment, |
| 34 | 34 | joinTypeNameSegments, |
| 35 | 35 | projectedCatalogTypeRoots, |
| 36 | −} from "./catalog-typescript"; | |
| 36 | +} from "../catalog-typescript"; | |
| 37 | 37 | import { |
| 38 | 38 | expandCatalogToolByPath, |
| 39 | 39 | expandCatalogTools, |
| 40 | 40 | type LoadedSourceCatalog, |
| 41 | −} from "./source-catalog-runtime"; | |
| 41 | +} from "./runtime"; | |
| 42 | 42 | |
| 43 | 43 | const put = <K extends string, V>(record: Record<K, V>, key: K, value: V) => { |
| 44 | 44 | record[key] = value; |
| @@ -30,27 +30,27 @@ import type { · 29 unmodified lines | ||
| 30 | 30 | ShapeSymbol, |
| 31 | 31 | Symbol as IrSymbol, |
| 32 | 32 | } from "@executor/ir/model"; |
| 33 | −import { LocalSourceArtifactMissingError } from "../local/local-errors"; | |
| 33 | +import { LocalSourceArtifactMissingError } from "../../local/errors"; | |
| 34 | 34 | import { |
| 35 | 35 | createCatalogTypeProjector, |
| 36 | 36 | joinTypeNameSegments, |
| 37 | 37 | projectedCatalogTypeRoots, |
| 38 | 38 | type CatalogTypeProjector, |
| 39 | −} from "./catalog-typescript"; | |
| 39 | +} from "../catalog-typescript"; | |
| 40 | 40 | import { |
| 41 | 41 | RuntimeLocalWorkspaceService, |
| 42 | 42 | type RuntimeLocalWorkspaceState, |
| 43 | −} from "../local/local-runtime-context"; | |
| 44 | −import type { LocalSourceArtifact } from "../local/local-source-artifacts"; | |
| 43 | +} from "../../local/runtime-context"; | |
| 44 | +import type { LocalSourceArtifact } from "../../local/source-artifacts"; | |
| 45 | 45 | import { |
| 46 | 46 | SourceArtifactStore, |
| 47 | 47 | type SourceArtifactStoreShape, |
| 48 | −} from "../local/local-storage"; | |
| 49 | −import { namespaceFromSourceName } from "../sources/source-names"; | |
| 48 | +} from "../../local/storage"; | |
| 49 | +import { namespaceFromSourceName } from "../../sources/source-names"; | |
| 50 | 50 | import { |
| 51 | 51 | RuntimeSourceStoreService, |
| 52 | 52 | type RuntimeSourceStore, |
| 53 | −} from "../sources/source-store"; | |
| 53 | +} from "../../sources/source-store"; | |
| 54 | 54 | |
| 55 | 55 | type CatalogImportMetadata = CatalogSnapshotV1["import"]; |
| 56 | 56 | |
| @@ -6,7 +6,7 @@ import { · 5 unmodified lines | ||
| 6 | 6 | buildGraphqlToolPresentation, |
| 7 | 7 | compileGraphqlToolDefinitions, |
| 8 | 8 | type GraphqlToolManifest, |
| 9 | −} from "../sources/graphql-tools"; | |
| 9 | +} from "../../sources/graphql-tools"; | |
| 10 | 10 | import { |
| 11 | 11 | createGoogleDiscoveryCatalogSnapshot, |
| 12 | 12 | createGraphqlCatalogSnapshot, |
| @@ -11,30 +11,30 @@ import * as Layer from "effect/Layer"; · 10 unmodified lines | ||
| 11 | 11 | import { |
| 12 | 12 | RuntimeLocalWorkspaceService, |
| 13 | 13 | type RuntimeLocalWorkspaceState, |
| 14 | −} from "../local/local-runtime-context"; | |
| 14 | +} from "../../local/runtime-context"; | |
| 15 | 15 | import { |
| 16 | 16 | SourceArtifactStore, |
| 17 | 17 | type SourceArtifactStoreShape, |
| 18 | 18 | WorkspaceStateStore, |
| 19 | 19 | type WorkspaceStateStoreShape, |
| 20 | −} from "../local/local-storage"; | |
| 20 | +} from "../../local/storage"; | |
| 21 | 21 | import { |
| 22 | 22 | type LocalWorkspaceState, |
| 23 | −} from "../local/local-workspace-state"; | |
| 23 | +} from "../../local/workspace-state"; | |
| 24 | 24 | import { |
| 25 | 25 | RuntimeSourceAuthMaterialService, |
| 26 | −} from "../auth/source-auth-material"; | |
| 26 | +} from "../../auth/source-auth-material"; | |
| 27 | 27 | import { |
| 28 | 28 | getSourceAdapterForSource, |
| 29 | −} from "../sources/source-adapters"; | |
| 29 | +} from "../../sources/source-adapters"; | |
| 30 | 30 | import { |
| 31 | 31 | catalogSyncResultFromMcpManifest, |
| 32 | −} from "../sources/source-adapters/mcp"; | |
| 33 | −import { SecretMaterialResolverService } from "../local/secret-material-providers"; | |
| 34 | −import { snapshotFromSourceCatalogSyncResult } from "../sources/catalog-sync-result"; | |
| 32 | +} from "../../sources/source-adapters/mcp"; | |
| 33 | +import { SecretMaterialResolverService } from "../../local/secret-material-providers"; | |
| 34 | +import { snapshotFromSourceCatalogSyncResult } from "../../sources/catalog-sync-result"; | |
| 35 | 35 | import { |
| 36 | 36 | refreshSourceTypeDeclarationInBackground, |
| 37 | −} from "./source-type-declarations"; | |
| 37 | +} from "./type-declarations"; | |
| 38 | 38 | |
| 39 | 39 | const shouldIndexSource = (source: Source): boolean => |
| 40 | 40 | source.enabled |
| @@ -24,7 +24,7 @@ import { · 23 unmodified lines | ||
| 24 | 24 | ShapeSymbolIdSchema, |
| 25 | 25 | } from "@executor/ir/ids"; |
| 26 | 26 | import type { CatalogV1, GraphQLExecutable, ProvenanceRef } from "@executor/ir/model"; |
| 27 | −import { syncWorkspaceSourceTypeDeclarationsNode } from "./source-type-declarations"; | |
| 27 | +import { syncWorkspaceSourceTypeDeclarationsNode } from "./type-declarations"; | |
| 28 | 28 | |
| 29 | 29 | const put = <K extends string, V>(record: Record<K, V>, key: K, value: V) => { |
| 30 | 30 | record[key] = value; |
| @@ -14,12 +14,12 @@ import { · 13 unmodified lines | ||
| 14 | 14 | joinTypeNameSegments, |
| 15 | 15 | projectedCatalogTypeRoots, |
| 16 | 16 | shapeAllowsOmittedArgs, |
| 17 | −} from "./catalog-typescript"; | |
| 18 | −import type { ResolvedLocalWorkspaceContext } from "../local/local-config"; | |
| 17 | +} from "../catalog-typescript"; | |
| 18 | +import type { ResolvedLocalWorkspaceContext } from "../../local/config"; | |
| 19 | 19 | import { |
| 20 | 20 | LocalFileSystemError, |
| 21 | 21 | unknownLocalErrorDetails, |
| 22 | −} from "../local/local-errors"; | |
| 22 | +} from "../../local/errors"; | |
| 23 | 23 | |
| 24 | 24 | type SourceDeclarationEntry = { |
| 25 | 25 | source: Source; |
File renamed without changes.
| @@ -33,7 +33,7 @@ import type { · 32 unmodified lines | ||
| 33 | 33 | ParameterSymbol, |
| 34 | 34 | Scope, |
| 35 | 35 | } from "@executor/ir/model"; |
| 36 | −import type { LoadedSourceCatalogToolIndexEntry } from "../catalog/source-catalog-runtime"; | |
| 36 | +import type { LoadedSourceCatalogToolIndexEntry } from "../catalog/source/runtime"; | |
| 37 | 37 | import type { ResolvedSourceAuthMaterial } from "../auth/source-auth-material"; |
| 38 | 38 | |
| 39 | 39 | const asObject = (value: unknown): Record<string, unknown> => |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | import { describe, expect, it } from "@effect/vitest"; |
| 2 | 2 | |
| 3 | −import { sanitizePersistedElicitationResponse } from "./live-execution"; | |
| 3 | +import { sanitizePersistedElicitationResponse } from "./live"; | |
| 4 | 4 | |
| 5 | 5 | describe("live-execution", () => { |
| 6 | 6 | it("redacts secret refs from persisted interaction responses", () => { |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -29,16 +29,16 @@ import * as Effect from "effect/Effect"; · 28 unmodified lines | ||
| 29 | 29 | import * as Option from "effect/Option"; |
| 30 | 30 | import * as Schema from "effect/Schema"; |
| 31 | 31 | |
| 32 | −import { type ResolveExecutionEnvironment } from "./execution-state"; | |
| 32 | +import { type ResolveExecutionEnvironment } from "./state"; | |
| 33 | 33 | import { |
| 34 | 34 | LiveExecutionManagerService, |
| 35 | 35 | sanitizePersistedElicitationResponse, |
| 36 | 36 | type LiveExecutionManager, |
| 37 | −} from "./live-execution"; | |
| 37 | +} from "./live"; | |
| 38 | 38 | import { |
| 39 | 39 | getRuntimeLocalWorkspaceOption, |
| 40 | 40 | provideOptionalRuntimeLocalWorkspace, |
| 41 | −} from "../local/local-runtime-context"; | |
| 41 | +} from "../local/runtime-context"; | |
| 42 | 42 | import { |
| 43 | 43 | asOperationErrors, |
| 44 | 44 | operationErrors, |
| @@ -48,7 +48,7 @@ import { · 3 unmodified lines | ||
| 48 | 48 | ControlPlaneStore, |
| 49 | 49 | type ControlPlaneStoreShape, |
| 50 | 50 | } from "../store"; |
| 51 | −import { RuntimeExecutionResolverService } from "./workspace-execution-environment"; | |
| 51 | +import { RuntimeExecutionResolverService } from "./workspace/environment"; | |
| 52 | 52 | |
| 53 | 53 | const executionOps = { |
| 54 | 54 | create: operationErrors("executions.create"), |
File renamed without changes.
| @@ -4,12 +4,12 @@ import * as Either from "effect/Either"; · 3 unmodified lines | ||
| 4 | 4 | import * as Effect from "effect/Effect"; |
| 5 | 5 | import * as Schema from "effect/Schema"; |
| 6 | 6 | |
| 7 | −import type { LoadedSourceCatalogToolIndexEntry } from "../catalog/source-catalog-runtime"; | |
| 8 | −import type { SecretMaterialResolveContext } from "../local/secret-material-providers"; | |
| 9 | −import type { WorkspaceStorageServices } from "../local/local-storage"; | |
| 10 | −import { invocationDescriptorFromTool } from "./ir-execution"; | |
| 11 | −import { evaluateInvocationPolicy } from "../policy/invocation-policy-engine"; | |
| 12 | −import { loadRuntimeLocalWorkspacePolicies } from "../policy/policies-operations"; | |
| 7 | +import type { LoadedSourceCatalogToolIndexEntry } from "../../catalog/source/runtime"; | |
| 8 | +import type { SecretMaterialResolveContext } from "../../local/secret-material-providers"; | |
| 9 | +import type { WorkspaceStorageServices } from "../../local/storage"; | |
| 10 | +import { invocationDescriptorFromTool } from "../ir-execution"; | |
| 11 | +import { evaluateInvocationPolicy } from "../../policy/invocation-policy-engine"; | |
| 12 | +import { loadRuntimeLocalWorkspacePolicies } from "../../policy/policies-operations"; | |
| 13 | 13 | |
| 14 | 14 | const asToolPath = (value: string): ToolPath => value as ToolPath; |
| 15 | 15 | |
| @@ -13,27 +13,27 @@ import * as Layer from "effect/Layer"; · 12 unmodified lines | ||
| 13 | 13 | import type { |
| 14 | 14 | ExecutionEnvironment, |
| 15 | 15 | ResolveExecutionEnvironment, |
| 16 | −} from "./execution-state"; | |
| 16 | +} from "../state"; | |
| 17 | 17 | import { |
| 18 | 18 | createCodeExecutorForRuntime, |
| 19 | 19 | resolveConfiguredExecutionRuntime, |
| 20 | −} from "./execution-runtime"; | |
| 21 | −import { createWorkspaceToolInvoker } from "./workspace-tool-invoker"; | |
| 20 | +} from "../runtime"; | |
| 21 | +import { createWorkspaceToolInvoker } from "./tool-invoker"; | |
| 22 | 22 | import { |
| 23 | 23 | RuntimeSourceAuthServiceTag, |
| 24 | −} from "../sources/source-auth-service"; | |
| 24 | +} from "../../sources/source-auth-service"; | |
| 25 | 25 | import { |
| 26 | 26 | RuntimeSourceCatalogStoreService, |
| 27 | −} from "../catalog/source-catalog-runtime"; | |
| 28 | −import { RuntimeSourceAuthMaterialService } from "../auth/source-auth-material"; | |
| 27 | +} from "../../catalog/source/runtime"; | |
| 28 | +import { RuntimeSourceAuthMaterialService } from "../../auth/source-auth-material"; | |
| 29 | 29 | import { |
| 30 | 30 | getRuntimeLocalWorkspaceOption, |
| 31 | −} from "../local/local-runtime-context"; | |
| 31 | +} from "../../local/runtime-context"; | |
| 32 | 32 | import { |
| 33 | 33 | LocalToolRuntimeLoaderService, |
| 34 | 34 | type LocalToolRuntimeLoaderShape, |
| 35 | 35 | type LocalToolRuntime, |
| 36 | −} from "../local/local-tools"; | |
| 36 | +} from "../../local/tools"; | |
| 37 | 37 | import { |
| 38 | 38 | SourceArtifactStore, |
| 39 | 39 | type SourceArtifactStoreShape, |
| @@ -41,11 +41,11 @@ import { · 1 unmodified line | ||
| 41 | 41 | type WorkspaceConfigStoreShape, |
| 42 | 42 | WorkspaceStateStore, |
| 43 | 43 | type WorkspaceStateStoreShape, |
| 44 | −} from "../local/local-storage"; | |
| 44 | +} from "../../local/storage"; | |
| 45 | 45 | export { |
| 46 | 46 | createCodeExecutorForRuntime, |
| 47 | 47 | resolveConfiguredExecutionRuntime, |
| 48 | −} from "./execution-runtime"; | |
| 48 | +} from "../runtime"; | |
| 49 | 49 | |
| 50 | 50 | const createEmptyLocalToolRuntime = (): LocalToolRuntime => ({ |
| 51 | 51 | tools: {}, |
| @@ -3,7 +3,7 @@ import * as Effect from "effect/Effect"; · 2 unmodified lines | ||
| 3 | 3 | import { |
| 4 | 4 | provideOptionalRuntimeLocalWorkspace, |
| 5 | 5 | type RuntimeLocalWorkspaceState, |
| 6 | −} from "../local/local-runtime-context"; | |
| 6 | +} from "../../local/runtime-context"; | |
| 7 | 7 | |
| 8 | 8 | export const provideRuntimeLocalWorkspace = <A, E, R>( |
| 9 | 9 | effect: Effect.Effect<A, E, R>, |
| @@ -9,16 +9,16 @@ import { · 8 unmodified lines | ||
| 9 | 9 | RuntimeSourceCatalogStoreService, |
| 10 | 10 | type LoadedSourceCatalogToolIndexEntry, |
| 11 | 11 | catalogToolCatalogEntry, |
| 12 | −} from "../catalog/source-catalog-runtime"; | |
| 13 | −import type { RuntimeLocalWorkspaceState } from "../local/local-runtime-context"; | |
| 12 | +} from "../../catalog/source/runtime"; | |
| 13 | +import type { RuntimeLocalWorkspaceState } from "../../local/runtime-context"; | |
| 14 | 14 | import { |
| 15 | 15 | makeWorkspaceStorageLayer, |
| 16 | 16 | type SourceArtifactStoreShape, |
| 17 | 17 | type WorkspaceConfigStoreShape, |
| 18 | 18 | type WorkspaceStateStoreShape, |
| 19 | 19 | type WorkspaceStorageServices, |
| 20 | −} from "../local/local-storage"; | |
| 21 | −import { provideRuntimeLocalWorkspace } from "./workspace-runtime-local"; | |
| 20 | +} from "../../local/storage"; | |
| 21 | +import { provideRuntimeLocalWorkspace } from "./local"; | |
| 22 | 22 | |
| 23 | 23 | const tokenize = (value: string): string[] => |
| 24 | 24 | value |
| @@ -10,32 +10,32 @@ import { · 9 unmodified lines | ||
| 10 | 10 | import type { AccountId, Source } from "#schema"; |
| 11 | 11 | import * as Effect from "effect/Effect"; |
| 12 | 12 | |
| 13 | −import { RuntimeSourceAuthMaterialService } from "../auth/source-auth-material"; | |
| 14 | −import { RuntimeSourceCatalogStoreService } from "../catalog/source-catalog-runtime"; | |
| 15 | −import type { RuntimeLocalWorkspaceState } from "../local/local-runtime-context"; | |
| 13 | +import { RuntimeSourceAuthMaterialService } from "../../auth/source-auth-material"; | |
| 14 | +import { RuntimeSourceCatalogStoreService } from "../../catalog/source/runtime"; | |
| 15 | +import type { RuntimeLocalWorkspaceState } from "../../local/runtime-context"; | |
| 16 | 16 | import { |
| 17 | 17 | type LocalToolRuntime, |
| 18 | −} from "../local/local-tools"; | |
| 18 | +} from "../../local/tools"; | |
| 19 | 19 | import { |
| 20 | 20 | makeWorkspaceStorageLayer, |
| 21 | 21 | type SourceArtifactStoreShape, |
| 22 | 22 | type WorkspaceConfigStoreShape, |
| 23 | 23 | type WorkspaceStateStoreShape, |
| 24 | −} from "../local/local-storage"; | |
| 24 | +} from "../../local/storage"; | |
| 25 | 25 | import { |
| 26 | 26 | RuntimeSourceAuthService, |
| 27 | −} from "../sources/source-auth-service"; | |
| 28 | −import { createExecutorToolMap } from "../sources/executor-tools"; | |
| 29 | −import { invokeIrTool } from "./ir-execution"; | |
| 27 | +} from "../../sources/source-auth-service"; | |
| 28 | +import { createExecutorToolMap } from "../../sources/executor-tools"; | |
| 29 | +import { invokeIrTool } from "../ir-execution"; | |
| 30 | 30 | import { |
| 31 | 31 | authorizePersistedToolInvocation, |
| 32 | 32 | toSecretResolutionContext, |
| 33 | −} from "./workspace-persisted-tool-authorization"; | |
| 34 | −import { provideRuntimeLocalWorkspace } from "./workspace-runtime-local"; | |
| 33 | +} from "./authorization"; | |
| 34 | +import { provideRuntimeLocalWorkspace } from "./local"; | |
| 35 | 35 | import { |
| 36 | 36 | createWorkspaceSourceCatalog, |
| 37 | 37 | loadWorkspaceCatalogToolByPath, |
| 38 | −} from "./workspace-source-catalog"; | |
| 38 | +} from "./source-catalog"; | |
| 39 | 39 | |
| 40 | 40 | export const createWorkspaceToolInvoker = (input: { |
| 41 | 41 | workspaceId: Source["workspaceId"]; |
| @@ -8,35 +8,35 @@ import { NodeFileSystem } from "@effect/platform-node"; · 7 unmodified lines | ||
| 8 | 8 | import { type ControlPlaneApiRuntimeContext } from "#api"; |
| 9 | 9 | import type { LocalInstallation } from "#schema"; |
| 10 | 10 | |
| 11 | −import { type ResolveExecutionEnvironment } from "./execution/execution-state"; | |
| 11 | +import { type ResolveExecutionEnvironment } from "./execution/state"; | |
| 12 | 12 | import { |
| 13 | 13 | createLiveExecutionManager, |
| 14 | 14 | LiveExecutionManagerService, |
| 15 | −} from "./execution/live-execution"; | |
| 15 | +} from "./execution/live"; | |
| 16 | 16 | import { |
| 17 | 17 | createLocalControlPlanePersistence, |
| 18 | 18 | type LocalControlPlanePersistence, |
| 19 | −} from "./local/local-control-plane-store"; | |
| 19 | +} from "./local/control-plane-store"; | |
| 20 | 20 | |
| 21 | 21 | import { |
| 22 | 22 | resolveLocalWorkspaceContext, |
| 23 | −} from "./local/local-config"; | |
| 23 | +} from "./local/config"; | |
| 24 | 24 | import { |
| 25 | 25 | LocalStorageLive, |
| 26 | 26 | LocalInstallationStore, |
| 27 | 27 | LocalWorkspaceConfigStore, |
| 28 | −} from "./local/local-storage"; | |
| 28 | +} from "./local/storage"; | |
| 29 | 29 | import { |
| 30 | 30 | type RuntimeLocalWorkspaceState, |
| 31 | 31 | RuntimeLocalWorkspaceLive, |
| 32 | −} from "./local/local-runtime-context"; | |
| 33 | −import { LocalToolRuntimeLoaderLive } from "./local/local-tools"; | |
| 34 | −import { synchronizeLocalWorkspaceState } from "./local/local-workspace-sync"; | |
| 32 | +} from "./local/runtime-context"; | |
| 33 | +import { LocalToolRuntimeLoaderLive } from "./local/tools"; | |
| 34 | +import { synchronizeLocalWorkspaceState } from "./local/workspace-sync"; | |
| 35 | 35 | import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store"; |
| 36 | 36 | import { RuntimeSourceStoreLive } from "./sources/source-store"; |
| 37 | −import { RuntimeSourceCatalogStoreLive } from "./catalog/source-catalog-runtime"; | |
| 37 | +import { RuntimeSourceCatalogStoreLive } from "./catalog/source/runtime"; | |
| 38 | 38 | import { RuntimeSourceAuthMaterialLive } from "./auth/source-auth-material"; |
| 39 | −import { RuntimeSourceCatalogSyncLive } from "./catalog/source-catalog-sync"; | |
| 39 | +import { RuntimeSourceCatalogSyncLive } from "./catalog/source/sync"; | |
| 40 | 40 | import { |
| 41 | 41 | RuntimeSourceAuthServiceLive, |
| 42 | 42 | } from "./sources/source-auth-service"; |
| @@ -44,26 +44,26 @@ import type { ResolveSecretMaterial } from "./local/secret-material-providers"; · 1 unmodified line | ||
| 44 | 44 | import { SecretMaterialLive } from "./local/secret-material-providers"; |
| 45 | 45 | import { |
| 46 | 46 | RuntimeExecutionResolverLive, |
| 47 | −} from "./execution/workspace-execution-environment"; | |
| 47 | +} from "./execution/workspace/environment"; | |
| 48 | 48 | |
| 49 | −export * from "./execution/execution-state"; | |
| 49 | +export * from "./execution/state"; | |
| 50 | 50 | export * from "./sources/executor-tools"; |
| 51 | −export * from "./execution/live-execution"; | |
| 52 | −export * from "./local/local-config"; | |
| 53 | −export * from "./local/local-installation"; | |
| 54 | −export * from "./local/local-storage"; | |
| 55 | −export * from "./local/local-source-artifacts"; | |
| 56 | −export * from "./local/local-tools"; | |
| 51 | +export * from "./execution/live"; | |
| 52 | +export * from "./local/config"; | |
| 53 | +export * from "./local/installation"; | |
| 54 | +export * from "./local/storage"; | |
| 55 | +export * from "./local/source-artifacts"; | |
| 56 | +export * from "./local/tools"; | |
| 57 | 57 | export * from "./catalog/schema-type-signature"; |
| 58 | 58 | export * from "./sources/source-auth-service"; |
| 59 | 59 | export * from "./local/secret-material-providers"; |
| 60 | 60 | export * from "./sources/source-credential-interactions"; |
| 61 | 61 | export * from "./sources/source-adapters/mcp"; |
| 62 | 62 | export * from "./store"; |
| 63 | −export * from "./execution/workspace-execution-environment"; | |
| 63 | +export * from "./execution/workspace/environment"; | |
| 64 | 64 | export * from "./sources/source-inspection"; |
| 65 | 65 | export * from "./sources/source-discovery"; |
| 66 | −export * from "./execution/execution-service"; | |
| 66 | +export * from "./execution/service"; | |
| 67 | 67 | |
| 68 | 68 | export type RuntimeControlPlaneOptions = { |
| 69 | 69 | executionResolver?: ResolveExecutionEnvironment; |
File renamed without changes.
| @@ -13,7 +13,7 @@ import { · 12 unmodified lines | ||
| 13 | 13 | resolveDefaultHomeStateDirectory, |
| 14 | 14 | resolveHomeConfigPath, |
| 15 | 15 | resolveLocalWorkspaceContext, |
| 16 | −} from "./local-config"; | |
| 16 | +} from "./config"; | |
| 17 | 17 | |
| 18 | 18 | const makeWorkspaceRoot = () => |
| 19 | 19 | mkdtempSync(join(tmpdir(), "executor-local-config-")); |
| @@ -20,7 +20,7 @@ import { · 19 unmodified lines | ||
| 20 | 20 | LocalExecutorConfigDecodeError, |
| 21 | 21 | LocalFileSystemError, |
| 22 | 22 | unknownLocalErrorDetails, |
| 23 | −} from "./local-errors"; | |
| 23 | +} from "./errors"; | |
| 24 | 24 | |
| 25 | 25 | const decodeLocalExecutorConfig = Schema.decodeUnknownSync(LocalExecutorConfigSchema); |
| 26 | 26 | |
| @@ -4,12 +4,12 @@ import { dirname, join } from "node:path"; · 3 unmodified lines | ||
| 4 | 4 | import { describe, expect, it } from "@effect/vitest"; |
| 5 | 5 | import * as Effect from "effect/Effect"; |
| 6 | 6 | |
| 7 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 7 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 8 | 8 | import { |
| 9 | 9 | loadLocalControlPlaneState, |
| 10 | 10 | localControlPlaneStatePath, |
| 11 | 11 | writeLocalControlPlaneState, |
| 12 | −} from "./local-control-plane-store"; | |
| 12 | +} from "./control-plane-store"; | |
| 13 | 13 | |
| 14 | 14 | const makeContext = (): ResolvedLocalWorkspaceContext => { |
| 15 | 15 | const workspaceRoot = mkdtempSync(join(tmpdir(), "executor-control-plane-store-")); |
| @@ -29,12 +29,12 @@ import * as Effect from "effect/Effect"; · 28 unmodified lines | ||
| 29 | 29 | import * as Option from "effect/Option"; |
| 30 | 30 | import * as Schema from "effect/Schema"; |
| 31 | 31 | |
| 32 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 33 | −import { deriveLocalInstallation } from "./local-installation"; | |
| 32 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 33 | +import { deriveLocalInstallation } from "./installation"; | |
| 34 | 34 | import { |
| 35 | 35 | LocalFileSystemError, |
| 36 | 36 | unknownLocalErrorDetails, |
| 37 | −} from "./local-errors"; | |
| 37 | +} from "./errors"; | |
| 38 | 38 | |
| 39 | 39 | const LOCAL_CONTROL_PLANE_STATE_VERSION = 1 as const; |
| 40 | 40 | const LOCAL_CONTROL_PLANE_STATE_BASENAME = "control-plane-state.json"; |
File renamed without changes.
| @@ -6,8 +6,8 @@ import { describe, expect, it } from "@effect/vitest"; · 5 unmodified lines | ||
| 6 | 6 | import * as Effect from "effect/Effect"; |
| 7 | 7 | |
| 8 | 8 | import { createControlPlaneRuntime } from "../index"; |
| 9 | −import { getOrProvisionLocalInstallation } from "./local-installation"; | |
| 10 | −import { resolveLocalWorkspaceContext } from "./local-config"; | |
| 9 | +import { getOrProvisionLocalInstallation } from "./installation"; | |
| 10 | +import { resolveLocalWorkspaceContext } from "./config"; | |
| 11 | 11 | |
| 12 | 12 | const TEST_WORKSPACE_ROOT = mkdtempSync(join(tmpdir(), "executor-local-installation-")); |
| 13 | 13 | const TEST_HOME_CONFIG_PATH = join(TEST_WORKSPACE_ROOT, ".executor-home.jsonc"); |
| @@ -7,7 +7,7 @@ import { · 6 unmodified lines | ||
| 7 | 7 | } from "#schema"; |
| 8 | 8 | import * as Effect from "effect/Effect"; |
| 9 | 9 | |
| 10 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 10 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 11 | 11 | |
| 12 | 12 | const LOCAL_ACCOUNT_ID = AccountIdSchema.make("acc_local_default"); |
| 13 | 13 | |
| @@ -11,14 +11,14 @@ import { · 10 unmodified lines | ||
| 11 | 11 | import * as Effect from "effect/Effect"; |
| 12 | 12 | import * as Option from "effect/Option"; |
| 13 | 13 | |
| 14 | −import { submitExecutionInteractionResponse } from "../execution/execution-service"; | |
| 15 | −import { LiveExecutionManagerService } from "../execution/live-execution"; | |
| 14 | +import { submitExecutionInteractionResponse } from "../execution/service"; | |
| 15 | +import { LiveExecutionManagerService } from "../execution/live"; | |
| 16 | 16 | import { |
| 17 | 17 | operationErrors, |
| 18 | 18 | } from "../policy/operation-errors"; |
| 19 | −import { resolveLocalWorkspaceContext } from "./local-config"; | |
| 20 | −import { InstallationStore, LocalInstallationStore } from "./local-storage"; | |
| 21 | −import { getRuntimeLocalWorkspaceOption } from "./local-runtime-context"; | |
| 19 | +import { resolveLocalWorkspaceContext } from "./config"; | |
| 20 | +import { InstallationStore, LocalInstallationStore } from "./storage"; | |
| 21 | +import { getRuntimeLocalWorkspaceOption } from "./runtime-context"; | |
| 22 | 22 | import { RuntimeSourceAuthServiceTag } from "../sources/source-auth-service"; |
| 23 | 23 | import { |
| 24 | 24 | createSourceCredentialSelectionBearerContent, |
| @@ -7,11 +7,11 @@ import type { AccountId, WorkspaceId } from "#schema"; · 6 unmodified lines | ||
| 7 | 7 | import type { |
| 8 | 8 | LoadedLocalExecutorConfig, |
| 9 | 9 | ResolvedLocalWorkspaceContext, |
| 10 | −} from "./local-config"; | |
| 10 | +} from "./config"; | |
| 11 | 11 | import { |
| 12 | 12 | RuntimeLocalWorkspaceMismatchError, |
| 13 | 13 | RuntimeLocalWorkspaceUnavailableError, |
| 14 | −} from "./local-errors"; | |
| 14 | +} from "./errors"; | |
| 15 | 15 | |
| 16 | 16 | export type RuntimeLocalWorkspaceState = { |
| 17 | 17 | context: ResolvedLocalWorkspaceContext; |
| @@ -17,9 +17,9 @@ import * as Effect from "effect/Effect"; · 16 unmodified lines | ||
| 17 | 17 | import * as Layer from "effect/Layer"; |
| 18 | 18 | import * as Option from "effect/Option"; |
| 19 | 19 | |
| 20 | −import { resolveConfigRelativePath } from "./local-config"; | |
| 21 | −import { fromConfigSecretProviderId } from "./local-config-secrets"; | |
| 22 | −import { getRuntimeLocalWorkspaceOption } from "./local-runtime-context"; | |
| 20 | +import { resolveConfigRelativePath } from "./config"; | |
| 21 | +import { fromConfigSecretProviderId } from "./config-secrets"; | |
| 22 | +import { getRuntimeLocalWorkspaceOption } from "./runtime-context"; | |
| 23 | 23 | import { ControlPlaneStore } from "../store"; |
| 24 | 24 | import type { ControlPlaneStoreShape } from "../store"; |
| 25 | 25 | |
| @@ -17,8 +17,8 @@ import { · 16 unmodified lines | ||
| 17 | 17 | readLocalSourceArtifact, |
| 18 | 18 | removeLocalSourceArtifact, |
| 19 | 19 | writeLocalSourceArtifact, |
| 20 | −} from "./local-source-artifacts"; | |
| 21 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 20 | +} from "./source-artifacts"; | |
| 21 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 22 | 22 | import { |
| 23 | 23 | createCatalogImportMetadata, |
| 24 | 24 | createGraphqlCatalogFragment, |
| @@ -25,12 +25,12 @@ import { · 24 unmodified lines | ||
| 25 | 25 | snapshotFromSourceCatalogSyncResult, |
| 26 | 26 | type SourceCatalogSyncResult, |
| 27 | 27 | } from "../sources/catalog-sync-result"; |
| 28 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 28 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 29 | 29 | import { |
| 30 | 30 | LocalFileSystemError, |
| 31 | 31 | LocalSourceArtifactDecodeError, |
| 32 | 32 | unknownLocalErrorDetails, |
| 33 | −} from "./local-errors"; | |
| 33 | +} from "./errors"; | |
| 34 | 34 | import { |
| 35 | 35 | createSourceCatalogRevisionRecord, |
| 36 | 36 | stableSourceCatalogId, |
| @@ -8,30 +8,30 @@ import * as Layer from "effect/Layer"; · 7 unmodified lines | ||
| 8 | 8 | import type { |
| 9 | 9 | LoadedLocalExecutorConfig, |
| 10 | 10 | ResolvedLocalWorkspaceContext, |
| 11 | −} from "./local-config"; | |
| 11 | +} from "./config"; | |
| 12 | 12 | import { |
| 13 | 13 | loadLocalExecutorConfig, |
| 14 | 14 | resolveConfigRelativePath, |
| 15 | 15 | writeProjectLocalExecutorConfig, |
| 16 | −} from "./local-config"; | |
| 16 | +} from "./config"; | |
| 17 | 17 | import { |
| 18 | 18 | getOrProvisionLocalInstallation, |
| 19 | 19 | loadLocalInstallation, |
| 20 | −} from "./local-installation"; | |
| 20 | +} from "./installation"; | |
| 21 | 21 | import type { |
| 22 | 22 | LocalSourceArtifact, |
| 23 | −} from "./local-source-artifacts"; | |
| 23 | +} from "./source-artifacts"; | |
| 24 | 24 | import { |
| 25 | 25 | buildLocalSourceArtifact, |
| 26 | 26 | readLocalSourceArtifact, |
| 27 | 27 | removeLocalSourceArtifact, |
| 28 | 28 | writeLocalSourceArtifact, |
| 29 | −} from "./local-source-artifacts"; | |
| 30 | −import type { LocalWorkspaceState } from "./local-workspace-state"; | |
| 29 | +} from "./source-artifacts"; | |
| 30 | +import type { LocalWorkspaceState } from "./workspace-state"; | |
| 31 | 31 | import { |
| 32 | 32 | loadLocalWorkspaceState, |
| 33 | 33 | writeLocalWorkspaceState, |
| 34 | −} from "./local-workspace-state"; | |
| 34 | +} from "./workspace-state"; | |
| 35 | 35 | import type { SourceCatalogSyncResult } from "../sources/catalog-sync-result"; |
| 36 | 36 | import type { Source } from "#schema"; |
| 37 | 37 | |
| @@ -21,7 +21,7 @@ import * as Effect from "effect/Effect"; · 20 unmodified lines | ||
| 21 | 21 | import * as Layer from "effect/Layer"; |
| 22 | 22 | import * as ts from "typescript"; |
| 23 | 23 | |
| 24 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 24 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 25 | 25 | import { |
| 26 | 26 | LocalFileSystemError, |
| 27 | 27 | LocalToolDefinitionError, |
| @@ -29,7 +29,7 @@ import { · 1 unmodified line | ||
| 29 | 29 | LocalToolPathConflictError, |
| 30 | 30 | LocalToolTranspileError, |
| 31 | 31 | unknownLocalErrorDetails, |
| 32 | −} from "./local-errors"; | |
| 32 | +} from "./errors"; | |
| 33 | 33 | |
| 34 | 34 | const SUPPORTED_LOCAL_TOOL_EXTENSIONS = new Set([".ts", ".js", ".mjs"]); |
| 35 | 35 | const LOCAL_TOOLS_DIRECTORY = "tools"; |
| @@ -9,12 +9,12 @@ import { · 8 unmodified lines | ||
| 9 | 9 | import * as Effect from "effect/Effect"; |
| 10 | 10 | import * as Schema from "effect/Schema"; |
| 11 | 11 | |
| 12 | −import type { ResolvedLocalWorkspaceContext } from "./local-config"; | |
| 12 | +import type { ResolvedLocalWorkspaceContext } from "./config"; | |
| 13 | 13 | import { |
| 14 | 14 | LocalFileSystemError, |
| 15 | 15 | LocalWorkspaceStateDecodeError, |
| 16 | 16 | unknownLocalErrorDetails, |
| 17 | −} from "./local-errors"; | |
| 17 | +} from "./errors"; | |
| 18 | 18 | |
| 19 | 19 | const WORKSPACE_STATE_BASENAME = "workspace-state.json"; |
| 20 | 20 | |
| @@ -4,12 +4,12 @@ import * as Effect from "effect/Effect"; · 3 unmodified lines | ||
| 4 | 4 | import { |
| 5 | 5 | type LoadedLocalExecutorConfig, |
| 6 | 6 | type ResolvedLocalWorkspaceContext, |
| 7 | −} from "./local-config"; | |
| 7 | +} from "./config"; | |
| 8 | 8 | import { |
| 9 | 9 | loadLocalWorkspaceState, |
| 10 | 10 | writeLocalWorkspaceState, |
| 11 | 11 | type LocalWorkspaceState, |
| 12 | −} from "./local-workspace-state"; | |
| 12 | +} from "./workspace-state"; | |
| 13 | 13 | |
| 14 | 14 | const trimOrNull = (value: string | null | undefined): string | null => { |
| 15 | 15 | if (value == null) { |
| @@ -15,23 +15,23 @@ import * as Effect from "effect/Effect"; · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | import { |
| 17 | 17 | requireRuntimeLocalWorkspace, |
| 18 | −} from "../local/local-runtime-context"; | |
| 18 | +} from "../local/runtime-context"; | |
| 19 | 19 | import type { |
| 20 | 20 | WorkspaceStorageServices, |
| 21 | 21 | WorkspaceConfigStoreShape, |
| 22 | 22 | WorkspaceStateStoreShape, |
| 23 | −} from "../local/local-storage"; | |
| 23 | +} from "../local/storage"; | |
| 24 | 24 | import { |
| 25 | 25 | WorkspaceConfigStore, |
| 26 | 26 | WorkspaceStateStore, |
| 27 | −} from "../local/local-storage"; | |
| 28 | −import type { ResolvedLocalWorkspaceContext } from "../local/local-config"; | |
| 27 | +} from "../local/storage"; | |
| 28 | +import type { ResolvedLocalWorkspaceContext } from "../local/config"; | |
| 29 | 29 | import { |
| 30 | 30 | type LocalWorkspaceState, |
| 31 | −} from "../local/local-workspace-state"; | |
| 31 | +} from "../local/workspace-state"; | |
| 32 | 32 | import { |
| 33 | 33 | derivePolicyConfigKey, |
| 34 | −} from "../local/local-workspace-sync"; | |
| 34 | +} from "../local/workspace-sync"; | |
| 35 | 35 | import { |
| 36 | 36 | type OperationErrors, |
| 37 | 37 | operationErrors, |
| @@ -19,7 +19,7 @@ import * as Effect from "effect/Effect"; · 18 unmodified lines | ||
| 19 | 19 | import * as Cause from "effect/Cause"; |
| 20 | 20 | import * as Exit from "effect/Exit"; |
| 21 | 21 | import * as Schema from "effect/Schema"; |
| 22 | −import type { RuntimeLocalWorkspaceState } from "../local/local-runtime-context"; | |
| 22 | +import type { RuntimeLocalWorkspaceState } from "../local/runtime-context"; | |
| 23 | 23 | import { |
| 24 | 24 | type LocalStorageServices, |
| 25 | 25 | LocalInstallationStore, |
| @@ -27,8 +27,8 @@ import { · 1 unmodified line | ||
| 27 | 27 | LocalWorkspaceConfigStore, |
| 28 | 28 | LocalWorkspaceStateStore, |
| 29 | 29 | makeLocalStorageLayer, |
| 30 | −} from "../local/local-storage"; | |
| 31 | −import { provideOptionalRuntimeLocalWorkspace } from "../local/local-runtime-context"; | |
| 30 | +} from "../local/storage"; | |
| 31 | +import { provideOptionalRuntimeLocalWorkspace } from "../local/runtime-context"; | |
| 32 | 32 | |
| 33 | 33 | /** Run an Effect as a Promise, preserving the original error (not FiberFailure). */ |
| 34 | 34 | const runEffect = async <A>( |
| @@ -46,7 +46,7 @@ import { · 45 unmodified lines | ||
| 46 | 46 | import { |
| 47 | 47 | expandCatalogToolByPath, |
| 48 | 48 | type LoadedSourceCatalog, |
| 49 | −} from "../catalog/source-catalog-runtime"; | |
| 49 | +} from "../catalog/source/runtime"; | |
| 50 | 50 | import { invokeIrTool } from "../execution/ir-execution"; |
| 51 | 51 | import { |
| 52 | 52 | createGoogleDiscoveryCatalogSnapshot, |
| @@ -26,7 +26,7 @@ import { invokeIrTool } from "../../execution/ir-execution"; · 25 unmodified lines | ||
| 26 | 26 | import { |
| 27 | 27 | expandCatalogToolByPath, |
| 28 | 28 | type LoadedSourceCatalog, |
| 29 | −} from "../../catalog/source-catalog-runtime"; | |
| 29 | +} from "../../catalog/source/runtime"; | |
| 30 | 30 | import { snapshotFromSourceCatalogSyncResult } from "../catalog-sync-result"; |
| 31 | 31 | import { createSourceFromPayload } from "../source-definitions"; |
| 32 | 32 | import { mcpSourceAdapter } from "./mcp"; |
| @@ -45,12 +45,12 @@ import { · 44 unmodified lines | ||
| 45 | 45 | LiveExecutionManagerService, |
| 46 | 46 | sanitizePersistedElicitationResponse, |
| 47 | 47 | type LiveExecutionManager, |
| 48 | −} from "../execution/live-execution"; | |
| 48 | +} from "../execution/live"; | |
| 49 | 49 | import { |
| 50 | 50 | getRuntimeLocalWorkspaceOption, |
| 51 | 51 | provideOptionalRuntimeLocalWorkspace, |
| 52 | 52 | type RuntimeLocalWorkspaceState, |
| 53 | −} from "../local/local-runtime-context"; | |
| 53 | +} from "../local/runtime-context"; | |
| 54 | 54 | import { |
| 55 | 55 | exchangeMcpOAuthAuthorizationCode, |
| 56 | 56 | startMcpOAuthAuthorization, |
| @@ -86,7 +86,7 @@ import { · 29 unmodified lines | ||
| 86 | 86 | import { |
| 87 | 87 | RuntimeSourceCatalogSyncService, |
| 88 | 88 | type RuntimeSourceCatalogSyncShape, |
| 89 | −} from "../catalog/source-catalog-sync"; | |
| 89 | +} from "../catalog/source/sync"; | |
| 90 | 90 | import { |
| 91 | 91 | buildOAuth2AuthorizationUrl, |
| 92 | 92 | createPkceCodeVerifier, |
| @@ -100,7 +100,7 @@ import { · 7 unmodified lines | ||
| 100 | 100 | type RuntimeSourceStore, |
| 101 | 101 | RuntimeSourceStoreService, |
| 102 | 102 | } from "./source-store"; |
| 103 | −import type { WorkspaceStorageServices } from "../local/local-storage"; | |
| 103 | +import type { WorkspaceStorageServices } from "../local/storage"; | |
| 104 | 104 | import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store"; |
| 105 | 105 | |
| 106 | 106 | const trimOrNull = (value: string | null | undefined): string | null => { |
| @@ -17,7 +17,7 @@ import { · 16 unmodified lines | ||
| 17 | 17 | import * as Effect from "effect/Effect"; |
| 18 | 18 | |
| 19 | 19 | import { joinTypeNameSegments } from "../catalog/catalog-typescript"; |
| 20 | −import { LocalSourceArtifactMissingError } from "../local/local-errors"; | |
| 20 | +import { LocalSourceArtifactMissingError } from "../local/errors"; | |
| 21 | 21 | import { operationErrors } from "../policy/operation-errors"; |
| 22 | 22 | import { formatWithPrettier } from "../catalog/prettier-format"; |
| 23 | 23 | import { |
| @@ -25,7 +25,7 @@ import { · 1 unmodified line | ||
| 25 | 25 | expandCatalogTools, |
| 26 | 26 | loadSourceWithCatalog, |
| 27 | 27 | type LoadedSourceCatalogTool, |
| 28 | −} from "../catalog/source-catalog-runtime"; | |
| 28 | +} from "../catalog/source/runtime"; | |
| 29 | 29 | import { RuntimeSourceStoreService } from "./source-store"; |
| 30 | 30 | |
| 31 | 31 | const sourceInspectOps = { |
| @@ -7,9 +7,9 @@ import { · 6 unmodified lines | ||
| 7 | 7 | type Source, |
| 8 | 8 | } from "#schema"; |
| 9 | 9 | |
| 10 | −import type { LoadedLocalExecutorConfig } from "../local/local-config"; | |
| 10 | +import type { LoadedLocalExecutorConfig } from "../local/config"; | |
| 11 | 11 | import { buildLocalSourceRecord } from "./source-store"; |
| 12 | −import type { LocalWorkspaceState } from "../local/local-workspace-state"; | |
| 12 | +import type { LocalWorkspaceState } from "../local/workspace-state"; | |
| 13 | 13 | |
| 14 | 14 | const workspaceId = WorkspaceIdSchema.make("ws_source_store"); |
| 15 | 15 | const sourceId = SourceIdSchema.make("linear"); |
| @@ -12,8 +12,8 @@ import { · 11 unmodified lines | ||
| 12 | 12 | type WorkspaceStorageServices, |
| 13 | 13 | WorkspaceConfigStore, |
| 14 | 14 | WorkspaceStateStore, |
| 15 | −} from "../local/local-storage"; | |
| 16 | −import { RuntimeLocalWorkspaceService } from "../local/local-runtime-context"; | |
| 15 | +} from "../local/storage"; | |
| 16 | +import { RuntimeLocalWorkspaceService } from "../local/runtime-context"; | |
| 17 | 17 | import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store"; |
| 18 | 18 | import { |
| 19 | 19 | loadRuntimeSourceStoreDeps, |
| @@ -6,12 +6,12 @@ import type { · 5 unmodified lines | ||
| 6 | 6 | } from "#schema"; |
| 7 | 7 | import { SourceIdSchema } from "#schema"; |
| 8 | 8 | |
| 9 | −import type { LoadedLocalExecutorConfig } from "../../local/local-config"; | |
| 10 | −import { LocalUnsupportedSourceKindError } from "../../local/local-errors"; | |
| 9 | +import type { LoadedLocalExecutorConfig } from "../../local/config"; | |
| 10 | +import { LocalUnsupportedSourceKindError } from "../../local/errors"; | |
| 11 | 11 | import { |
| 12 | 12 | fromConfigSecretProviderId, |
| 13 | 13 | toConfigSecretProviderId, |
| 14 | −} from "../../local/local-config-secrets"; | |
| 14 | +} from "../../local/config-secrets"; | |
| 15 | 15 | import { slugify } from "../slug"; |
| 16 | 16 | |
| 17 | 17 | export const trimOrNull = (value: string | null | undefined): string | null => { |
| @@ -4,30 +4,30 @@ import * as Effect from "effect/Effect"; · 3 unmodified lines | ||
| 4 | 4 | import type { |
| 5 | 5 | LoadedLocalExecutorConfig, |
| 6 | 6 | ResolvedLocalWorkspaceContext, |
| 7 | −} from "../../local/local-config"; | |
| 7 | +} from "../../local/config"; | |
| 8 | 8 | import { |
| 9 | 9 | LocalExecutorConfigDecodeError, |
| 10 | 10 | LocalFileSystemError, |
| 11 | 11 | LocalWorkspaceStateDecodeError, |
| 12 | 12 | RuntimeLocalWorkspaceMismatchError, |
| 13 | 13 | RuntimeLocalWorkspaceUnavailableError, |
| 14 | −} from "../../local/local-errors"; | |
| 14 | +} from "../../local/errors"; | |
| 15 | 15 | import { |
| 16 | 16 | requireRuntimeLocalWorkspace, |
| 17 | 17 | type RuntimeLocalWorkspaceState, |
| 18 | −} from "../../local/local-runtime-context"; | |
| 18 | +} from "../../local/runtime-context"; | |
| 19 | 19 | import type { |
| 20 | 20 | SourceArtifactStoreShape, |
| 21 | 21 | WorkspaceStorageServices, |
| 22 | 22 | WorkspaceConfigStoreShape, |
| 23 | 23 | WorkspaceStateStoreShape, |
| 24 | −} from "../../local/local-storage"; | |
| 24 | +} from "../../local/storage"; | |
| 25 | 25 | import { |
| 26 | 26 | SourceArtifactStore, |
| 27 | 27 | WorkspaceConfigStore, |
| 28 | 28 | WorkspaceStateStore, |
| 29 | −} from "../../local/local-storage"; | |
| 30 | −import type { LocalWorkspaceState } from "../../local/local-workspace-state"; | |
| 29 | +} from "../../local/storage"; | |
| 30 | +import type { LocalWorkspaceState } from "../../local/workspace-state"; | |
| 31 | 31 | import type { ControlPlaneStoreShape } from "../../store"; |
| 32 | 32 | |
| 33 | 33 | export type RuntimeSourceStoreDeps = { |
| @@ -6,7 +6,7 @@ import { · 5 unmodified lines | ||
| 6 | 6 | clearProviderGrantOrphanedAt, |
| 7 | 7 | markProviderGrantOrphanedIfUnused, |
| 8 | 8 | } from "../../auth/provider-grant-lifecycle"; |
| 9 | −import type { LocalWorkspaceState } from "../../local/local-workspace-state"; | |
| 9 | +import type { LocalWorkspaceState } from "../../local/workspace-state"; | |
| 10 | 10 | import { |
| 11 | 11 | stableSourceCatalogId, |
| 12 | 12 | stableSourceCatalogRevisionId, |
| @@ -10,8 +10,8 @@ import * as Effect from "effect/Effect"; · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | import { sourceAuthFromAuthArtifact } from "../../auth/auth-artifacts"; |
| 12 | 12 | import { authArtifactSecretMaterialRefs } from "../../auth/auth-artifacts"; |
| 13 | −import { refreshWorkspaceSourceTypeDeclarationsInBackground } from "../../catalog/source-type-declarations"; | |
| 14 | −import type { LoadedLocalExecutorConfig } from "../../local/local-config"; | |
| 13 | +import { refreshWorkspaceSourceTypeDeclarationsInBackground } from "../../catalog/source/type-declarations"; | |
| 14 | +import type { LoadedLocalExecutorConfig } from "../../local/config"; | |
| 15 | 15 | import { |
| 16 | 16 | LocalConfiguredSourceNotFoundError, |
| 17 | 17 | LocalExecutorConfigDecodeError, |
| @@ -19,8 +19,8 @@ import { · 1 unmodified line | ||
| 19 | 19 | LocalWorkspaceStateDecodeError, |
| 20 | 20 | RuntimeLocalWorkspaceMismatchError, |
| 21 | 21 | RuntimeLocalWorkspaceUnavailableError, |
| 22 | −} from "../../local/local-errors"; | |
| 23 | −import type { LocalWorkspaceState } from "../../local/local-workspace-state"; | |
| 22 | +} from "../../local/errors"; | |
| 23 | +import type { LocalWorkspaceState } from "../../local/workspace-state"; | |
| 24 | 24 | import { getSourceAdapter } from "../source-adapters"; |
| 25 | 25 | import { |
| 26 | 26 | resolveRuntimeLocalWorkspaceFromDeps, |
| @@ -25,7 +25,7 @@ import { · 24 unmodified lines | ||
| 25 | 25 | operationErrors, |
| 26 | 26 | } from "../policy/operation-errors"; |
| 27 | 27 | import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store"; |
| 28 | −import { RuntimeSourceCatalogSyncService } from "../catalog/source-catalog-sync"; | |
| 28 | +import { RuntimeSourceCatalogSyncService } from "../catalog/source/sync"; | |
| 29 | 29 | import { |
| 30 | 30 | RuntimeSourceStoreService, |
| 31 | 31 | } from "./source-store"; |