History

refactor control plane

Rhys Sullivan committed 8 months ago

Commit b2b2e801 parent dcfa48888 files · +222 −222Browse files

Unified · Split

88 files
  1. packages/platform/control-plane/src/api/executions/http.ts +1 −1
  2. packages/platform/control-plane/src/api/local-context.ts +2 −2
  3. packages/platform/control-plane/src/api/local/http.ts +4 −4
  4. packages/platform/control-plane/src/api/oauth/http.ts +1 −1
  5. packages/platform/control-plane/src/api/policies/http.ts +1 −1
  6. packages/platform/control-plane/src/api/sources/api.ts +1 −1
  7. packages/platform/control-plane/src/api/sources/http.ts +6 −6
  8. packages/platform/control-plane/src/runtime/auth/auth-artifacts.ts +1 −1
  9. packages/platform/control-plane/src/runtime/auth/auth-leases.ts +2 −2
  10. packages/platform/control-plane/src/runtime/auth/mcp-auth-provider.ts +2 −2
  11. packages/platform/control-plane/src/runtime/auth/mcp-oauth.ts +0 −0
  12. packages/platform/control-plane/src/runtime/auth/oauth-loopback.test.ts +0 −0
  13. packages/platform/control-plane/src/runtime/auth/oauth-loopback.ts +0 −0
  14. packages/platform/control-plane/src/runtime/auth/oauth2-pkce.ts +0 −0
  15. packages/platform/control-plane/src/runtime/auth/provider-grant-lifecycle.ts +2 −2
  16. packages/platform/control-plane/src/runtime/auth/source-auth-material.test.ts +0 −0
  17. packages/platform/control-plane/src/runtime/auth/source-auth-material.ts +3 −3
  18. packages/platform/control-plane/src/runtime/catalog/catalog-typescript.ts +3 −3
  19. packages/platform/control-plane/src/runtime/catalog/prettier-format.ts +0 −0
  20. packages/platform/control-plane/src/runtime/catalog/schema-type-signature.ts +0 −0
  21. packages/platform/control-plane/src/runtime/catalog/source-catalog-runtime.test.ts +3 −3
  22. packages/platform/control-plane/src/runtime/catalog/source-catalog-runtime.ts +8 −8
  23. packages/platform/control-plane/src/runtime/catalog/source-catalog-snapshot.test.ts +1 −1
  24. packages/platform/control-plane/src/runtime/catalog/source-catalog-snapshot.ts +5 −5
  25. packages/platform/control-plane/src/runtime/catalog/source-catalog-support.ts +2 −2
  26. packages/platform/control-plane/src/runtime/catalog/source-catalog-sync.ts +7 −7
  27. packages/platform/control-plane/src/runtime/catalog/source-type-declarations.test.ts +4 −4
  28. packages/platform/control-plane/src/runtime/catalog/source-type-declarations.ts +5 −5
  29. packages/platform/control-plane/src/runtime/control-plane-runtime.test.ts +4 −4
  30. packages/platform/control-plane/src/runtime/execution/execution-http.test.ts +1 −1
  31. packages/platform/control-plane/src/runtime/execution/execution-mcp-resume.test.ts +1 −1
  32. packages/platform/control-plane/src/runtime/execution/execution-runtime-config.test.ts +1 −1
  33. packages/platform/control-plane/src/runtime/execution/execution-service.ts +5 −5
  34. packages/platform/control-plane/src/runtime/execution/execution-state.ts +0 −0
  35. packages/platform/control-plane/src/runtime/execution/ir-execution.ts +4 −4
  36. packages/platform/control-plane/src/runtime/execution/live-execution.test.ts +0 −0
  37. packages/platform/control-plane/src/runtime/execution/live-execution.ts +1 −1
  38. packages/platform/control-plane/src/runtime/execution/test-http-client.ts +1 −1
  39. packages/platform/control-plane/src/runtime/execution/workspace-execution-environment.ts +10 −10
  40. packages/platform/control-plane/src/runtime/index.ts +34 −34
  41. packages/platform/control-plane/src/runtime/local/local-config-secrets.ts +0 −0
  42. packages/platform/control-plane/src/runtime/local/local-config.test.ts +0 −0
  43. packages/platform/control-plane/src/runtime/local/local-config.ts +0 −0
  44. packages/platform/control-plane/src/runtime/local/local-control-plane-store.test.ts +0 −0
  45. packages/platform/control-plane/src/runtime/local/local-control-plane-store.ts +0 −0
  46. packages/platform/control-plane/src/runtime/local/local-errors.ts +0 −0
  47. packages/platform/control-plane/src/runtime/local/local-installation.test.ts +1 −1
  48. packages/platform/control-plane/src/runtime/local/local-installation.ts +0 −0
  49. packages/platform/control-plane/src/runtime/local/local-operations.ts +6 −6
  50. packages/platform/control-plane/src/runtime/local/local-runtime-context.ts +0 −0
  51. packages/platform/control-plane/src/runtime/local/local-source-artifacts.test.ts +1 −1
  52. packages/platform/control-plane/src/runtime/local/local-source-artifacts.ts +4 −4
  53. packages/platform/control-plane/src/runtime/local/local-storage.ts +1 −1
  54. packages/platform/control-plane/src/runtime/local/local-tools.ts +0 −0
  55. packages/platform/control-plane/src/runtime/local/local-workspace-state.ts +0 −0
  56. packages/platform/control-plane/src/runtime/local/local-workspace-sync.ts +0 −0
  57. packages/platform/control-plane/src/runtime/local/secret-material-providers.ts +2 −2
  58. packages/platform/control-plane/src/runtime/policy/invocation-policy-engine.test.ts +0 −0
  59. packages/platform/control-plane/src/runtime/policy/invocation-policy-engine.ts +0 −0
  60. packages/platform/control-plane/src/runtime/policy/operation-errors.ts +1 −1
  61. packages/platform/control-plane/src/runtime/policy/operations-shared.ts +1 −1
  62. packages/platform/control-plane/src/runtime/policy/policies-operations.ts +7 −7
  63. packages/platform/control-plane/src/runtime/sources/executor-tools.ts +4 −4
  64. packages/platform/control-plane/src/runtime/sources/graphql-tools.test.ts +0 −0
  65. packages/platform/control-plane/src/runtime/sources/graphql-tools.ts +0 −0
  66. packages/platform/control-plane/src/runtime/sources/slug.ts +0 −0
  67. packages/platform/control-plane/src/runtime/sources/source-adapter-fixture-matrix.test.ts +6 −6
  68. packages/platform/control-plane/src/runtime/sources/source-adapters/google-discovery.test.ts +1 −1
  69. packages/platform/control-plane/src/runtime/sources/source-adapters/google-discovery.ts +2 −2
  70. packages/platform/control-plane/src/runtime/sources/source-adapters/graphql.ts +2 −2
  71. packages/platform/control-plane/src/runtime/sources/source-adapters/index.ts +0 −0
  72. packages/platform/control-plane/src/runtime/sources/source-adapters/internal.ts +2 −2
  73. packages/platform/control-plane/src/runtime/sources/source-adapters/mcp.test.ts +6 −6
  74. packages/platform/control-plane/src/runtime/sources/source-adapters/mcp.ts +2 −2
  75. packages/platform/control-plane/src/runtime/sources/source-adapters/openapi.ts +2 −2
  76. packages/platform/control-plane/src/runtime/sources/source-adapters/shared.ts +1 −1
  77. packages/platform/control-plane/src/runtime/sources/source-adapters/types.ts +3 −3
  78. packages/platform/control-plane/src/runtime/sources/source-auth-service.ts +12 −12
  79. packages/platform/control-plane/src/runtime/sources/source-credential-interactions.ts +0 −0
  80. packages/platform/control-plane/src/runtime/sources/source-definitions.test.ts +0 −0
  81. packages/platform/control-plane/src/runtime/sources/source-definitions.ts +1 −1
  82. packages/platform/control-plane/src/runtime/sources/source-discovery.test.ts +0 −0
  83. packages/platform/control-plane/src/runtime/sources/source-discovery.ts +1 −1
  84. packages/platform/control-plane/src/runtime/sources/source-inspection.ts +6 −6
  85. packages/platform/control-plane/src/runtime/sources/source-names.ts +0 −0
  86. packages/platform/control-plane/src/runtime/sources/source-store.test.ts +2 −2
  87. packages/platform/control-plane/src/runtime/sources/source-store.ts +14 −14
  88. packages/platform/control-plane/src/runtime/sources/sources-operations.ts +5 −5
