forgeos 0.1.0-alpha.2 → 0.1.0-alpha.3

package/src/forge/compiler/agent-contract/build.ts

@@ -46,6 +46,7 @@ import type {
   AgentHttpEndpointInfo,
   AgentIntegrationInfo,
   AgentRuntimeRule,
+  AgentToolRegistry,
   AgentPlaybook,
 } from "./types.ts";
 
@@ -78,9 +79,11 @@ export interface AgentContractInput {
 export interface AgentContractArtifacts {
   contract: AgentContract;
   capabilityMap: AgentCapabilityMap;
+  toolRegistry: AgentToolRegistry;
   agentsMd: string;
   appMapMd: string;
   capabilityMapMd: string;
+  agentToolsMd: string;
   runtimeRulesMd: string;
   operationPlaybooksMd: string;
   agentQuickstartMd: string;
@@ -245,26 +248,26 @@ function runtimeRules(): AgentRuntimeRule[] {
     {
       context: "command",
       allowed: ["ctx.db writes", "ctx.emit", "ctx.telemetry buffered events"],
-      forbidden: ["network packages", "ctx.secrets", "ctx.ai", "process.env", "filesystem access"],
+      forbidden: ["network packages", "ctx.secrets", "ctx.ai", "ctx.ai.runAgent", "ctx.agent.run", "process.env", "filesystem access"],
     },
     {
       context: "query",
       allowed: ["ctx.db reads", "ctx.telemetry buffered events"],
-      forbidden: ["insert/update/delete", "ctx.emit", "ctx.secrets", "ctx.ai", "network integrations"],
+      forbidden: ["insert/update/delete", "ctx.emit", "ctx.secrets", "ctx.ai", "ctx.ai.runAgent", "ctx.agent.run", "network integrations"],
     },
     {
       context: "liveQuery",
       allowed: ["ctx.db reads", "tenant-scoped subscriptions"],
-      forbidden: ["insert/update/delete", "ctx.emit", "ctx.secrets", "ctx.ai", "network integrations"],
+      forbidden: ["insert/update/delete", "ctx.emit", "ctx.secrets", "ctx.ai", "ctx.ai.runAgent", "ctx.agent.run", "network integrations"],
     },
     {
       context: "action",
-      allowed: ["ctx.secrets", "integrations", "ctx.ai", "ctx.db reads/writes", "network packages"],
+      allowed: ["ctx.secrets", "integrations", "ctx.ai", "ctx.ai.runAgent", "ctx.agent.run", "AI SDK tools", "ctx.db reads/writes", "network packages"],
       forbidden: ["uncommitted transactional side effects"],
     },
     {
       context: "workflow",
-      allowed: ["durable steps", "ctx.secrets", "integrations", "ctx.ai", "retries"],
+      allowed: ["durable steps", "ctx.secrets", "integrations", "ctx.ai", "ctx.ai.runAgent", "ctx.agent.run", "AI SDK ToolLoopAgent", "retries"],
       forbidden: ["non-idempotent step behavior without guards"],
     },
   ];
@@ -320,6 +323,28 @@ function playbooks(): AgentPlaybook[] {
         "Reconnect with Last-Event-ID or ?lastRevision=<revision> to verify resume behavior.",
       ],
     },
+    {
+      title: "Add an AI tool",
+      steps: [
+        "Add a server-only file under src/ai or src/tools.",
+        "Export aiTool({ description, inputSchema, outputSchema, risk, needsApproval, handler }).",
+        "Use zod schemas for inputSchema and outputSchema.",
+        "Access secrets through the tool context, not process.env.",
+        "Mark destructive or external side effects with risk and needsApproval.",
+        "Run forge generate and inspect src/forge/_generated/aiRegistry.json.",
+      ],
+    },
+    {
+      title: "Add an agent",
+      steps: [
+        "Export agent({ provider, model, instructions, tools, stopWhen }) from server-only source.",
+        "Prefer AI SDK ToolLoopAgent semantics through ctx.agent.run or ctx.ai.runAgent instead of custom loops.",
+        "Use stopWhen with stepCount or terminal tool calls to prevent unbounded loops.",
+        "Run agents only in actions, workflows, endpoints, or server code.",
+        "Run forge inspect all --json and confirm agentContract.ai.agents lists the agent.",
+        "Use forge ai trace <traceId> --json to inspect agent runs and tool calls.",
+      ],
+    },
     {
       title: "Add a table",
       steps: [
@@ -355,7 +380,8 @@ function playbooks(): AgentPlaybook[] {
       title: "Safely refactor a feature",
       steps: [
         "Run forge refactor rename field <table.field> <table.field> --dry-run --json.",
-        "Rename codemods are AST-aware for extract-action, rename field, and rename table.",
+        "Run forge refactor rename command <oldName> <newName> --dry-run --json when renaming runtime entrypoints.",
+        "Rename codemods are AST-aware for extract-action, rename command, rename field, and rename table.",
         "Field renames are scoped to the target table, so tickets.priority only rewrites references linked to tickets.",
         "Review filesToModify, migrationPlan, diagnostics, and risk.",
         "Use --allow-high-risk only for intentional high-risk refactors.",
@@ -428,6 +454,7 @@ function playbooks(): AgentPlaybook[] {
       title: "Add or update frontend",
       steps: [
         "Run forge make ui --framework vite --dry-run --json when the app does not have a web root.",
+        "Run forge make ai-chat support --dry-run --json to add a chat surface backed by /ai/agents/chat streaming and /ai/agents/run JSON automation.",
         "Use web/lib/forge.ts as the generated client bridge.",
         "Mount ForgeProvider once in the web app provider/layout layer; use devAuth for local development.",
         "Use useQuery, useCommand, and useLiveQuery instead of raw /commands or /queries fetches.",
@@ -656,6 +683,72 @@ function buildCapabilityMap(contract: AgentContract): AgentCapabilityMap {
   };
 }
 
+function autoToolName(kind: "command" | "query" | "liveQuery", name: string): string {
+  return `forge_${kind}_${name}`.replace(/[^A-Za-z0-9_$]/g, "_");
+}
+
+function buildAgentToolRegistry(contract: AgentContract): AgentToolRegistry {
+  const autoTools: AgentToolRegistry["autoTools"] = [
+    ...contract.commands.map((command) => ({
+      name: autoToolName("command", command.name),
+      sourceKind: "command" as const,
+      sourceName: command.name,
+      ...(command.policy ? { policy: command.policy } : {}),
+      file: command.file,
+      http: command.http,
+      frontend: command.frontend,
+      tablesRead: command.tablesRead,
+      tablesWritten: command.tablesWritten,
+      emits: command.emits,
+      dependencies: [],
+      readOnly: false,
+      requiresAuth: command.policy !== undefined && command.policy !== "public",
+      execution: "forge-runtime-endpoint" as const,
+    })),
+    ...contract.queries.map((query) => ({
+      name: autoToolName("query", query.name),
+      sourceKind: "query" as const,
+      sourceName: query.name,
+      ...(query.policy ? { policy: query.policy } : {}),
+      file: query.file,
+      http: query.http,
+      frontend: query.frontend,
+      tablesRead: query.tablesRead,
+      tablesWritten: [],
+      emits: [],
+      dependencies: [],
+      readOnly: true,
+      requiresAuth: query.policy !== undefined && query.policy !== "public",
+      execution: "forge-runtime-endpoint" as const,
+    })),
+    ...contract.liveQueries.map((liveQuery) => ({
+      name: autoToolName("liveQuery", liveQuery.name),
+      sourceKind: "liveQuery" as const,
+      sourceName: liveQuery.name,
+      ...(liveQuery.policy ? { policy: liveQuery.policy } : {}),
+      file: liveQuery.file,
+      http: liveQuery.http,
+      frontend: liveQuery.frontend,
+      tablesRead: liveQuery.tablesRead,
+      tablesWritten: [],
+      emits: [],
+      dependencies: liveQuery.dependencies,
+      readOnly: true,
+      requiresAuth: liveQuery.policy !== undefined && liveQuery.policy !== "public",
+      execution: "forge-runtime-endpoint" as const,
+    })),
+  ].sort((a, b) => a.name.localeCompare(b.name));
+
+  return {
+    schemaVersion: "0.1.0",
+    generatorVersion: GENERATOR_VERSION,
+    project: contract.project,
+    explicitTools: contract.ai.tools,
+    autoTools,
+    agents: contract.ai.agents,
+  };
+}
+
 function jsAccess(group: string, name: string): string {
   return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name)
     ? `api.${group}.${name}`
@@ -951,6 +1044,23 @@ export function buildAgentContractArtifacts(
           ...(generation.purpose ? { purpose: generation.purpose } : {}),
         }))
         .sort((a, b) => `${a.file}:${a.method}:${a.model}`.localeCompare(`${b.file}:${b.method}:${b.model}`)),
+      tools: input.aiRegistry.tools.map((tool) => ({
+        name: tool.name,
+        file: tool.file,
+        ...(tool.description ? { description: tool.description } : {}),
+        risk: tool.risk,
+        strict: tool.strict,
+        needsApproval: tool.needsApproval,
+      })),
+      agents: input.aiRegistry.agents.map((agent) => ({
+        name: agent.name,
+        file: agent.file,
+        provider: agent.provider,
+        model: agent.model,
+        ...(agent.instructions ? { instructions: agent.instructions } : {}),
+        tools: agent.tools,
+        stopWhen: agent.stopWhen,
+      })),
     },
     client: {
       queries: input.clientManifest.queries,
@@ -1038,14 +1148,17 @@ export function buildAgentContractArtifacts(
     : null;
   const userNotes = extractUserNotes(existingAgents);
   const agentsMd = renderAgentsMd(contract, userNotes);
+  const toolRegistry = buildAgentToolRegistry(contract);
   const capabilityMap = buildCapabilityMap(contract);
   const capabilityMapMd = renderCapabilityMapMd(capabilityMap);
+  const agentToolsMd = renderAgentToolsMd(toolRegistry);
   const appMapMd = renderAppMapMd(contract);
   const runtimeRulesMd = renderRuntimeRulesMd(contract.rules);
   const operationPlaybooksMd = renderOperationPlaybooksMd(contract.playbooks);
   const agentQuickstartMd = renderAgentQuickstartMd();
   const diagnostics = scanAgentContractForLeaks(contract, [
     agentsMd,
+    agentToolsMd,
     capabilityMapMd,
     appMapMd,
     runtimeRulesMd,
@@ -1056,9 +1169,11 @@ export function buildAgentContractArtifacts(
   return {
     contract,
     capabilityMap,
+    toolRegistry,
     agentsMd,
     appMapMd,
     capabilityMapMd,
+    agentToolsMd,
     runtimeRulesMd,
     operationPlaybooksMd,
     agentQuickstartMd,
@@ -1099,6 +1214,15 @@ export function serializeCapabilityMapTs(capabilityMap: AgentCapabilityMap): str
   return `export const capabilityMap = ${JSON.stringify(parsed, null, 2)} as const;\n`;
 }
 
+export function serializeAgentToolRegistryJson(registry: AgentToolRegistry): string {
+  return serializeCanonical(registry);
+}
+
+export function serializeAgentToolRegistryTs(registry: AgentToolRegistry): string {
+  const parsed = JSON.parse(serializeAgentToolRegistryJson(registry)) as unknown;
+  return `export const agentTools = ${JSON.stringify(parsed, null, 2)} as const;\n`;
+}
+
 function renderAgentsMd(contract: AgentContract, userNotes: string): string {
   const tenantTables = contract.data.tables
     .filter((table) => table.tenantScoped)
@@ -1107,6 +1231,12 @@ function renderAgentsMd(contract: AgentContract, userNotes: string): string {
     `${policy.name}: ${policy.roles.length > 0 ? policy.roles.join(", ") : policy.kind}`,
   );
   const secrets = contract.secrets.map((secret) => `${secret.name}${secret.required ? " (required)" : " (optional)"}`);
+  const aiTools = contract.ai.tools.map((tool) =>
+    `${tool.name}: ${tool.description ?? "no description"} (${tool.risk}${tool.needsApproval ? ", approval" : ""})`,
+  );
+  const aiAgents = contract.ai.agents.map((agent) =>
+    `${agent.name}: ${agent.provider}/${agent.model} with ${agent.tools.length > 0 ? agent.tools.join(", ") : "no tools"}`,
+  );
 
   return normalizeNewlines(`# AGENTS.md
 
@@ -1178,6 +1308,7 @@ forge inspect app --json
 forge inspect all --json
 forge inspect frontend --json
 forge inspect capabilities --json
+forge inspect agent-tools --json
 forge deps inspect <package> --json
 forge deps api <package> <symbol> --json
 forge deps trace <package> --json
@@ -1191,6 +1322,9 @@ forge doctor
 forge doctor windows --json
 forge setup windows --json
 forge agent print-context --json
+forge ai tools --json
+forge ai agents --json
+forge ai trace <traceId> --json
 forge verify --smoke
 forge verify --standard
 forge verify --strict
@@ -1210,6 +1344,21 @@ ${renderList(policies)}
 
 ${renderList(secrets)}
 
+## AI Tools And Agents
+
+- AI SDK engine: Vercel AI SDK v6.
+- Forge layer: generated registry, runtime rules, telemetry, secrets, tenant/auth context, and agent contract.
+- Use \`ctx.agent.run\` or \`ctx.ai.runAgent\` only in actions, workflows, endpoints, and server code.
+- Do not create custom tool loops; use Forge tools and AI SDK \`ToolLoopAgent\` through the Forge runtime.
+
+Tools:
+
+${renderList(aiTools)}
+
+Agents:
+
+${renderList(aiAgents)}
+
 ## Auth
 
 - Modes: ${contract.auth.modes.join(", ")}
@@ -1268,6 +1417,7 @@ Use:
 forge make resource <name> --fields title:text,status:enum(open,closed) --dry-run --json
 forge make resource <name> --fields title:text,status:enum(open,closed) --with-ui --yes
 forge make ui --framework vite --dry-run --json
+forge make ai-chat support --dry-run --json
 \`\`\`
 
 Review the plan before applying when the resource touches schema or policies.
@@ -1304,11 +1454,13 @@ Use:
 \`\`\`bash
 forge refactor rename field tickets.priority tickets.urgency --dry-run --json
 forge refactor rename field tickets.priority tickets.urgency --yes
+forge refactor rename command createTicket openTicket --dry-run --json
+forge refactor rename command createTicket openTicket --yes
 \`\`\`
 
-These codemods are AST-aware for \`extract-action\`, \`rename field\`, and \`rename table\`. Field renames are scoped to the target table, so \`tickets.priority\` only rewrites references linked to \`tickets\`.
+These codemods are AST-aware for \`extract-action\`, \`rename command\`, \`rename field\`, and \`rename table\`. Command renames update runtime registries, generated client references, frontend hooks, tests, and string references where safe. Field renames are scoped to the target table, so \`tickets.priority\` only rewrites references linked to \`tickets\`.
 
-Never edit \`src/forge/_generated/**\` directly. Review migration hints before applying field or table renames.
+Never edit \`src/forge/_generated/**\` directly. Review migration hints before applying command, field, or table renames.
 
 ### Plan impact-based tests
 
@@ -1334,6 +1486,19 @@ forge repair plan --from-last-test-run --write
 
 Apply only high-confidence deterministic repairs automatically. Review medium or low confidence repairs before changing code.
 
+### Add AI tools or agents
+
+Use:
+
+\`\`\`bash
+forge generate
+forge inspect all --json
+forge ai check --json
+forge ai trace <traceId> --json
+\`\`\`
+
+Define tools with \`aiTool({ inputSchema, outputSchema, risk, needsApproval, handler })\` and agents with \`agent({ provider, model, instructions, tools, stopWhen })\`. Execute agents with \`ctx.agent.run\` or \`ctx.ai.runAgent\` only from actions, workflows, endpoints, or server code. In dev, POST \`/ai/agents/run\` returns JSON for automation and POST \`/ai/agents/chat\` returns an AI SDK UIMessage stream for React \`useChat\`; both accept \`agent: "<exportedAgentName>"\` and use generated auto-tools from \`agentTools.json\`.
+
 ### Export agent adapters
 
 Use:
@@ -1471,6 +1636,48 @@ function renderAppMapMd(contract: AgentContract): string {
     lines.push(`### ${workflow.name}`, `Trigger: ${workflow.trigger ?? "manual"}`, "Steps:", ...renderList(workflow.steps).split("\n"), "");
   }
 
+  lines.push("## AI", "");
+  lines.push("### Providers", "", ...renderList(contract.ai.providers).split("\n"), "");
+  lines.push("### Generations", "");
+  for (const generation of contract.ai.generations) {
+    lines.push(
+      `- ${generation.method}: ${generation.provider}/${generation.model} in ${generation.file}${generation.purpose ? ` (${generation.purpose})` : ""}`,
+    );
+  }
+  if (contract.ai.generations.length === 0) {
+    lines.push("- none");
+  }
+  lines.push("", "### Tools", "");
+  for (const tool of contract.ai.tools) {
+    lines.push(
+      `#### ${tool.name}`,
+      `File: ${tool.file}`,
+      `Risk: ${tool.risk}`,
+      `Strict: ${tool.strict ? "yes" : "no"}`,
+      `Needs approval: ${String(tool.needsApproval)}`,
+      `Description: ${tool.description ?? "none"}`,
+      "",
+    );
+  }
+  if (contract.ai.tools.length === 0) {
+    lines.push("- none", "");
+  }
+  lines.push("### Agents", "");
+  for (const agent of contract.ai.agents) {
+    lines.push(
+      `#### ${agent.name}`,
+      `File: ${agent.file}`,
+      `Model: ${agent.provider}/${agent.model}`,
+      "Tools:",
+      ...renderList(agent.tools).split("\n"),
+      `Stop when: ${JSON.stringify(agent.stopWhen)}`,
+      "",
+    );
+  }
+  if (contract.ai.agents.length === 0) {
+    lines.push("- none", "");
+  }
+
   lines.push("## Frontend", "");
   lines.push(`Present: ${contract.frontend.present ? "yes" : "no"}`);
   lines.push(`Framework: ${contract.frontend.framework}`);
@@ -1631,6 +1838,70 @@ function renderCapabilityMapMd(capabilityMap: AgentCapabilityMap): string {
   return normalizeNewlines(lines.join("\n"));
 }
 
+function renderAgentToolsMd(registry: AgentToolRegistry): string {
+  const lines = [
+    "# Agent Tools",
+    "",
+    `Project: ${registry.project.name}`,
+    "",
+    "## Explicit AI Tools",
+    "",
+  ];
+
+  for (const tool of registry.explicitTools) {
+    lines.push(
+      `### ${tool.name}`,
+      `File: ${tool.file}`,
+      `Risk: ${tool.risk}`,
+      `Strict: ${tool.strict ? "yes" : "no"}`,
+      `Needs approval: ${String(tool.needsApproval)}`,
+      `Description: ${tool.description ?? "none"}`,
+      "",
+    );
+  }
+  if (registry.explicitTools.length === 0) {
+    lines.push("- none", "");
+  }
+
+  lines.push("## Auto Tools From Forge Runtime", "");
+  for (const tool of registry.autoTools) {
+    lines.push(
+      `### ${tool.name}`,
+      `Source: ${tool.sourceKind} ${tool.sourceName}`,
+      `File: ${tool.file}`,
+      `HTTP: ${tool.http.method} ${tool.http.path}`,
+      `Policy: ${tool.policy ?? "none"}`,
+      `Requires auth: ${tool.requiresAuth ? "yes" : "no"}`,
+      `Read-only: ${tool.readOnly ? "yes" : "no"}`,
+      `Frontend hook: \`${tool.frontend.hook}\``,
+      `Reads: ${tool.tablesRead.length > 0 ? tool.tablesRead.join(", ") : "none"}`,
+      `Writes: ${tool.tablesWritten.length > 0 ? tool.tablesWritten.join(", ") : "none"}`,
+      `Emits: ${tool.emits.length > 0 ? tool.emits.join(", ") : "none"}`,
+      "",
+    );
+  }
+  if (registry.autoTools.length === 0) {
+    lines.push("- none", "");
+  }
+
+  lines.push("## Agents", "");
+  for (const agent of registry.agents) {
+    lines.push(
+      `### ${agent.name}`,
+      `File: ${agent.file}`,
+      `Model: ${agent.provider}/${agent.model}`,
+      `Tools: ${agent.tools.length > 0 ? agent.tools.join(", ") : "none"}`,
+      `Stop when: ${JSON.stringify(agent.stopWhen)}`,
+      "",
+    );
+  }
+  if (registry.agents.length === 0) {
+    lines.push("- none", "");
+  }
+
+  return normalizeNewlines(lines.join("\n"));
+}
+
 function renderOperationPlaybooksMd(playbookEntries: AgentPlaybook[]): string {
   const lines = ["# Operation Playbooks", ""];
   for (const playbook of playbookEntries) {
@@ -1657,7 +1928,9 @@ forge dev
 forge inspect all --json
 forge inspect frontend --json
 forge inspect capabilities --json
+forge inspect agent-tools --json
 forge check --json
+forge ai trace <traceId> --json
 \`\`\`
 
 Never edit:

package/src/forge/compiler/agent-contract/types.ts

@@ -145,6 +145,23 @@ export interface AgentAiInfo {
     file: string;
     purpose?: string;
   }>;
+  tools: Array<{
+    name: string;
+    file: string;
+    description?: string;
+    risk: string;
+    strict: boolean;
+    needsApproval: boolean | "dynamic";
+  }>;
+  agents: Array<{
+    name: string;
+    file: string;
+    provider: string;
+    model: string;
+    instructions?: string;
+    tools: string[];
+    stopWhen: unknown;
+  }>;
 }
 
 export interface AgentClientInfo {
@@ -306,6 +323,30 @@ export interface AgentCapabilityMap {
   diagnostics: Diagnostic[];
 }
 
+export interface AgentToolRegistry {
+  schemaVersion: "0.1.0";
+  generatorVersion: string;
+  project: AgentProjectInfo;
+  explicitTools: AgentAiInfo["tools"];
+  autoTools: Array<{
+    name: string;
+    sourceKind: "command" | "query" | "liveQuery";
+    sourceName: string;
+    policy?: string;
+    file: string;
+    http: AgentHttpEndpointInfo;
+    frontend: AgentFrontendUsageInfo;
+    tablesRead: string[];
+    tablesWritten: string[];
+    emits: string[];
+    dependencies: Array<{ table: string; scope: "tenant" | "global" }>;
+    readOnly: boolean;
+    requiresAuth: boolean;
+    execution: "forge-runtime-endpoint";
+  }>;
+  agents: AgentAiInfo["agents"];
+}
+
 export interface AgentPlaybook {
   title: string;
   steps: string[];

package/src/forge/compiler/ai-registry/build.ts

@@ -4,9 +4,11 @@ import { canonicalJson } from "../primitives/serialize.ts";
 import type { AppGraph } from "../types/app-graph.ts";
 import type {
   AiGenerationCall,
+  AiAgentDefinition,
   AiModelDefinition,
   AiProviderDefinition,
   AiRegistry,
+  AiToolDefinition,
   ForgeAiProvider,
 } from "../types/ai-registry.ts";
 import type { ClassifiedPackage } from "../classifier/runtime-matrix.ts";
@@ -15,9 +17,17 @@ import {
   AI_REGISTRY_ANALYZER_VERSION,
   AI_REGISTRY_SCHEMA_VERSION,
 } from "./constants.ts";
-import { parseAiCallsFromSlice } from "./parse.ts";
+import {
+  parseAiAgentMeta,
+  parseAiCallsFromSlice,
+  parseAiToolMeta,
+} from "./parse.ts";
 
 const KNOWN_MODELS: AiModelDefinition[] = [
+  {
+    provider: "openai",
+    model: "gpt-5.4",
+  },
   {
     provider: "openai",
     model: "gpt-4o",
@@ -30,6 +40,10 @@ const KNOWN_MODELS: AiModelDefinition[] = [
     inputCostPer1kTokensUsd: 0.00015,
     outputCostPer1kTokensUsd: 0.0006,
   },
+  {
+    provider: "anthropic",
+    model: "claude-sonnet-4.5",
+  },
   {
     provider: "anthropic",
     model: "claude-3-5-sonnet-20241022",
@@ -42,6 +56,14 @@ const KNOWN_MODELS: AiModelDefinition[] = [
     inputCostPer1kTokensUsd: 0.0008,
     outputCostPer1kTokensUsd: 0.004,
   },
+  {
+    provider: "gateway",
+    model: "openai/gpt-5.4",
+  },
+  {
+    provider: "gateway",
+    model: "anthropic/claude-sonnet-4.5",
+  },
   {
     provider: "gateway",
     model: "openai/gpt-4o",
@@ -123,12 +145,39 @@ export function buildAiRegistry(
   classified: ClassifiedPackage[],
 ): AiRegistry {
   const generations: AiGenerationCall[] = [];
+  const tools: AiToolDefinition[] = [];
+  const agents: AiAgentDefinition[] = [];
 
   for (const symbol of appGraph.symbols) {
     const sourceSlice =
       typeof symbol.meta.sourceSlice === "string" ? symbol.meta.sourceSlice : "";
     if (sourceSlice.length === 0) continue;
 
+    if (symbol.kind === "aiTool") {
+      const meta = parseAiToolMeta(sourceSlice);
+      tools.push({
+        name: symbol.name,
+        file: symbol.file,
+        ...(meta.description ? { description: meta.description } : {}),
+        risk: meta.risk,
+        strict: meta.strict,
+        needsApproval: meta.needsApproval,
+      });
+    }
+
+    if (symbol.kind === "agent") {
+      const meta = parseAiAgentMeta(sourceSlice);
+      agents.push({
+        name: symbol.name,
+        file: symbol.file,
+        provider: meta.provider ?? "gateway",
+        model: meta.model ?? "unknown",
+        ...(meta.instructions ? { instructions: meta.instructions } : {}),
+        tools: meta.tools,
+        stopWhen: meta.stopWhen,
+      });
+    }
+
     for (const call of parseAiCallsFromSlice(sourceSlice)) {
       generations.push({
         provider: call.provider ?? "openai",
@@ -145,6 +194,16 @@ export function buildAiRegistry(
     if (fileCmp !== 0) return fileCmp;
     return a.method.localeCompare(b.method);
   });
+  tools.sort((a, b) => {
+    const nameCmp = a.name.localeCompare(b.name);
+    if (nameCmp !== 0) return nameCmp;
+    return a.file.localeCompare(b.file);
+  });
+  agents.sort((a, b) => {
+    const nameCmp = a.name.localeCompare(b.name);
+    if (nameCmp !== 0) return nameCmp;
+    return a.file.localeCompare(b.file);
+  });
 
   return {
     schemaVersion: AI_REGISTRY_SCHEMA_VERSION,
@@ -158,6 +217,8 @@ export function buildAiRegistry(
     ),
     providers: buildProviders(classified),
     generations,
+    tools,
+    agents,
     diagnostics: [],
   };
 }

package/src/forge/compiler/ai-registry/constants.ts

@@ -1,2 +1,2 @@
 export const AI_REGISTRY_SCHEMA_VERSION = "1";
-export const AI_REGISTRY_ANALYZER_VERSION = "1.0.0";
+export const AI_REGISTRY_ANALYZER_VERSION = "1.1.0";