refactor: move plugins to plugins folder

packages/appkit/src/index.ts

@@ -13,7 +13,6 @@ export type {
   StreamExecutionSettings,
 } from "shared";
 export { isSQLTypeMarker, sql } from "shared";
-export { analytics } from "./analytics";
 export { CacheManager } from "./cache";
 export { getExecutionContext } from "./context";
 export { createApp } from "./core";
@@ -31,7 +30,7 @@ export {
 } from "./errors";
 // Plugin authoring
 export { Plugin, toPlugin } from "./plugin";
-export { server } from "./server";
+export { analytics, server } from "./plugins";
 // Telemetry (for advanced custom telemetry)
 export {
   type Counter,

packages/appkit/src/plugin/dev-reader.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import type { TunnelConnection } from "shared";
-import { isRemoteTunnelAllowedByEnv } from "@/server/remote-tunnel/gate";
+import { isRemoteTunnelAllowedByEnv } from "@/plugins/server/remote-tunnel/gate";
 import { TunnelError } from "../errors";
 import { createLogger } from "../logging/logger";
 

packages/appkit/src/plugin/tests/dev-reader.test.ts

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
 import { TunnelError } from "../../errors";
 
 // Mock the gate to allow remote tunnel in tests
-vi.mock("@/server/remote-tunnel/gate", () => ({
+vi.mock("@/plugins/server/remote-tunnel/gate", () => ({
   isRemoteTunnelAllowedByEnv: () => true,
 }));
 

packages/appkit/src/analytics/analytics.ts → packages/appkit/src/plugins/analytics/analytics.ts

@@ -6,14 +6,14 @@ import type {
   SQLTypeMarker,
   StreamExecutionSettings,
 } from "shared";
-import { SQLWarehouseConnector } from "../connectors";
+import { SQLWarehouseConnector } from "../../connectors";
 import {
   getCurrentUserId,
   getWarehouseId,
   getWorkspaceClient,
-} from "../context";
-import { createLogger } from "../logging/logger";
-import { Plugin, toPlugin } from "../plugin";
+} from "../../context";
+import { createLogger } from "../../logging/logger";
+import { Plugin, toPlugin } from "../../plugin";
 import { queryDefaults } from "./defaults";
 import { QueryProcessor } from "./query";
 import type {

packages/appkit/src/analytics/query.ts → packages/appkit/src/plugins/analytics/query.ts

@@ -1,8 +1,8 @@
 import { createHash } from "node:crypto";
 import type { sql } from "@databricks/sdk-experimental";
 import { isSQLTypeMarker, type SQLTypeMarker, sql as sqlHelpers } from "shared";
-import { getWorkspaceId } from "../context";
-import { ValidationError } from "../errors";
+import { getWorkspaceId } from "../../context";
+import { ValidationError } from "../../errors";
 
 type SQLParameterValue = SQLTypeMarker | null | undefined;
 

packages/appkit/src/analytics/tests/analytics.test.ts → packages/appkit/src/plugins/analytics/tests/analytics.test.ts

@@ -7,7 +7,7 @@ import {
 } from "@tools/test-helpers";
 import { sql } from "shared";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { ServiceContext } from "../../context/service-context";
+import { ServiceContext } from "../../../context/service-context";
 import { AnalyticsPlugin, analytics } from "../analytics";
 import type { IAnalyticsConfig } from "../types";
 
@@ -45,7 +45,7 @@ const { mockCacheStore, mockCacheInstance } = vi.hoisted(() => {
   return { mockCacheStore: store, mockCacheInstance: instance };
 });
 
-vi.mock("../../cache", () => ({
+vi.mock("../../../cache", () => ({
   CacheManager: {
     getInstanceSync: vi.fn(() => mockCacheInstance),
   },

packages/appkit/src/analytics/tests/query.test.ts → packages/appkit/src/plugins/analytics/tests/query.test.ts

@@ -1,7 +1,7 @@
 import { mockServiceContext } from "@tools/test-helpers";
 import { sql } from "shared";
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
-import { ServiceContext } from "../../context/service-context";
+import { ServiceContext } from "../../../context/service-context";
 import { QueryProcessor } from "../query";
 
 describe("QueryProcessor", () => {

packages/appkit/src/plugins/index.ts

@@ -0,0 +1,2 @@
+export * from "./analytics";
+export * from "./server";

packages/appkit/src/server/index.ts → packages/appkit/src/plugins/server/index.ts

@@ -4,10 +4,10 @@ import path from "node:path";
 import dotenv from "dotenv";
 import express from "express";
 import type { PluginPhase } from "shared";
-import { ServerError } from "../errors";
-import { createLogger } from "../logging/logger";
-import { Plugin, toPlugin } from "../plugin";
-import { instrumentations } from "../telemetry";
+import { ServerError } from "../../errors";
+import { createLogger } from "../../logging/logger";
+import { Plugin, toPlugin } from "../../plugin";
+import { instrumentations } from "../../telemetry";
 import { RemoteTunnelController } from "./remote-tunnel/remote-tunnel-controller";
 import { StaticServer } from "./static-server";
 import type { ServerConfig } from "./types";

packages/appkit/src/server/remote-tunnel/remote-tunnel-controller.ts → packages/appkit/src/plugins/server/remote-tunnel/remote-tunnel-controller.ts

@@ -1,7 +1,7 @@
 import type { Server as HTTPServer } from "node:http";
 import type express from "express";
-import { createLogger } from "../../logging/logger";
-import type { DevFileReader } from "../../plugin/dev-reader";
+import { createLogger } from "../../../logging/logger";
+import type { DevFileReader } from "../../../plugin/dev-reader";
 import {
   hasDevQuery,
   isLocalDev,

packages/appkit/src/server/remote-tunnel/remote-tunnel-manager.ts → packages/appkit/src/plugins/server/remote-tunnel/remote-tunnel-manager.ts

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import type express from "express";
 import type { TunnelConnection } from "shared";
 import { WebSocketServer } from "ws";
-import { createLogger } from "../../logging/logger";
+import { createLogger } from "../../../logging/logger";
 import {
   generateTunnelIdFromEmail,
   getConfigScript,

packages/appkit/src/server/tests/server.integration.test.ts → packages/appkit/src/plugins/server/tests/server.integration.test.ts

@@ -6,9 +6,9 @@ import { afterAll, beforeAll, describe, expect, test } from "vitest";
 process.env.DATABRICKS_APP_PORT = "8000";
 process.env.FLASK_RUN_HOST = "0.0.0.0";
 
-import { ServiceContext } from "../../context/service-context";
-import { createApp } from "../../core";
-import { Plugin, toPlugin } from "../../plugin";
+import { ServiceContext } from "../../../context/service-context";
+import { createApp } from "../../../core";
+import { Plugin, toPlugin } from "../../../plugin";
 import { server as serverPlugin } from "../index";
 
 // Integration tests - actually start server and make HTTP requests

packages/appkit/src/server/tests/server.test.ts → packages/appkit/src/plugins/server/tests/server.test.ts

@@ -62,7 +62,7 @@ vi.mock("express", () => {
 });
 
 // Mock dependencies before imports
-vi.mock("../../telemetry", () => ({
+vi.mock("../../../telemetry", () => ({
   TelemetryManager: {
     getProvider: vi.fn().mockReturnValue({
       getTracer: vi.fn().mockReturnValue({ startActiveSpan: vi.fn() }),
@@ -80,7 +80,7 @@ vi.mock("../../telemetry", () => ({
   },
 }));
 
-vi.mock("../../cache", () => ({
+vi.mock("../../../cache", () => ({
   CacheManager: {
     getInstanceSync: vi.fn().mockReturnValue({
       get: vi.fn(),
@@ -90,7 +90,7 @@ vi.mock("../../cache", () => ({
   },
 }));
 
-vi.mock("../../utils", () => ({
+vi.mock("../../../utils", () => ({
   validateEnv: vi.fn(),
   deepMerge: vi.fn((a, b) => ({ ...a, ...b })),
 }));
@@ -110,7 +110,7 @@ const { mockLoggerDebug, mockLoggerInfo, mockLoggerWarn, mockLoggerError } =
     mockLoggerWarn: vi.fn(),
     mockLoggerError: vi.fn(),
   }));
-vi.mock("../../logging/logger", () => ({
+vi.mock("../../../logging/logger", () => ({
   createLogger: vi.fn(() => ({
     debug: mockLoggerDebug,
     info: mockLoggerInfo,

packages/appkit/src/server/types.ts → packages/appkit/src/plugins/server/types.ts

@@ -1,5 +1,5 @@
 import type { BasePluginConfig } from "shared";
-import type { Plugin } from "../plugin";
+import type { Plugin } from "../../plugin";
 
 export interface ServerConfig extends BasePluginConfig {
   port?: number;

packages/appkit/src/server/vite-dev-server.ts → packages/appkit/src/plugins/server/vite-dev-server.ts

@@ -3,9 +3,9 @@ import path from "node:path";
 import type express from "express";
 import type { ViteDevServer as ViteDevServerType } from "vite";
 import { mergeConfigDedup } from "@/utils";
-import { ServerError } from "../errors";
-import { createLogger } from "../logging/logger";
-import { appKitTypesPlugin } from "../type-generator/vite-plugin";
+import { ServerError } from "../../errors";
+import { createLogger } from "../../logging/logger";
+import { appKitTypesPlugin } from "../../type-generator/vite-plugin";
 import { BaseServer } from "./base-server";
 import type { PluginEndpoints } from "./utils";
 

packages/appkit/tsdown.config.ts

@@ -26,16 +26,16 @@ export default defineConfig([
     tsconfig: "./tsconfig.json",
     copy: [
       {
-        from: "src/server/remote-tunnel/index.html",
-        to: "dist/server/remote-tunnel/index.html",
+        from: "src/plugins/server/remote-tunnel/index.html",
+        to: "dist/plugins/server/remote-tunnel/index.html",
       },
       {
-        from: "src/server/remote-tunnel/wait.html",
-        to: "dist/server/remote-tunnel/wait.html",
+        from: "src/plugins/server/remote-tunnel/wait.html",
+        to: "dist/plugins/server/remote-tunnel/wait.html",
       },
       {
-        from: "src/server/remote-tunnel/denied.html",
-        to: "dist/server/remote-tunnel/denied.html",
+        from: "src/plugins/server/remote-tunnel/denied.html",
+        to: "dist/plugins/server/remote-tunnel/denied.html",
       },
     ],
   },