refactor(appkit): move agent exports to @databricks/appkit/beta

fromPlugin, isFromPluginMarker, AgentTools, FromPluginMarker added in
this PR are exported from beta. Also fixes agents.ts import paths
from Option A rewrite (normalize-result, consume-adapter-stream,
tool-dispatch now in core/agent/).

Author: MarioCadenas

packages/appkit/src/beta.ts

@@ -1,7 +1,61 @@
-// Beta plugins -- APIs may change between minor releases.
-// These plugins are on a path to GA and will graduate.
-// Import from '@databricks/appkit' once a plugin graduates to GA.
+// Beta plugins and APIs -- may change between minor releases.
+// These are on a path to GA and will graduate to '@databricks/appkit'.
 //
-// The exports below are auto-generated from each plugin's manifest.json
+// Plugin factory exports are auto-generated from each plugin's manifest.json
 // "stability" field. See tools/generate-plugin-entries.ts.
+
+// Agent types from shared
+export type {
+  AgentAdapter,
+  AgentEvent,
+  AgentInput,
+  AgentRunContext,
+  AgentToolDefinition,
+  Message,
+  Thread,
+  ThreadStore,
+  ToolAnnotations,
+  ToolProvider,
+} from "shared";
+// Agent runtime
+export { createAgent } from "./core/agent/create-agent";
+export {
+  type RunAgentInput,
+  type RunAgentResult,
+  runAgent,
+} from "./core/agent/run-agent";
+// Tool authoring primitives
+export {
+  type FunctionTool,
+  type HostedTool,
+  isFunctionTool,
+  isHostedTool,
+  mcpServer,
+  type ToolConfig,
+  tool,
+} from "./core/agent/tools";
+
+// Agent types
+export type {
+  AgentDefinition,
+  AgentsPluginConfig,
+  AgentTool,
+  AgentTools,
+  AutoInheritToolsConfig,
+  BaseSystemPromptOption,
+  FromPluginMarker,
+  PromptContext,
+  RegisteredAgent,
+  ResolvedToolEntry,
+  ToolkitEntry,
+  ToolkitOptions,
+} from "./plugins/agents";
+export {
+  agentIdFromMarkdownPath,
+  fromPlugin,
+  isFromPluginMarker,
+  isToolkitEntry,
+  loadAgentFromFile,
+  loadAgentsFromDir,
+} from "./plugins/agents";
 export * from "./plugins/beta-exports.generated";

packages/appkit/src/index.ts

@@ -7,20 +7,11 @@
 
 // Types from shared
 export type {
-  AgentAdapter,
-  AgentEvent,
-  AgentInput,
-  AgentRunContext,
-  AgentToolDefinition,
   BasePluginConfig,
   CacheConfig,
   IAppRouter,
-  Message,
   PluginData,
   StreamExecutionSettings,
-  Thread,
-  ThreadStore,
-  ToolProvider,
 } from "shared";
 export { isSQLTypeMarker, sql } from "shared";
 export { CacheManager } from "./cache";
@@ -44,12 +35,6 @@ export {
 } from "./connectors/lakebase";
 export { getExecutionContext } from "./context";
 export { createApp } from "./core";