packages/platform/control-plane/src/api/executions/http.ts+1−1
@@ -4,7 +4,7 @@ import { · 3 unmodified lines
44 createExecution,
55 getExecution,
66 resumeExecution,
7−} from "../../runtime/execution-service";
7+} from "../../runtime/execution/execution-service";
88
99 import { ControlPlaneApi } from "../api";
1010 import { resolveRequestedLocalWorkspace } from "../local-context";
packages/platform/control-plane/src/api/local-context.ts+2−2
@@ -3,8 +3,8 @@ import * as Effect from "effect/Effect"; · 2 unmodified lines
33
44 import {
55 RuntimeLocalWorkspaceMismatchError,
6−} from "../runtime/local-errors";
7−import { requireRuntimeLocalWorkspace } from "../runtime/local-runtime-context";
6+} from "../runtime/local/local-errors";
7+import { requireRuntimeLocalWorkspace } from "../runtime/local/local-runtime-context";
88 import { ControlPlaneForbiddenError } from "./errors";
99
1010 export const resolveRequestedLocalWorkspace = (
packages/platform/control-plane/src/api/local/http.ts+4−4
@@ -7,8 +7,8 @@ import * as Option from "effect/Option"; · 6 unmodified lines
77 import { SecretMaterialIdSchema } from "#schema";
88 import {
99 getLocalInstallation,
10−} from "../../runtime/local-operations";
11−import { requireRuntimeLocalWorkspace } from "../../runtime/local-runtime-context";
10+} from "../../runtime/local/local-operations";
11+import { requireRuntimeLocalWorkspace } from "../../runtime/local/local-runtime-context";
1212 import {
1313 createDefaultSecretMaterialDeleter,
1414 createDefaultSecretMaterialStorer,
@@ -18,8 +18,8 @@ import { · 3 unmodified lines
1818 LOCAL_SECRET_PROVIDER_ID,
1919 parseSecretStoreProviderId,
2020 resolveDefaultSecretStoreProviderId,
21−} from "../../runtime/secret-material-providers";
22−import { RuntimeSourceStoreService } from "../../runtime/source-store";
21+} from "../../runtime/local/secret-material-providers";
22+import { RuntimeSourceStoreService } from "../../runtime/sources/source-store";
2323 import { ControlPlaneStore } from "../../runtime/store";
2424 import type {
2525 CreateSecretResult,
packages/platform/control-plane/src/api/oauth/http.ts+1−1
@@ -8,7 +8,7 @@ import * as Cause from "effect/Cause"; · 7 unmodified lines
88 import * as Effect from "effect/Effect";
99 import * as Schema from "effect/Schema";
1010
11−import { RuntimeSourceAuthServiceTag } from "../../runtime/source-auth-service";
11+import { RuntimeSourceAuthServiceTag } from "../../runtime/sources/source-auth-service";
1212 import { ControlPlaneApi } from "../api";
1313 import {
1414 ControlPlaneBadRequestError,
packages/platform/control-plane/src/api/policies/http.ts+1−1
@@ -6,7 +6,7 @@ import { · 5 unmodified lines
66 listPolicies,
77 removePolicy,
88 updatePolicy,
9−} from "../../runtime/policies-operations";
9+} from "../../runtime/policy/policies-operations";
1010
1111 import { ControlPlaneApi } from "../api";
1212 import { resolveRequestedLocalWorkspace } from "../local-context";
packages/platform/control-plane/src/api/sources/api.ts+1−1
@@ -37,7 +37,7 @@ import { · 36 unmodified lines
3737 import {
3838 ConnectSourcePayloadSchema,
3939 type ConnectSourcePayload,
40−} from "../../runtime/source-adapters";
40+} from "../../runtime/sources/source-adapters";
4141
4242 const createSourcePayloadRequiredSchema = Schema.Struct({
4343 name: TrimmedNonEmptyStringSchema,
packages/platform/control-plane/src/api/sources/http.ts+6−6
@@ -12,20 +12,20 @@ import { · 11 unmodified lines
1212 listSources,
1313 removeSource,
1414 updateSource,
15−} from "../../runtime/sources-operations";
15+} from "../../runtime/sources/sources-operations";
1616 import {
1717 discoverSourceInspectionTools,
1818 getSourceInspection,
1919 getSourceInspectionToolDetail,
20−} from "../../runtime/source-inspection";
20+} from "../../runtime/sources/source-inspection";
2121 import {
2222 completeSourceCredentialSetup,
2323 getSourceCredentialInteraction,
2424 submitSourceCredentialInteraction,
25−} from "../../runtime/local-operations";
26−import { discoverSource } from "../../runtime/source-discovery";
27−import { hasSourceAdapterFamily } from "../../runtime/source-adapters";
28−import { RuntimeSourceAuthServiceTag } from "../../runtime/source-auth-service";
25+} from "../../runtime/local/local-operations";
26+import { discoverSource } from "../../runtime/sources/source-discovery";
27+import { hasSourceAdapterFamily } from "../../runtime/sources/source-adapters";
28+import { RuntimeSourceAuthServiceTag } from "../../runtime/sources/source-auth-service";
2929
3030 import {
3131 ControlPlaneBadRequestError,
packages/platform/control-plane/src/runtime/auth/auth-artifacts.tsrenamed from packages/platform/control-plane/src/runtime/auth-artifacts.ts+1−1
@@ -36,7 +36,7 @@ import * as Schema from "effect/Schema"; · 35 unmodified lines
3636 import type {
3737 ResolveSecretMaterial,
3838 SecretMaterialResolveContext,
39−} from "./secret-material-providers";
39+} from "../local/secret-material-providers";
4040
4141 export type ResolvedSourceAuthMaterial = {
4242 placements: ReadonlyArray<RequestPlacement>;
packages/platform/control-plane/src/runtime/auth/auth-leases.tsrenamed from packages/platform/control-plane/src/runtime/auth-leases.ts+2−2
@@ -16,14 +16,14 @@ import { · 15 unmodified lines
1616 import * as Effect from "effect/Effect";
1717 import * as Option from "effect/Option";
1818
19−import type { ControlPlaneStoreShape } from "./store";
19+import type { ControlPlaneStoreShape } from "../store";
2020 import { resolveAuthArtifactMaterial, type ResolvedSourceAuthMaterial } from "./auth-artifacts";
2121 import {
2222 createDefaultSecretMaterialDeleter,
2323 createDefaultSecretMaterialStorer,
2424 type ResolveSecretMaterial,
2525 type SecretMaterialResolveContext,
26−} from "./secret-material-providers";
26+} from "../local/secret-material-providers";
2727 import { refreshOAuth2AccessToken } from "./oauth2-pkce";
2828 import type { OAuth2TokenResponse } from "./oauth2-pkce";
2929 import { createPersistedMcpAuthProvider } from "./mcp-auth-provider";
packages/platform/control-plane/src/runtime/auth/mcp-auth-provider.tsrenamed from packages/platform/control-plane/src/runtime/mcp-auth-provider.ts+2−2
@@ -20,13 +20,13 @@ import { · 19 unmodified lines
2020 import * as Effect from "effect/Effect";
2121 import * as Schema from "effect/Schema";
2222
23−import type { ControlPlaneStoreShape } from "./store";
23+import type { ControlPlaneStoreShape } from "../store";
2424 import {
2525 createDefaultSecretMaterialDeleter,
2626 createDefaultSecretMaterialStorer,
2727 type ResolveSecretMaterial,
2828 type SecretMaterialResolveContext,
29−} from "./secret-material-providers";
29+} from "../local/secret-material-providers";
3030
3131 const encodeMcpOAuthAuthArtifactConfig = Schema.encodeSync(
3232 McpOAuthAuthArtifactConfigJsonSchema,
packages/platform/control-plane/src/runtime/auth/mcp-oauth.tsrenamed from packages/platform/control-plane/src/runtime/mcp-oauth.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/auth/oauth-loopback.test.tsrenamed from packages/platform/control-plane/src/runtime/oauth-loopback.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/auth/oauth-loopback.tsrenamed from packages/platform/control-plane/src/runtime/oauth-loopback.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/auth/oauth2-pkce.tsrenamed from packages/platform/control-plane/src/runtime/oauth2-pkce.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/auth/provider-grant-lifecycle.tsrenamed from packages/platform/control-plane/src/runtime/provider-grant-lifecycle.ts+2−2
@@ -9,8 +9,8 @@ import { · 8 unmodified lines
99 import * as Effect from "effect/Effect";
1010 import * as Option from "effect/Option";
1111
12−import { createDefaultSecretMaterialDeleter } from "./secret-material-providers";
13−import type { ControlPlaneStoreShape } from "./store";
12+import { createDefaultSecretMaterialDeleter } from "../local/secret-material-providers";
13+import type { ControlPlaneStoreShape } from "../store";
1414
1515 const providerGrantRefFromArtifact = (
1616 artifact: Pick<AuthArtifact, "artifactKind" | "configJson">,
packages/platform/control-plane/src/runtime/auth/source-auth-material.test.tsrenamed from packages/platform/control-plane/src/runtime/source-auth-material.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/auth/source-auth-material.tsrenamed from packages/platform/control-plane/src/runtime/source-auth-material.ts+3−3
@@ -9,7 +9,7 @@ import * as Effect from "effect/Effect"; · 8 unmodified lines
99 import * as Layer from "effect/Layer";
1010 import * as Option from "effect/Option";
1111
12−import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store";
12+import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store";
1313 import {
1414 authArtifactFromSourceAuth,
1515 resolveAuthArtifactMaterial,
@@ -19,8 +19,8 @@ import { resolveAuthArtifactMaterialWithLeases } from "./auth-leases"; · 3 unmodified lines
1919 import type {
2020 ResolveSecretMaterial,
2121 SecretMaterialResolveContext,
22−} from "./secret-material-providers";
23−import { SecretMaterialResolverService } from "./secret-material-providers";
22+} from "../local/secret-material-providers";
23+import { SecretMaterialResolverService } from "../local/secret-material-providers";
2424
2525 const authForSlot = (input: {
2626 source: Source;
packages/platform/control-plane/src/runtime/catalog/catalog-typescript.tsrenamed from packages/platform/control-plane/src/runtime/catalog-typescript.ts+3−3
@@ -1,8 +1,8 @@
11 import { createHash } from "node:crypto";
22
3−import type { ProjectedCatalog } from "../ir/catalog";
4−import type { ShapeSymbolId } from "../ir/ids";
5−import type { CatalogV1, ShapeNode, ShapeSymbol } from "../ir/model";
3+import type { ProjectedCatalog } from "../../ir/catalog";
4+import type { ShapeSymbolId } from "../../ir/ids";
5+import type { CatalogV1, ShapeNode, ShapeSymbol } from "../../ir/model";
66
77 export type CatalogTypeRoot = {
88 readonly shapeId: ShapeSymbolId;
packages/platform/control-plane/src/runtime/catalog/prettier-format.tsrenamed from packages/platform/control-plane/src/runtime/prettier-format.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/catalog/schema-type-signature.tsrenamed from packages/platform/control-plane/src/runtime/schema-type-signature.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/catalog/source-catalog-runtime.test.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-runtime.test.ts+3−3
@@ -17,7 +17,7 @@ import { · 16 unmodified lines
1717 createCatalogSnapshotV1,
1818 createEmptyCatalogV1,
1919 projectCatalogForAgentSdk,
20−} from "../ir/catalog";
20+} from "../../ir/catalog";
2121 import {
2222 CapabilityIdSchema,
2323 DocumentIdSchema,
@@ -26,8 +26,8 @@ import { · 2 unmodified lines
2626 ResponseSetIdSchema,
2727 ScopeIdSchema,
2828 ShapeSymbolIdSchema,
29−} from "../ir/ids";
30−import type { CatalogV1, ProvenanceRef } from "../ir/model";
29+} from "../../ir/ids";
30+import type { CatalogV1, ProvenanceRef } from "../../ir/model";
3131 import {
3232 createCatalogTypeProjector,
3333 formatTypeNameSegment,
packages/platform/control-plane/src/runtime/catalog/source-catalog-runtime.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-runtime.ts+8−8
@@ -18,7 +18,7 @@ import { · 17 unmodified lines
1818 decodeCatalogSnapshotV1,
1919 projectCatalogForAgentSdk,
2020 type ProjectedCatalog,
21−} from "../ir/catalog";
21+} from "../../ir/catalog";
2222 import type {
2323 Capability,
2424 CatalogSnapshotV1,
@@ -29,8 +29,8 @@ import type { · 4 unmodified lines
2929 McpExecutable,
3030 ShapeSymbol,
3131 Symbol as IrSymbol,
32−} from "../ir/model";
33−import { LocalSourceArtifactMissingError } from "./local-errors";
32+} from "../../ir/model";
33+import { LocalSourceArtifactMissingError } from "../local/local-errors";
3434 import {
3535 createCatalogTypeProjector,
3636 joinTypeNameSegments,
@@ -40,17 +40,17 @@ import { · 3 unmodified lines
4040 import {
4141 RuntimeLocalWorkspaceService,
4242 type RuntimeLocalWorkspaceState,
43−} from "./local-runtime-context";
44−import type { LocalSourceArtifact } from "./local-source-artifacts";
43+} from "../local/local-runtime-context";
44+import type { LocalSourceArtifact } from "../local/local-source-artifacts";
4545 import {
4646 SourceArtifactStore,
4747 type SourceArtifactStoreShape,
48−} from "./local-storage";
49−import { namespaceFromSourceName } from "./source-names";
48+} from "../local/local-storage";
49+import { namespaceFromSourceName } from "../sources/source-names";
5050 import {
5151 RuntimeSourceStoreService,
5252 type RuntimeSourceStore,
53−} from "./source-store";
53+} from "../sources/source-store";
5454
5555 type CatalogImportMetadata = CatalogSnapshotV1["import"];
5656
packages/platform/control-plane/src/runtime/catalog/source-catalog-snapshot.test.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-snapshot.test.ts+1−1
@@ -6,7 +6,7 @@ import { · 5 unmodified lines
66 buildGraphqlToolPresentation,
77 compileGraphqlToolDefinitions,
88 type GraphqlToolManifest,
9−} from "./graphql-tools";
9+} from "../sources/graphql-tools";
1010 import {
1111 createGoogleDiscoveryCatalogSnapshot,
1212 createGraphqlCatalogSnapshot,
packages/platform/control-plane/src/runtime/catalog/source-catalog-snapshot.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-snapshot.ts+5−5
@@ -15,7 +15,7 @@ import type { Source } from "#schema"; · 14 unmodified lines
1515
1616 import {
1717 createCatalogSnapshotV1FromFragments,
18−} from "../ir/catalog";
18+} from "../../ir/catalog";
1919 import {
2020 CapabilityIdSchema,
2121 DiagnosticIdSchema,
@@ -31,7 +31,7 @@ import { · 9 unmodified lines
3131 ScopeIdSchema,
3232 SecuritySchemeSymbolIdSchema,
3333 ShapeSymbolIdSchema,
34−} from "../ir/ids";
34+} from "../../ir/ids";
3535 import type {
3636 AuthRequirement,
3737 Capability,
@@ -56,9 +56,9 @@ import type { · 18 unmodified lines
5656 ShapeSymbol,
5757 SourceKind,
5858 SourceDocument,
59−} from "../ir/model";
60−import type { GraphqlToolProviderData } from "./graphql-tools";
61−import { namespaceFromSourceName } from "./source-names";
59+} from "../../ir/model";
60+import type { GraphqlToolProviderData } from "../sources/graphql-tools";
61+import { namespaceFromSourceName } from "../sources/source-names";
6262
6363 type JsonSchema = boolean | Record<string, unknown>;
6464
packages/platform/control-plane/src/runtime/catalog/source-catalog-support.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-support.ts+2−2
@@ -1,10 +1,10 @@
11 import { sha256Hex } from "@executor/codemode-core";
2−import { createCatalogSnapshotV1FromFragments } from "../ir/catalog";
2+import { createCatalogSnapshotV1FromFragments } from "../../ir/catalog";
33 import type {
44 CatalogFragmentV1,
55 CatalogSnapshotV1,
66 ImportMetadata,
7−} from "../ir/model";
7+} from "../../ir/model";
88
99 export const normalizeSearchText = (
1010 ...parts: ReadonlyArray<string | null | undefined>
packages/platform/control-plane/src/runtime/catalog/source-catalog-sync.tsrenamed from packages/platform/control-plane/src/runtime/source-catalog-sync.ts+7−7
@@ -11,26 +11,26 @@ import * as Layer from "effect/Layer"; · 10 unmodified lines
1111 import {
1212 RuntimeLocalWorkspaceService,
1313 type RuntimeLocalWorkspaceState,
14−} from "./local-runtime-context";
14+} from "../local/local-runtime-context";
1515 import {
1616 SourceArtifactStore,
1717 type SourceArtifactStoreShape,
1818 WorkspaceStateStore,
1919 type WorkspaceStateStoreShape,
20−} from "./local-storage";
20+} from "../local/local-storage";
2121 import {
2222 type LocalWorkspaceState,
23−} from "./local-workspace-state";
23+} from "../local/local-workspace-state";
2424 import {
2525 RuntimeSourceAuthMaterialService,
26−} from "./source-auth-material";
26+} from "../auth/source-auth-material";
2727 import {
2828 getSourceAdapterForSource,
29−} from "./source-adapters";
29+} from "../sources/source-adapters";
3030 import {
3131 catalogSyncResultFromMcpManifest,
32−} from "./source-adapters/mcp";
33−import { SecretMaterialResolverService } from "./secret-material-providers";
32+} from "../sources/source-adapters/mcp";
33+import { SecretMaterialResolverService } from "../local/secret-material-providers";
3434 import { snapshotFromSourceCatalogSyncResult } from "./source-catalog-support";
3535 import {
3636 refreshSourceTypeDeclarationInBackground,
packages/platform/control-plane/src/runtime/catalog/source-type-declarations.test.tsrenamed from packages/platform/control-plane/src/runtime/source-type-declarations.test.ts+4−4
@@ -13,7 +13,7 @@ import { · 12 unmodified lines
1313 import {
1414 createCatalogSnapshotV1,
1515 createEmptyCatalogV1,
16−} from "../ir/catalog";
16+} from "../../ir/catalog";
1717 import {
1818 CapabilityIdSchema,
1919 DocumentIdSchema,
@@ -22,8 +22,8 @@ import { · 2 unmodified lines
2222 ResponseSetIdSchema,
2323 ScopeIdSchema,
2424 ShapeSymbolIdSchema,
25−} from "../ir/ids";
26−import type { CatalogV1, GraphQLExecutable, ProvenanceRef } from "../ir/model";
25+} from "../../ir/ids";
26+import type { CatalogV1, GraphQLExecutable, ProvenanceRef } from "../../ir/model";
2727 import { syncWorkspaceSourceTypeDeclarationsNode } from "./source-type-declarations";
2828
2929 const put = <K extends string, V>(record: Record<K, V>, key: K, value: V) => {
@@ -324,7 +324,7 @@ describe("source-type-declarations", () => { · 294 unmodified lines
324324 expect(sourceDeclaration).toContain("teams: (args?: LinearTeamsCall) => Promise<LinearTeamsResult>;");
325325 expect(sourceDeclaration).toContain("teamsSearch: (args?: LinearTeamsCall) => Promise<LinearTeamsResult>;");
326326 expect(sourceDeclaration).not.toMatch(/type\s+[0-9]/);
327− expect(aggregateDeclaration).toContain('import type { SourceTools_src_linear } from "./sources/src_linear";');
327+ expect(aggregateDeclaration).toContain('import type { SourceTools_src_linear } from "../sources/src_linear";');
328328 expect(aggregateDeclaration).not.toContain("src_hidden");
329329 expect(aggregateDeclaration).toContain("declare global {");
330330 expect(aggregateDeclaration).toContain("const tools: ExecutorSourceTools;");
packages/platform/control-plane/src/runtime/catalog/source-type-declarations.tsrenamed from packages/platform/control-plane/src/runtime/source-type-declarations.ts+5−5
@@ -6,8 +6,8 @@ import * as Cause from "effect/Cause"; · 5 unmodified lines
66 import * as Effect from "effect/Effect";
77 import * as Fiber from "effect/Fiber";
88
9−import { projectCatalogForAgentSdk } from "../ir/catalog";
10−import type { CatalogSnapshotV1 } from "../ir/model";
9+import { projectCatalogForAgentSdk } from "../../ir/catalog";
10+import type { CatalogSnapshotV1 } from "../../ir/model";
1111 import {
1212 createCatalogTypeProjector,
1313 formatPropertyKey,
@@ -15,11 +15,11 @@ import { · 1 unmodified line
1515 projectedCatalogTypeRoots,
1616 shapeAllowsOmittedArgs,
1717 } from "./catalog-typescript";
18−import type { ResolvedLocalWorkspaceContext } from "./local-config";
18+import type { ResolvedLocalWorkspaceContext } from "../local/local-config";
1919 import {
2020 LocalFileSystemError,
2121 unknownLocalErrorDetails,
22−} from "./local-errors";
22+} from "../local/local-errors";
2323
2424 type SourceDeclarationEntry = {
2525 source: Source;
@@ -235,7 +235,7 @@ const aggregateDeclarationText = (entries: readonly SourceDeclarationEntry[]): s · 209 unmodified lines
235235 const aggregateDeclarationTextFromSourceIds = (entries: readonly SourceDeclarationStub[]): string => {
236236 const sorted = [...entries].sort((left, right) => left.sourceId.localeCompare(right.sourceId));
237237 const imports = sorted.map((entry) =>
238− `import type { ${sourceTypeInterfaceName(entry.sourceId)} } from "./sources/${entry.sourceId}";`
238+ `import type { ${sourceTypeInterfaceName(entry.sourceId)} } from "../sources/${entry.sourceId}";`
239239 );
240240 const intersections = sorted.map((entry) => sourceTypeInterfaceName(entry.sourceId));
241241 const executorToolsType = intersections.length > 0
packages/platform/control-plane/src/runtime/control-plane-runtime.test.ts+4−4
@@ -29,10 +29,10 @@ import { · 28 unmodified lines
2929 LiveExecutionManagerService,
3030 provideControlPlaneRuntime,
3131 } from "./index";
32−import { createSourceFromPayload } from "./source-definitions";
33−import { decodeSourceCredentialSelectionContent } from "./source-credential-interactions";
34−import { persistSource } from "./source-store";
35−import { withControlPlaneClient } from "./test-http-client";
32+import { createSourceFromPayload } from "./sources/source-definitions";
33+import { decodeSourceCredentialSelectionContent } from "./sources/source-credential-interactions";
34+import { persistSource } from "./sources/source-store";
35+import { withControlPlaneClient } from "./execution/test-http-client";
3636
3737 const makeRuntime = Effect.gen(function* () {
3838 const fs = yield* FileSystem.FileSystem;
packages/platform/control-plane/src/runtime/execution/execution-http.test.tsrenamed from packages/platform/control-plane/src/runtime/execution-http.test.ts+1−1
@@ -10,7 +10,7 @@ import { makeDenoSubprocessExecutor } from "@executor/runtime-deno-subprocess"; · 9 unmodified lines
1010
1111 import {
1212 createControlPlaneRuntime,
13−} from "./index";
13+} from "../index";
1414 import { withControlPlaneClient } from "./test-http-client";
1515
1616 const makeExecutionResolver = () => {
packages/platform/control-plane/src/runtime/execution/execution-mcp-resume.test.tsrenamed from packages/platform/control-plane/src/runtime/execution-mcp-resume.test.ts+1−1
@@ -20,7 +20,7 @@ import { makeDenoSubprocessExecutor } from "@executor/runtime-deno-subprocess"; · 19 unmodified lines
2020 import {
2121 createControlPlaneRuntime,
2222 type ResolveExecutionEnvironment,
23−} from "./index";
23+} from "../index";
2424 import { withControlPlaneClient } from "./test-http-client";
2525
2626 type McpFormServer = {
packages/platform/control-plane/src/runtime/execution/execution-runtime-config.test.tsrenamed from packages/platform/control-plane/src/runtime/execution-runtime-config.test.ts+1−1
@@ -6,7 +6,7 @@ import * as Effect from "effect/Effect"; · 5 unmodified lines
66
77 import {
88 createControlPlaneRuntime,
9−} from "./index";
9+} from "../index";
1010 import { withControlPlaneClient } from "./test-http-client";
1111
1212 const writeProjectConfig = (
packages/platform/control-plane/src/runtime/execution/execution-service.tsrenamed from packages/platform/control-plane/src/runtime/execution-service.ts+5−5
@@ -2,7 +2,7 @@ import { · 1 unmodified line
22 ControlPlaneBadRequestError,
33 ControlPlaneNotFoundError,
44 ControlPlaneStorageError,
5−} from "../api/errors";
5+} from "../../api/errors";
66 import type {
77 ElicitationResponse,
88 OnElicitation,
@@ -12,7 +12,7 @@ import type { · 3 unmodified lines
1212 import type {
1313 CreateExecutionPayload,
1414 ResumeExecutionPayload,
15−} from "../api/executions/api";
15+} from "../../api/executions/api";
1616 import {
1717 ExecutionIdSchema,
1818 ExecutionInteractionIdSchema,
@@ -38,16 +38,16 @@ import { · 19 unmodified lines
3838 import {
3939 getRuntimeLocalWorkspaceOption,
4040 provideOptionalRuntimeLocalWorkspace,
41−} from "./local-runtime-context";
41+} from "../local/local-runtime-context";
4242 import {
4343 asOperationErrors,
4444 operationErrors,
4545 type OperationErrorsLike,
46−} from "./operation-errors";
46+} from "../policy/operation-errors";
4747 import {
4848 ControlPlaneStore,
4949 type ControlPlaneStoreShape,
50−} from "./store";
50+} from "../store";
5151 import { RuntimeExecutionResolverService } from "./workspace-execution-environment";
5252
5353 const executionOps = {
packages/platform/control-plane/src/runtime/execution/execution-state.tsrenamed from packages/platform/control-plane/src/runtime/execution-state.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/execution/ir-execution.tsrenamed from packages/platform/control-plane/src/runtime/ir-execution.ts+4−4
@@ -22,7 +22,7 @@ import type { · 21 unmodified lines
2222 ToolInput,
2323 ToolPath,
2424 } from "@executor/codemode-core";
25−import { buildInvocationPlan, type InvocationPlan } from "../ir/catalog";
25+import { buildInvocationPlan, type InvocationPlan } from "../../ir/catalog";
2626 import type {
2727 CatalogV1,
2828 Capability,
@@ -32,9 +32,9 @@ import type { · 3 unmodified lines
3232 McpExecutable,
3333 ParameterSymbol,
3434 Scope,
35−} from "../ir/model";
36−import type { LoadedSourceCatalogToolIndexEntry } from "./source-catalog-runtime";
37−import type { ResolvedSourceAuthMaterial } from "./source-auth-material";
35+} from "../../ir/model";
36+import type { LoadedSourceCatalogToolIndexEntry } from "../catalog/source-catalog-runtime";
37+import type { ResolvedSourceAuthMaterial } from "../auth/source-auth-material";
3838
3939 const asObject = (value: unknown): Record<string, unknown> =>
4040 value !== null && typeof value === "object" && !Array.isArray(value)
packages/platform/control-plane/src/runtime/execution/live-execution.test.tsrenamed from packages/platform/control-plane/src/runtime/live-execution.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/execution/live-execution.tsrenamed from packages/platform/control-plane/src/runtime/live-execution.ts+1−1
@@ -12,7 +12,7 @@ import * as Deferred from "effect/Deferred"; · 11 unmodified lines
1212 import * as Effect from "effect/Effect";
1313 import * as Layer from "effect/Layer";
1414
15−import type { ControlPlaneStoreShape } from "./store";
15+import type { ControlPlaneStoreShape } from "../store";
1616
1717 type VisibleExecutionState =
1818 | "running"
packages/platform/control-plane/src/runtime/execution/test-http-client.tsrenamed from packages/platform/control-plane/src/runtime/test-http-client.ts+1−1
@@ -13,7 +13,7 @@ import { · 12 unmodified lines
1313
1414 import {
1515 type ControlPlaneRuntime,
16−} from "./index";
16+} from "../index";
1717
1818 const createClientLayer = (runtime: ControlPlaneRuntime) => {
1919 const apiLayer = createControlPlaneApiLayer(runtime.runtimeLayer);
packages/platform/control-plane/src/runtime/execution/workspace-execution-environment.tsrenamed from packages/platform/control-plane/src/runtime/workspace-execution-environment.ts+10−10
@@ -29,39 +29,39 @@ import type { · 28 unmodified lines
2929 ExecutionEnvironment,
3030 ResolveExecutionEnvironment,
3131 } from "./execution-state";
32−import { createExecutorToolMap } from "./executor-tools";
32+import { createExecutorToolMap } from "../sources/executor-tools";
3333 import {
3434 RuntimeSourceAuthServiceTag,
3535 type RuntimeSourceAuthService,
36−} from "./source-auth-service";
36+} from "../sources/source-auth-service";
3737 import {
3838 RuntimeSourceCatalogStoreService,
3939 type LoadedSourceCatalogToolIndexEntry,
4040 catalogToolCatalogEntry,
41−} from "./source-catalog-runtime";
41+} from "../catalog/source-catalog-runtime";
4242 import {
4343 invocationDescriptorFromTool,
4444 invokeIrTool,
4545 } from "./ir-execution";
46−import { RuntimeSourceAuthMaterialService } from "./source-auth-material";
46+import { RuntimeSourceAuthMaterialService } from "../auth/source-auth-material";
4747 import {
4848 type SecretMaterialResolveContext,
49−} from "./secret-material-providers";
49+} from "../local/secret-material-providers";
5050 import {
5151 evaluateInvocationPolicy,
5252 type InvocationDescriptor,
53−} from "./invocation-policy-engine";
54−import { loadRuntimeLocalWorkspacePolicies } from "./policies-operations";
53+} from "../policy/invocation-policy-engine";
54+import { loadRuntimeLocalWorkspacePolicies } from "../policy/policies-operations";
5555 import {
5656 getRuntimeLocalWorkspaceOption,
5757 provideOptionalRuntimeLocalWorkspace,
5858 type RuntimeLocalWorkspaceState,
59−} from "./local-runtime-context";
59+} from "../local/local-runtime-context";
6060 import {
6161 LocalToolRuntimeLoaderService,
6262 type LocalToolRuntime,
6363 type LocalToolRuntimeLoaderShape,
64−} from "./local-tools";
64+} from "../local/local-tools";
6565 import {
6666 SourceArtifactStore,
6767 makeWorkspaceStorageLayer,
@@ -71,7 +71,7 @@ import { · 3 unmodified lines
7171 WorkspaceStateStore,
7272 type WorkspaceStateStoreShape,
7373 type WorkspaceStorageServices,
74−} from "./local-storage";
74+} from "../local/local-storage";
7575
7676 const asToolPath = (value: string): ToolPath => value as ToolPath;
7777
packages/platform/control-plane/src/runtime/index.ts+34−34
@@ -8,62 +8,62 @@ import { NodeFileSystem } from "@effect/platform-node"; · 7 unmodified lines
88 import { type ControlPlaneApiRuntimeContext } from "#api";
99 import type { LocalInstallation } from "#schema";
1010
11−import { type ResolveExecutionEnvironment } from "./execution-state";
11+import { type ResolveExecutionEnvironment } from "./execution/execution-state";
1212 import {
1313 createLiveExecutionManager,
1414 LiveExecutionManagerService,
15−} from "./live-execution";
15+} from "./execution/live-execution";
1616 import {
1717 createLocalControlPlanePersistence,
1818 type LocalControlPlanePersistence,
19−} from "./local-control-plane-store";
19+} from "./local/local-control-plane-store";
2020
2121 import {
2222 resolveLocalWorkspaceContext,
23−} from "./local-config";
23+} from "./local/local-config";
2424 import {
2525 LocalStorageLive,
2626 LocalInstallationStore,
2727 LocalWorkspaceConfigStore,
28−} from "./local-storage";
28+} from "./local/local-storage";
2929 import {
3030 type RuntimeLocalWorkspaceState,
3131 RuntimeLocalWorkspaceLive,
32−} from "./local-runtime-context";
33−import { LocalToolRuntimeLoaderLive } from "./local-tools";
34−import { synchronizeLocalWorkspaceState } from "./local-workspace-sync";
32+} from "./local/local-runtime-context";
33+import { LocalToolRuntimeLoaderLive } from "./local/local-tools";
34+import { synchronizeLocalWorkspaceState } from "./local/local-workspace-sync";
3535 import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store";
36−import { RuntimeSourceStoreLive } from "./source-store";
37−import { RuntimeSourceCatalogStoreLive } from "./source-catalog-runtime";
38−import { RuntimeSourceAuthMaterialLive } from "./source-auth-material";
39−import { RuntimeSourceCatalogSyncLive } from "./source-catalog-sync";
36+import { RuntimeSourceStoreLive } from "./sources/source-store";
37+import { RuntimeSourceCatalogStoreLive } from "./catalog/source-catalog-runtime";
38+import { RuntimeSourceAuthMaterialLive } from "./auth/source-auth-material";
39+import { RuntimeSourceCatalogSyncLive } from "./catalog/source-catalog-sync";
4040 import {
4141 RuntimeSourceAuthServiceLive,
42−} from "./source-auth-service";
43−import type { ResolveSecretMaterial } from "./secret-material-providers";
44−import { SecretMaterialLive } from "./secret-material-providers";
42+} from "./sources/source-auth-service";
43+import type { ResolveSecretMaterial } from "./local/secret-material-providers";
44+import { SecretMaterialLive } from "./local/secret-material-providers";
4545 import {
4646 RuntimeExecutionResolverLive,
47−} from "./workspace-execution-environment";
48−
49−export * from "./execution-state";
50−export * from "./executor-tools";
51−export * from "./live-execution";
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−export * from "./schema-type-signature";
58−export * from "./source-auth-service";
59−export * from "./secret-material-providers";
60−export * from "./source-credential-interactions";
61−export * from "./source-adapters/mcp";
47+} from "./execution/workspace-execution-environment";
48+
49+export * from "./execution/execution-state";
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";
57+export * from "./catalog/schema-type-signature";
58+export * from "./sources/source-auth-service";
59+export * from "./local/secret-material-providers";
60+export * from "./sources/source-credential-interactions";
61+export * from "./sources/source-adapters/mcp";
6262 export * from "./store";
63−export * from "./workspace-execution-environment";
64−export * from "./source-inspection";
65−export * from "./source-discovery";
66−export * from "./execution-service";
63+export * from "./execution/workspace-execution-environment";
64+export * from "./sources/source-inspection";
65+export * from "./sources/source-discovery";
66+export * from "./execution/execution-service";
6767
6868 export type RuntimeControlPlaneOptions = {
6969 executionResolver?: ResolveExecutionEnvironment;
packages/platform/control-plane/src/runtime/local/local-config-secrets.tsrenamed from packages/platform/control-plane/src/runtime/local-config-secrets.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-config.test.tsrenamed from packages/platform/control-plane/src/runtime/local-config.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-config.tsrenamed from packages/platform/control-plane/src/runtime/local-config.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-control-plane-store.test.tsrenamed from packages/platform/control-plane/src/runtime/local-control-plane-store.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-control-plane-store.tsrenamed from packages/platform/control-plane/src/runtime/local-control-plane-store.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-errors.tsrenamed from packages/platform/control-plane/src/runtime/local-errors.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-installation.test.tsrenamed from packages/platform/control-plane/src/runtime/local-installation.test.ts+1−1
@@ -5,7 +5,7 @@ import { NodeFileSystem } from "@effect/platform-node"; · 4 unmodified lines
55 import { describe, expect, it } from "@effect/vitest";
66 import * as Effect from "effect/Effect";
77
8−import { createControlPlaneRuntime } from "./index";
8+import { createControlPlaneRuntime } from "../index";
99 import { getOrProvisionLocalInstallation } from "./local-installation";
1010 import { resolveLocalWorkspaceContext } from "./local-config";
1111
packages/platform/control-plane/src/runtime/local/local-installation.tsrenamed from packages/platform/control-plane/src/runtime/local-installation.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-operations.tsrenamed from packages/platform/control-plane/src/runtime/local-operations.ts+6−6
@@ -11,20 +11,20 @@ import { · 10 unmodified lines
1111 import * as Effect from "effect/Effect";
1212 import * as Option from "effect/Option";
1313
14−import { submitExecutionInteractionResponse } from "./execution-service";
15−import { LiveExecutionManagerService } from "./live-execution";
14+import { submitExecutionInteractionResponse } from "../execution/execution-service";
15+import { LiveExecutionManagerService } from "../execution/live-execution";
1616 import {
1717 operationErrors,
18−} from "./operation-errors";
18+} from "../policy/operation-errors";
1919 import { resolveLocalWorkspaceContext } from "./local-config";
2020 import { InstallationStore, LocalInstallationStore } from "./local-storage";
2121 import { getRuntimeLocalWorkspaceOption } from "./local-runtime-context";
22−import { RuntimeSourceAuthServiceTag } from "./source-auth-service";
22+import { RuntimeSourceAuthServiceTag } from "../sources/source-auth-service";
2323 import {
2424 createSourceCredentialSelectionBearerContent,
2525 createSourceCredentialSelectionNoneContent,
26−} from "./source-credential-interactions";
27−import { ControlPlaneStore } from "./store";
26+} from "../sources/source-credential-interactions";
27+import { ControlPlaneStore } from "../store";
2828
2929 const localOps = {
3030 installation: operationErrors("local.installation.get"),
packages/platform/control-plane/src/runtime/local/local-runtime-context.tsrenamed from packages/platform/control-plane/src/runtime/local-runtime-context.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-source-artifacts.test.tsrenamed from packages/platform/control-plane/src/runtime/local-source-artifacts.test.ts+1−1
@@ -23,7 +23,7 @@ import { · 22 unmodified lines
2323 createCatalogImportMetadata,
2424 createGraphqlCatalogFragment,
2525 createOpenApiCatalogFragment,
26−} from "./source-catalog-snapshot";
26+} from "../catalog/source-catalog-snapshot";
2727
2828 const makeContext = (): ResolvedLocalWorkspaceContext => {
2929 const workspaceRoot = mkdtempSync(join(tmpdir(), "executor-artifacts-"));
packages/platform/control-plane/src/runtime/local/local-source-artifacts.tsrenamed from packages/platform/control-plane/src/runtime/local-source-artifacts.ts+4−4
@@ -13,18 +13,18 @@ import { · 12 unmodified lines
1313 import * as Effect from "effect/Effect";
1414 import * as Schema from "effect/Schema";
1515
16−import { decodeCatalogSnapshotV1 } from "../ir/catalog";
16+import { decodeCatalogSnapshotV1 } from "../../ir/catalog";
1717 import {
1818 CatalogSnapshotV1Schema,
1919 type CatalogSnapshotV1,
2020 type NativeBlob,
2121 type SourceDocument,
22−} from "../ir/model";
22+} from "../../ir/model";
2323 import {
2424 contentHash,
2525 snapshotFromSourceCatalogSyncResult,
2626 type SourceCatalogSyncResult,
27−} from "./source-catalog-support";
27+} from "../catalog/source-catalog-support";
2828 import type { ResolvedLocalWorkspaceContext } from "./local-config";
2929 import {
3030 LocalFileSystemError,
@@ -34,7 +34,7 @@ import { · 3 unmodified lines
3434 import {
3535 createSourceCatalogRevisionRecord,
3636 stableSourceCatalogId,
37−} from "./source-definitions";
37+} from "../sources/source-definitions";
3838 const LOCAL_SOURCE_ARTIFACT_VERSION = 3 as const;
3939
4040 export const LocalSourceArtifactSchema = Schema.Struct({
packages/platform/control-plane/src/runtime/local/local-storage.tsrenamed from packages/platform/control-plane/src/runtime/local-storage.ts+1−1
@@ -32,7 +32,7 @@ import { · 31 unmodified lines
3232 loadLocalWorkspaceState,
3333 writeLocalWorkspaceState,
3434 } from "./local-workspace-state";
35−import type { SourceCatalogSyncResult } from "./source-catalog-support";
35+import type { SourceCatalogSyncResult } from "../catalog/source-catalog-support";
3636 import type { Source } from "#schema";
3737
3838 export type InstallationStoreShape = {
packages/platform/control-plane/src/runtime/local/local-tools.tsrenamed from packages/platform/control-plane/src/runtime/local-tools.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-workspace-state.tsrenamed from packages/platform/control-plane/src/runtime/local-workspace-state.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/local-workspace-sync.tsrenamed from packages/platform/control-plane/src/runtime/local-workspace-sync.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/local/secret-material-providers.tsrenamed from packages/platform/control-plane/src/runtime/secret-material-providers.ts+2−2
@@ -20,8 +20,8 @@ import * as Option from "effect/Option"; · 19 unmodified lines
2020 import { resolveConfigRelativePath } from "./local-config";
2121 import { fromConfigSecretProviderId } from "./local-config-secrets";
2222 import { getRuntimeLocalWorkspaceOption } from "./local-runtime-context";
23−import { ControlPlaneStore } from "./store";
24−import type { ControlPlaneStoreShape } from "./store";
23+import { ControlPlaneStore } from "../store";
24+import type { ControlPlaneStoreShape } from "../store";
2525
2626 export const ENV_SECRET_PROVIDER_ID = "env";
2727 export const PARAMS_SECRET_PROVIDER_ID = "params";
packages/platform/control-plane/src/runtime/policy/invocation-policy-engine.test.tsrenamed from packages/platform/control-plane/src/runtime/invocation-policy-engine.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/policy/invocation-policy-engine.tsrenamed from packages/platform/control-plane/src/runtime/invocation-policy-engine.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/policy/operation-errors.tsrenamed from packages/platform/control-plane/src/runtime/operation-errors.ts+1−1
@@ -2,7 +2,7 @@ import { · 1 unmodified line
22 ControlPlaneBadRequestError,
33 ControlPlaneNotFoundError,
44 ControlPlaneStorageError,
5−} from "../api/errors";
5+} from "../../api/errors";
66 import * as Effect from "effect/Effect";
77
88 export type OperationErrors<TOperation extends string = string> = {
packages/platform/control-plane/src/runtime/policy/operations-shared.tsrenamed from packages/platform/control-plane/src/runtime/operations-shared.ts+1−1
@@ -1,7 +1,7 @@
11 import {
22 ControlPlaneBadRequestError,
33 ControlPlaneStorageError,
4−} from "../api/errors";
4+} from "../../api/errors";
55 import * as Effect from "effect/Effect";
66
77 import {
packages/platform/control-plane/src/runtime/policy/policies-operations.tsrenamed from packages/platform/control-plane/src/runtime/policies-operations.ts+7−7
@@ -3,7 +3,7 @@ import { createHash } from "node:crypto"; · 2 unmodified lines
33 import type {
44 CreatePolicyPayload,
55 UpdatePolicyPayload,
6−} from "../api/policies/api";
6+} from "../../api/policies/api";
77 import {
88 PolicyIdSchema,
99 type LocalExecutorConfig,
@@ -15,23 +15,23 @@ import * as Effect from "effect/Effect"; · 5 unmodified lines
1515
1616 import {
1717 requireRuntimeLocalWorkspace,
18−} from "./local-runtime-context";
18+} from "../local/local-runtime-context";
1919 import type {
2020 WorkspaceStorageServices,
2121 WorkspaceConfigStoreShape,
2222 WorkspaceStateStoreShape,
23−} from "./local-storage";
23+} from "../local/local-storage";
2424 import {
2525 WorkspaceConfigStore,
2626 WorkspaceStateStore,
27−} from "./local-storage";
28−import type { ResolvedLocalWorkspaceContext } from "./local-config";
27+} from "../local/local-storage";
28+import type { ResolvedLocalWorkspaceContext } from "../local/local-config";
2929 import {
3030 type LocalWorkspaceState,
31−} from "./local-workspace-state";
31+} from "../local/local-workspace-state";
3232 import {
3333 derivePolicyConfigKey,
34−} from "./local-workspace-sync";
34+} from "../local/local-workspace-sync";
3535 import {
3636 type OperationErrors,
3737 operationErrors,
packages/platform/control-plane/src/runtime/sources/executor-tools.tsrenamed from packages/platform/control-plane/src/runtime/executor-tools.ts+4−4
@@ -19,7 +19,7 @@ import * as Effect from "effect/Effect"; · 18 unmodified lines
1919 import * as Cause from "effect/Cause";
2020 import * as Exit from "effect/Exit";
2121 import * as Schema from "effect/Schema";
22−import type { RuntimeLocalWorkspaceState } from "./local-runtime-context";
22+import type { RuntimeLocalWorkspaceState } from "../local/local-runtime-context";
2323 import {
2424 type LocalStorageServices,
2525 LocalInstallationStore,
@@ -27,8 +27,8 @@ import { · 1 unmodified line
2727 LocalWorkspaceConfigStore,
2828 LocalWorkspaceStateStore,
2929 makeLocalStorageLayer,
30−} from "./local-storage";
31−import { provideOptionalRuntimeLocalWorkspace } from "./local-runtime-context";
30+} from "../local/local-storage";
31+import { provideOptionalRuntimeLocalWorkspace } from "../local/local-runtime-context";
3232
3333 /** Run an Effect as a Promise, preserving the original error (not FiberFailure). */
3434 const runEffect = async <A>(
@@ -59,7 +59,7 @@ import { · 24 unmodified lines
5959 import {
6060 deriveSchemaJson,
6161 deriveSchemaTypeSignature,
62−} from "./schema-type-signature";
62+} from "../catalog/schema-type-signature";
6363 import {
6464 ExecutorAddSourceInputSchema,
6565 executorAddableSourceAdapters,
packages/platform/control-plane/src/runtime/sources/graphql-tools.test.tsrenamed from packages/platform/control-plane/src/runtime/graphql-tools.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/graphql-tools.tsrenamed from packages/platform/control-plane/src/runtime/graphql-tools.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/slug.tsrenamed from packages/platform/control-plane/src/runtime/slug.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-adapter-fixture-matrix.test.tsrenamed from packages/platform/control-plane/src/runtime/source-adapter-fixture-matrix.test.ts+6−6
@@ -35,9 +35,9 @@ import { · 34 unmodified lines
3535 import * as Effect from "effect/Effect";
3636 import { Schema } from "effect";
3737
38−import { projectCatalogForAgentSdk } from "../ir/catalog";
39−import type { CatalogSnapshotV1 } from "../ir/model";
40−import { createCatalogTypeProjector, projectedCatalogTypeRoots } from "./catalog-typescript";
38+import { projectCatalogForAgentSdk } from "../../ir/catalog";
39+import type { CatalogSnapshotV1 } from "../../ir/model";
40+import { createCatalogTypeProjector, projectedCatalogTypeRoots } from "../catalog/catalog-typescript";
4141 import {
4242 buildGraphqlToolPresentation,
4343 compileGraphqlToolDefinitions,
@@ -46,13 +46,13 @@ import { · 2 unmodified lines
4646 import {
4747 expandCatalogToolByPath,
4848 type LoadedSourceCatalog,
49−} from "./source-catalog-runtime";
50−import { invokeIrTool } from "./ir-execution";
49+} from "../catalog/source-catalog-runtime";
50+import { invokeIrTool } from "../execution/ir-execution";
5151 import {
5252 createGoogleDiscoveryCatalogSnapshot,
5353 createGraphqlCatalogSnapshot,
5454 createOpenApiCatalogSnapshot,
55−} from "./source-catalog-snapshot";
55+} from "../catalog/source-catalog-snapshot";
5656
5757 const FIXTURE_WORKSPACE_ID = WorkspaceIdSchema.make("ws_source_fixture_matrix");
5858
packages/platform/control-plane/src/runtime/sources/source-adapters/google-discovery.test.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/google-discovery.test.ts+1−1
@@ -6,7 +6,7 @@ import { SourceIdSchema } from "#schema"; · 5 unmodified lines
66 import * as Effect from "effect/Effect";
77
88 import { googleDiscoverySourceAdapter } from "./google-discovery";
9−import { snapshotFromSourceCatalogSyncResult } from "../source-catalog-support";
9+import { snapshotFromSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
1010 import { createSourceFromPayload } from "../source-definitions";
1111
1212 const fetchLiveDiscoveryDocument = async (): Promise<string> => {
packages/platform/control-plane/src/runtime/sources/source-adapters/google-discovery.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/google-discovery.ts+2−2
@@ -19,8 +19,8 @@ import { · 18 unmodified lines
1919 createCatalogImportMetadata,
2020 createGoogleDiscoveryCatalogFragment,
2121 type GoogleDiscoveryCatalogOperationInput,
22−} from "../source-catalog-snapshot";
23−import { createSourceCatalogSyncResult } from "../source-catalog-support";
22+} from "../../catalog/source-catalog-snapshot";
23+import { createSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
2424 import type { SourceAdapter } from "./types";
2525 import {
2626 ConnectHttpAuthSchema,
packages/platform/control-plane/src/runtime/sources/source-adapters/graphql.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/graphql.ts+2−2
@@ -19,8 +19,8 @@ import { · 18 unmodified lines
1919 createCatalogImportMetadata,
2020 createGraphqlCatalogFragment,
2121 type GraphqlCatalogOperationInput,
22−} from "../source-catalog-snapshot";
23−import { createSourceCatalogSyncResult } from "../source-catalog-support";
22+} from "../../catalog/source-catalog-snapshot";
23+import { createSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
2424 import type { SourceAdapter } from "./types";
2525 import {
2626 ConnectHttpAuthSchema,
packages/platform/control-plane/src/runtime/sources/source-adapters/index.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/index.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-adapters/internal.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/internal.ts+2−2
@@ -2,8 +2,8 @@ import * as Effect from "effect/Effect"; · 1 unmodified line
22 import * as Schema from "effect/Schema";
33 import type { Source } from "#schema";
44
5−import { createCatalogImportMetadata } from "../source-catalog-snapshot";
6−import { createSourceCatalogSyncResult } from "../source-catalog-support";
5+import { createCatalogImportMetadata } from "../../catalog/source-catalog-snapshot";
6+import { createSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
77 import type { SourceAdapter } from "./types";
88 import {
99 decodeBindingConfig,
packages/platform/control-plane/src/runtime/sources/source-adapters/mcp.test.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/mcp.test.ts+6−6
@@ -19,15 +19,15 @@ import type { · 18 unmodified lines
1919 import * as Effect from "effect/Effect";
2020 import { z } from "zod/v4";
2121
22−import { projectCatalogForAgentSdk } from "../../ir/catalog";
23−import type { CatalogSnapshotV1 } from "../../ir/model";
24−import { createCatalogTypeProjector, projectedCatalogTypeRoots } from "../catalog-typescript";
25−import { invokeIrTool } from "../ir-execution";
22+import { projectCatalogForAgentSdk } from "../../../ir/catalog";
23+import type { CatalogSnapshotV1 } from "../../../ir/model";
24+import { createCatalogTypeProjector, projectedCatalogTypeRoots } from "../../catalog/catalog-typescript";
25+import { invokeIrTool } from "../../execution/ir-execution";
2626 import {
2727 expandCatalogToolByPath,
2828 type LoadedSourceCatalog,
29−} from "../source-catalog-runtime";
30−import { snapshotFromSourceCatalogSyncResult } from "../source-catalog-support";
29+} from "../../catalog/source-catalog-runtime";
30+import { snapshotFromSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
3131 import { createSourceFromPayload } from "../source-definitions";
3232 import { mcpSourceAdapter } from "./mcp";
3333
packages/platform/control-plane/src/runtime/sources/source-adapters/mcp.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/mcp.ts+2−2
@@ -22,12 +22,12 @@ import { · 21 unmodified lines
2222 createCatalogImportMetadata,
2323 createMcpCatalogFragment,
2424 type McpCatalogOperationInput,
25−} from "../source-catalog-snapshot";
25+} from "../../catalog/source-catalog-snapshot";
2626 import {
2727 contentHash,
2828 createSourceCatalogSyncResult,
2929 type SourceCatalogSyncResult,
30−} from "../source-catalog-support";
30+} from "../../catalog/source-catalog-support";
3131 import { namespaceFromSourceName } from "../source-names";
3232 import type { SourceAdapter } from "./types";
3333 import {
packages/platform/control-plane/src/runtime/sources/source-adapters/openapi.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/openapi.ts+2−2
@@ -23,8 +23,8 @@ import { · 22 unmodified lines
2323 createCatalogImportMetadata,
2424 createOpenApiCatalogFragment,
2525 type OpenApiCatalogOperationInput,
26−} from "../source-catalog-snapshot";
27−import { createSourceCatalogSyncResult } from "../source-catalog-support";
26+} from "../../catalog/source-catalog-snapshot";
27+import { createSourceCatalogSyncResult } from "../../catalog/source-catalog-support";
2828 import type { SourceAdapter } from "./types";
2929 import {
3030 ConnectHttpAuthSchema,
packages/platform/control-plane/src/runtime/sources/source-adapters/shared.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/shared.ts+1−1
@@ -18,7 +18,7 @@ import * as Schema from "effect/Schema"; · 17 unmodified lines
1818
1919 import {
2020 TrimmedNonEmptyStringSchema,
21−} from "../../api/string-schemas";
21+} from "../../../api/string-schemas";
2222
2323 export const OptionalNullableStringSchema = Schema.optional(
2424 Schema.NullOr(Schema.String),
packages/platform/control-plane/src/runtime/sources/source-adapters/types.tsrenamed from packages/platform/control-plane/src/runtime/source-adapters/types.ts+3−3
@@ -12,9 +12,9 @@ import type { · 11 unmodified lines
1212 import * as Effect from "effect/Effect";
1313 import * as Schema from "effect/Schema";
1414
15−import type { ResolvedSourceAuthMaterial } from "../source-auth-material";
16−import type { ResolveSecretMaterial } from "../secret-material-providers";
17−import type { SourceCatalogSyncResult } from "../source-catalog-support";
15+import type { ResolvedSourceAuthMaterial } from "../../auth/source-auth-material";
16+import type { ResolveSecretMaterial } from "../../local/secret-material-providers";
17+import type { SourceCatalogSyncResult } from "../../catalog/source-catalog-support";
1818
1919 export type SourceAdapterFamily = "http_api" | "mcp" | "internal";
2020 export type SourceAdapterInputSchema = Schema.Schema<any, any, never>;
packages/platform/control-plane/src/runtime/sources/source-auth-service.tsrenamed from packages/platform/control-plane/src/runtime/source-auth-service.ts+12−12
@@ -45,17 +45,17 @@ import { · 44 unmodified lines
4545 LiveExecutionManagerService,
4646 sanitizePersistedElicitationResponse,
4747 type LiveExecutionManager,
48−} from "./live-execution";
48+} from "../execution/live-execution";
4949 import {
5050 getRuntimeLocalWorkspaceOption,
5151 provideOptionalRuntimeLocalWorkspace,
5252 type RuntimeLocalWorkspaceState,
53−} from "./local-runtime-context";
53+} from "../local/local-runtime-context";
5454 import {
5555 exchangeMcpOAuthAuthorizationCode,
5656 startMcpOAuthAuthorization,
57−} from "./mcp-oauth";
58−import { createPersistedMcpOAuthSourceAuth } from "./mcp-auth-provider";
57+} from "../auth/mcp-oauth";
58+import { createPersistedMcpOAuthSourceAuth } from "../auth/mcp-auth-provider";
5959 import {
6060 createSourceFromPayload,
6161 updateSourceFromPayload,
@@ -74,25 +74,25 @@ import { · 12 unmodified lines
7474 SecretMaterialResolverService,
7575 SecretMaterialStorerService,
7676 type StoreSecretMaterial,
77−} from "./secret-material-providers";
77+} from "../local/secret-material-providers";
7878 import {
7979 removeAuthLeaseAndSecrets,
8080 upsertOauth2AuthorizedUserLeaseFromTokenResponse,
81−} from "./auth-leases";
81+} from "../auth/auth-leases";
8282 import {
8383 listProviderGrantRefArtifacts,
8484 removeProviderAuthGrantSecret,
85−} from "./provider-grant-lifecycle";
85+} from "../auth/provider-grant-lifecycle";
8686 import {
8787 RuntimeSourceCatalogSyncService,
8888 type RuntimeSourceCatalogSyncShape,
89−} from "./source-catalog-sync";
89+} from "../catalog/source-catalog-sync";
9090 import {
9191 buildOAuth2AuthorizationUrl,
9292 createPkceCodeVerifier,
9393 exchangeOAuth2AuthorizationCode,
94−} from "./oauth2-pkce";
95−import { startOauthLoopbackRedirectServer } from "./oauth-loopback";
94+} from "../auth/oauth2-pkce";
95+import { startOauthLoopbackRedirectServer } from "../auth/oauth-loopback";
9696 import {
9797 loadSourceById,
9898 loadSourcesInWorkspace,
@@ -100,8 +100,8 @@ import { · 1 unmodified line
100100 type RuntimeSourceStore,
101101 RuntimeSourceStoreService,
102102 } from "./source-store";
103−import type { WorkspaceStorageServices } from "./local-storage";
104−import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store";
103+import type { WorkspaceStorageServices } from "../local/local-storage";
104+import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store";
105105
106106 const trimOrNull = (value: string | null | undefined): string | null => {
107107 if (value === null || value === undefined) {
packages/platform/control-plane/src/runtime/sources/source-credential-interactions.tsrenamed from packages/platform/control-plane/src/runtime/source-credential-interactions.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-definitions.test.tsrenamed from packages/platform/control-plane/src/runtime/source-definitions.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-definitions.tsrenamed from packages/platform/control-plane/src/runtime/source-definitions.ts+1−1
@@ -32,7 +32,7 @@ import { getSourceAdapter, getSourceAdapterForSource } from "./source-adapters"; · 31 unmodified lines
3232 import {
3333 authArtifactFromSourceAuth,
3434 sourceAuthFromAuthArtifact,
35−} from "./auth-artifacts";
35+} from "../auth/auth-artifacts";
3636
3737 const trimOrNull = (value: string | null | undefined): string | null => {
3838 if (value === null || value === undefined) {
packages/platform/control-plane/src/runtime/sources/source-discovery.test.tsrenamed from packages/platform/control-plane/src/runtime/source-discovery.test.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-discovery.tsrenamed from packages/platform/control-plane/src/runtime/source-discovery.ts+1−1
@@ -21,7 +21,7 @@ import { · 20 unmodified lines
2121 } from "#schema";
2222 import * as Effect from "effect/Effect";
2323 import { getIntrospectionQuery } from "graphql";
24−import { startMcpOAuthAuthorization } from "./mcp-oauth";
24+import { startMcpOAuthAuthorization } from "../auth/mcp-oauth";
2525 import { namespaceFromSourceName } from "./source-names";
2626
2727 const GRAPHQL_INTROSPECTION_QUERY = getIntrospectionQuery();
packages/platform/control-plane/src/runtime/sources/source-inspection.tsrenamed from packages/platform/control-plane/src/runtime/source-inspection.ts+6−6
@@ -13,19 +13,19 @@ import type { · 12 unmodified lines
1313 import {
1414 ControlPlaneNotFoundError,
1515 ControlPlaneStorageError,
16−} from "../api/errors";
16+} from "../../api/errors";
1717 import * as Effect from "effect/Effect";
1818
19−import { joinTypeNameSegments } from "./catalog-typescript";
20−import { LocalSourceArtifactMissingError } from "./local-errors";
21−import { operationErrors } from "./operation-errors";
22−import { formatWithPrettier } from "./prettier-format";
19+import { joinTypeNameSegments } from "../catalog/catalog-typescript";
20+import { LocalSourceArtifactMissingError } from "../local/local-errors";
21+import { operationErrors } from "../policy/operation-errors";
22+import { formatWithPrettier } from "../catalog/prettier-format";
2323 import {
2424 expandCatalogToolByPath,
2525 expandCatalogTools,
2626 loadSourceWithCatalog,
2727 type LoadedSourceCatalogTool,
28−} from "./source-catalog-runtime";
28+} from "../catalog/source-catalog-runtime";
2929 import { RuntimeSourceStoreService } from "./source-store";
3030
3131 const sourceInspectOps = {
packages/platform/control-plane/src/runtime/sources/source-names.tsrenamed from packages/platform/control-plane/src/runtime/source-names.ts+0−0

File renamed without changes.

packages/platform/control-plane/src/runtime/sources/source-store.test.tsrenamed from packages/platform/control-plane/src/runtime/source-store.test.ts+2−2
@@ -7,9 +7,9 @@ import { · 6 unmodified lines
77 type Source,
88 } from "#schema";
99
10−import type { LoadedLocalExecutorConfig } from "./local-config";
10+import type { LoadedLocalExecutorConfig } from "../local/local-config";
1111 import { buildLocalSourceRecord } from "./source-store";
12−import type { LocalWorkspaceState } from "./local-workspace-state";
12+import type { LocalWorkspaceState } from "../local/local-workspace-state";
1313
1414 const workspaceId = WorkspaceIdSchema.make("ws_source_store");
1515 const sourceId = SourceIdSchema.make("linear");
packages/platform/control-plane/src/runtime/sources/source-store.tsrenamed from packages/platform/control-plane/src/runtime/source-store.ts+14−14
@@ -24,11 +24,11 @@ import { · 23 unmodified lines
2424 } from "./source-definitions";
2525 import {
2626 sourceAuthFromAuthArtifact,
27−} from "./auth-artifacts";
27+} from "../auth/auth-artifacts";
2828 import {
2929 type LoadedLocalExecutorConfig,
3030 type ResolvedLocalWorkspaceContext,
31−} from "./local-config";
31+} from "../local/local-config";
3232 import {
3333 LocalConfiguredSourceNotFoundError,
3434 LocalExecutorConfigDecodeError,
@@ -37,40 +37,40 @@ import { · 2 unmodified lines
3737 LocalWorkspaceStateDecodeError,
3838 RuntimeLocalWorkspaceMismatchError,
3939 RuntimeLocalWorkspaceUnavailableError,
40−} from "./local-errors";
40+} from "../local/local-errors";
4141 import {
4242 requireRuntimeLocalWorkspace,
4343 RuntimeLocalWorkspaceService,
4444 type RuntimeLocalWorkspaceState,
45−} from "./local-runtime-context";
45+} from "../local/local-runtime-context";
4646 import type {
4747 SourceArtifactStoreShape,
4848 WorkspaceStorageServices,
4949 WorkspaceConfigStoreShape,
5050 WorkspaceStateStoreShape,
51−} from "./local-storage";
51+} from "../local/local-storage";
5252 import {
5353 SourceArtifactStore,
5454 WorkspaceConfigStore,
5555 WorkspaceStateStore,
56−} from "./local-storage";
56+} from "../local/local-storage";
5757 import {
5858 type LocalWorkspaceState,
59−} from "./local-workspace-state";
59+} from "../local/local-workspace-state";
6060 import {
6161 fromConfigSecretProviderId,
6262 toConfigSecretProviderId,
63−} from "./local-config-secrets";
64−import { createDefaultSecretMaterialDeleter } from "./secret-material-providers";
65−import { authArtifactSecretMaterialRefs } from "./auth-artifacts";
66−import { removeAuthLeaseAndSecrets } from "./auth-leases";
63+} from "../local/local-config-secrets";
64+import { createDefaultSecretMaterialDeleter } from "../local/secret-material-providers";
65+import { authArtifactSecretMaterialRefs } from "../auth/auth-artifacts";
66+import { removeAuthLeaseAndSecrets } from "../auth/auth-leases";
6767 import {
6868 clearProviderGrantOrphanedAt,
6969 markProviderGrantOrphanedIfUnused,
70−} from "./provider-grant-lifecycle";
71−import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store";
70+} from "../auth/provider-grant-lifecycle";
71+import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store";
7272 import { getSourceAdapter } from "./source-adapters";
73−import { refreshWorkspaceSourceTypeDeclarationsInBackground } from "./source-type-declarations";
73+import { refreshWorkspaceSourceTypeDeclarationsInBackground } from "../catalog/source-type-declarations";
7474 import { slugify } from "./slug";
7575
7676 const secretRefKey = (ref: { providerId: string; handle: string }): string =>
packages/platform/control-plane/src/runtime/sources/sources-operations.tsrenamed from packages/platform/control-plane/src/runtime/sources-operations.ts+5−5
@@ -1,7 +1,7 @@
11 import type {
22 CreateSourcePayload,
33 UpdateSourcePayload,
4−} from "../api/sources/api";
4+} from "../../api/sources/api";
55 import {
66 type AccountId,
77 SourceIdSchema,
@@ -20,12 +20,12 @@ import { · 12 unmodified lines
2020 import { getSourceAdapterForSource } from "./source-adapters";
2121 import {
2222 mapPersistenceError,
23−} from "./operations-shared";
23+} from "../policy/operations-shared";
2424 import {
2525 operationErrors,
26−} from "./operation-errors";
27−import { ControlPlaneStore, type ControlPlaneStoreShape } from "./store";
28−import { RuntimeSourceCatalogSyncService } from "./source-catalog-sync";
26+} from "../policy/operation-errors";
27+import { ControlPlaneStore, type ControlPlaneStoreShape } from "../store";
28+import { RuntimeSourceCatalogSyncService } from "../catalog/source-catalog-sync";
2929 import {
3030 RuntimeSourceStoreService,
3131 } from "./source-store";