-export { createAgent } from "./core/agent/create-agent";
-export {
-  type RunAgentInput,
-  type RunAgentResult,
-  runAgent,
-} from "./core/agent/run-agent";
 // Errors
 export {
   AppKitError,
@@ -69,45 +54,6 @@ export {
   type ToPlugin,
   toPlugin,
 } from "./plugin";
-export * from "./plugins/ga-exports.generated";
-export type {
-  AgentDefinition,
-  AgentTools,
-  AgentsPluginConfig,
-  AgentTool,
-  AutoInheritToolsConfig,
-  BaseSystemPromptOption,
-  FromPluginMarker,
-  PromptContext,
-  RegisteredAgent,
-  ResolvedToolEntry,
-  ToolkitEntry,
-  ToolkitOptions,
-} from "./plugins/agents";
-export {
-  agentIdFromMarkdownPath,
-  fromPlugin,
-  isFromPluginMarker,
-  isToolkitEntry,
-  loadAgentFromFile,
-  loadAgentsFromDir,
-} from "./plugins/agents";
-export type {
-  IJobsConfig,
-  JobAPI,
-  JobConfig,
-  JobHandle,
-  JobsExport,
-} from "./plugins/jobs";
-export {
-  type FunctionTool,
-  type HostedTool,
-  isFunctionTool,
-  isHostedTool,
-  mcpServer,
-  type ToolConfig,
-  tool,
-} from "./core/agent/tools";
 // Files plugin types (for custom policy authoring)
 export type {
   FileAction,
@@ -120,6 +66,14 @@ export {
   READ_ACTIONS,
   WRITE_ACTIONS,
 } from "./plugins/files/policy";
+export * from "./plugins/ga-exports.generated";
+export type {
+  IJobsConfig,
+  JobAPI,
+  JobConfig,
+  JobHandle,
+  JobsExport,
+} from "./plugins/jobs";
 export type {
   EndpointConfig,
   ServingEndpointEntry,

packages/appkit/src/plugins/agents/agents.ts

@@ -16,29 +16,15 @@ import type {
 } from "shared";
 import { AppKitMcpClient, buildMcpHostPolicy } from "../../connectors/mcp";
 import { getWorkspaceClient } from "../../context";
+import { consumeAdapterStream } from "../../core/agent/consume-adapter-stream";
 import { isFromPluginMarker } from "../../core/agent/from-plugin";
 import { loadAgentsFromDir } from "../../core/agent/load-agents";
-import { normalizeToolResult } from "./normalize-result";
+import { normalizeToolResult } from "../../core/agent/normalize-result";
 import {
   buildBaseSystemPrompt,
   composeSystemPrompt,
 } from "../../core/agent/system-prompt";
-import { consumeAdapterStream } from "./consume-adapter-stream";
-import { agentStreamDefaults } from "./defaults";
-import { EventChannel } from "./event-channel";
-import { AgentEventTranslator } from "./event-translator";
-import { createLogger } from "../../logging/logger";
-import { Plugin, toPlugin } from "../../plugin";
-import type { PluginManifest } from "../../registry";
-import manifest from "./manifest.json";
-import {
-  approvalRequestSchema,
-  chatRequestSchema,
-  invocationsRequestSchema,
-} from "./schemas";
-import { InMemoryThreadStore } from "./thread-store";
-import { ToolApprovalGate } from "./tool-approval-gate";
-import { dispatchToolCall } from "./tool-dispatch";
+import { dispatchToolCall } from "../../core/agent/tool-dispatch";
 import { resolveToolkitFromProvider } from "../../core/agent/toolkit-resolver";
 import {
   functionToolToDefinition,
@@ -62,6 +48,13 @@ import { agentStreamDefaults } from "./defaults";
 import { EventChannel } from "./event-channel";
 import { AgentEventTranslator } from "./event-translator";
 import manifest from "./manifest.json";
+import {
+  approvalRequestSchema,
+  chatRequestSchema,
+  invocationsRequestSchema,
+} from "./schemas";
+import { InMemoryThreadStore } from "./thread-store";
+import { ToolApprovalGate } from "./tool-approval-gate";
 
 const logger = createLogger("agents");
 
@@ -388,7 +381,8 @@ export class AgentsPlugin extends Plugin implements ToolProvider {
     this.resolveFromPluginMarkers(agentName, toolsRecord, index);
 
     // 3. Explicit tools (toolkit entries, function tools, hosted tools)
-    const hostedToCollect: import("../../core/agent/tools/hosted-tools").HostedTool[] = [];
+    const hostedToCollect: import("../../core/agent/tools/hosted-tools").HostedTool[] =
+      [];
     for (const [key, tool] of Object.entries(toolsRecord)) {
       if (isToolkitEntry(tool)) {
         index.set(key, {