@comma-agents/core 2.0.0-rc.0 → 2.0.0-rc.1

package/dist/index.js

@@ -1,6 +1,399 @@
 // @bun
 var __require = import.meta.require;
 
+// src/hub/hub.ts
+import { join as join3 } from "path";
+
+// src/data-directory/data-directory.ts
+import { homedir } from "os";
+import { join } from "path";
+function resolveDataDir() {
+  return join(homedir(), ".comma");
+}
+// src/hub/hub.constants.ts
+var DEFAULT_HUB_REPOSITORY = {
+  owner: "CloAI",
+  repository: "CommaAgentsHub",
+  branch: "main"
+};
+var HUB_MAX_FILES = 2000;
+var HUB_MAX_UNCOMPRESSED_BYTES = 50 * 1024 * 1024;
+var HUB_INSTALLED_STATE_FILENAME = "installed-packages.json";
+
+// src/hub/hub.utils.ts
+function findAvailableHubPackage(snapshot, name) {
+  const project = snapshot.registry.packages.find((availablePackage) => availablePackage.name === name);
+  if (!project)
+    throw new Error(`Hub package not found: ${name}`);
+  return project;
+}
+
+// src/hub/installed-packages/installed-packages.ts
+import { mkdir, readFile, rename, rm, writeFile } from "fs/promises";
+import { dirname, resolve } from "path";
+function createInstalledPackageStore({
+  statePath
+}) {
+  async function readState() {
+    try {
+      const parsed = JSON.parse(await readFile(statePath, "utf8"));
+      return {
+        packages: Array.isArray(parsed.packages) ? parsed.packages : []
+      };
+    } catch (error) {
+      if (error.code === "ENOENT")
+        return { packages: [] };
+      throw error;
+    }
+  }
+  async function writeState(packages) {
+    await mkdir(dirname(statePath), { recursive: true });
+    const temporaryPath = `${statePath}.${crypto.randomUUID()}.tmp`;
+    await writeFile(temporaryPath, `${JSON.stringify({ packages: [...packages].sort((firstPackage, secondPackage) => firstPackage.name.localeCompare(secondPackage.name)) }, null, 2)}
+`);
+    await rename(temporaryPath, statePath);
+  }
+  async function list() {
+    return (await readState()).packages;
+  }
+  async function get(name) {
+    return (await list()).find((installedPackage) => installedPackage.name === name);
+  }
+  return {
+    list,
+    get,
+    async replace(installedPackage) {
+      const state = await readState();
+      await writeState([
+        ...state.packages.filter((statePackage) => statePackage.name !== installedPackage.name),
+        installedPackage
+      ]);
+    },
+    async remove(name) {
+      const installedPackage = await get(name);
+      if (!installedPackage)
+        return false;
+      const backupPath = `${installedPackage.path}.${crypto.randomUUID()}.removing`;
+      const state = await readState();
+      await rename(installedPackage.path, backupPath);
+      try {
+        await writeState(state.packages.filter((statePackage) => statePackage.name !== name));
+        await rm(backupPath, { recursive: true, force: true });
+        return true;
+      } catch (error) {
+        await rename(backupPath, installedPackage.path);
+        throw error;
+      }
+    },
+    async isExecutableCodeApproved(manifestPath) {
+      const installedPackage = (await list()).find((statePackage) => resolve(statePackage.path, "comma-project.json") === resolve(manifestPath));
+      return installedPackage?.executableCodeApproved ?? false;
+    }
+  };
+}
+// src/hub/package-installer/package-installer.ts
+import { mkdir as mkdir3, mkdtemp, readFile as readFile2, rename as rename2, rm as rm2, stat } from "fs/promises";
+import { tmpdir } from "os";
+import { dirname as dirname3, join as join2 } from "path";
+
+// src/hub/archive/archive.ts
+import { createWriteStream } from "fs";
+import { mkdir as mkdir2 } from "fs/promises";
+import { dirname as dirname2, relative, resolve as resolve2, sep } from "path";
+import { extract } from "tar-stream";
+async function extractHubPackageArchive(compressedArchive, packageName, destination) {
+  const unpackedArchive = Bun.gunzipSync(compressedArchive.buffer);
+  const archive = extract();
+  const packageMarker = `/packages/${packageName}/`;
+  let fileCount = 0;
+  let byteCount = 0;
+  let foundManifest = false;
+  await new Promise((resolveExtraction, rejectExtraction) => {
+    archive.on("entry", (header, stream, next) => {
+      const markerIndex = header.name.indexOf(packageMarker);
+      if (markerIndex === -1) {
+        stream.resume();
+        stream.once("end", next);
+        return;
+      }
+      const relativePath = header.name.slice(markerIndex + packageMarker.length);
+      if (relativePath.length === 0 || header.type === "directory") {
+        stream.resume();
+        stream.once("end", next);
+        return;
+      }
+      if (header.type !== "file") {
+        rejectExtraction(new Error(`Hub archive contains unsupported ${header.type} entry: ${relativePath}`));
+        stream.resume();
+        return;
+      }
+      const outputPath = resolve2(destination, relativePath);
+      const relativeOutputPath = relative(resolve2(destination), resolve2(outputPath));
+      if (relativeOutputPath === "" || relativeOutputPath === ".." || relativeOutputPath.startsWith(`..${sep}`)) {
+        rejectExtraction(new Error(`Hub archive path escapes package root: ${relativePath}`));
+        stream.resume();
+        return;
+      }
+      fileCount += 1;
+      byteCount += header.size ?? 0;
+      if (fileCount > HUB_MAX_FILES || byteCount > HUB_MAX_UNCOMPRESSED_BYTES) {
+        rejectExtraction(new Error("Hub package exceeds extraction limits"));
+        stream.resume();
+        return;
+      }
+      mkdir2(dirname2(outputPath), { recursive: true }).then(() => {
+        if (relativePath === "comma-project.json")
+          foundManifest = true;
+        const output = createWriteStream(outputPath, { flags: "wx" });
+        output.once("error", rejectExtraction);
+        output.once("finish", next);
+        stream.once("error", rejectExtraction);
+        stream.pipe(output);
+      }).catch(rejectExtraction);
+    });
+    archive.once("finish", () => {
+      if (!foundManifest) {
+        rejectExtraction(new Error(`Package ${packageName} was not found in the Hub archive`));
+        return;
+      }
+      resolveExtraction();
+    });
+    archive.once("error", rejectExtraction);
+    archive.end(unpackedArchive);
+  });
+}
+// src/hub/hub.schema.ts
+import { z } from "zod";
+var PACKAGE_NAME_PATTERN = /^@[a-z0-9][a-z0-9-]*\/[a-z0-9][a-z0-9-]*$/;
+var ARTIFACT_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+var SEMVER_PATTERN = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
+var HubPersonSchema = z.object({
+  name: z.string().min(1),
+  email: z.string().email().optional(),
+  url: z.string().url().optional()
+}).strict();
+var HubEnvironmentVariableSchema = z.object({
+  description: z.string().optional(),
+  required: z.boolean().optional(),
+  default: z.string().optional(),
+  example: z.string().optional()
+}).strict();
+var HubPermissionsSchema = z.object({
+  network: z.boolean().optional(),
+  filesystem: z.boolean().optional(),
+  shell: z.boolean().optional(),
+  executesCode: z.boolean().optional()
+}).strict();
+var ProjectArtifactEntrySchema = z.object({
+  path: z.string().min(1),
+  expose: z.boolean().optional(),
+  description: z.string().optional()
+}).strict();
+var ArtifactMapSchema = z.record(z.string().regex(ARTIFACT_NAME_PATTERN), ProjectArtifactEntrySchema);
+var CommaProjectManifestSchema = z.object({
+  name: z.string().regex(PACKAGE_NAME_PATTERN),
+  version: z.string().regex(SEMVER_PATTERN, "Expected semantic version x.y.z"),
+  description: z.string().optional(),
+  license: z.string().optional(),
+  author: HubPersonSchema.optional(),
+  contributors: z.array(HubPersonSchema).optional(),
+  keywords: z.array(z.string()).optional(),
+  strategies: ArtifactMapSchema.optional(),
+  agents: ArtifactMapSchema.optional(),
+  flows: ArtifactMapSchema.optional(),
+  tools: ArtifactMapSchema.optional(),
+  entry: z.string().min(1).optional(),
+  dependencies: z.record(z.string(), z.string()).optional(),
+  environment: z.record(z.string().regex(/^[A-Z_][A-Z0-9_]*$/), HubEnvironmentVariableSchema).optional(),
+  permissions: HubPermissionsSchema.optional(),
+  links: z.object({
+    homepage: z.string().url().optional(),
+    repository: z.string().url().optional(),
+    docs: z.string().url().optional(),
+    issues: z.string().url().optional()
+  }).strict().optional()
+}).strict();
+var HubRegistryArtifactSchema = z.object({
+  id: z.string().regex(ARTIFACT_NAME_PATTERN),
+  ref: z.string().min(1),
+  path: z.string().min(1),
+  description: z.string().optional()
+}).strict();
+var RegistryArtifactListSchema = z.array(HubRegistryArtifactSchema);
+var HubPackageSchema = z.object({
+  name: z.string().regex(PACKAGE_NAME_PATTERN),
+  version: z.string().regex(SEMVER_PATTERN),
+  description: z.string().optional(),
+  license: z.string().optional(),
+  path: z.string().min(1),
+  author: HubPersonSchema.optional(),
+  contributors: z.array(HubPersonSchema).optional(),
+  keywords: z.array(z.string()).optional(),
+  exports: z.object({
+    strategies: RegistryArtifactListSchema,
+    agents: RegistryArtifactListSchema,
+    flows: RegistryArtifactListSchema,
+    tools: RegistryArtifactListSchema
+  }).strict(),
+  environment: z.record(HubEnvironmentVariableSchema).optional(),
+  permissions: HubPermissionsSchema.optional(),
+  links: z.object({
+    homepage: z.string().url().optional(),
+    repository: z.string().url().optional(),
+    docs: z.string().url().optional(),
+    issues: z.string().url().optional()
+  }).strict().optional()
+}).strict();
+var HubRegistrySchema = z.object({
+  version: z.literal(1),
+  packages: z.array(HubPackageSchema)
+}).strict();
+
+// src/hub/package-installer/package-installer.ts
+function createHubPackageInstaller({
+  packagesRoot,
+  installedPackages,
+  registryClient
+}) {
+  return {
+    async install(project, snapshot, options, replace) {
+      if (project.permissions?.executesCode === true && options.allowCode !== true) {
+        throw new Error(`Package ${project.name} contains executable code; pass allowCode: true to install it`);
+      }
+      const existingPackage = await installedPackages.get(project.name);
+      if (existingPackage && !replace)
+        throw new Error(`Package ${project.name} is already installed`);
+      const stagingRoot = await mkdtemp(join2(tmpdir(), "comma-hub-"));
+      const stagedPackagePath = join2(stagingRoot, "package");
+      const destinationPath = join2(packagesRoot, ...project.name.split("/"));
+      const backupPath = `${destinationPath}.${crypto.randomUUID()}.backup`;
+      let destinationReplaced = false;
+      try {
+        await mkdir3(stagedPackagePath, { recursive: true });
+        await extractHubPackageArchive(await registryClient.fetchArchive(snapshot.commit), project.name, stagedPackagePath);
+        const manifest = CommaProjectManifestSchema.safeParse(JSON.parse(await readFile2(join2(stagedPackagePath, "comma-project.json"), "utf8")));
+        if (!manifest.success || manifest.data.name !== project.name || manifest.data.version !== project.version) {
+          throw new Error(`Installed manifest does not match registry entry for ${project.name}`);
+        }
+        if (manifest.data.permissions?.executesCode !== project.permissions?.executesCode) {
+          throw new Error(`Installed manifest permissions do not match registry entry for ${project.name}`);
+        }
+        if (manifest.data.dependencies && Object.keys(manifest.data.dependencies).length > 0) {
+          throw new Error(`Package dependencies are not supported in v1: ${project.name}`);
+        }
+        await mkdir3(dirname3(destinationPath), { recursive: true });
+        if (existingPackage)
+          await rename2(destinationPath, backupPath);
+        await rename2(stagedPackagePath, destinationPath);
+        destinationReplaced = true;
+        const installedPackage = {
+          name: project.name,
+          version: project.version,
+          commit: snapshot.commit,
+          path: destinationPath,
+          executableCodeApproved: project.permissions?.executesCode === true
+        };
+        await installedPackages.replace(installedPackage);
+        await rm2(backupPath, { recursive: true, force: true });
+        return installedPackage;
+      } catch (error) {
+        try {
+          if (destinationReplaced) {
+            await rm2(destinationPath, { recursive: true, force: true });
+          }
+          if (existingPackage && (await stat(backupPath)).isDirectory()) {
+            await rename2(backupPath, destinationPath);
+          }
+        } catch {}
+        throw error;
+      } finally {
+        await rm2(stagingRoot, { recursive: true, force: true });
+        await rm2(backupPath, { recursive: true, force: true });
+      }
+    }
+  };
+}
+// src/hub/registry-client/registry-client.ts
+function createHubRegistryClient({
+  repository,
+  fetch: fetch2
+}) {
+  let registrySnapshot;
+  async function fetchRequired(url) {
+    const response = await fetch2(url, {
+      headers: { Accept: "application/vnd.github+json" }
+    });
+    if (!response.ok)
+      throw new Error(`Hub request failed (${response.status}): ${url}`);
+    return response;
+  }
+  async function refresh() {
+    const repositoryUrl = `https://api.github.com/repos/${repository.owner}/${repository.repository}`;
+    const commitResponse = await fetchRequired(`${repositoryUrl}/commits/${repository.branch}`);
+    const commitJson = await commitResponse.json();
+    if (typeof commitJson.sha !== "string")
+      throw new Error("Hub commit response did not contain a SHA");
+    const registryResponse = await fetchRequired(`https://raw.githubusercontent.com/${repository.owner}/${repository.repository}/${commitJson.sha}/registry.json`);
+    const parsedRegistry = HubRegistrySchema.safeParse(await registryResponse.json());
+    if (!parsedRegistry.success) {
+      throw new Error(`Hub registry validation failed: ${parsedRegistry.error.message}`);
+    }
+    registrySnapshot = {
+      commit: commitJson.sha,
+      registry: parsedRegistry.data
+    };
+    return registrySnapshot;
+  }
+  return {
+    refresh,
+    async getSnapshot() {
+      return registrySnapshot ?? refresh();
+    },
+    async fetchArchive(commit) {
+      const archiveResponse = await fetchRequired(`https://codeload.github.com/${repository.owner}/${repository.repository}/tar.gz/${commit}`);
+      return new Uint8Array(await archiveResponse.arrayBuffer());
+    }
+  };
+}
+// src/hub/hub.ts
+function createHubManager(options = {}) {
+  const dataDirectory = options.dataDir ?? resolveDataDir();
+  const repository = options.repository ?? DEFAULT_HUB_REPOSITORY;
+  const registryClient = createHubRegistryClient({
+    repository,
+    fetch: options.fetch ?? globalThis.fetch
+  });
+  const installedPackages = createInstalledPackageStore({
+    statePath: join3(dataDirectory, "hub", HUB_INSTALLED_STATE_FILENAME)
+  });
+  const packageInstaller = createHubPackageInstaller({
+    packagesRoot: join3(dataDirectory, "packages"),
+    installedPackages,
+    registryClient
+  });
+  return {
+    refreshRegistry: registryClient.refresh,
+    async listAvailable() {
+      return (await registryClient.getSnapshot()).registry.packages;
+    },
+    listInstalled: installedPackages.list,
+    async install(name, installOptions = {}) {
+      const snapshot = await registryClient.getSnapshot();
+      const project = findAvailableHubPackage(snapshot, name);
+      return packageInstaller.install(project, snapshot, installOptions, false);
+    },
+    async update(name, installOptions = {}) {
+      if (!await installedPackages.get(name))
+        throw new Error(`Package ${name} is not installed`);
+      const snapshot = await registryClient.refresh();
+      const project = findAvailableHubPackage(snapshot, name);
+      return packageInstaller.install(project, snapshot, installOptions, true);
+    },
+    remove: installedPackages.remove,
+    getInstalled: installedPackages.get,
+    isExecutableCodeApproved: installedPackages.isExecutableCodeApproved
+  };
+}
 // src/abortable/abortable.ts
 function createAbortablePromise(executor) {
   const controller = new AbortController;
@@ -494,7 +887,7 @@ import { tool as aiTool, generateText, Output, stepCountIs } from "ai";
 // src/defaults/defaults.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
 import { createRequire } from "module";
-import { join as join3 } from "path";
+import { join as join6 } from "path";
 // ../../node_modules/.bun/@comma-agents+utils@file+packages+utils/node_modules/@comma-agents/utils/src/string.ts
 function capitalize(text) {
   if (text.length === 0)
@@ -503,35 +896,35 @@ function capitalize(text) {
 }
 // src/credentials/backends/json-file.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { dirname } from "path";
-import { z as z2 } from "zod";
+import { dirname as dirname4 } from "path";
+import { z as z3 } from "zod";
 
 // src/credentials/credentials.schema.ts
-import { z } from "zod";
-var ApiCredentialSchema = z.object({
-  type: z.literal("api"),
-  key: z.string().min(1)
+import { z as z2 } from "zod";
+var ApiCredentialSchema = z2.object({
+  type: z2.literal("api"),
+  key: z2.string().min(1)
 });
-var OAuthCredentialSchema = z.object({
-  type: z.literal("oauth"),
-  accessToken: z.string().min(1),
-  refreshToken: z.string().optional(),
-  expiresAt: z.string().datetime().optional(),
-  accountId: z.string().optional(),
-  metadata: z.record(z.unknown()).optional()
+var OAuthCredentialSchema = z2.object({
+  type: z2.literal("oauth"),
+  accessToken: z2.string().min(1),
+  refreshToken: z2.string().optional(),
+  expiresAt: z2.string().datetime().optional(),
+  accountId: z2.string().optional(),
+  metadata: z2.record(z2.unknown()).optional()
 });
-var CustomCredentialSchema = z.object({
-  type: z.literal("custom"),
-  data: z.record(z.unknown())
+var CustomCredentialSchema = z2.object({
+  type: z2.literal("custom"),
+  data: z2.record(z2.unknown())
 });
-var CredentialSchema = z.discriminatedUnion("type", [
+var CredentialSchema = z2.discriminatedUnion("type", [
   ApiCredentialSchema,
   OAuthCredentialSchema,
   CustomCredentialSchema
 ]);
 
 // src/credentials/backends/json-file.ts
-var CredentialFileSchema = z2.record(z2.record(CredentialSchema));
+var CredentialFileSchema = z3.record(z3.record(CredentialSchema));
 function createJsonFileBackend(options) {
   const { filePath } = options;
   return {
@@ -562,7 +955,7 @@ function createJsonFileBackend(options) {
     },
     async writeAll(data) {
       CredentialFileSchema.parse(data);
-      const dir = dirname(filePath);
+      const dir = dirname4(filePath);
       if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true });
       }
@@ -573,6 +966,7 @@ function createJsonFileBackend(options) {
 }
 
 // src/credentials/credentials.constants.ts
+var CREDENTIALS_FILENAME = "credentials.json";
 var WELL_KNOWN_ENV_VARS = {
   openai: ["OPENAI_API_KEY"],
   anthropic: ["ANTHROPIC_API_KEY"],
@@ -612,7 +1006,7 @@ function createCredentialStore(options) {
   const { backend } = options;
   const envVarMap = buildEnvVarMap(options.envVarOverrides);
   const env = options.env ?? process.env;
-  async function resolve(providerId, scope) {
+  async function resolve3(providerId, scope) {
     const data = await backend.readAll();
     if (scope && scope !== "$global") {
       const scopedCred = data[scope]?.[providerId];
@@ -628,7 +1022,7 @@ function createCredentialStore(options) {
     return;
   }
   return {
-    resolve,
+    resolve: resolve3,
     async get(providerId, scope) {
       const data = await backend.readAll();
       return data[scope]?.[providerId];
@@ -672,35 +1066,21 @@ function createCredentialStore(options) {
       return Object.keys(data);
     },
     async getAuthStatus(providerId, scope) {
-      const credential = await resolve(providerId, scope);
+      const credential = await resolve3(providerId, scope);
       return credential ? "configured" : "none";
     }
   };
 }
 
 // src/credentials/credentials.utils.ts
-import { homedir } from "os";
-import { join } from "path";
-function resolveDataDir() {
-  const platform = process.platform;
-  if (platform === "win32") {
-    const base2 = process.env.LOCALAPPDATA ?? join(homedir(), "AppData", "Local");
-    return join(base2, "comma-agents");
-  }
-  if (platform === "darwin") {
-    return join(homedir(), "Library", "Application Support", "comma-agents");
-  }
-  const base = process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share");
-  return join(base, "comma-agents");
-}
-var CREDENTIALS_FILENAME = "credentials.json";
+import { join as join4 } from "path";
 function resolveCredentialsPath() {
-  return join(resolveDataDir(), CREDENTIALS_FILENAME);
+  return join4(resolveDataDir(), CREDENTIALS_FILENAME);
 }
 
 // src/model/providers/catalog/catalog.ts
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname2 } from "path";
+import { dirname as dirname5 } from "path";
 // src/model/providers/catalog/catalog.data.json
 var catalog_data_default = {
   "302ai": { id: "302ai", env: ["302AI_API_KEY"], npm: "@ai-sdk/openai-compatible", api: "https://api.302.ai/v1", name: "302.AI", doc: "https://doc.302.ai", models: { "qwen3-235b-a22b": { id: "qwen3-235b-a22b", name: "Qwen3-235B-A22B", family: "qwen", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-04-29", last_updated: "2025-04-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 2.86 }, limit: { context: 128000, output: 16384 } }, "grok-4.1": { id: "grok-4.1", name: "grok-4.1", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-11-18", last_updated: "2025-11-18", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 10 }, limit: { context: 200000, output: 64000 } }, "MiniMax-M2": { id: "MiniMax-M2", name: "MiniMax-M2", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2025-10-26", last_updated: "2025-10-26", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.33, output: 1.32 }, limit: { context: 1e6, output: 128000 } }, "grok-4-1-fast-reasoning": { id: "grok-4-1-fast-reasoning", name: "grok-4-1-fast-reasoning", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-11-20", last_updated: "2025-11-20", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 0.5 }, limit: { context: 2000000, output: 30000 } }, "gemini-2.5-flash-nothink": { id: "gemini-2.5-flash-nothink", name: "gemini-2.5-flash-nothink", family: "gemini-flash", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-01", release_date: "2025-06-24", last_updated: "2025-06-24", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 2.5 }, limit: { context: 1e6, output: 65536 } }, "grok-4.20-multi-agent-beta-0309": { id: "grok-4.20-multi-agent-beta-0309", name: "grok-4.20-multi-agent-beta-0309", attachment: true, reasoning: true, tool_call: true, temperature: true, release_date: "2026-03-16", last_updated: "2026-03-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 6 }, limit: { context: 2000000, output: 30000 } }, "kimi-k2-0905-preview": { id: "kimi-k2-0905-preview", name: "kimi-k2-0905-preview", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-09-05", last_updated: "2025-09-05", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.632, output: 2.53 }, limit: { context: 262144, output: 262144 } }, "claude-haiku-4-5": { id: "claude-haiku-4-5", name: "claude-haiku-4-5", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-02", release_date: "2025-10-16", last_updated: "2025-10-16", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 1, output: 5 }, limit: { context: 200000, output: 64000 } }, "claude-opus-4-5-20251101": { id: "claude-opus-4-5-20251101", name: "claude-opus-4-5-20251101", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-11-25", last_updated: "2025-11-25", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25 }, limit: { context: 200000, output: 64000 } }, "gemini-2.5-flash-lite-preview-09-2025": { id: "gemini-2.5-flash-lite-preview-09-2025", name: "gemini-2.5-flash-lite-preview-09-2025", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-01", release_date: "2025-09-26", last_updated: "2025-09-26", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.1, output: 0.4 }, limit: { context: 1e6, output: 65536 } }, "qwen3-235b-a22b-instruct-2507": { id: "qwen3-235b-a22b-instruct-2507", name: "qwen3-235b-a22b-instruct-2507", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-07-30", last_updated: "2025-07-30", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 1.143 }, limit: { context: 128000, output: 65536 } }, "glm-5v-turbo": { id: "glm-5v-turbo", name: "glm-5v-turbo", attachment: true, reasoning: true, tool_call: true, temperature: true, release_date: "2026-04-02", last_updated: "2026-04-02", modalities: { input: ["text", "image", "video", "audio", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 0.72, output: 3.2 }, limit: { context: 200000, output: 131072 } }, "mistral-large-2512": { id: "mistral-large-2512", name: "mistral-large-2512", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-12", release_date: "2025-12-16", last_updated: "2025-12-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.1, output: 3.3 }, limit: { context: 128000, output: 262144 } }, "glm-4.7": { id: "glm-4.7", name: "glm-4.7", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-12-22", last_updated: "2025-12-22", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.286, output: 1.142 }, limit: { context: 200000, output: 131072 } }, "claude-3-5-haiku-20241022": { id: "claude-3-5-haiku-20241022", name: "claude-3-5-haiku-20241022", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-07", release_date: "2024-10-22", last_updated: "2024-10-22", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 0.8, output: 4 }, limit: { context: 200000, output: 8192 } }, "doubao-seed-1-8-251215": { id: "doubao-seed-1-8-251215", name: "doubao-seed-1-8-251215", attachment: true, reasoning: false, tool_call: true, temperature: true, release_date: "2025-12-18", last_updated: "2025-12-18", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.114, output: 0.286 }, limit: { context: 224000, output: 64000 } }, "chatgpt-4o-latest": { id: "chatgpt-4o-latest", name: "chatgpt-4o-latest", family: "gpt", attachment: true, reasoning: false, tool_call: false, temperature: true, knowledge: "2023-09", release_date: "2024-08-08", last_updated: "2024-08-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 15 }, limit: { context: 128000, output: 16384 } }, "glm-5": { id: "glm-5", name: "glm-5", attachment: false, reasoning: true, tool_call: true, temperature: true, release_date: "2026-02-12", last_updated: "2026-02-12", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.6, output: 2.6 }, limit: { context: 200000, output: 131072 } }, "deepseek-chat": { id: "deepseek-chat", name: "Deepseek-Chat", family: "deepseek", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-07", release_date: "2024-11-29", last_updated: "2024-11-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 0.43 }, limit: { context: 128000, output: 8192 } }, "deepseek-v3.2-thinking": { id: "deepseek-v3.2-thinking", name: "DeepSeek-V3.2-Thinking", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2024-12", release_date: "2025-12-01", last_updated: "2025-12-01", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 0.43 }, limit: { context: 128000, output: 128000 } }, "claude-sonnet-4-6": { id: "claude-sonnet-4-6", name: "claude-sonnet-4-6", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-02-18", last_updated: "2026-03-13", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 1e6, output: 64000 } }, "gpt-5-thinking": { id: "gpt-5-thinking", name: "gpt-5-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-08-08", last_updated: "2025-08-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.25, output: 10 }, limit: { context: 400000, output: 128000 } }, "glm-4.7-flashx": { id: "glm-4.7-flashx", name: "glm-4.7-flashx", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2026-01-20", last_updated: "2026-01-20", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.0715, output: 0.429 }, limit: { context: 200000, output: 131072 } }, "gemini-3-flash-preview": { id: "gemini-3-flash-preview", name: "gemini-3-flash-preview", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-12-18", last_updated: "2025-12-18", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.5, output: 3 }, limit: { context: 1e6, output: 65536 } }, "qwen-plus": { id: "qwen-plus", name: "Qwen-Plus", family: "qwen", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2024-07-23", last_updated: "2024-07-23", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.12, output: 1.2 }, limit: { context: 1e6, output: 32768 } }, "grok-4.20-beta-0309-non-reasoning": { id: "grok-4.20-beta-0309-non-reasoning", name: "grok-4.20-beta-0309-non-reasoning", attachment: true, reasoning: false, tool_call: true, temperature: true, release_date: "2026-03-16", last_updated: "2026-03-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 6 }, limit: { context: 2000000, output: 30000 } }, "claude-opus-4-7": { id: "claude-opus-4-7", name: "claude-opus-4-7", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-05", release_date: "2026-04-17", last_updated: "2026-04-17", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25, cache_read: 0.5, cache_write: 6.25, context_over_200k: { input: 10, output: 37.5, cache_read: 1, cache_write: 12.5 } }, limit: { context: 200000, output: 128000 } }, "gpt-5-mini": { id: "gpt-5-mini", name: "gpt-5-mini", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-08-08", last_updated: "2025-08-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.25, output: 2 }, limit: { context: 400000, output: 128000 } }, "gemini-3-pro-preview": { id: "gemini-3-pro-preview", name: "gemini-3-pro-preview", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-11-19", last_updated: "2025-11-19", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 12 }, limit: { context: 1e6, output: 64000 } }, "MiniMax-M2.7": { id: "MiniMax-M2.7", name: "MiniMax-M2.7", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 1.2 }, limit: { context: 204800, output: 131072 } }, "qwen3-max-2025-09-23": { id: "qwen3-max-2025-09-23", name: "qwen3-max-2025-09-23", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-09-24", last_updated: "2025-09-24", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.86, output: 3.43 }, limit: { context: 258048, output: 65536 } }, "claude-sonnet-4-5-20250929": { id: "claude-sonnet-4-5-20250929", name: "claude-sonnet-4-5-20250929", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 200000, output: 64000 } }, "qwen-flash": { id: "qwen-flash", name: "Qwen-Flash", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2025-07-28", last_updated: "2025-07-28", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.022, output: 0.22 }, limit: { context: 1e6, output: 32768 } }, "gemini-2.5-pro": { id: "gemini-2.5-pro", name: "gemini-2.5-pro", family: "gemini-pro", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-01", release_date: "2025-06-17", last_updated: "2025-06-17", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.25, output: 10 }, limit: { context: 1e6, output: 65536 } }, "grok-4-1-fast-non-reasoning": { id: "grok-4-1-fast-non-reasoning", name: "grok-4-1-fast-non-reasoning", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-11-20", last_updated: "2025-11-20", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 0.5 }, limit: { context: 2000000, output: 30000 } }, "claude-3-5-haiku-latest": { id: "claude-3-5-haiku-latest", name: "claude-3-5-haiku-latest", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-07", release_date: "2024-10-22", last_updated: "2024-10-22", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 0.8, output: 4 }, limit: { context: 200000, output: 8192 } }, "claude-opus-4-5-20251101-thinking": { id: "claude-opus-4-5-20251101-thinking", name: "claude-opus-4-5-20251101-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-11-25", last_updated: "2025-11-25", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25 }, limit: { context: 200000, output: 64000 } }, "gpt-5.2": { id: "gpt-5.2", name: "gpt-5.2", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-12-12", last_updated: "2025-12-12", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.75, output: 14 }, limit: { context: 400000, output: 128000 } }, "gpt-5.4-mini": { id: "gpt-5.4-mini", name: "gpt-5.4-mini", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.75, output: 4.5 }, limit: { context: 400000, output: 128000 } }, "gemini-3-pro-image-preview": { id: "gemini-3-pro-image-preview", name: "gemini-3-pro-image-preview", attachment: true, reasoning: false, tool_call: false, temperature: true, knowledge: "2025-06", release_date: "2025-11-20", last_updated: "2025-11-20", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 120 }, limit: { context: 32768, output: 64000 } }, "glm-5.1": { id: "glm-5.1", name: "glm-5.1", attachment: false, reasoning: true, tool_call: true, temperature: true, release_date: "2026-04-10", last_updated: "2026-04-10", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.86, output: 3.5 }, limit: { context: 200000, output: 131072 } }, "qwen-max-latest": { id: "qwen-max-latest", name: "Qwen-Max-Latest", family: "qwen", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-11", release_date: "2024-04-03", last_updated: "2025-01-25", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.343, output: 1.372 }, limit: { context: 131072, output: 8192 } }, "gpt-5.4-nano": { id: "gpt-5.4-nano", name: "gpt-5.4-nano", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 1.25 }, limit: { context: 400000, output: 128000 } }, "gemini-2.5-flash-image": { id: "gemini-2.5-flash-image", name: "gemini-2.5-flash-image", attachment: true, reasoning: false, tool_call: false, temperature: true, knowledge: "2025-01", release_date: "2025-10-08", last_updated: "2025-10-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 30 }, limit: { context: 32768, output: 32768 } }, "glm-4.5": { id: "glm-4.5", name: "GLM-4.5", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-07-29", last_updated: "2025-07-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.286, output: 1.142 }, limit: { context: 128000, output: 98304 } }, "gpt-5.4-mini-2026-03-17": { id: "gpt-5.4-mini-2026-03-17", name: "gpt-5.4-mini-2026-03-17", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.75, output: 4.5 }, limit: { context: 400000, output: 128000 } }, "gemini-2.5-flash": { id: "gemini-2.5-flash", name: "gemini-2.5-flash", family: "gemini-flash", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-01", release_date: "2025-06-17", last_updated: "2025-06-17", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 2.5 }, limit: { context: 1e6, output: 65536 } }, "gpt-5.2-chat-latest": { id: "gpt-5.2-chat-latest", name: "gpt-5.2-chat-latest", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-12-12", last_updated: "2025-12-12", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.75, output: 14 }, limit: { context: 128000, output: 16384 } }, "doubao-seed-1-6-vision-250815": { id: "doubao-seed-1-6-vision-250815", name: "doubao-seed-1-6-vision-250815", attachment: true, reasoning: false, tool_call: true, temperature: true, release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.114, output: 1.143 }, limit: { context: 256000, output: 32000 } }, "gemini-3.1-flash-image-preview": { id: "gemini-3.1-flash-image-preview", name: "gemini-3.1-flash-image-preview", attachment: true, reasoning: false, tool_call: false, temperature: true, knowledge: "2025-01", release_date: "2026-02-27", last_updated: "2026-02-27", modalities: { input: ["text", "image", "pdf"], output: ["text", "image"] }, open_weights: false, cost: { input: 0.5, output: 60 }, limit: { context: 131072, output: 32768 } }, "MiniMax-M2.7-highspeed": { id: "MiniMax-M2.7-highspeed", name: "MiniMax-M2.7-highspeed", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.6, output: 4.8 }, limit: { context: 204800, output: 131072 } }, "glm-4.5-x": { id: "glm-4.5-x", name: "glm-4.5-x", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-07-29", last_updated: "2025-07-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 1.143, output: 2.29 }, limit: { context: 128000, output: 16384 } }, "MiniMax-M2.1": { id: "MiniMax-M2.1", name: "MiniMax-M2.1", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2025-12-19", last_updated: "2025-12-19", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 1.2 }, limit: { context: 1e6, output: 131072 } }, "gpt-5.1": { id: "gpt-5.1", name: "gpt-5.1", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-11-14", last_updated: "2025-11-14", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.25, output: 10 }, limit: { context: 400000, output: 128000 } }, "kimi-k2-thinking-turbo": { id: "kimi-k2-thinking-turbo", name: "kimi-k2-thinking-turbo", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-09-05", last_updated: "2025-09-05", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 1.265, output: 9.119 }, limit: { context: 262144, output: 262144 } }, "deepseek-reasoner": { id: "deepseek-reasoner", name: "Deepseek-Reasoner", family: "deepseek-thinking", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2024-07", release_date: "2025-01-20", last_updated: "2025-01-20", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 0.43 }, limit: { context: 128000, output: 128000 } }, "grok-4-fast-reasoning": { id: "grok-4-fast-reasoning", name: "grok-4-fast-reasoning", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-09-23", last_updated: "2025-09-23", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 0.5 }, limit: { context: 2000000, output: 30000 } }, "claude-opus-4-1-20250805-thinking": { id: "claude-opus-4-1-20250805-thinking", name: "claude-opus-4-1-20250805-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-05-27", last_updated: "2025-05-27", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 15, output: 75 }, limit: { context: 200000, output: 32000 } }, "glm-4.5-air": { id: "glm-4.5-air", name: "glm-4.5-air", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-07-29", last_updated: "2025-07-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.1143, output: 0.286 }, limit: { context: 128000, output: 98304 } }, "glm-5-turbo": { id: "glm-5-turbo", name: "glm-5-turbo", attachment: false, reasoning: true, tool_call: true, temperature: true, release_date: "2026-03-16", last_updated: "2026-03-16", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.72, output: 3.2 }, limit: { context: 200000, output: 131072 } }, "qwen3-30b-a3b": { id: "qwen3-30b-a3b", name: "Qwen3-30B-A3B", family: "qwen", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-04-29", last_updated: "2025-04-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.11, output: 1.08 }, limit: { context: 128000, output: 8192 } }, "claude-opus-4-5": { id: "claude-opus-4-5", name: "claude-opus-4-5", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-11-25", last_updated: "2025-11-25", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25 }, limit: { context: 200000, output: 64000 } }, "glm-4.5v": { id: "glm-4.5v", name: "GLM-4.5V", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-08-12", last_updated: "2025-08-12", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 0.86 }, limit: { context: 64000, output: 16384 } }, "glm-4.6": { id: "glm-4.6", name: "glm-4.6", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.286, output: 1.142 }, limit: { context: 200000, output: 131072 } }, "claude-opus-4-6-thinking": { id: "claude-opus-4-6-thinking", name: "claude-opus-4-6-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-05", release_date: "2026-02-06", last_updated: "2026-03-13", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25 }, limit: { context: 1e6, output: 128000 } }, "gemini-2.5-flash-preview-09-2025": { id: "gemini-2.5-flash-preview-09-2025", name: "gemini-2.5-flash-preview-09-2025", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-01", release_date: "2025-09-26", last_updated: "2025-09-26", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.3, output: 2.5 }, limit: { context: 1e6, output: 65536 } }, "claude-sonnet-4-6-thinking": { id: "claude-sonnet-4-6-thinking", name: "claude-sonnet-4-6-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-02-18", last_updated: "2026-03-13", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 1e6, output: 64000 } }, "glm-4.6v": { id: "glm-4.6v", name: "GLM-4.6V", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-12-08", last_updated: "2025-12-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.145, output: 0.43 }, limit: { context: 128000, output: 32768 } }, "claude-opus-4-1-20250805": { id: "claude-opus-4-1-20250805", name: "claude-opus-4-1-20250805", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-08-05", last_updated: "2025-08-05", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 15, output: 75 }, limit: { context: 200000, output: 32000 } }, "gpt-5.1-chat-latest": { id: "gpt-5.1-chat-latest", name: "gpt-5.1-chat-latest", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-11-14", last_updated: "2025-11-14", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.25, output: 10 }, limit: { context: 128000, output: 16384 } }, "claude-haiku-4-5-20251001": { id: "claude-haiku-4-5-20251001", name: "claude-haiku-4-5-20251001", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-10-16", last_updated: "2025-10-16", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 1, output: 5 }, limit: { context: 200000, output: 64000 } }, "MiniMax-M1": { id: "MiniMax-M1", name: "MiniMax-M1", family: "minimax", attachment: false, reasoning: false, tool_call: true, temperature: true, release_date: "2025-06-16", last_updated: "2025-06-16", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.132, output: 1.254 }, limit: { context: 1e6, output: 128000 } }, "gpt-5.4-nano-2026-03-17": { id: "gpt-5.4-nano-2026-03-17", name: "gpt-5.4-nano-2026-03-17", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-08", release_date: "2026-03-19", last_updated: "2026-03-19", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 1.25 }, limit: { context: 400000, output: 128000 } }, "claude-sonnet-4-20250514": { id: "claude-sonnet-4-20250514", name: "claude-sonnet-4-20250514", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-05-22", last_updated: "2025-05-22", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 200000, output: 64000 } }, "qwen3-coder-480b-a35b-instruct": { id: "qwen3-coder-480b-a35b-instruct", name: "qwen3-coder-480b-a35b-instruct", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-07-23", last_updated: "2025-07-23", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.86, output: 3.43 }, limit: { context: 262144, output: 65536 } }, "claude-opus-4-6": { id: "claude-opus-4-6", name: "claude-opus-4-6", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-05", release_date: "2026-02-06", last_updated: "2026-03-13", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 5, output: 25 }, limit: { context: 1e6, output: 128000 } }, "doubao-seed-code-preview-251028": { id: "doubao-seed-code-preview-251028", name: "doubao-seed-code-preview-251028", attachment: true, reasoning: false, tool_call: true, temperature: true, release_date: "2025-11-11", last_updated: "2025-11-11", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.17, output: 1.14 }, limit: { context: 256000, output: 32000 } }, "gpt-4.1-nano": { id: "gpt-4.1-nano", name: "gpt-4.1-nano", family: "gpt-nano", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-04", release_date: "2025-04-14", last_updated: "2025-04-14", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.1, output: 0.4 }, limit: { context: 1e6, output: 32768 } }, "deepseek-v3.2": { id: "deepseek-v3.2", name: "deepseek-v3.2", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-12", release_date: "2025-12-01", last_updated: "2025-12-01", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.29, output: 0.43 }, limit: { context: 128000, output: 8192 } }, "gpt-5-pro": { id: "gpt-5-pro", name: "gpt-5-pro", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-10-08", last_updated: "2025-10-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 15, output: 120 }, limit: { context: 400000, output: 272000 } }, "gpt-4o": { id: "gpt-4o", name: "gpt-4o", family: "gpt", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2023-09", release_date: "2024-05-13", last_updated: "2024-05-13", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2.5, output: 10 }, limit: { context: 128000, output: 16384 } }, "claude-sonnet-4-5": { id: "claude-sonnet-4-5", name: "claude-sonnet-4-5", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-07", release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 200000, output: 64000 } }, "gpt-5": { id: "gpt-5", name: "gpt-5", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-10", release_date: "2025-08-08", last_updated: "2025-08-08", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 1.25, output: 10 }, limit: { context: 400000, output: 128000 } }, "grok-4.20-beta-0309-reasoning": { id: "grok-4.20-beta-0309-reasoning", name: "grok-4.20-beta-0309-reasoning", attachment: true, reasoning: true, tool_call: true, temperature: true, release_date: "2026-03-16", last_updated: "2026-03-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 6 }, limit: { context: 2000000, output: 30000 } }, "claude-opus-4-20250514": { id: "claude-opus-4-20250514", name: "claude-opus-4-20250514", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-05-22", last_updated: "2025-05-22", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 15, output: 75 }, limit: { context: 200000, output: 32000 } }, "glm-for-coding": { id: "glm-for-coding", name: "glm-for-coding", attachment: false, reasoning: true, tool_call: true, temperature: true, release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.086, output: 0.343 }, limit: { context: 200000, output: 131072 } }, "claude-sonnet-4-5-20250929-thinking": { id: "claude-sonnet-4-5-20250929-thinking", name: "claude-sonnet-4-5-20250929-thinking", attachment: true, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-03", release_date: "2025-09-30", last_updated: "2025-09-30", modalities: { input: ["text", "image", "pdf"], output: ["text"] }, open_weights: false, cost: { input: 3, output: 15 }, limit: { context: 200000, output: 64000 } }, "glm-4.5-airx": { id: "glm-4.5-airx", name: "glm-4.5-airx", attachment: false, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-04", release_date: "2025-07-29", last_updated: "2025-07-29", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.572, output: 1.714 }, limit: { context: 128000, output: 16384 } }, "gpt-4.1": { id: "gpt-4.1", name: "gpt-4.1", family: "gpt", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-04", release_date: "2025-04-14", last_updated: "2025-04-14", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 2, output: 8 }, limit: { context: 1e6, output: 32768 } }, "kimi-k2-thinking": { id: "kimi-k2-thinking", name: "kimi-k2-thinking", attachment: false, reasoning: true, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-09-05", last_updated: "2025-09-05", modalities: { input: ["text"], output: ["text"] }, open_weights: false, cost: { input: 0.575, output: 2.3 }, limit: { context: 262144, output: 262144 } }, "gemini-2.0-flash-lite": { id: "gemini-2.0-flash-lite", name: "gemini-2.0-flash-lite", family: "gemini-flash-lite", attachment: true, reasoning: false, tool_call: false, temperature: true, knowledge: "2024-11", release_date: "2025-06-16", last_updated: "2025-06-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.075, output: 0.3 }, limit: { context: 2000000, output: 8192 } }, "gpt-4.1-mini": { id: "gpt-4.1-mini", name: "gpt-4.1-mini", family: "gpt-mini", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-04", release_date: "2025-04-14", last_updated: "2025-04-14", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.4, output: 1.6 }, limit: { context: 1e6, output: 32768 } }, "grok-4-fast-non-reasoning": { id: "grok-4-fast-non-reasoning", name: "grok-4-fast-non-reasoning", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2025-06", release_date: "2025-09-23", last_updated: "2025-09-23", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.2, output: 0.5 }, limit: { context: 2000000, output: 30000 } }, "doubao-seed-1-6-thinking-250715": { id: "doubao-seed-1-6-thinking-250715", name: "doubao-seed-1-6-thinking-250715", attachment: true, reasoning: true, tool_call: true, temperature: true, release_date: "2025-07-15", last_updated: "2025-07-15", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.121, output: 1.21 }, limit: { context: 256000, output: 16000 } }, "ministral-14b-2512": { id: "ministral-14b-2512", name: "ministral-14b-2512", attachment: true, reasoning: false, tool_call: true, temperature: true, knowledge: "2024-12", release_date: "2025-12-16", last_updated: "2025-12-16", modalities: { input: ["text", "image"], output: ["text"] }, open_weights: false, cost: { input: 0.33, output: 0.33 }, limit: { context: 128000, output: 128000 } } } },
@@ -821,8 +1201,7 @@ var catalog_data_default = {
 };
 
 // src/model/providers/catalog/catalog.utils.ts
-import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
+import { join as join5 } from "path";
 var KNOWN_MODALITIES = new Set([
   "text",
   "image",
@@ -887,17 +1266,8 @@ function toModelInfo(catalogModel) {
   };
 }
 var CATALOG_CACHE_FILENAME = "models-catalog.json";
-function resolveCatalogCachePath(env = process.env, platform = process.platform) {
-  if (platform === "win32") {
-    const base2 = env.LOCALAPPDATA && env.LOCALAPPDATA.length > 0 ? env.LOCALAPPDATA : join2(homedir2(), "AppData", "Local");
-    return join2(base2, "comma-agents", "Cache", CATALOG_CACHE_FILENAME);
-  }
-  if (platform === "darwin") {
-    return join2(homedir2(), "Library", "Caches", "comma-agents", CATALOG_CACHE_FILENAME);
-  }
-  const xdgCacheHome = env.XDG_CACHE_HOME;
-  const base = xdgCacheHome && xdgCacheHome.length > 0 ? xdgCacheHome : join2(homedir2(), ".cache");
-  return join2(base, "comma-agents", CATALOG_CACHE_FILENAME);
+function resolveCatalogCachePath() {
+  return join5(resolveDataDir(), "cache", CATALOG_CACHE_FILENAME);
 }
 
 // src/model/providers/catalog/catalog.ts
@@ -1002,7 +1372,7 @@ function readCache(cachePath) {
 }
 function writeCache(cachePath, payload) {
   try {
-    mkdirSync2(dirname2(cachePath), { recursive: true });
+    mkdirSync2(dirname5(cachePath), { recursive: true });
     writeFileSync2(cachePath, JSON.stringify(payload), "utf8");
   } catch {}
 }
@@ -1309,18 +1679,18 @@ function unregisterProvider(providerId) {
 }
 function ensureCacheDir(dir) {
   mkdirSync3(dir, { recursive: true });
-  const pkgJsonPath = join3(dir, "package.json");
+  const pkgJsonPath = join6(dir, "package.json");
   if (!existsSync2(pkgJsonPath)) {
     writeFileSync3(pkgJsonPath, JSON.stringify({ name: "comma-providers", private: true }, null, 2));
   }
 }
 function requireFromCache(cacheDir, packageName) {
-  const _require = createRequire(join3(cacheDir, "package.json"));
+  const _require = createRequire(join6(cacheDir, "package.json"));
   return _require(packageName);
 }
 function isPackageCached(cacheDir, packageName) {
   const parts = packageName.split("/");
-  const pkgJsonPath = join3(cacheDir, "node_modules", ...parts, "package.json");
+  const pkgJsonPath = join6(cacheDir, "node_modules", ...parts, "package.json");
   return existsSync2(pkgJsonPath);
 }
 async function ensurePackageInCache(dir, packageName) {
@@ -1676,20 +2046,20 @@ async function resolveSystemPrompt(options) {
 }
 
 // src/sandbox/sandbox.ts
-import { resolve as resolve2 } from "path";
+import { resolve as resolve4 } from "path";
 
 // src/guard/guard.ts
 import { realpathSync } from "fs";
-import { isAbsolute, resolve } from "path";
+import { isAbsolute, resolve as resolve3 } from "path";
 function resolveSymlinks(absolutePath) {
   let current = absolutePath;
   const suffix = [];
-  while (current !== resolve(current, "..") || suffix.length === 0) {
+  while (current !== resolve3(current, "..") || suffix.length === 0) {
     try {
       const real = realpathSync(current);
-      return suffix.length > 0 ? resolve(real, ...suffix.reverse()) : real;
+      return suffix.length > 0 ? resolve3(real, ...suffix.reverse()) : real;
     } catch {
-      const parent = resolve(current, "..");
+      const parent = resolve3(current, "..");
       if (parent === current)
         break;
       suffix.push(current.slice(parent.length + 1));
@@ -1702,15 +2072,15 @@ function resolvePath(cwd2, inputPath, allowAbsolutePaths, jail) {
   if (!allowAbsolutePaths && isAbsolute(inputPath)) {
     throw new SandboxViolationError(inputPath, "absolute-path", `Absolute paths are not allowed; use a path relative to "${cwd2}".`);
   }
-  const resolved = resolve(cwd2, inputPath);
+  const resolved = resolve3(cwd2, inputPath);
   if (!jail)
     return resolved;
   const realResolved = resolveSymlinks(resolved);
   const realCwd = resolveSymlinks(cwd2);
-  const sep = "/";
-  const jailRoot = realCwd.endsWith(sep) ? realCwd : `${realCwd}${sep}`;
+  const sep2 = "/";
+  const jailRoot = realCwd.endsWith(sep2) ? realCwd : `${realCwd}${sep2}`;
   if (realResolved !== realCwd && !realResolved.startsWith(jailRoot)) {
-    throw new SandboxViolationError(resolve(cwd2, inputPath), "jail", `Path escapes sandbox jail (cwd: ${cwd2})`);
+    throw new SandboxViolationError(resolve3(cwd2, inputPath), "jail", `Path escapes sandbox jail (cwd: ${cwd2})`);
   }
   return realResolved;
 }
@@ -1783,11 +2153,11 @@ function createGuard(toolName, cwd2, allowAbsolutePaths, jail, policies, callbac
     }
     if (decision === "allow" || decision === "allow-session" || decision === "deny-session") {
       const mode = request.type === "fs.write" ? "write" : "read";
-      const relative = resolvedPath.startsWith(`${cwd2}/`) ? resolvedPath.slice(cwd2.length + 1) : resolvedPath;
+      const relative2 = resolvedPath.startsWith(`${cwd2}/`) ? resolvedPath.slice(cwd2.length + 1) : resolvedPath;
       if (decision === "allow" || decision === "allow-session") {
-        addPolicy(pathSessionPolicy(mode, "allow", relative));
+        addPolicy(pathSessionPolicy(mode, "allow", relative2));
       } else {
-        addPolicy(pathSessionPolicy(mode, "deny", relative));
+        addPolicy(pathSessionPolicy(mode, "deny", relative2));
       }
     }
     return decision;
@@ -1862,25 +2232,25 @@ function createGuard(toolName, cwd2, allowAbsolutePaths, jail, policies, callbac
     askQuestion
   };
 }
-function pathSessionPolicy(mode, decision, relative) {
+function pathSessionPolicy(mode, decision, relative2) {
   const fsType = mode === "write" ? "fs.write" : "fs.read";
   const decisionName = decision === "allow" ? "allow" : "deny";
   return {
-    name: `session-${decisionName}-${mode}-${relative.replace(/[^a-zA-Z0-9]/g, "-")}`,
+    name: `session-${decisionName}-${mode}-${relative2.replace(/[^a-zA-Z0-9]/g, "-")}`,
     evaluate: (req) => {
       if (req.type !== fsType)
         return "pass";
-      if (req.resource.endsWith(`/${relative}`) || req.resource === `${cwd}/${relative}` || req.resource === `${cwd}/${relative}`) {
+      if (req.resource.endsWith(`/${relative2}`) || req.resource === `${cwd}/${relative2}` || req.resource === `${cwd}/${relative2}`) {
         return decision;
       }
       const cwdSep = cwd.endsWith("/") ? cwd : `${cwd}/`;
-      const pattern = `${cwdSep}${relative}`;
+      const pattern = `${cwdSep}${relative2}`;
       if (req.resource === pattern || req.resource.startsWith(`${pattern}/`)) {
         return decision;
       }
       if (req.resource.startsWith(cwdSep)) {
         const rel = req.resource.slice(cwdSep.length);
-        if (new Bun.Glob(relative).match(rel)) {
+        if (new Bun.Glob(relative2).match(rel)) {
           return decision;
         }
       }
@@ -1891,14 +2261,14 @@ function pathSessionPolicy(mode, decision, relative) {
 
 // src/guard/policies.ts
 function matchesAny(absolutePath, patterns, cwd2) {
-  const sep = "/";
-  const cwdWithSep = cwd2.endsWith(sep) ? cwd2 : `${cwd2}${sep}`;
+  const sep2 = "/";
+  const cwdWithSep = cwd2.endsWith(sep2) ? cwd2 : `${cwd2}${sep2}`;
   if (absolutePath !== cwd2 && !absolutePath.startsWith(cwdWithSep)) {
     return false;
   }
-  const relative = absolutePath === cwd2 ? "." : absolutePath.slice(cwdWithSep.length);
+  const relative2 = absolutePath === cwd2 ? "." : absolutePath.slice(cwdWithSep.length);
   for (const pattern of patterns) {
-    if (new Bun.Glob(pattern).match(relative))
+    if (new Bun.Glob(pattern).match(relative2))
       return true;
   }
   return false;
@@ -1994,7 +2364,7 @@ function buildDefaultPolicies(forbiddenGlobs, read, write, cwd2) {
 // src/sandbox/sandbox.ts
 function createSandbox(config = {}, callbacks) {
   const cwd2 = config.cwd ?? process.cwd();
-  const sandboxCwd = resolve2(cwd2);
+  const sandboxCwd = resolve4(cwd2);
   const jail = config.jail ?? false;
   const allowAbsolutePaths = config.allowAbsolutePaths ?? true;
   const forbiddenGlobs = config.forbiddenGlobs ?? [];
@@ -2066,8 +2436,8 @@ var DEFAULT_DAEMON_SANDBOX_CONFIG = {
 };
 
 // src/tools/io/audit-sink.ts
-import { appendFile, mkdir, open, readdir, readFile } from "fs/promises";
-import { join as join4 } from "path";
+import { appendFile, mkdir as mkdir4, open, readdir, readFile as readFile3 } from "fs/promises";
+import { join as join7 } from "path";
 function createMemoryAuditSink() {
   const entries = [];
   return {
@@ -2086,10 +2456,10 @@ function createMemoryAuditSink() {
 }
 var DEFAULT_MAX_DIFF_BYTES = 64 * 1024;
 function createFileAuditSink(workspaceRoot, options = {}) {
-  const auditDir = join4(workspaceRoot, ".comma", "audit");
+  const auditDir = join7(workspaceRoot, ".comma", "audit");
   const maxDiffBytes = options.maxDiffBytes ?? DEFAULT_MAX_DIFF_BYTES;
   function fileForSession(sessionId) {
-    return join4(auditDir, `${sessionId ?? "default"}.jsonl`);
+    return join7(auditDir, `${sessionId ?? "default"}.jsonl`);
   }
   function truncateDiff(entry) {
     if (entry.diff === undefined)
@@ -2113,7 +2483,7 @@ function createFileAuditSink(workspaceRoot, options = {}) {
     for (const filename of files) {
       if (!filename.endsWith(".jsonl"))
         continue;
-      const entries = await readJsonl(join4(auditDir, filename));
+      const entries = await readJsonl(join7(auditDir, filename));
       out.push(...entries);
     }
     return out;
@@ -2121,7 +2491,7 @@ function createFileAuditSink(workspaceRoot, options = {}) {
   async function readJsonl(absolutePath) {
     let content;
     try {
-      content = await readFile(absolutePath, "utf8");
+      content = await readFile3(absolutePath, "utf8");
     } catch {
       return [];
     }
@@ -2138,7 +2508,7 @@ function createFileAuditSink(workspaceRoot, options = {}) {
   }
   return {
     async append(entry) {
-      await mkdir(auditDir, { recursive: true });
+      await mkdir4(auditDir, { recursive: true });
       const targetPath = fileForSession(entry.sessionId);
       const line = `${JSON.stringify(truncateDiff(entry))}
 `;
@@ -2212,7 +2582,7 @@ function sandboxErrorToToolError(error) {
 }
 
 // src/tools/built-in/ask-question/ask-question.ts
-import { z as z3 } from "zod";
+import { z as z4 } from "zod";
 
 // src/tools/define/define-tool.ts
 function defineTool(config) {
@@ -2282,8 +2652,8 @@ function formatInput(input) {
 }
 
 // src/tools/built-in/ask-question/ask-question.ts
-var askQuestionParams = z3.object({
-  question: z3.string().min(1).describe("The question to ask the user for feedback or clarification.")
+var askQuestionParams = z4.object({
+  question: z4.string().min(1).describe("The question to ask the user for feedback or clarification.")
 });
 function createAskQuestionTool() {
   return defineTool({
@@ -2332,27 +2702,27 @@ function createAskQuestionTool() {
   });
 }
 // src/tools/built-in/create-file/create-file.ts
-import { mkdir as mkdir3, stat as stat3 } from "fs/promises";
-import { dirname as dirname5 } from "path";
-import { z as z4 } from "zod";
+import { mkdir as mkdir6, stat as stat4 } from "fs/promises";
+import { dirname as dirname8 } from "path";
+import { z as z5 } from "zod";
 
 // src/tools/io/atomic-write.ts
 import { randomBytes } from "crypto";
-import { chmod, open as open2, rename, stat, unlink, writeFile } from "fs/promises";
-import { dirname as dirname3, join as join5 } from "path";
+import { chmod, open as open2, rename as rename3, stat as stat2, unlink, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname6, join as join8 } from "path";
 async function writeAtomic(absolutePath, content, options = {}) {
-  const dir = dirname3(absolutePath);
+  const dir = dirname6(absolutePath);
   const tempName = `.${randomBytes(8).toString("hex")}.tmp`;
-  const tempPath = join5(dir, tempName);
+  const tempPath = join8(dir, tempName);
   let effectiveMode = options.mode;
   if (effectiveMode === undefined) {
     try {
-      const existing = await stat(absolutePath);
+      const existing = await stat2(absolutePath);
       effectiveMode = existing.mode & 511;
     } catch {}
   }
   try {
-    await writeFile(tempPath, content);
+    await writeFile2(tempPath, content);
     if (options.fsync !== false) {
       const handle = await open2(tempPath, "r+");
       try {
@@ -2364,7 +2734,7 @@ async function writeAtomic(absolutePath, content, options = {}) {
     if (effectiveMode !== undefined) {
       await chmod(tempPath, effectiveMode);
     }
-    await rename(tempPath, absolutePath);
+    await rename3(tempPath, absolutePath);
   } catch (error) {
     try {
       await unlink(tempPath);
@@ -2430,14 +2800,14 @@ function unifiedDiff(before, after, options) {
   return patch;
 }
 // src/tools/io/hash.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 function sha256OfBuffer(data) {
   const hasher = new Bun.CryptoHasher("sha256");
   hasher.update(data);
   return hasher.digest("hex");
 }
 async function sha256OfFile(absolutePath) {
-  const buffer = await readFile2(absolutePath);
+  const buffer = await readFile4(absolutePath);
   return sha256OfBuffer(buffer);
 }
 // src/tools/io/newline.ts
@@ -2539,29 +2909,29 @@ var STALE_FILE_RECOVERY_HINT = "Re-read the file to obtain the current sha256 an
 // src/tools/io/trash.ts
 import { createHash } from "crypto";
 import {
-  mkdir as mkdir2,
+  mkdir as mkdir5,
   readdir as readdir2,
-  readFile as readFile3,
-  rm,
-  stat as stat2,
-  writeFile as writeFile2
+  readFile as readFile5,
+  rm as rm3,
+  stat as stat3,
+  writeFile as writeFile3
 } from "fs/promises";
-import { basename, dirname as dirname4, join as join6, relative, resolve as resolve3 } from "path";
+import { basename, dirname as dirname7, join as join9, relative as relative2, resolve as resolve5 } from "path";
 import { gunzipSync, gzipSync } from "zlib";
-import extract from "tar-stream/extract";
+import extract2 from "tar-stream/extract";
 import pack from "tar-stream/pack";
 function trashWorkspaceDir(workspaceRoot) {
   const key = createHash("sha256").update(workspaceRoot).digest("hex");
-  return join6(resolveDataDir(), "trash", key);
+  return join9(resolveDataDir(), "trash", key);
 }
 function shortHash(input, length) {
   return createHash("sha256").update(input).digest("hex").slice(0, length);
 }
 async function moveToTrash(workspaceRoot, absSourcePath, metadata) {
   const bucket = trashWorkspaceDir(workspaceRoot);
-  await mkdir2(bucket, { recursive: true });
-  const relativePath = relative(workspaceRoot, absSourcePath);
-  const content = await readFile3(absSourcePath);
+  await mkdir5(bucket, { recursive: true });
+  const relativePath = relative2(workspaceRoot, absSourcePath);
+  const content = await readFile5(absSourcePath);
   const contentBuffer = Buffer.from(content);
   const sha256 = createHash("sha256").update(content).digest("hex");
   const stamp = new Date().toISOString().replace(/[:.]/g, "-");
@@ -2569,7 +2939,7 @@ async function moveToTrash(workspaceRoot, absSourcePath, metadata) {
   const runPart = metadata?.runId ? `${shortHash(metadata.runId, 8)}-` : "";
   const randomSuffix = !sessionPart && !runPart ? `${Math.random().toString(36).slice(2, 8)}-` : "";
   const archiveName = `${stamp}-${sessionPart}${runPart}${randomSuffix}${basename(absSourcePath)}.tar.gz`;
-  const archivePath = join6(bucket, archiveName);
+  const archivePath = join9(bucket, archiveName);
   const metaEntry = {
     trashedAt: new Date().toISOString(),
     originalPath: relativePath,
@@ -2579,22 +2949,22 @@ async function moveToTrash(workspaceRoot, absSourcePath, metadata) {
     agentName: metadata?.agentName
   };
   const metaBuffer = Buffer.from(JSON.stringify(metaEntry, null, 2), "utf-8");
-  const packed = await new Promise((resolve4, reject) => {
+  const packed = await new Promise((resolve6, reject) => {
     const p = pack();
     const chunks = [];
     p.on("error", reject);
     p.on("data", (chunk) => chunks.push(chunk));
-    p.on("end", () => resolve4(Buffer.concat(chunks)));
+    p.on("end", () => resolve6(Buffer.concat(chunks)));
     p.entry({ name: "metadata.json", mode: 420, size: metaBuffer.length }, metaBuffer);
     p.entry({ name: relativePath, mode: 420, size: contentBuffer.length }, contentBuffer);
     p.finalize();
   });
   const compressed = gzipSync(packed);
-  await writeFile2(archivePath, new Uint8Array(compressed));
+  await writeFile3(archivePath, new Uint8Array(compressed));
   try {
-    await rm(absSourcePath, { force: true });
+    await rm3(absSourcePath, { force: true });
   } catch {
-    await rm(archivePath, { force: true });
+    await rm3(archivePath, { force: true });
     throw new Error(`Failed to remove source file after archiving: ${absSourcePath}`);
   }
   return archivePath;
@@ -2611,9 +2981,9 @@ async function listTrash(workspaceRoot) {
   for (const name of entries) {
     if (!name.endsWith(".tar.gz"))
       continue;
-    const full = join6(bucket, name);
+    const full = join9(bucket, name);
     try {
-      const fileStat = await stat2(full);
+      const fileStat = await stat3(full);
       const metaResult = await readTrashMetadata(full);
       if (!metaResult)
         continue;
@@ -2628,10 +2998,10 @@ async function listTrash(workspaceRoot) {
 }
 async function readTrashMetadata(archivePath) {
   try {
-    const compressed = await readFile3(archivePath);
+    const compressed = await readFile5(archivePath);
     const decompressed = gunzipSync(compressed);
-    return await new Promise((resolve4, _reject) => {
-      const ext = extract();
+    return await new Promise((resolve6, _reject) => {
+      const ext = extract2();
       let found;
       ext.on("entry", (header, stream, next) => {
         if (header.name === "metadata.json") {
@@ -2650,8 +3020,8 @@ async function readTrashMetadata(archivePath) {
           stream.on("error", () => next());
         }
       });
-      ext.on("finish", () => resolve4(found));
-      ext.on("error", () => resolve4(undefined));
+      ext.on("finish", () => resolve6(found));
+      ext.on("error", () => resolve6(undefined));
       ext.end(Buffer.from(decompressed));
     });
   } catch {
@@ -2664,23 +3034,23 @@ async function restoreFromTrash(workspaceRoot, trashPath, targetPath) {
     throw new Error(`Could not read metadata from trash archive: ${trashPath}`);
   }
   const restoreRelative = targetPath ?? metadata.originalPath;
-  const restoreAbsolute = resolve3(workspaceRoot, restoreRelative);
-  const relativeToWorkspace = relative(workspaceRoot, restoreAbsolute);
+  const restoreAbsolute = resolve5(workspaceRoot, restoreRelative);
+  const relativeToWorkspace = relative2(workspaceRoot, restoreAbsolute);
   if (relativeToWorkspace === ".." || relativeToWorkspace.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`)) {
     throw new Error(`Restore target escapes workspace: ${restoreRelative}`);
   }
-  await mkdir2(dirname4(restoreAbsolute), { recursive: true });
-  const compressed = await readFile3(trashPath);
+  await mkdir5(dirname7(restoreAbsolute), { recursive: true });
+  const compressed = await readFile5(trashPath);
   const decompressed = gunzipSync(compressed);
-  await new Promise((resolve4, reject) => {
-    const ext = extract();
+  await new Promise((resolve6, reject) => {
+    const ext = extract2();
     ext.on("entry", (header, stream, next) => {
       if (header.name === metadata.originalPath) {
         const chunks = [];
         stream.on("data", (chunk) => chunks.push(chunk));
         stream.on("end", async () => {
           try {
-            await writeFile2(restoreAbsolute, new Uint8Array(Buffer.concat(chunks)));
+            await writeFile3(restoreAbsolute, new Uint8Array(Buffer.concat(chunks)));
           } catch (error) {
             reject(error);
             return;
@@ -2694,11 +3064,11 @@ async function restoreFromTrash(workspaceRoot, trashPath, targetPath) {
         stream.on("error", () => next());
       }
     });
-    ext.on("finish", resolve4);
+    ext.on("finish", resolve6);
     ext.on("error", reject);
     ext.end(Buffer.from(decompressed));
   });
-  await rm(trashPath, { force: true });
+  await rm3(trashPath, { force: true });
   return restoreAbsolute;
 }
 async function clearTrash(workspaceRoot) {
@@ -2711,20 +3081,20 @@ async function clearTrash(workspaceRoot) {
       if (!name.endsWith(".tar.gz"))
         continue;
       try {
-        const fileStat = await stat2(join6(bucket, name));
+        const fileStat = await stat3(join9(bucket, name));
         totalBytes += fileStat.size;
         count += 1;
       } catch {}
     }
-    await rm(bucket, { recursive: true, force: true });
+    await rm3(bucket, { recursive: true, force: true });
   } catch {}
   return { cleared: count, bytesFreed: totalBytes };
 }
 // src/tools/built-in/create-file/create-file.ts
-var createFileParams = z4.object({
-  path: z4.string().min(1).describe("Workspace-relative path of the file to create. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
-  content: z4.string().describe("Full UTF-8 content for the new file. May be empty to create a zero-byte file."),
-  createParentDirectories: z4.boolean().optional().describe("When true, missing parent directories are created (mkdir -p). When false (default), " + "a missing parent yields `not_found` \u2014 the LLM should re-call with this flag set.")
+var createFileParams = z5.object({
+  path: z5.string().min(1).describe("Workspace-relative path of the file to create. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
+  content: z5.string().describe("Full UTF-8 content for the new file. May be empty to create a zero-byte file."),
+  createParentDirectories: z5.boolean().optional().describe("When true, missing parent directories are created (mkdir -p). When false (default), " + "a missing parent yields `not_found` \u2014 the LLM should re-call with this flag set.")
 });
 function createCreateFileTool(config) {
   const defaultSink = config?.defaultAuditSink;
@@ -2824,7 +3194,7 @@ After every successful \`create_file\` call, **run the project's configured veri
         throw caught;
       }
       try {
-        await stat3(absolutePath);
+        await stat4(absolutePath);
         return errorResult(toolError("already_exists", `File already exists: ${validatedArguments.path}`, {
           path: validatedArguments.path,
           recoverable: true,
@@ -2835,9 +3205,9 @@ After every successful \`create_file\` call, **run the project's configured veri
         if (code !== "ENOENT" && code !== "ENOTDIR")
           throw statError;
       }
-      const parent = dirname5(absolutePath);
+      const parent = dirname8(absolutePath);
       try {
-        const parentStat = await stat3(parent);
+        const parentStat = await stat4(parent);
         if (!parentStat.isDirectory()) {
           return errorResult(toolError("not_found", `Parent path is not a directory: ${validatedArguments.path}`, { path: validatedArguments.path, recoverable: false }));
         }
@@ -2852,7 +3222,7 @@ After every successful \`create_file\` call, **run the project's configured veri
             suggestedNextAction: "Re-call create_file with `createParentDirectories: true`."
           }));
         }
-        await mkdir3(parent, { recursive: true });
+        await mkdir6(parent, { recursive: true });
       }
       const contentBytes = new TextEncoder().encode(validatedArguments.content);
       const sha256 = sha256OfBuffer(contentBytes);
@@ -2886,14 +3256,14 @@ After every successful \`create_file\` call, **run the project's configured veri
   });
 }
 // src/tools/built-in/delete-file/delete-file.ts
-import { readFile as readFile4, stat as stat4, unlink as unlink2 } from "fs/promises";
+import { readFile as readFile6, stat as stat5, unlink as unlink2 } from "fs/promises";
 
 // src/tools/built-in/delete-file/delete-file.constants.ts
-import { z as z5 } from "zod";
-var deleteFileParams = z5.object({
-  path: z5.string().min(1).describe("Workspace-relative path of the file to delete. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
-  expectedSha256: z5.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").optional().describe("Optional. SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "When present, a mismatch yields `stale_file` so concurrent edits are caught. " + "When omitted, the file is deleted without staleness protection."),
-  permanent: z5.boolean().optional().describe("When true, the file is unlinked directly with no recovery path. When false (default), " + "the file is moved to a workspace-scoped trash bucket under the OS temp directory.")
+import { z as z6 } from "zod";
+var deleteFileParams = z6.object({
+  path: z6.string().min(1).describe("Workspace-relative path of the file to delete. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
+  expectedSha256: z6.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").optional().describe("Optional. SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "When present, a mismatch yields `stale_file` so concurrent edits are caught. " + "When omitted, the file is deleted without staleness protection."),
+  permanent: z6.boolean().optional().describe("When true, the file is unlinked directly with no recovery path. When false (default), " + "the file is moved to a workspace-scoped trash bucket under the OS temp directory.")
 });
 
 // src/tools/built-in/delete-file/delete-file.ts
@@ -2988,7 +3358,7 @@ After every successful \`delete_file\` call, **run the project's configured veri
       }
       let targetStat;
       try {
-        targetStat = await stat4(absolutePath);
+        targetStat = await stat5(absolutePath);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -3002,7 +3372,7 @@ After every successful \`delete_file\` call, **run the project's configured veri
       if (targetStat.isDirectory()) {
         return errorResult(toolError("not_found", `Path is a directory, not a file: ${validatedArguments.path}`, { path: validatedArguments.path, recoverable: false }));
       }
-      const beforeBytes = await readFile4(absolutePath);
+      const beforeBytes = await readFile6(absolutePath);
       const beforeSha256 = sha256OfBuffer(beforeBytes);
       if (validatedArguments.expectedSha256 !== undefined && beforeSha256 !== validatedArguments.expectedSha256) {
         return errorResult(toolError("stale_file", `File has changed since last read: ${validatedArguments.path}`, {
@@ -3068,8 +3438,8 @@ After every successful \`delete_file\` call, **run the project's configured veri
   });
 }
 // src/tools/built-in/edit-file/edit-file.ts
-import { readFile as readFile5, stat as stat5 } from "fs/promises";
-import { z as z6 } from "zod";
+import { readFile as readFile7, stat as stat6 } from "fs/promises";
+import { z as z7 } from "zod";
 
 // src/tools/built-in/edit-file/edit-file.replacers.ts
 var exactReplacer = function* (content, find) {
@@ -3358,15 +3728,15 @@ function stripBomToLF(text) {
 }
 
 // src/tools/built-in/edit-file/edit-file.ts
-var editSchema = z6.object({
-  oldText: z6.string().min(1).describe("Exact substring to match in the current file content. Matching is literal " + "(no regex). Compared against logical (LF, no-BOM) content \u2014 provide LF newlines."),
-  newText: z6.string().describe("Replacement text. May be empty to delete the matched range. Provide LF newlines; " + "the tool re-applies the file's existing newline style and BOM on write."),
-  expectedOccurrences: z6.number().int().min(1).optional().describe("Expected number of matches for `oldText` (default 1). Any other count yields " + "`multiple_matches` with the actual match ranges in `error.details`.")
+var editSchema = z7.object({
+  oldText: z7.string().min(1).describe("Exact substring to match in the current file content. Matching is literal " + "(no regex). Compared against logical (LF, no-BOM) content \u2014 provide LF newlines."),
+  newText: z7.string().describe("Replacement text. May be empty to delete the matched range. Provide LF newlines; " + "the tool re-applies the file's existing newline style and BOM on write."),
+  expectedOccurrences: z7.number().int().min(1).optional().describe("Expected number of matches for `oldText` (default 1). Any other count yields " + "`multiple_matches` with the actual match ranges in `error.details`.")
 });
-var editFileParams = z6.object({
-  path: z6.string().min(1).describe("Workspace-relative path of the file to edit. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
-  expectedSha256: z6.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").optional().describe("Optional. SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "When present, a mismatch yields `stale_file` so concurrent edits are caught. " + "When omitted, the tool reads the file at edit time and proceeds without staleness " + "protection \u2014 fine for typical single-agent runs."),
-  edits: z6.array(editSchema).min(1).describe("One or more (oldText, newText) replacements. All edits are evaluated against the " + "ORIGINAL file snapshot, so order is irrelevant and overlapping replacements " + "are reported as `overlapping_edits` rather than silently clobbering each other.")
+var editFileParams = z7.object({
+  path: z7.string().min(1).describe("Workspace-relative path of the file to edit. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
+  expectedSha256: z7.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").optional().describe("Optional. SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "When present, a mismatch yields `stale_file` so concurrent edits are caught. " + "When omitted, the tool reads the file at edit time and proceeds without staleness " + "protection \u2014 fine for typical single-agent runs."),
+  edits: z7.array(editSchema).min(1).describe("One or more (oldText, newText) replacements. All edits are evaluated against the " + "ORIGINAL file snapshot, so order is irrelevant and overlapping replacements " + "are reported as `overlapping_edits` rather than silently clobbering each other.")
 });
 function createEditFileTool(config) {
   const defaultSink = config?.defaultAuditSink;
@@ -3500,7 +3870,7 @@ After every successful \`edit_file\` call, **run the project's configured verifi
       }
       let targetStat;
       try {
-        targetStat = await stat5(absolutePath);
+        targetStat = await stat6(absolutePath);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -3518,7 +3888,7 @@ After every successful \`edit_file\` call, **run the project's configured verifi
           recoverable: false
         }));
       }
-      const beforeBytes = await readFile5(absolutePath);
+      const beforeBytes = await readFile7(absolutePath);
       if (isLikelyBinary(beforeBytes)) {
         return errorResult(toolError("binary_file", `Cannot edit binary file: ${validatedArguments.path}`, {
           path: validatedArguments.path,
@@ -3601,9 +3971,9 @@ After every successful \`edit_file\` call, **run the project's configured verifi
   });
 }
 // src/tools/built-in/glob/glob.ts
-import { readdir as readdir3, stat as stat6 } from "fs/promises";
-import { join as join7, relative as relative2 } from "path";
-import { z as z7 } from "zod";
+import { readdir as readdir3, stat as stat7 } from "fs/promises";
+import { join as join10, relative as relative3 } from "path";
+import { z as z8 } from "zod";
 
 // src/tools/built-in/glob/glob.constants.ts
 var DEFAULT_EXCLUDE_GLOBS = [
@@ -3619,9 +3989,9 @@ var DEFAULT_MAX_RESULTS = 1000;
 var DEFAULT_TRAVERSAL_DEPTH = 32;
 
 // src/tools/built-in/glob/glob.utils.ts
-import { sep } from "path";
+import { sep as sep2 } from "path";
 function toForwardSlash(pathString) {
-  return sep === "/" ? pathString : pathString.split(sep).join("/");
+  return sep2 === "/" ? pathString : pathString.split(sep2).join("/");
 }
 function matchesAnyGlob(relPath, patterns) {
   for (const pattern of patterns) {
@@ -3645,11 +4015,11 @@ ${lines.join(`
 }
 
 // src/tools/built-in/glob/glob.ts
-var globParams = z7.object({
-  pattern: z7.string().min(1).describe('The glob pattern to match files and folders against (e.g., "src/**/*.ts" or "**/*.json").'),
-  root: z7.string().optional().describe('Workspace-relative directory to search under. Defaults to "." (the workspace root).'),
-  excludeGlobs: z7.array(z7.string()).optional().describe("Glob patterns to exclude. Replaces the default exclude set " + "(node_modules, .git, dist, build, .next, .turbo, coverage). Pass [] to disable."),
-  maxResults: z7.number().int().positive().optional().describe("Maximum number of matches to return. Defaults to 1000.")
+var globParams = z8.object({
+  pattern: z8.string().min(1).describe('The glob pattern to match files and folders against (e.g., "src/**/*.ts" or "**/*.json").'),
+  root: z8.string().optional().describe('Workspace-relative directory to search under. Defaults to "." (the workspace root).'),
+  excludeGlobs: z8.array(z8.string()).optional().describe("Glob patterns to exclude. Replaces the default exclude set " + "(node_modules, .git, dist, build, .next, .turbo, coverage). Pass [] to disable."),
+  maxResults: z8.number().int().positive().optional().describe("Maximum number of matches to return. Defaults to 1000.")
 });
 function createGlobTool(config) {
   const maxResultsCap = config?.maxResults ?? DEFAULT_MAX_RESULTS;
@@ -3750,7 +4120,7 @@ function createGlobTool(config) {
       }
       let rootStat;
       try {
-        rootStat = await stat6(absoluteRoot);
+        rootStat = await stat7(absoluteRoot);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -3791,9 +4161,9 @@ function createGlobTool(config) {
           for (const dirent of dirents) {
             if (abort.aborted)
               break outer;
-            const childAbs = join7(node.absolutePath, dirent.name);
-            const relFromRoot = toForwardSlash(relative2(absoluteRoot, childAbs));
-            const relFromWorkspace = toForwardSlash(relative2(guard.cwd, childAbs));
+            const childAbs = join10(node.absolutePath, dirent.name);
+            const relFromRoot = toForwardSlash(relative3(absoluteRoot, childAbs));
+            const relFromWorkspace = toForwardSlash(relative3(guard.cwd, childAbs));
             if (matchesAnyGlob(relFromWorkspace, excludeGlobs))
               continue;
             const isDir = dirent.isDirectory();
@@ -3815,7 +4185,7 @@ function createGlobTool(config) {
               let mtime = new Date(0).toISOString();
               if (type !== "symlink") {
                 try {
-                  const childStat = await stat6(childAbs);
+                  const childStat = await stat7(childAbs);
                   size = type === "directory" ? 0 : childStat.size;
                   mtime = childStat.mtime.toISOString();
                 } catch {
@@ -3843,158 +4213,195 @@ function createGlobTool(config) {
   });
 }
 // src/tools/built-in/launch-strategy/launch-strategy.ts
-import { z as z10 } from "zod";
+import { z as z11 } from "zod";
 
 // src/strategy/discover/discover.ts
 import { existsSync as existsSync4 } from "fs";
-import { join as join9 } from "path";
+import { isAbsolute as isAbsolute3, join as join12, relative as relative5, resolve as resolve7 } from "path";
+import stripJsonComments2 from "strip-json-comments";
 
 // src/strategy/discover/discover.utils.ts
-import { existsSync as existsSync3, readdirSync, readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname6, join as join8, resolve as resolve4 } from "path";
+import { existsSync as existsSync3, readdirSync } from "fs";
+import { realpath, stat as stat8 } from "fs/promises";
+import { dirname as dirname9, isAbsolute as isAbsolute2, join as join11, relative as relative4, resolve as resolve6 } from "path";
 import stripJsonComments from "strip-json-comments";
 import YAML2 from "yaml";
 
 // src/strategy/schema.ts
+import { z as z10 } from "zod";
+
+// src/agents/loader/loader.schema.ts
 import { z as z9 } from "zod";
 
+// src/agents/registry/agent-registry.constants.ts
+var BUILT_IN_AGENT_NAMES = ["llm", "user"];
+
 // src/agents/loader/loader.schema.ts
-import { z as z8 } from "zod";
-var SystemPromptTemplateSchema = z8.object({
-  template: z8.string(),
-  variables: z8.record(z8.union([
-    z8.string(),
-    z8.number(),
-    z8.boolean(),
-    z8.array(z8.string()),
-    z8.record(z8.string())
+var SystemPromptTemplateSchema = z9.object({
+  template: z9.string(),
+  variables: z9.record(z9.union([
+    z9.string(),
+    z9.number(),
+    z9.boolean(),
+    z9.array(z9.string()),
+    z9.record(z9.string())
   ])).optional()
 }).strict();
-var ModelOptionsSchema = z8.object({
-  temperature: z8.number().optional(),
-  topP: z8.number().optional(),
-  topK: z8.number().optional(),
-  maxOutputTokens: z8.number().optional(),
-  maxRetries: z8.number().optional(),
-  frequencyPenalty: z8.number().optional(),
-  presencePenalty: z8.number().optional(),
-  seed: z8.number().optional()
+var ModelOptionsSchema = z9.object({
+  temperature: z9.number().optional(),
+  topP: z9.number().optional(),
+  topK: z9.number().optional(),
+  maxOutputTokens: z9.number().optional(),
+  maxRetries: z9.number().optional(),
+  frequencyPenalty: z9.number().optional(),
+  presencePenalty: z9.number().optional(),
+  seed: z9.number().optional()
 }).strict();
-var OutputSchemaSchema = z8.record(z8.unknown());
-var ConversationContextSchema = z8.object({
-  rollingWindow: z8.union([
-    z8.number().int().nonnegative(),
-    z8.object({ maxRecords: z8.number().int().nonnegative() }).strict()
+var OutputSchemaSchema = z9.record(z9.unknown());
+var ConversationContextSchema = z9.object({
+  rollingWindow: z9.union([
+    z9.number().int().nonnegative(),
+    z9.object({ maxRecords: z9.number().int().nonnegative() }).strict()
   ]).optional(),
-  compaction: z8.union([
-    z8.boolean(),
-    z8.object({
-      keepRecent: z8.number().int().nonnegative().optional(),
-      threshold: z8.number().int().positive().optional()
+  compaction: z9.union([
+    z9.boolean(),
+    z9.object({
+      keepRecent: z9.number().int().nonnegative().optional(),
+      threshold: z9.number().int().positive().optional()
     }).strict()
   ]).optional()
 }).strict();
-var AgentDescriptionSchema = z8.object({
-  name: z8.string().min(1),
-  description: z8.string().optional(),
-  model: z8.string().min(1),
-  systemPrompt: z8.string().optional(),
+var LLMAgentDescriptionSchema = z9.object({
+  name: z9.string().min(1),
+  type: z9.literal("llm").optional(),
+  description: z9.string().optional(),
+  model: z9.string().min(1),
+  systemPrompt: z9.string().optional(),
   systemPromptTemplate: SystemPromptTemplateSchema.optional(),
-  tools: z8.array(z8.string()).optional(),
-  providerOptions: z8.record(z8.record(z8.unknown())).optional(),
+  tools: z9.array(z9.string()).optional(),
+  providerOptions: z9.record(z9.record(z9.unknown())).optional(),
   modelOptions: ModelOptionsSchema.optional(),
   outputSchema: OutputSchemaSchema.optional(),
   context: ConversationContextSchema.optional(),
-  maxSteps: z8.number().int().positive().optional()
+  maxSteps: z9.number().int().positive().optional()
+}).strict();
+var CustomAgentDescriptionSchema = z9.object({
+  name: z9.string().min(1),
+  description: z9.string().optional(),
+  type: z9.string().min(1).refine((type) => !BUILT_IN_AGENT_NAMES.includes(type), "Built-in agent types must use their built-in schema."),
+  config: z9.record(z9.unknown()).optional()
 }).strict();
+var AgentDescriptionSchema = z9.union([
+  LLMAgentDescriptionSchema,
+  CustomAgentDescriptionSchema
+]);
+
+// src/flows/registry/flow-registry.constants.ts
+var BUILT_IN_FLOW_NAMES = [
+  "sequential",
+  "cycle",
+  "broadcast"
+];
 
 // src/strategy/schema.ts
-var UserAgentDefSchema = z9.object({
-  type: z9.literal("user"),
-  description: z9.string().optional(),
-  config: z9.object({
-    requireInput: z9.boolean().optional(),
-    presetMessage: z9.string().optional()
+var UserAgentDefSchema = z10.object({
+  type: z10.literal("user"),
+  description: z10.string().optional(),
+  config: z10.object({
+    requireInput: z10.boolean().optional(),
+    presetMessage: z10.string().optional()
   }).strict().optional()
 }).strict();
-var LLMAgentDefSchema = z9.object({
-  type: z9.literal("llm").optional(),
-  description: z9.string().optional(),
-  model: z9.string().optional(),
-  systemPrompt: z9.string().optional(),
-  systemPromptTemplate: z9.object({
-    template: z9.string(),
-    variables: z9.record(z9.union([
-      z9.string(),
-      z9.number(),
-      z9.boolean(),
-      z9.array(z9.string()),
-      z9.record(z9.string())
+var LLMAgentDefSchema = z10.object({
+  type: z10.literal("llm").optional(),
+  description: z10.string().optional(),
+  model: z10.string().optional(),
+  systemPrompt: z10.string().optional(),
+  systemPromptTemplate: z10.object({
+    template: z10.string(),
+    variables: z10.record(z10.union([
+      z10.string(),
+      z10.number(),
+      z10.boolean(),
+      z10.array(z10.string()),
+      z10.record(z10.string())
     ])).optional()
   }).strict().optional(),
-  tools: z9.array(z9.string()).optional(),
-  skills: z9.array(z9.string().min(1)).optional(),
-  providerOptions: z9.record(z9.record(z9.unknown())).optional(),
+  tools: z10.array(z10.string()).optional(),
+  skills: z10.array(z10.string().min(1)).optional(),
+  providerOptions: z10.record(z10.record(z10.unknown())).optional(),
   modelOptions: ModelOptionsSchema.optional(),
   outputSchema: OutputSchemaSchema.optional(),
   context: ConversationContextSchema.optional(),
-  maxSteps: z9.number().int().positive().optional()
+  maxSteps: z10.number().int().positive().optional()
+}).strict();
+var CustomAgentDefSchema = z10.object({
+  type: z10.string().min(1).refine((type) => !BUILT_IN_AGENT_NAMES.includes(type), "Built-in agent types must use their built-in schema."),
+  description: z10.string().optional(),
+  config: z10.record(z10.unknown()).optional()
 }).strict();
-var AgentDefSchema = z9.union([UserAgentDefSchema, LLMAgentDefSchema]);
-var AgentStepSchema = z9.object({
-  agent: z9.string(),
-  description: z9.string().optional()
+var AgentDefSchema = z10.union([
+  UserAgentDefSchema,
+  LLMAgentDefSchema,
+  CustomAgentDefSchema
+]);
+var AgentStepSchema = z10.object({
+  agent: z10.string(),
+  description: z10.string().optional()
 }).strict();
-var FlowStepSchema = z9.lazy(() => z9.union([AgentStepSchema, FlowDefSchema]));
+var FlowStepSchema = z10.lazy(() => z10.union([AgentStepSchema, FlowDefSchema]));
 var BaseFlowFields = {
-  name: z9.string(),
-  description: z9.string().optional(),
-  steps: z9.array(FlowStepSchema).min(1)
+  name: z10.string().min(1),
+  description: z10.string().optional(),
+  steps: z10.array(FlowStepSchema).min(1)
 };
-var SequentialFlowDefSchema = z9.object({
+var SequentialFlowDefSchema = z10.object({
+  ...BaseFlowFields,
+  type: z10.literal("sequential")
+}).strict();
+var CycleFlowDefSchema = z10.object({
   ...BaseFlowFields,
-  type: z9.literal("sequential")
+  type: z10.literal("cycle"),
+  cycles: z10.union([z10.number().int().positive(), z10.literal("Infinity")]).optional(),
+  observer: z10.string().optional(),
+  breakCycleSignals: z10.array(z10.string().min(1)).min(1).optional(),
+  breakCycleSignalMatch: z10.enum(["substring", "first-line", "any-line", "exact"]).optional()
 }).strict();
-var CycleFlowDefSchema = z9.object({
+var BroadcastFlowDefSchema = z10.object({
   ...BaseFlowFields,
-  type: z9.literal("cycle"),
-  cycles: z9.union([z9.number().int().positive(), z9.literal("Infinity")]).optional(),
-  observer: z9.string().optional(),
-  breakCycleSignals: z9.array(z9.string().min(1)).min(1).optional(),
-  breakCycleSignalMatch: z9.enum(["substring", "first-line", "any-line", "exact"]).optional()
+  type: z10.literal("broadcast"),
+  separator: z10.string().optional()
 }).strict();
-var BroadcastFlowDefSchema = z9.object({
+var CustomFlowDefSchema = z10.object({
   ...BaseFlowFields,
-  type: z9.literal("broadcast"),
-  separator: z9.string().optional()
+  type: z10.string().min(1).refine((type) => !BUILT_IN_FLOW_NAMES.includes(type), "Built-in flow types must use their built-in schema."),
+  config: z10.record(z10.unknown()).optional()
 }).strict();
-var FlowDefSchema = z9.discriminatedUnion("type", [
+var BuiltInFlowDefSchema = z10.discriminatedUnion("type", [
   SequentialFlowDefSchema,
   CycleFlowDefSchema,
   BroadcastFlowDefSchema
 ]);
-var StrategySchema = z9.object({
-  name: z9.string().min(1),
-  version: z9.string().min(1),
-  description: z9.string().optional(),
-  agents: z9.record(AgentDefSchema),
+var FlowDefSchema = z10.union([
+  BuiltInFlowDefSchema,
+  CustomFlowDefSchema
+]);
+var StrategySchema = z10.object({
+  name: z10.string().min(1),
+  version: z10.string().min(1),
+  description: z10.string().optional(),
+  agents: z10.record(AgentDefSchema),
   flow: FlowDefSchema
 }).strict();
-var CommaProjectManifestSchema = z9.object({
-  name: z9.string().min(1),
-  version: z9.string().optional(),
-  description: z9.string().optional(),
-  strategies: z9.array(z9.string()).min(1),
-  tools: z9.array(z9.string()).optional(),
-  entry: z9.string().optional(),
-  dependencies: z9.array(z9.string()).optional()
-}).strict();
 function isUserAgentDef(agentDefinition) {
   return "type" in agentDefinition && agentDefinition.type === "user";
 }
 function isLLMAgentDef(agentDefinition) {
   return !("type" in agentDefinition) || agentDefinition.type === undefined || agentDefinition.type === "llm";
 }
+function isCustomAgentDef(agentDefinition) {
+  return !isUserAgentDef(agentDefinition) && !isLLMAgentDef(agentDefinition);
+}
 function isAgentStep(step) {
   return typeof step === "object" && step !== null && "agent" in step && typeof step.agent === "string";
 }
@@ -4075,8 +4482,50 @@ async function parseProjectManifest(manifestPath) {
     const detail = firstIssue ? `${firstIssue.path.join(".")}: ${firstIssue.message}` : "validation failed";
     return { ok: false, reason: `Manifest invalid (${detail})` };
   }
-  const manifestDir = dirname6(manifestPath);
-  const strategyPaths = result.data.strategies.map((relativePath) => resolve4(manifestDir, relativePath));
+  const manifestDir = dirname9(manifestPath);
+  const strategyPaths = [];
+  let realManifestDir;
+  try {
+    realManifestDir = await realpath(manifestDir);
+    for (const entry of Object.values(result.data.strategies ?? {})) {
+      if (entry.expose !== true)
+        continue;
+      if (isAbsolute2(entry.path)) {
+        return {
+          ok: false,
+          reason: `Strategy path must be relative: ${entry.path}`
+        };
+      }
+      const candidate = resolve6(manifestDir, entry.path);
+      const lexicalRelative = relative4(manifestDir, candidate);
+      if (lexicalRelative.startsWith("..") || isAbsolute2(lexicalRelative)) {
+        return {
+          ok: false,
+          reason: `Strategy path escapes project: ${entry.path}`
+        };
+      }
+      const resolvedPath = await realpath(candidate);
+      const realRelative = relative4(realManifestDir, resolvedPath);
+      if (realRelative.startsWith("..") || isAbsolute2(realRelative)) {
+        return {
+          ok: false,
+          reason: `Strategy path escapes project: ${entry.path}`
+        };
+      }
+      if (!(await stat8(resolvedPath)).isFile()) {
+        return {
+          ok: false,
+          reason: `Strategy path is not a regular file: ${entry.path}`
+        };
+      }
+      strategyPaths.push(candidate);
+    }
+  } catch (error) {
+    return {
+      ok: false,
+      reason: `Strategy path is missing or unreadable: ${error instanceof Error ? error.message : String(error)}`
+    };
+  }
   return {
     ok: true,
     name: result.data.name,
@@ -4088,7 +4537,7 @@ function listStrategyFiles(dir) {
   if (!existsSync3(dir))
     return [];
   try {
-    return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isFile() && hasStrategyExtension(entry.name)).map((entry) => join8(dir, entry.name));
+    return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isFile() && hasStrategyExtension(entry.name)).map((entry) => join11(dir, entry.name));
   } catch {
     return [];
   }
@@ -4097,7 +4546,17 @@ function listProjectManifests(dir) {
   if (!existsSync3(dir))
     return [];
   try {
-    return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync3(join8(dir, entry.name, "comma-project.json"))).map((entry) => join8(dir, entry.name, "comma-project.json"));
+    return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync3(join11(dir, entry.name, "comma-project.json"))).map((entry) => join11(dir, entry.name, "comma-project.json"));
+  } catch {
+    return [];
+  }
+}
+function listInstalledProjectManifests(dataDir) {
+  const packagesDir = join11(dataDir, "packages");
+  if (!existsSync3(packagesDir))
+    return [];
+  try {
+    return readdirSync(packagesDir, { withFileTypes: true }).filter((scope) => scope.isDirectory() && scope.name.startsWith("@")).flatMap((scope) => listProjectManifests(join11(packagesDir, scope.name)));
   } catch {
     return [];
   }
@@ -4115,31 +4574,6 @@ function buildDiscoveredStrategy(input) {
     ...manifestPath !== undefined ? { manifestPath } : {}
   };
 }
-function findCorePackageRoot() {
-  let dir;
-  try {
-    dir = import.meta.dir;
-  } catch {
-    return null;
-  }
-  for (let i = 0;i < 12; i += 1) {
-    const manifestPath = join8(dir, "package.json");
-    if (existsSync3(manifestPath)) {
-      try {
-        const content = readFileSync3(manifestPath, "utf8");
-        const parsed = JSON.parse(content);
-        if (parsed && parsed.name === "@comma-agents/core") {
-          return dir;
-        }
-      } catch {}
-    }
-    const parent = dirname6(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  return null;
-}
 
 // src/strategy/discover/discover.ts
 async function discoverStrategies(options = {}) {
@@ -4186,38 +4620,55 @@ async function discoverStrategies(options = {}) {
       }));
     }
   }
-  if (includeBundled) {
-    const corePackageRoot = findCorePackageRoot();
-    if (corePackageRoot) {
-      const bundledRoot = join9(corePackageRoot, "strategies");
-      await collectSingleFiles(bundledRoot, "bundled");
-      for (const manifestPath of listProjectManifests(bundledRoot)) {
-        await collectProjectManifest(manifestPath, "bundled-project");
-      }
-      const bundledRootManifest = join9(bundledRoot, "comma-project.json");
-      if (existsSync4(bundledRootManifest)) {
-        await collectProjectManifest(bundledRootManifest, "bundled-project");
-      }
-    }
-  }
-  const cwdStrategiesDir = join9(cwd2, ".comma", "strategies");
+  const cwdStrategiesDir = join12(cwd2, ".comma", "strategies");
   await collectSingleFiles(cwdStrategiesDir, "cwd");
   for (const manifestPath of listProjectManifests(cwdStrategiesDir)) {
     await collectProjectManifest(manifestPath, "cwd-project");
   }
-  const cwdRootManifest = join9(cwd2, ".comma", "comma-project.json");
+  const cwdRootManifest = join12(cwd2, ".comma", "comma-project.json");
   if (existsSync4(cwdRootManifest)) {
     await collectProjectManifest(cwdRootManifest, "cwd-root-project");
   }
   if (dataDir) {
-    const dataStrategiesDir = join9(dataDir, "strategies");
+    const dataStrategiesDir = join12(dataDir, "strategies");
     await collectSingleFiles(dataStrategiesDir, "data");
     for (const manifestPath of listProjectManifests(dataStrategiesDir)) {
       await collectProjectManifest(manifestPath, "data-project");
     }
+    for (const manifestPath of listInstalledProjectManifests(dataDir)) {
+      await collectProjectManifest(manifestPath, "hub-package");
+    }
+  }
+  if (includeBundled) {
+    for (const manifestPath of getBundledProjectManifestCandidates()) {
+      if (!existsSync4(manifestPath))
+        continue;
+      await collectProjectManifest(manifestPath, "bundled");
+      break;
+    }
   }
   return { strategies, warnings };
 }
+async function resolveInstalledStrategyReference(reference, dataDir = safeResolveDataDir()) {
+  const match = /^(@[^/]+\/[^/]+)\/strategies\/([^/]+)$/.exec(reference);
+  if (!match)
+    return;
+  const [, packageName, artifactId] = match;
+  if (!packageName || !artifactId)
+    return;
+  if (dataDir) {
+    const installedManifestPath = join12(dataDir, "packages", packageName, "comma-project.json");
+    const installed = await resolveProjectStrategyReference(installedManifestPath, packageName, artifactId, "hub-package");
+    if (installed)
+      return installed;
+  }
+  for (const manifestPath of getBundledProjectManifestCandidates()) {
+    const bundled = await resolveProjectStrategyReference(manifestPath, packageName, artifactId, "bundled");
+    if (bundled)
+      return bundled;
+  }
+  return;
+}
 function safeResolveDataDir() {
   try {
     return resolveDataDir();
@@ -4225,65 +4676,49 @@ function safeResolveDataDir() {
     return;
   }
 }
+function getBundledProjectManifestCandidates() {
+  return [
+    resolve7(import.meta.dir, "strategies", "@comma", "core-strategies", "comma-project.json"),
+    resolve7(import.meta.dir, "..", "..", "..", "strategies", "@comma", "core-strategies", "comma-project.json"),
+    resolve7(import.meta.dir, "..", "..", "strategies", "@comma", "core-strategies", "comma-project.json")
+  ];
+}
+async function resolveProjectStrategyReference(manifestPath, packageName, artifactId, origin) {
+  if (!existsSync4(manifestPath))
+    return;
+  try {
+    const raw = JSON.parse(stripJsonComments2(await Bun.file(manifestPath).text()));
+    const manifest = CommaProjectManifestSchema.parse(raw);
+    if (manifest.name !== packageName)
+      return;
+    const artifact = manifest.strategies?.[artifactId];
+    if (!artifact || isAbsolute3(artifact.path))
+      return;
+    const manifestDir = resolve7(manifestPath, "..");
+    const strategyPath = resolve7(manifestDir, artifact.path);
+    const rel = relative5(manifestDir, strategyPath);
+    if (rel.startsWith("..") || isAbsolute3(rel))
+      return;
+    const header = await parseStrategyHeader(strategyPath);
+    if (!header.ok)
+      return;
+    return buildDiscoveredStrategy({
+      header,
+      path: strategyPath,
+      origin,
+      projectName: manifest.name,
+      manifestPath
+    });
+  } catch {
+    return;
+  }
+}
 
 // src/strategy/loader/loader.ts
-import { dirname as dirname7 } from "path";
-import stripJsonComments2 from "strip-json-comments";
+import { dirname as dirname10 } from "path";
+import stripJsonComments3 from "strip-json-comments";
 import YAML3 from "yaml";
 
-// src/strategy/loader/loader.utils.ts
-import { isAbsolute as isAbsolute2, resolve as resolve5 } from "path";
-import { jsonSchema } from "ai";
-
-// src/agents/built-in/user/user-agent.utils.ts
-var defaultInputCollector = async (request) => {
-  if (typeof globalThis.prompt === "function") {
-    return globalThis.prompt(request.prompt) ?? "";
-  }
-  const { createInterface } = await import("readline");
-  const readlineInterface = createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return new Promise((resolve5, reject) => {
-    if (request.signal?.aborted) {
-      readlineInterface.close();
-      reject(new DOMException("Input collection aborted", "AbortError"));
-      return;
-    }
-    const onAbort = () => {
-      readlineInterface.close();
-      reject(new DOMException("Input collection aborted", "AbortError"));
-    };
-    request.signal?.addEventListener("abort", onAbort, { once: true });
-    readlineInterface.question(`${request.prompt}
-> `, (answer) => {
-      request.signal?.removeEventListener("abort", onAbort);
-      readlineInterface.close();
-      resolve5(answer);
-    });
-  });
-};
-
-// src/agents/built-in/user/user-agent.ts
-function createUserAgent(config) {
-  const requireInput = config.requireInput ?? true;
-  const collector = config.inputCollector ?? defaultInputCollector;
-  const agent = createAgent({
-    name: config.name,
-    execute: async (message) => {
-      if (requireInput && message === "") {
-        return collector({
-          agentName: config.name,
-          prompt: message
-        });
-      }
-      return config.presetMessage ?? message;
-    }
-  });
-  return agent;
-}
-
 // src/flows/flow/flow.utils.ts
 function buildFlowResult(text, stepResults) {
   let promptTokens = 0;
@@ -4453,7 +4888,7 @@ function createCycleFlow(config) {
     let current = message;
     for (let cycle = 0;cycle < cycles; cycle++) {
       if (cycle > 0) {
-        await new Promise((resolve5) => setTimeout(resolve5, 0));
+        await new Promise((resolve8) => setTimeout(resolve8, 0));
       }
       current = await runTransformHooks(store.alterMessageBeforeCycle, current);
       for (const step of steps) {
@@ -4501,8 +4936,221 @@ function hookIntoFlow(flow, hooks) {
   }
 }
 
+// src/flows/registry/flow-registry.ts
+var flowRegistry = new Map;
+function defineFlowType(definition) {
+  return definition;
+}
+function registerFlow(name, definition) {
+  if (BUILT_IN_FLOW_NAMES.includes(name)) {
+    console.warn(`[comma-agents] registerFlow("${name}"): overriding built-in flow "${name}". ` + "The custom flow will be used instead of the default.");
+  } else if (flowRegistry.has(name)) {
+    console.warn(`[comma-agents] registerFlow("${name}"): overriding previously registered flow "${name}".`);
+  }
+  flowRegistry.set(name, {
+    create(context) {
+      const result = definition.configSchema.safeParse(context.config);
+      if (!result.success) {
+        const issues = result.error.issues.map((issue) => {
+          const path = issue.path.length ? `config.${issue.path.join(".")}` : "config";
+          return `  - ${path}: ${issue.message}`;
+        }).join(`
+`);
+        throw new StrategyValidationError(`Flow "${context.name}" configuration validation failed for type "${name}":
+${issues}`, { cause: result.error });
+      }
+      return definition.create({
+        name: context.name,
+        steps: context.steps,
+        config: result.data,
+        resolveAgent: context.resolveAgent
+      });
+    }
+  });
+}
+function unregisterFlow(name) {
+  return flowRegistry.delete(name);
+}
+function getRegisteredFlowNames() {
+  return [...flowRegistry.keys()];
+}
+function resolveRegisteredFlow(name) {
+  return flowRegistry.get(name);
+}
+function resetFlowRegistry() {
+  flowRegistry = new Map;
+}
+
+// src/flows/loader/loader.utils.ts
+var builtInFlowFactories = {
+  sequential(definition, steps) {
+    return createSequentialFlow({ name: definition.name, steps });
+  },
+  cycle(definition, steps, resolveAgent) {
+    const cycleDefinition = definition;
+    const cycles = cycleDefinition.cycles === "Infinity" ? Infinity : cycleDefinition.cycles ?? 1;
+    const observer = cycleDefinition.observer ? resolveAgent(cycleDefinition.observer) : undefined;
+    return createCycleFlow({
+      name: cycleDefinition.name,
+      steps,
+      cycles,
+      ...observer ? { observer } : {},
+      ...cycleDefinition.breakCycleSignals ? { breakCycleSignals: cycleDefinition.breakCycleSignals } : {},
+      ...cycleDefinition.breakCycleSignalMatch ? { breakCycleSignalMatch: cycleDefinition.breakCycleSignalMatch } : {}
+    });
+  },
+  broadcast(definition, steps) {
+    const broadcastDefinition = definition;
+    return createBroadcastFlow({
+      name: broadcastDefinition.name,
+      steps,
+      separator: broadcastDefinition.separator
+    });
+  }
+};
+function buildFlowFromDescription(description, options) {
+  const resolveAgent = (name) => resolveAgentReference(name, description.name, options.agents);
+  const steps = description.steps.map((step, stepIndex) => {
+    if (isAgentStep(step)) {
+      return resolveAgentReference(step.agent, description.name, options.agents);
+    }
+    if (isFlowDef(step)) {
+      return buildFlowFromDescription(step, options);
+    }
+    throw new StrategyValidationError(`Flow "${description.name}" step ${stepIndex} is neither an agent reference nor a flow definition.`);
+  });
+  const registeredFlow = resolveRegisteredFlow(description.type);
+  const builtInFactory = builtInFlowFactories[description.type];
+  let flow;
+  if (registeredFlow) {
+    flow = registeredFlow.create({
+      name: description.name,
+      steps,
+      config: "config" in description ? description.config ?? {} : {},
+      resolveAgent
+    });
+  } else if (builtInFactory) {
+    flow = builtInFactory(description, steps, resolveAgent);
+  } else {
+    throw new StrategyValidationError(`Flow "${description.name}" references unknown flow type "${description.type}". ` + `Built-in flows: [${BUILT_IN_FLOW_NAMES.join(", ")}]. ` + `Registered flows: [${getRegisteredFlowNames().join(", ") || "(none)"}].`);
+  }
+  if (options.flowHooks) {
+    hookIntoFlow(flow, options.flowHooks);
+  }
+  return flow;
+}
+function resolveAgentReference(agentName, flowName, agents) {
+  const agent = agents[agentName];
+  if (!agent) {
+    const available = Object.keys(agents).join(", ");
+    throw new StrategyValidationError(`Flow "${flowName}" references agent "${agentName}" which is not defined. ` + `Available agents: [${available}].`);
+  }
+  return agent;
+}
+
+// src/strategy/loader/loader.utils.ts
+import { isAbsolute as isAbsolute4, resolve as resolve8 } from "path";
+import { jsonSchema } from "ai";
+
+// src/agents/built-in/user/user-agent.utils.ts
+var defaultInputCollector = async (request) => {
+  if (typeof globalThis.prompt === "function") {
+    return globalThis.prompt(request.prompt) ?? "";
+  }
+  const { createInterface } = await import("readline");
+  const readlineInterface = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve8, reject) => {
+    if (request.signal?.aborted) {
+      readlineInterface.close();
+      reject(new DOMException("Input collection aborted", "AbortError"));
+      return;
+    }
+    const onAbort = () => {
+      readlineInterface.close();
+      reject(new DOMException("Input collection aborted", "AbortError"));
+    };
+    request.signal?.addEventListener("abort", onAbort, { once: true });
+    readlineInterface.question(`${request.prompt}
+> `, (answer) => {
+      request.signal?.removeEventListener("abort", onAbort);
+      readlineInterface.close();
+      resolve8(answer);
+    });
+  });
+};
+
+// src/agents/built-in/user/user-agent.ts
+function createUserAgent(config) {
+  const requireInput = config.requireInput ?? true;
+  const collector = config.inputCollector ?? defaultInputCollector;
+  const agent = createAgent({
+    name: config.name,
+    execute: async (message) => {
+      if (requireInput && message === "") {
+        return collector({
+          agentName: config.name,
+          prompt: message
+        });
+      }
+      return config.presetMessage ?? message;
+    }
+  });
+  return agent;
+}
+
+// src/agents/registry/agent-registry.ts
+var agentRegistry = new Map;
+function defineAgentType(definition) {
+  return definition;
+}
+function registerAgent(name, definition) {
+  if (BUILT_IN_AGENT_NAMES.includes(name)) {
+    throw new StrategyValidationError(`Cannot register reserved built-in agent type "${name}". ` + `Choose a custom name other than: [${BUILT_IN_AGENT_NAMES.join(", ")}].`);
+  }
+  if (name.length === 0) {
+    throw new StrategyValidationError("Custom agent type names cannot be empty.");
+  }
+  if (agentRegistry.has(name)) {
+    console.warn(`[comma-agents] registerAgent("${name}"): overriding previously registered agent "${name}".`);
+  }
+  agentRegistry.set(name, {
+    async create(context) {
+      const result = definition.configSchema.safeParse(context.config);
+      if (!result.success) {
+        const issues = result.error.issues.map((issue) => {
+          const path = issue.path.length ? `config.${issue.path.join(".")}` : "config";
+          return `  - ${path}: ${issue.message}`;
+        }).join(`
+`);
+        throw new StrategyValidationError(`Agent "${context.name}" configuration validation failed for type "${name}":
+${issues}`, { cause: result.error });
+      }
+      return await definition.create({
+        name: context.name,
+        config: result.data,
+        runtime: context.runtime
+      });
+    }
+  });
+}
+function unregisterAgent(name) {
+  return agentRegistry.delete(name);
+}
+function getRegisteredAgentNames() {
+  return [...agentRegistry.keys()];
+}
+function resolveRegisteredAgent(name) {
+  return agentRegistry.get(name);
+}
+function resetAgentRegistry() {
+  agentRegistry = new Map;
+}
+
 // src/prompts/template/prompt-template.ts
-import { readFile as readFile6 } from "fs/promises";
+import { readFile as readFile8 } from "fs/promises";
 import { Liquid } from "liquidjs";
 var engine = new Liquid({
   strictVariables: false,
@@ -4523,7 +5171,7 @@ engine.registerFilter("file", async (filePath) => {
   if (!resolvedPath)
     throw new Error('{{ "/path" | file }} requires a file path');
   try {
-    const content = await readFile6(resolvedPath, "utf-8");
+    const content = await readFile8(resolvedPath, "utf-8");
     return content.split(`
 `)[0]?.trim() ?? "";
   } catch {
@@ -4565,7 +5213,7 @@ function createPromptTemplate(config) {
     template: config.template,
     defaults,
     async render(overrides) {
-      const resolve5 = async (vars) => {
+      const resolve8 = async (vars) => {
         const out = {};
         await Promise.all(Object.entries(vars).map(async ([key, variableValue]) => {
           out[key] = typeof variableValue === "function" ? await variableValue() : variableValue;
@@ -4573,8 +5221,8 @@ function createPromptTemplate(config) {
         return out;
       };
       const [base, over] = await Promise.all([
-        resolve5(defaults),
-        overrides ? resolve5(overrides) : {}
+        resolve8(defaults),
+        overrides ? resolve8(overrides) : {}
       ]);
       return engine.parseAndRender(config.template, { ...base, ...over });
     },
@@ -4585,11 +5233,11 @@ function createPromptTemplate(config) {
 }
 
 // src/skills/skills.loader.ts
-import { readdir as readdir4, stat as stat7 } from "fs/promises";
-import { join as join11 } from "path";
+import { readdir as readdir4, stat as stat9 } from "fs/promises";
+import { join as join14 } from "path";
 
 // src/skills/skills.constants.ts
-var GLOBAL_SKILLS_SUBDIR = "comma-agents/skills";
+var GLOBAL_SKILLS_SUBDIR = "skills";
 var PROJECT_SKILLS_SUBDIR = ".comma/skills";
 var SKILL_FILENAME = "SKILL.md";
 var SKILL_MAX_BYTES = 256 * 1024;
@@ -4620,23 +5268,12 @@ function createSkillRegistry() {
 }
 
 // src/skills/skills.utils.ts
-import { homedir as homedir3, platform } from "os";
-import { join as join10 } from "path";
-function resolveUserConfigRoot() {
-  const currentPlatform = platform();
-  if (currentPlatform === "darwin") {
-    return join10(homedir3(), "Library", "Application Support");
-  }
-  if (currentPlatform === "win32") {
-    return process.env.APPDATA ?? join10(homedir3(), "AppData", "Roaming");
-  }
-  return process.env.XDG_CONFIG_HOME ?? join10(homedir3(), ".config");
-}
+import { join as join13 } from "path";
 function resolveDefaultGlobalSkillsDir() {
-  return join10(resolveUserConfigRoot(), GLOBAL_SKILLS_SUBDIR);
+  return join13(resolveDataDir(), GLOBAL_SKILLS_SUBDIR);
 }
 function resolveDefaultProjectSkillsDir(workspaceRoot) {
-  return join10(workspaceRoot, PROJECT_SKILLS_SUBDIR);
+  return join13(workspaceRoot, PROJECT_SKILLS_SUBDIR);
 }
 function parseSkillFile(rawContent) {
   const normalised = rawContent.replace(/^\uFEFF/, "");
@@ -4725,11 +5362,11 @@ async function scanDirectoryInto(skillsDirectory, origin, registry, warnings) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const skillDir = join11(skillsDirectory, entry.name);
-    const skillFile = join11(skillDir, SKILL_FILENAME);
+    const skillDir = join14(skillsDirectory, entry.name);
+    const skillFile = join14(skillDir, SKILL_FILENAME);
     let fileStat;
     try {
-      fileStat = await stat7(skillFile);
+      fileStat = await stat9(skillFile);
     } catch (statError) {
       const code = statError.code;
       if (code === "ENOENT" || code === "ENOTDIR")
@@ -4822,14 +5459,32 @@ function mergeSystemPrompts(prompts) {
 }
 
 // src/strategy/loader/loader.utils.ts
+var builtInAgentFactories = {
+  user(name, agentDefinition, options) {
+    return buildUserAgent(name, agentDefinition, options);
+  },
+  llm(name, agentDefinition, options) {
+    return buildLLMAgent(name, agentDefinition, options);
+  }
+};
 async function buildAgentRegistry(strategy, options) {
   const registry = {};
   for (const [name, agentDefinition] of Object.entries(strategy.agents)) {
-    if (isUserAgentDef(agentDefinition)) {
-      registry[name] = buildUserAgent(name, agentDefinition, options);
-    } else if (isLLMAgentDef(agentDefinition)) {
-      registry[name] = await buildLLMAgent(name, agentDefinition, options);
+    const agentType = agentDefinition.type ?? "llm";
+    const builtInFactory = builtInAgentFactories[agentType];
+    if (builtInFactory) {
+      registry[name] = await builtInFactory(name, agentDefinition, options);
+      continue;
     }
+    const registeredAgent = resolveRegisteredAgent(agentType);
+    if (!registeredAgent) {
+      throw new StrategyValidationError(`Agent "${name}" references unknown agent type "${agentType}". ` + `Built-in agents: [${BUILT_IN_AGENT_NAMES.join(", ")}]. ` + `Registered agents: [${getRegisteredAgentNames().join(", ") || "(none)"}].`);
+    }
+    registry[name] = await registeredAgent.create({
+      name,
+      config: "config" in agentDefinition ? agentDefinition.config ?? {} : {},
+      runtime: options
+    });
   }
   return registry;
 }
@@ -4880,11 +5535,11 @@ async function buildLLMAgent(name, agentDefinition, options) {
   let resolvedSystemPrompt = agentDefinition.systemPrompt;
   if (resolvedSystemPrompt && (resolvedSystemPrompt.endsWith(".txt") || resolvedSystemPrompt.endsWith(".md"))) {
     let resolvedPath = resolvedSystemPrompt;
-    if (!isAbsolute2(resolvedSystemPrompt)) {
+    if (!isAbsolute4(resolvedSystemPrompt)) {
       if (options.strategyDir) {
-        resolvedPath = resolve5(options.strategyDir, resolvedSystemPrompt);
+        resolvedPath = resolve8(options.strategyDir, resolvedSystemPrompt);
       } else {
-        resolvedPath = resolve5(resolvedSystemPrompt);
+        resolvedPath = resolve8(resolvedSystemPrompt);
       }
     }
     const file = Bun.file(resolvedPath);
@@ -4896,11 +5551,11 @@ async function buildLLMAgent(name, agentDefinition, options) {
   let resolvedTemplate = agentDefinition.systemPromptTemplate?.template;
   if (resolvedTemplate && (resolvedTemplate.endsWith(".txt") || resolvedTemplate.endsWith(".md"))) {
     let resolvedPath = resolvedTemplate;
-    if (!isAbsolute2(resolvedTemplate)) {
+    if (!isAbsolute4(resolvedTemplate)) {
       if (options.strategyDir) {
-        resolvedPath = resolve5(options.strategyDir, resolvedTemplate);
+        resolvedPath = resolve8(options.strategyDir, resolvedTemplate);
       } else {
-        resolvedPath = resolve5(resolvedTemplate);
+        resolvedPath = resolve8(resolvedTemplate);
       }
     }
     const file = Bun.file(resolvedPath);
@@ -4990,62 +5645,6 @@ function prependSkillsHeader(systemPrompt, skillsHeader) {
 
 ${skillsHeader}`;
 }
-function buildFlow(flowDef, agents, options) {
-  const steps = resolveSteps(flowDef.steps, flowDef.name, agents, options);
-  let flow;
-  switch (flowDef.type) {
-    case "sequential":
-      flow = createSequentialFlow({
-        name: flowDef.name,
-        steps
-      });
-      break;
-    case "cycle": {
-      const cycleDef = flowDef;
-      const cycles = cycleDef.cycles === "Infinity" ? Infinity : cycleDef.cycles ?? 1;
-      const observer = cycleDef.observer ? resolveAgentRef(cycleDef.observer, flowDef.name, agents) : undefined;
-      flow = createCycleFlow({
-        name: flowDef.name,
-        steps,
-        cycles,
-        ...observer ? { observer } : {},
-        ...cycleDef.breakCycleSignals ? { breakCycleSignals: cycleDef.breakCycleSignals } : {},
-        ...cycleDef.breakCycleSignalMatch ? { breakCycleSignalMatch: cycleDef.breakCycleSignalMatch } : {}
-      });
-      break;
-    }
-    case "broadcast":
-      flow = createBroadcastFlow({
-        name: flowDef.name,
-        steps,
-        separator: flowDef.separator
-      });
-      break;
-  }
-  if (options.flowHooks) {
-    hookIntoFlow(flow, options.flowHooks);
-  }
-  return flow;
-}
-function resolveSteps(steps, flowName, agents, options) {
-  return steps.map((step, index) => {
-    if (isAgentStep(step)) {
-      return resolveAgentRef(step.agent, flowName, agents);
-    }
-    if (isFlowDef(step)) {
-      return buildFlow(step, agents, options);
-    }
-    throw new StrategyValidationError(`Flow "${flowName}" step ${index} is neither an agent reference nor a flow definition.`);
-  });
-}
-function resolveAgentRef(agentName, flowName, agents) {
-  const agent = agents[agentName];
-  if (!agent) {
-    const available = Object.keys(agents).join(", ");
-    throw new StrategyValidationError(`Flow "${flowName}" references agent "${agentName}" which is not defined. ` + `Available agents: [${available}].`);
-  }
-  return agent;
-}
 
 // src/strategy/loader/loader.ts
 async function loadStrategy(filePath, options = {}) {
@@ -5063,7 +5662,7 @@ async function loadStrategy(filePath, options = {}) {
     throw new StrategyValidationError(`Strategy file not found: ${filePath}`);
   }
   const content = await file.text();
-  const strategyDir = dirname7(filePath);
+  const strategyDir = dirname10(filePath);
   return await loadStrategyFromString(content, format, {
     ...options,
     strategyDir: options.strategyDir ?? strategyDir
@@ -5073,7 +5672,7 @@ async function loadStrategyFromString(content, format, options = {}) {
   let raw;
   try {
     if (format === "json") {
-      raw = JSON.parse(stripJsonComments2(content));
+      raw = JSON.parse(stripJsonComments3(content));
     } else {
       raw = YAML3.parse(content);
     }
@@ -5091,7 +5690,10 @@ ${issues}`, {
   }
   const strategy = result.data;
   const agents = await buildAgentRegistry(strategy, options);
-  const flow = buildFlow(strategy.flow, agents, options);
+  const flow = buildFlowFromDescription(strategy.flow, {
+    agents,
+    flowHooks: options.flowHooks
+  });
   return {
     name: strategy.name,
     version: strategy.version,
@@ -5102,11 +5704,143 @@ ${issues}`, {
   };
 }
 
+// src/strategy/loader/project-loader.ts
+import { realpath as realpath2, stat as stat10 } from "fs/promises";
+import { dirname as dirname11, isAbsolute as isAbsolute5, relative as relative6, resolve as resolve9 } from "path";
+import stripJsonComments4 from "strip-json-comments";
+import YAML4 from "yaml";
+var FILESYSTEM_TOOLS = new Set([
+  "read_file",
+  "list_directory",
+  "search_files",
+  "glob",
+  "create_file",
+  "write_file",
+  "edit_file",
+  "delete_file",
+  "restore_file",
+  "move_file"
+]);
+async function resolveProjectFile(manifestDir, declaredPath, label) {
+  if (isAbsolute5(declaredPath)) {
+    throw new StrategyValidationError(`${label} must use a relative path: ${declaredPath}`);
+  }
+  const candidate = resolve9(manifestDir, declaredPath);
+  const lexicalRelative = relative6(manifestDir, candidate);
+  if (lexicalRelative.startsWith("..") || isAbsolute5(lexicalRelative)) {
+    throw new StrategyValidationError(`${label} escapes the project directory: ${declaredPath}`);
+  }
+  let resolvedPath;
+  try {
+    resolvedPath = await realpath2(candidate);
+  } catch {
+    throw new StrategyValidationError(`${label} not found: ${candidate}`);
+  }
+  const realManifestDir = await realpath2(manifestDir);
+  const realRelative = relative6(realManifestDir, resolvedPath);
+  if (realRelative.startsWith("..") || isAbsolute5(realRelative)) {
+    throw new StrategyValidationError(`${label} escapes the project directory: ${declaredPath}`);
+  }
+  if (!(await stat10(resolvedPath)).isFile()) {
+    throw new StrategyValidationError(`${label} must be a regular file: ${candidate}`);
+  }
+  if (!await Bun.file(resolvedPath).exists()) {
+    throw new StrategyValidationError(`${label} not found: ${candidate}`);
+  }
+  return resolvedPath;
+}
+async function importProjectFile(filePath, label) {
+  try {
+    await import(filePath);
+  } catch (importError) {
+    throw new StrategyValidationError(`Failed to import ${label} "${filePath}": ${importError instanceof Error ? importError.message : String(importError)}`, { cause: importError });
+  }
+}
+async function loadProject(manifestPath) {
+  const file = Bun.file(manifestPath);
+  if (!await file.exists()) {
+    throw new StrategyValidationError(`Project manifest not found: ${manifestPath}`);
+  }
+  const content = await file.text();
+  let raw;
+  try {
+    raw = JSON.parse(stripJsonComments4(content));
+  } catch (parseError) {
+    throw new StrategyValidationError(`Failed to parse comma-project.json: ${parseError instanceof Error ? parseError.message : String(parseError)}`, { cause: parseError });
+  }
+  const result = CommaProjectManifestSchema.safeParse(raw);
+  if (!result.success) {
+    const issues = result.error.issues.map((issue) => `  - ${issue.path.join(".")}: ${issue.message}`).join(`
+`);
+    throw new StrategyValidationError(`Project manifest validation failed:
+${issues}`, { cause: result.error });
+  }
+  const manifest = result.data;
+  const manifestDir = dirname11(manifestPath);
+  if ((manifest.entry || Object.keys(manifest.tools ?? {}).length > 0 || Object.keys(manifest.flows ?? {}).length > 0) && manifest.permissions?.executesCode !== true) {
+    throw new StrategyValidationError("Projects with entry, tool, or flow modules must set permissions.executesCode to true");
+  }
+  const strategyPaths = [];
+  for (const artifact of Object.values(manifest.strategies ?? {})) {
+    strategyPaths.push(await resolveProjectFile(manifestDir, artifact.path, "Strategy file"));
+  }
+  for (const artifact of Object.values(manifest.agents ?? {})) {
+    await resolveProjectFile(manifestDir, artifact.path, "Agent file");
+  }
+  const usedTools = new Set;
+  for (const strategyPath of strategyPaths) {
+    const strategyFile = await readStrategyFile(strategyPath);
+    const raw2 = strategyFile.format === "json" ? JSON.parse(stripJsonComments4(strategyFile.content)) : YAML4.parse(strategyFile.content);
+    const strategy = StrategySchema.safeParse(raw2);
+    if (!strategy.success) {
+      throw new StrategyValidationError(`Strategy file validation failed: ${strategyPath}`, { cause: strategy.error });
+    }
+    for (const agent of Object.values(strategy.data.agents)) {
+      if ("tools" in agent && Array.isArray(agent.tools)) {
+        for (const tool of agent.tools)
+          usedTools.add(tool);
+      }
+    }
+  }
+  if ([...usedTools].some((tool) => FILESYSTEM_TOOLS.has(tool)) && manifest.permissions?.filesystem !== true) {
+    throw new StrategyValidationError("Project strategies use filesystem tools but permissions.filesystem is not true");
+  }
+  if (usedTools.has("run_command") && manifest.permissions?.shell !== true) {
+    throw new StrategyValidationError("Project strategies use run_command but permissions.shell is not true");
+  }
+  if (usedTools.has("webfetch") && manifest.permissions?.network !== true) {
+    throw new StrategyValidationError("Project strategies use webfetch but permissions.network is not true");
+  }
+  if (manifest.entry) {
+    const entryPath = await resolveProjectFile(manifestDir, manifest.entry, "Entry file");
+    await importProjectFile(entryPath, "Entry file");
+  }
+  if (manifest.tools) {
+    for (const tool of Object.values(manifest.tools)) {
+      const resolvedToolPath = await resolveProjectFile(manifestDir, tool.path, "Tool file");
+      await importProjectFile(resolvedToolPath, "Tool file");
+    }
+  }
+  if (manifest.flows) {
+    for (const flow of Object.values(manifest.flows)) {
+      const resolvedFlowPath = await resolveProjectFile(manifestDir, flow.path, "Flow file");
+      await importProjectFile(resolvedFlowPath, "Flow file");
+    }
+  }
+  return {
+    name: manifest.name,
+    version: manifest.version,
+    description: manifest.description,
+    manifest,
+    manifestDir
+  };
+}
+
 // src/tools/built-in/launch-strategy/launch-strategy.ts
-var launchStrategyParams = z10.object({
-  name: z10.string().min(1).describe("Strategy name as advertised by list_strategy. Must match a `name` field exactly."),
-  input: z10.string().describe("Initial message passed to the strategy's entry flow. Use an empty string when the entry flow is a user agent that prompts for input on its own."),
-  modelOverride: z10.string().optional().describe("Optional provider/model override (`providerID/modelID`) applied to every LLM agent in the sub-strategy.")
+var launchStrategyParams = z11.object({
+  name: z11.string().min(1).describe("Strategy name as advertised by list_strategy. Must match a `name` field exactly."),
+  input: z11.string().describe("Initial message passed to the strategy's entry flow. Use an empty string when the entry flow is a user agent that prompts for input on its own."),
+  modelOverride: z11.string().optional().describe("Optional provider/model override (`providerID/modelID`) applied to every LLM agent in the sub-strategy.")
 });
 function createLaunchStrategyTool() {
   return defineTool({
@@ -5147,7 +5881,7 @@ function createLaunchStrategyTool() {
         }
       ],
       notes: [
-        "When multiple discovered strategies share the same name (rare \u2014 possible when the same file is reachable via multiple sources), the highest-priority match (bundled > cwd > data) is launched.",
+        "When multiple discovered strategies share the same name, the highest-priority match (cwd > data > Hub packages > bundled defaults) is launched.",
         "Sub-strategies inherit the parent run's sandbox state; tools inside them are subject to the same policies as the caller."
       ]
     }),
@@ -5160,7 +5894,7 @@ function createLaunchStrategyTool() {
       } catch (discoveryError) {
         return errorResult(toolError("unknown", `Strategy discovery failed: ${discoveryError instanceof Error ? discoveryError.message : String(discoveryError)}`, { recoverable: false }));
       }
-      const match = discovered.strategies.find((s) => s.name === name);
+      const match = discovered.strategies.find((strategy) => strategy.name === name) ?? await resolveInstalledStrategyReference(name);
       if (!match) {
         const available = discovered.strategies.map((s) => s.name);
         return errorResult(toolError("not_found", `No strategy named "${name}" is available. Known names: [${available.join(", ")}].`, {
@@ -5189,6 +5923,9 @@ function createLaunchStrategyTool() {
         }
       }
       try {
+        if (match.manifestPath) {
+          await loadProject(match.manifestPath);
+        }
         const { content, format } = await readStrategyFile(match.path);
         let seed = input.length > 0 ? input : null;
         const baseCollector = toolContext.inputCollector;
@@ -5221,9 +5958,9 @@ function createLaunchStrategyTool() {
   });
 }
 // src/tools/built-in/list-directory/list-directory.ts
-import { readdir as readdir5, stat as stat8 } from "fs/promises";
-import { join as join12, relative as relative3 } from "path";
-import { z as z11 } from "zod";
+import { readdir as readdir5, stat as stat11 } from "fs/promises";
+import { join as join15, relative as relative7 } from "path";
+import { z as z12 } from "zod";
 
 // src/tools/built-in/list-directory/list-directory.constants.ts
 var DEFAULT_ABSOLUTE_MAX_DEPTH = 32;
@@ -5231,9 +5968,9 @@ var DEFAULT_RECURSIVE_DEPTH = 8;
 var DEFAULT_MAX_ENTRIES = 5000;
 
 // src/tools/built-in/list-directory/list-directory.utils.ts
-import { sep as sep2 } from "path";
+import { sep as sep3 } from "path";
 function toForwardSlash2(pathString) {
-  return sep2 === "/" ? pathString : pathString.split(sep2).join("/");
+  return sep3 === "/" ? pathString : pathString.split(sep3).join("/");
 }
 function formatListing(data) {
   if (data.entries.length === 0) {
@@ -5254,11 +5991,11 @@ function typeRank(type) {
 }
 
 // src/tools/built-in/list-directory/list-directory.ts
-var listDirectoryParams = z11.object({
-  path: z11.string().min(1).describe('Workspace-relative path to the directory to list. Use "." for the workspace root.'),
-  recursive: z11.boolean().optional().describe("Recurse into subdirectories. Defaults to false (depth=1)."),
-  maxDepth: z11.number().int().positive().optional().describe("Maximum recursion depth (only meaningful with recursive:true). " + "Defaults to 8; capped at 32."),
-  includeHidden: z11.boolean().optional().describe('Include entries whose name starts with ".". Defaults to false.')
+var listDirectoryParams = z12.object({
+  path: z12.string().min(1).describe('Workspace-relative path to the directory to list. Use "." for the workspace root.'),
+  recursive: z12.boolean().optional().describe("Recurse into subdirectories. Defaults to false (depth=1)."),
+  maxDepth: z12.number().int().positive().optional().describe("Maximum recursion depth (only meaningful with recursive:true). " + "Defaults to 8; capped at 32."),
+  includeHidden: z12.boolean().optional().describe('Include entries whose name starts with ".". Defaults to false.')
 });
 function createListDirectoryTool(config) {
   const absoluteMaxDepth = config?.absoluteMaxDepth ?? DEFAULT_ABSOLUTE_MAX_DEPTH;
@@ -5353,7 +6090,7 @@ The result includes \`entries: [{ name, relativePath, type, size, mtime, depth }
       }
       let rootStat;
       try {
-        rootStat = await stat8(absoluteRoot);
+        rootStat = await stat11(absoluteRoot);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -5406,9 +6143,9 @@ The result includes \`entries: [{ name, relativePath, type, size, mtime, depth }
         for (const dirent of dirents) {
           if (!includeHidden && dirent.name.startsWith("."))
             continue;
-          const childAbs = join12(node.absolutePath, dirent.name);
+          const childAbs = join15(node.absolutePath, dirent.name);
           const childRelFromRoot = node.relativeFromRoot ? `${node.relativeFromRoot}/${dirent.name}` : dirent.name;
-          const childRelFromWorkspace = toForwardSlash2(relative3(guard.cwd, childAbs));
+          const childRelFromWorkspace = toForwardSlash2(relative7(guard.cwd, childAbs));
           if (!guard.canAccess({
             type: "fs.read",
             resource: childRelFromWorkspace
@@ -5419,7 +6156,7 @@ The result includes \`entries: [{ name, relativePath, type, size, mtime, depth }
           let mtime = new Date(0).toISOString();
           if (type !== "symlink") {
             try {
-              const childStat = await stat8(childAbs);
+              const childStat = await stat11(childAbs);
               size = type === "directory" ? 0 : childStat.size;
               mtime = childStat.mtime.toISOString();
             } catch {
@@ -5468,8 +6205,8 @@ The result includes \`entries: [{ name, relativePath, type, size, mtime, depth }
   });
 }
 // src/tools/built-in/list-skills/list-skills.ts
-import { z as z12 } from "zod";
-var listSkillsParams = z12.object({});
+import { z as z13 } from "zod";
+var listSkillsParams = z13.object({});
 function createListSkillsTool() {
   return defineTool({
     description: describeTool({
@@ -5521,14 +6258,14 @@ function createListSkillsTool() {
   });
 }
 // src/tools/built-in/list-strategy/list-strategy.ts
-import { z as z13 } from "zod";
-var listStrategyParams = z13.object({});
+import { z as z14 } from "zod";
+var listStrategyParams = z14.object({});
 function createListStrategyTool() {
   return defineTool({
     description: describeTool({
       purpose: [
         "List every strategy currently available to launch with launch_strategy.",
-        "Strategies are agent-orchestration files (JSON, JSONC, or YAML) discovered from the bundled set shipped with @comma-agents/core, the workspace `.comma/strategies/` directory, and the platform data dir."
+        "Strategies are agent-orchestration files (JSON, JSONC, or YAML) discovered from the workspace `.comma/strategies/` directory, the shared `~/.comma` data directory, installed Hub packages, and the bundled defaults shipped with @comma-agents/core."
       ],
       inputs: [
         {
@@ -5538,7 +6275,7 @@ function createListStrategyTool() {
           description: "This tool takes no parameters."
         }
       ],
-      outputs: "`{ strategies, count, warnings }` where each strategy is `{ name, version, description?, path, origin, manifestPath?, label }`. Entries are ordered by discovery priority (bundled \u2192 cwd \u2192 data) with duplicate paths removed.",
+      outputs: "`{ strategies, count, warnings }` where each strategy is `{ name, version, description?, path, origin, manifestPath?, label }`. Entries are ordered by discovery priority (cwd \u2192 data \u2192 Hub packages \u2192 bundled defaults) with duplicate paths removed.",
       errors: [],
       notes: [
         "Pass the `name` of any returned entry to `launch_strategy` to run it.",
@@ -5588,9 +6325,9 @@ function createListStrategyTool() {
   });
 }
 // src/tools/built-in/load-skill/load-skill.ts
-import { z as z14 } from "zod";
-var loadSkillParams = z14.object({
-  name: z14.string().min(1).describe("Name of the skill to load. Must match one of the names advertised in the agent's system prompt under '## Available Skills'.")
+import { z as z15 } from "zod";
+var loadSkillParams = z15.object({
+  name: z15.string().min(1).describe("Name of the skill to load. Must match one of the names advertised in the agent's system prompt under '## Available Skills'.")
 });
 function createLoadSkillTool() {
   return defineTool({
@@ -5650,9 +6387,9 @@ ${skill.content}` : "";
   });
 }
 // src/tools/built-in/lsp-request/lsp-request.schema.ts
-import { z as z15 } from "zod";
-var lspRequestParams = z15.object({
-  method: z15.enum([
+import { z as z16 } from "zod";
+var lspRequestParams = z16.object({
+  method: z16.enum([
     "textDocument/diagnostic",
     "textDocument/hover",
     "textDocument/definition",
@@ -5662,11 +6399,11 @@ var lspRequestParams = z15.object({
     "textDocument/documentSymbol",
     "workspace/symbol"
   ]),
-  languageId: z15.string().min(1).optional(),
-  path: z15.string().min(1).optional(),
-  line: z15.number().int().positive().optional(),
-  character: z15.number().int().positive().optional(),
-  query: z15.string().min(1).optional()
+  languageId: z16.string().min(1).optional(),
+  path: z16.string().min(1).optional(),
+  line: z16.number().int().positive().optional(),
+  character: z16.number().int().positive().optional(),
+  query: z16.string().min(1).optional()
 });
 
 // src/tools/built-in/lsp-request/lsp-request.ts
@@ -5851,14 +6588,14 @@ function formatSymbol(symbol) {
 }
 // src/tools/built-in/move-file/move-file.ts
 import * as fsp from "fs/promises";
-import { dirname as dirname8 } from "path";
-import { z as z16 } from "zod";
-var { copyFile, readFile: readFile7, stat: stat9, unlink: unlink3 } = fsp;
-var moveFileParams = z16.object({
-  fromPath: z16.string().min(1).describe("Workspace-relative path of the existing file to move. Absolute paths are rejected " + "unless the sandbox is configured with `allowAbsolutePaths: true`."),
-  toPath: z16.string().min(1).describe("Workspace-relative destination path. Parent directories must already exist (use " + "`create_file` to create directories on the fly). Directories are never valid as " + "a destination."),
-  expectedSha256: z16.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").describe("SHA-256 of the source file's current on-disk bytes, as returned by `read_file`. " + "Required to detect concurrent edits \u2014 a mismatch yields `stale_file`."),
-  overwrite: z16.boolean().optional().describe("When true, an existing regular file at `toPath` is moved to the workspace trash " + "before the rename. When false (default), an existing destination yields " + "`already_exists`. Destination directories are NEVER overwritten.")
+import { dirname as dirname12 } from "path";
+import { z as z17 } from "zod";
+var { copyFile, readFile: readFile9, stat: stat12, unlink: unlink3 } = fsp;
+var moveFileParams = z17.object({
+  fromPath: z17.string().min(1).describe("Workspace-relative path of the existing file to move. Absolute paths are rejected " + "unless the sandbox is configured with `allowAbsolutePaths: true`."),
+  toPath: z17.string().min(1).describe("Workspace-relative destination path. Parent directories must already exist (use " + "`create_file` to create directories on the fly). Directories are never valid as " + "a destination."),
+  expectedSha256: z17.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").describe("SHA-256 of the source file's current on-disk bytes, as returned by `read_file`. " + "Required to detect concurrent edits \u2014 a mismatch yields `stale_file`."),
+  overwrite: z17.boolean().optional().describe("When true, an existing regular file at `toPath` is moved to the workspace trash " + "before the rename. When false (default), an existing destination yields " + "`already_exists`. Destination directories are NEVER overwritten.")
 });
 function createMoveFileTool(config) {
   const defaultSink = config?.defaultAuditSink;
@@ -5983,7 +6720,7 @@ After every \`move_file\` call, **run the project's configured verifier with \`r
       }
       let fromStat;
       try {
-        fromStat = await stat9(fromAbs);
+        fromStat = await stat12(fromAbs);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -5997,7 +6734,7 @@ After every \`move_file\` call, **run the project's configured verifier with \`r
       if (fromStat.isDirectory()) {
         return errorResult(toolError("not_found", `Source path is a directory, not a file: ${validatedArguments.fromPath}`, { path: validatedArguments.fromPath, recoverable: false }));
       }
-      const beforeBytes = await readFile7(fromAbs);
+      const beforeBytes = await readFile9(fromAbs);
       const beforeSha256 = sha256OfBuffer(beforeBytes);
       if (beforeSha256 !== validatedArguments.expectedSha256) {
         return errorResult(toolError("stale_file", `File has changed since last read: ${validatedArguments.fromPath}`, {
@@ -6012,7 +6749,7 @@ After every \`move_file\` call, **run the project's configured verifier with \`r
       }
       let overwroteTrashedTo;
       try {
-        const toStat = await stat9(toAbs);
+        const toStat = await stat12(toAbs);
         if (toStat.isDirectory()) {
           return errorResult(toolError("already_exists", `Destination is a directory: ${validatedArguments.toPath}`, { path: validatedArguments.toPath, recoverable: false }));
         }
@@ -6032,9 +6769,9 @@ After every \`move_file\` call, **run the project's configured verifier with \`r
         const code = caughtError.code;
         if (code !== "ENOENT" && code !== "ENOTDIR")
           throw caughtError;
-        const parent = dirname8(toAbs);
+        const parent = dirname12(toAbs);
         try {
-          const parentStat = await stat9(parent);
+          const parentStat = await stat12(parent);
           if (!parentStat.isDirectory()) {
             return errorResult(toolError("not_found", `Destination parent is not a directory: ${validatedArguments.toPath}`, { path: validatedArguments.toPath, recoverable: false }));
           }
@@ -6114,8 +6851,8 @@ After every \`move_file\` call, **run the project's configured verifier with \`r
   });
 }
 // src/tools/built-in/read-file/read-file.ts
-import { stat as stat10 } from "fs/promises";
-import { z as z17 } from "zod";
+import { stat as stat13 } from "fs/promises";
+import { z as z18 } from "zod";
 
 // src/tools/built-in/read-file/read-file.constants.ts
 var DEFAULT_MAX_BYTES = 256 * 1024;
@@ -6138,12 +6875,12 @@ function truncateUtf8(content, maxBytes) {
 }
 
 // src/tools/built-in/read-file/read-file.ts
-var readFileParams = z17.object({
-  path: z17.string().min(1).describe("Workspace-relative path to the file. Absolute paths are rejected unless the sandbox " + "is configured with `allowAbsolutePaths: true`."),
-  startLine: z17.number().int().positive().optional().describe("1-indexed inclusive line to start at. Defaults to 1."),
-  endLine: z17.number().int().positive().optional().describe("1-indexed inclusive line to end at. Clamped to the file's lineCount when larger. " + "Defaults to the end of the file."),
-  maxBytes: z17.number().int().positive().optional().describe("Maximum UTF-8 byte length of the returned content. When the slice exceeds this, " + "content is truncated and `data.truncated` is set to true. Defaults to 262144."),
-  allowBinary: z17.boolean().optional().describe("Opt in to receiving the contents of a binary file as base64. Required for any file " + "whose first 8 KiB contains a NUL byte. Defaults to false.")
+var readFileParams = z18.object({
+  path: z18.string().min(1).describe("Workspace-relative path to the file. Absolute paths are rejected unless the sandbox " + "is configured with `allowAbsolutePaths: true`."),
+  startLine: z18.number().int().positive().optional().describe("1-indexed inclusive line to start at. Defaults to 1."),
+  endLine: z18.number().int().positive().optional().describe("1-indexed inclusive line to end at. Clamped to the file's lineCount when larger. " + "Defaults to the end of the file."),
+  maxBytes: z18.number().int().positive().optional().describe("Maximum UTF-8 byte length of the returned content. When the slice exceeds this, " + "content is truncated and `data.truncated` is set to true. Defaults to 262144."),
+  allowBinary: z18.boolean().optional().describe("Opt in to receiving the contents of a binary file as base64. Required for any file " + "whose first 8 KiB contains a NUL byte. Defaults to false.")
 });
 function createReadFileTool(config) {
   const defaultMaxBytes = config?.defaultMaxBytes ?? DEFAULT_MAX_BYTES;
@@ -6250,7 +6987,7 @@ If a subsequent edit/write returns \`stale_file\`, the file changed under you \u
       }
       let statResult;
       try {
-        statResult = await stat10(absolutePath);
+        statResult = await stat13(absolutePath);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -6356,11 +7093,11 @@ ${content}` : ""), { data });
   });
 }
 // src/tools/built-in/restore-file/restore-file.ts
-import { stat as stat11 } from "fs/promises";
-import { z as z18 } from "zod";
-var restoreFileParams = z18.object({
-  trashedPath: z18.string().min(1).describe("Absolute path to the .tar.gz trash archive. Obtain from a previous `delete_file` " + "result's `trashedTo` field or from the audit log."),
-  targetPath: z18.string().optional().describe("Optional workspace-relative path for the restored file. If omitted, the file is " + "restored to its original path (as recorded in the archive's metadata).")
+import { stat as stat14 } from "fs/promises";
+import { z as z19 } from "zod";
+var restoreFileParams = z19.object({
+  trashedPath: z19.string().min(1).describe("Absolute path to the .tar.gz trash archive. Obtain from a previous `delete_file` " + "result's `trashedTo` field or from the audit log."),
+  targetPath: z19.string().optional().describe("Optional workspace-relative path for the restored file. If omitted, the file is " + "restored to its original path (as recorded in the archive's metadata).")
 });
 function createRestoreFileTool() {
   return defineTool({
@@ -6413,7 +7150,7 @@ function createRestoreFileTool() {
         }));
       }
       try {
-        await stat11(validatedArguments.trashedPath);
+        await stat14(validatedArguments.trashedPath);
       } catch {
         return errorResult(toolError("not_found", `Trash archive not found: ${validatedArguments.trashedPath}`, { path: validatedArguments.trashedPath, recoverable: false }));
       }
@@ -6436,7 +7173,7 @@ function createRestoreFileTool() {
         throw caught;
       }
       try {
-        await stat11(targetAbsolute);
+        await stat14(targetAbsolute);
         return errorResult(toolError("already_exists", `Restore target already exists: ${targetPath}`, {
           path: targetPath,
           recoverable: true,
@@ -6450,7 +7187,7 @@ function createRestoreFileTool() {
       let restoredAbsolute;
       try {
         restoredAbsolute = await restoreFromTrash(guard.cwd, validatedArguments.trashedPath, targetPath);
-        const contentStat = await stat11(restoredAbsolute);
+        const contentStat = await stat14(restoredAbsolute);
         const sizeBytes = contentStat.size;
         return okResult(`Restored ${validatedArguments.trashedPath} to ${restoredAbsolute} (${sizeBytes} bytes)`, {
           data: {
@@ -6472,7 +7209,7 @@ function createRestoreFileTool() {
 }
 // src/tools/built-in/run-command/run-command.ts
 import { spawn } from "child_process";
-import { z as z19 } from "zod";
+import { z as z20 } from "zod";
 
 // src/tools/built-in/run-command/run-command.constants.ts
 var RUN_COMMAND_DEFAULT_TIMEOUT_MS = 60000;
@@ -6496,8 +7233,8 @@ var RUN_COMMAND_TRUNCATION_MARKER = `
 
 // src/tools/built-in/run-command/run-command.utils.ts
 import { release } from "os";
-function friendlyOsName(platform2) {
-  switch (platform2) {
+function friendlyOsName(platform) {
+  switch (platform) {
     case "darwin":
       return "macOS";
     case "linux":
@@ -6513,11 +7250,11 @@ function friendlyOsName(platform2) {
     case "aix":
       return "AIX";
     default:
-      return platform2;
+      return platform;
   }
 }
-function resolveShell(platform2, env = process.env) {
-  if (platform2 === "win32") {
+function resolveShell(platform, env = process.env) {
+  if (platform === "win32") {
     return {
       shellPath: env.ComSpec ?? "cmd.exe",
       shellFlag: "/d /s /c"
@@ -6529,13 +7266,13 @@ function resolveShell(platform2, env = process.env) {
   };
 }
 function detectPlatformInfo() {
-  const platform2 = process.platform;
-  const { shellPath, shellFlag } = resolveShell(platform2);
+  const platform = process.platform;
+  const { shellPath, shellFlag } = resolveShell(platform);
   const bunVersion = typeof globalThis.Bun !== "undefined" ? globalThis.Bun.version : undefined;
   const runtime = bunVersion ? `bun ${bunVersion}` : `node ${process.versions.node}`;
   return {
-    platform: platform2,
-    osName: friendlyOsName(platform2),
+    platform,
+    osName: friendlyOsName(platform),
     osRelease: release(),
     arch: process.arch,
     shellPath,
@@ -6612,11 +7349,11 @@ function truncateOutput(buffer, maxBytes) {
 }
 
 // src/tools/built-in/run-command/run-command.ts
-var runCommandParams = z19.object({
-  command: z19.string().min(1).describe("Shell command line to execute. Runs through the host's default shell \u2014 see the tool description for the resolved shell path."),
-  cwd: z19.string().optional().describe("Workspace-relative working directory. Defaults to the workspace root. Must resolve inside the sandbox or `outside_workspace` is returned."),
-  timeoutMs: z19.number().int().positive().max(RUN_COMMAND_MAX_TIMEOUT_MS).optional().describe(`Kill the process after this many milliseconds. Defaults to ${RUN_COMMAND_DEFAULT_TIMEOUT_MS}; hard-capped at ${RUN_COMMAND_MAX_TIMEOUT_MS}.`),
-  env: z19.record(z19.string(), z19.string()).optional().describe("Extra environment variables, merged on top of the daemon's environment. Existing variables are overwritten by entries supplied here; nothing is removed.")
+var runCommandParams = z20.object({
+  command: z20.string().min(1).describe("Shell command line to execute. Runs through the host's default shell \u2014 see the tool description for the resolved shell path."),
+  cwd: z20.string().optional().describe("Workspace-relative working directory. Defaults to the workspace root. Must resolve inside the sandbox or `outside_workspace` is returned."),
+  timeoutMs: z20.number().int().positive().max(RUN_COMMAND_MAX_TIMEOUT_MS).optional().describe(`Kill the process after this many milliseconds. Defaults to ${RUN_COMMAND_DEFAULT_TIMEOUT_MS}; hard-capped at ${RUN_COMMAND_MAX_TIMEOUT_MS}.`),
+  env: z20.record(z20.string(), z20.string()).optional().describe("Extra environment variables, merged on top of the daemon's environment. Existing variables are overwritten by entries supplied here; nothing is removed.")
 });
 function formatOutputWithCapturedStreams(summaryParts, data) {
   const outputParts = [...summaryParts];
@@ -6875,9 +7612,9 @@ function createRunCommandTool(config) {
   });
 }
 // src/tools/built-in/search-files/search-files.ts
-import { readdir as readdir6, stat as stat12 } from "fs/promises";
-import { join as join13, relative as relative4 } from "path";
-import { z as z20 } from "zod";
+import { readdir as readdir6, stat as stat15 } from "fs/promises";
+import { join as join16, relative as relative8 } from "path";
+import { z as z21 } from "zod";
 
 // src/tools/built-in/search-files/search-files.constants.ts
 var DEFAULT_EXCLUDE_GLOBS2 = [
@@ -6895,9 +7632,9 @@ var DEFAULT_MAX_FILE_BYTES = 4 * 1024 * 1024;
 var DEFAULT_TRAVERSAL_DEPTH2 = 32;
 
 // src/tools/built-in/search-files/search-files.utils.ts
-import { sep as sep3 } from "path";
+import { sep as sep4 } from "path";
 function toForwardSlash3(pathString) {
-  return sep3 === "/" ? pathString : pathString.split(sep3).join("/");
+  return sep4 === "/" ? pathString : pathString.split(sep4).join("/");
 }
 function matchesAnyGlob2(relPath, patterns) {
   for (const pattern of patterns) {
@@ -6930,14 +7667,14 @@ function compileRegex(query) {
 }
 
 // src/tools/built-in/search-files/search-files.ts
-var searchFilesParams = z20.object({
-  query: z20.string().min(1).describe("Search query. Interpretation depends on `mode`."),
-  mode: z20.enum(["path", "text", "regex"]).describe('Search mode. "path" \u2192 glob-match file paths. "text" \u2192 literal substring search in ' + 'file contents. "regex" \u2192 JavaScript regex search in file contents (compiled with the "m" flag).'),
-  root: z20.string().optional().describe('Workspace-relative directory to search under. Defaults to ".".'),
-  includeGlobs: z20.array(z20.string()).optional().describe("When set, only paths matching at least one of these Bun.Glob patterns are considered."),
-  excludeGlobs: z20.array(z20.string()).optional().describe("Bun.Glob patterns to exclude. Replaces the default exclude set " + "(node_modules, .git, dist, build, .next, .turbo, coverage). Pass [] to disable."),
-  maxResults: z20.number().int().positive().optional().describe("Maximum number of matches to return. Defaults to 100."),
-  contextLines: z20.number().int().min(0).optional().describe("Number of context lines to include on either side of each text/regex match. Defaults to 0.")
+var searchFilesParams = z21.object({
+  query: z21.string().min(1).describe("Search query. Interpretation depends on `mode`."),
+  mode: z21.enum(["path", "text", "regex"]).describe('Search mode. "path" \u2192 glob-match file paths. "text" \u2192 literal substring search in ' + 'file contents. "regex" \u2192 JavaScript regex search in file contents (compiled with the "m" flag).'),
+  root: z21.string().optional().describe('Workspace-relative directory to search under. Defaults to ".".'),
+  includeGlobs: z21.array(z21.string()).optional().describe("When set, only paths matching at least one of these Bun.Glob patterns are considered."),
+  excludeGlobs: z21.array(z21.string()).optional().describe("Bun.Glob patterns to exclude. Replaces the default exclude set " + "(node_modules, .git, dist, build, .next, .turbo, coverage). Pass [] to disable."),
+  maxResults: z21.number().int().positive().optional().describe("Maximum number of matches to return. Defaults to 100."),
+  contextLines: z21.number().int().min(0).optional().describe("Number of context lines to include on either side of each text/regex match. Defaults to 0.")
 });
 function createSearchFilesTool(config) {
   const maxResultsCap = config?.maxResults ?? DEFAULT_MAX_RESULTS2;
@@ -7075,7 +7812,7 @@ function createSearchFilesTool(config) {
       }
       let rootStat;
       try {
-        rootStat = await stat12(absoluteRoot);
+        rootStat = await stat15(absoluteRoot);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -7115,9 +7852,9 @@ function createSearchFilesTool(config) {
           for (const dirent of dirents) {
             if (abort.aborted)
               break outer;
-            const childAbs = join13(node.absolutePath, dirent.name);
-            const relFromRoot = toForwardSlash3(relative4(absoluteRoot, childAbs));
-            const relFromWorkspace = toForwardSlash3(relative4(guard.cwd, childAbs));
+            const childAbs = join16(node.absolutePath, dirent.name);
+            const relFromRoot = toForwardSlash3(relative8(absoluteRoot, childAbs));
+            const relFromWorkspace = toForwardSlash3(relative8(guard.cwd, childAbs));
             if (matchesAnyGlob2(relFromWorkspace, excludeGlobs))
               continue;
             if (dirent.isDirectory()) {
@@ -7143,7 +7880,7 @@ function createSearchFilesTool(config) {
             }
             let childStat;
             try {
-              childStat = await stat12(childAbs);
+              childStat = await stat15(childAbs);
             } catch {
               continue;
             }
@@ -7222,7 +7959,7 @@ ${lines.join(`
   });
 }
 // src/tools/built-in/todo/todo.ts
-import { z as z21 } from "zod";
+import { z as z22 } from "zod";
 var todoStore = new Map;
 var idCounters = new Map;
 function storeKey(context) {
@@ -7250,8 +7987,8 @@ function resetTodoStateForAgent(key) {
   todoStore.delete(key);
   idCounters.delete(key);
 }
-var todoAddParams = z21.object({
-  content: z21.string().min(1).describe("Description of the todo item to add.")
+var todoAddParams = z22.object({
+  content: z22.string().min(1).describe("Description of the todo item to add.")
 });
 function createTodoAddTool() {
   return defineTool({
@@ -7273,8 +8010,8 @@ function createTodoAddTool() {
     }
   });
 }
-var todoRemoveParams = z21.object({
-  id: z21.string().min(1).describe("The id of the todo item to remove from the list.")
+var todoRemoveParams = z22.object({
+  id: z22.string().min(1).describe("The id of the todo item to remove from the list.")
 });
 function createTodoRemoveTool() {
   return defineTool({
@@ -7301,8 +8038,8 @@ function createTodoRemoveTool() {
     }
   });
 }
-var todoCompleteParams = z21.object({
-  id: z21.string().min(1).describe("The id of the todo item to mark as completed.")
+var todoCompleteParams = z22.object({
+  id: z22.string().min(1).describe("The id of the todo item to mark as completed.")
 });
 function createTodoCompleteTool() {
   return defineTool({
@@ -7333,7 +8070,7 @@ function createTodoCompleteTool() {
     }
   });
 }
-var todoGetParams = z21.object({});
+var todoGetParams = z22.object({});
 function createTodoGetTool() {
   return defineTool({
     description: "Get all todo items for the current run, including completed and pending ones. " + "Use this to review progress or remember outstanding tasks.",
@@ -7354,7 +8091,7 @@ function createTodoGetTool() {
     }
   });
 }
-var todoGetNextParams = z21.object({});
+var todoGetNextParams = z22.object({});
 function createTodoGetNextTool() {
   return defineTool({
     description: "Get the next pending todo item without modifying the list. " + "Returns a message indicating no pending items if the list is exhausted.",
@@ -7373,7 +8110,7 @@ function createTodoGetNextTool() {
     }
   });
 }
-var todoClearParams = z21.object({});
+var todoClearParams = z22.object({});
 function createTodoClearTool() {
   return defineTool({
     description: "Clear all todo items for the current run. **WARNING: This destroys all progress tracking and should almost never be used.** " + "Only use when the entire goal has fundamentally changed and every existing item is obsolete. " + "For normal pivots, partial changes, or when some items become irrelevant, use todo_remove for specific obsolete items and todo_add for new ones. " + "Clearing loses the history of what was completed and what remains \u2014 this information is valuable for tracking progress and avoiding repeated work.",
@@ -7390,7 +8127,7 @@ function createTodoClearTool() {
 }
 
 // src/tools/built-in/webfetch/webfetch.ts
-import { z as z22 } from "zod";
+import { z as z23 } from "zod";
 
 // src/tools/built-in/webfetch/webfetch.constants.ts
 var DEFAULT_TIMEOUT_SECONDS = 30;
@@ -7437,10 +8174,10 @@ function transformContent(html, format) {
 }
 
 // src/tools/built-in/webfetch/webfetch.ts
-var webFetchParams = z22.object({
-  url: z22.string().url().describe("The fully-qualified URL to fetch."),
-  format: z22.enum(["text", "markdown", "html"]).optional().default("markdown").describe('Output format: "markdown" (HTML converted to Markdown), "text" (plain text only), ' + 'or "html" (raw HTML). Defaults to "markdown".'),
-  timeout: z22.number().positive().optional().describe("Optional request timeout in seconds. Defaults to 30.")
+var webFetchParams = z23.object({
+  url: z23.string().url().describe("The fully-qualified URL to fetch."),
+  format: z23.enum(["text", "markdown", "html"]).optional().default("markdown").describe('Output format: "markdown" (HTML converted to Markdown), "text" (plain text only), ' + 'or "html" (raw HTML). Defaults to "markdown".'),
+  timeout: z23.number().positive().optional().describe("Optional request timeout in seconds. Defaults to 30.")
 });
 function createWebFetchTool(config) {
   const defaultTimeout = config?.defaultTimeout ?? DEFAULT_TIMEOUT_SECONDS;
@@ -7520,12 +8257,12 @@ function createWebFetchTool(config) {
 }
 
 // src/tools/built-in/write-file/write-file.ts
-import { readFile as readFile8, stat as stat13 } from "fs/promises";
-import { z as z23 } from "zod";
-var writeFileParams = z23.object({
-  path: z23.string().min(1).describe("Workspace-relative path of the file to replace. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
-  content: z23.string().describe("Full UTF-8 replacement content. Provide logical content with LF newlines and no BOM; " + "the tool re-applies the file's existing newline style and BOM on write."),
-  expectedSha256: z23.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").describe("SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "Required to detect concurrent edits \u2014 a mismatch yields `stale_file`.")
+import { readFile as readFile10, stat as stat16 } from "fs/promises";
+import { z as z24 } from "zod";
+var writeFileParams = z24.object({
+  path: z24.string().min(1).describe("Workspace-relative path of the file to replace. Absolute paths are rejected unless " + "the sandbox is configured with `allowAbsolutePaths: true`."),
+  content: z24.string().describe("Full UTF-8 replacement content. Provide logical content with LF newlines and no BOM; " + "the tool re-applies the file's existing newline style and BOM on write."),
+  expectedSha256: z24.string().length(64).regex(/^[0-9a-f]{64}$/, "expectedSha256 must be a 64-character lowercase hex string").describe("SHA-256 of the file's current on-disk bytes, as returned by `read_file`. " + "Required to detect concurrent edits \u2014 a mismatch yields `stale_file`.")
 });
 function createWriteFileTool(config) {
   const defaultSink = config?.defaultAuditSink;
@@ -7631,7 +8368,7 @@ After every successful \`write_file\` call, **run the project's configured verif
       }
       let targetStat;
       try {
-        targetStat = await stat13(absolutePath);
+        targetStat = await stat16(absolutePath);
       } catch (statError) {
         const code = statError.code;
         if (code === "ENOENT" || code === "ENOTDIR") {
@@ -7649,7 +8386,7 @@ After every successful \`write_file\` call, **run the project's configured verif
           recoverable: false
         }));
       }
-      const beforeBytes = await readFile8(absolutePath);
+      const beforeBytes = await readFile10(absolutePath);
       const beforeSha256 = sha256OfBuffer(beforeBytes);
       if (beforeSha256 !== validatedArguments.expectedSha256) {
         return errorResult(toolError("stale_file", `File has changed since last read: ${validatedArguments.path}`, {
@@ -8214,8 +8951,15 @@ function hookIntoAgent(agent, hooks) {
   }
 }
 // src/agents/loader/loader.ts
+import { dirname as dirname13 } from "path";
 import { jsonSchema as jsonSchema2 } from "ai";
-import YAML4 from "yaml";
+import YAML5 from "yaml";
+function formatValidationIssue(issue) {
+  if (issue.code === "invalid_union") {
+    return issue.unionErrors.flatMap((unionError) => unionError.issues.flatMap(formatValidationIssue));
+  }
+  return [`  - ${issue.path.join(".")}: ${issue.message}`];
+}
 async function loadAgent(filePath, options = {}) {
   const fileExtension = filePath.split(".").pop()?.toLowerCase();
   let format;
@@ -8231,22 +8975,25 @@ async function loadAgent(filePath, options = {}) {
     throw new StrategyValidationError(`Agent description file not found: ${filePath}`);
   }
   const content = await file.text();
-  return await loadAgentFromString(content, format, options);
+  return await loadAgentFromString(content, format, {
+    ...options,
+    strategyDir: options.strategyDir ?? dirname13(filePath)
+  });
 }
-async function loadAgentFromString(content, format, _options = {}) {
+async function loadAgentFromString(content, format, options = {}) {
   let raw;
   try {
     if (format === "json") {
       raw = JSON.parse(content);
     } else {
-      raw = YAML4.parse(content);
+      raw = YAML5.parse(content);
     }
   } catch (parseError) {
     throw new StrategyValidationError(`Failed to parse agent description ${format.toUpperCase()}: ${parseError instanceof Error ? parseError.message : String(parseError)}`, { cause: parseError });
   }
   const result = AgentDescriptionSchema.safeParse(raw);
   if (!result.success) {
-    const issues = result.error.issues.map((issue) => `  - ${issue.path.join(".")}: ${issue.message}`).join(`
+    const issues = result.error.issues.flatMap(formatValidationIssue).join(`
 `);
     throw new StrategyValidationError(`Agent description validation failed:
 ${issues}`, {
@@ -8254,59 +9001,40 @@ ${issues}`, {
     });
   }
   const description = result.data;
+  if (description.type && description.type !== "llm") {
+    const registeredAgent = resolveRegisteredAgent(description.type);
+    if (!registeredAgent) {
+      throw new StrategyValidationError(`Agent "${description.name}" references unknown agent type "${description.type}". ` + `Built-in agents: [${BUILT_IN_AGENT_NAMES.join(", ")}]. ` + `Registered agents: [${getRegisteredAgentNames().join(", ") || "(none)"}].`);
+    }
+    return await registeredAgent.create({
+      name: description.name,
+      config: description.config ?? {},
+      runtime: options
+    });
+  }
   const systemPrompt = description.systemPromptTemplate ? createPromptTemplate({
     template: description.systemPromptTemplate.template,
     variables: description.systemPromptTemplate.variables
   }) : description.systemPrompt;
   return createAgent({
     name: description.name,
-    model: description.model,
+    model: options.modelOverride ?? description.model,
     systemPrompt,
     tools: description.tools,
     maxSteps: description.maxSteps,
     ...description.providerOptions ? { providerOptions: description.providerOptions } : {},
     ...description.modelOptions ? { modelOptions: description.modelOptions } : {},
     ...description.outputSchema ? { outputSchema: jsonSchema2(description.outputSchema) } : {},
-    ...description.context ? { context: description.context } : {}
+    ...description.context ? { context: description.context } : {},
+    ...options.skillRegistry ? { skillRegistry: options.skillRegistry } : {},
+    ...options.inputCollector ? { inputCollector: options.inputCollector } : {},
+    ...options.launchStrategy ? { launchStrategy: options.launchStrategy } : {},
+    ...options.languageService ? { languageService: options.languageService } : {},
+    ...options.runId ? { runId: options.runId } : {}
   });
 }
 // src/flows/loader/loader.ts
-import YAML5 from "yaml";
-
-// src/flows/loader/loader.schema.ts
-import { z as z24 } from "zod";
-var AgentStepDescriptionSchema = z24.object({
-  agent: z24.string().min(1),
-  description: z24.string().optional()
-}).strict();
-var FlowStepDescriptionSchema = z24.lazy(() => z24.union([AgentStepDescriptionSchema, FlowDescriptionSchema]));
-var BaseFlowDescriptionFields = {
-  name: z24.string().min(1),
-  description: z24.string().optional(),
-  steps: z24.array(FlowStepDescriptionSchema).min(1)
-};
-var SequentialFlowDescriptionSchema = z24.object({
-  ...BaseFlowDescriptionFields,
-  type: z24.literal("sequential")
-}).strict();
-var CycleFlowDescriptionSchema = z24.object({
-  ...BaseFlowDescriptionFields,
-  type: z24.literal("cycle"),
-  cycles: z24.union([z24.number().int().positive(), z24.literal("Infinity")]).optional(),
-  observer: z24.string().optional()
-}).strict();
-var BroadcastFlowDescriptionSchema = z24.object({
-  ...BaseFlowDescriptionFields,
-  type: z24.literal("broadcast"),
-  separator: z24.string().optional()
-}).strict();
-var FlowDescriptionSchema = z24.discriminatedUnion("type", [
-  SequentialFlowDescriptionSchema,
-  CycleFlowDescriptionSchema,
-  BroadcastFlowDescriptionSchema
-]);
-
-// src/flows/loader/loader.ts
+import YAML6 from "yaml";
 async function loadFlow(filePath, options) {
   const fileExtension = filePath.split(".").pop()?.toLowerCase();
   let format;
@@ -8330,12 +9058,12 @@ function loadFlowFromString(content, format, options) {
     if (format === "json") {
       raw = JSON.parse(content);
     } else {
-      raw = YAML5.parse(content);
+      raw = YAML6.parse(content);
     }
   } catch (parseError) {
     throw new StrategyValidationError(`Failed to parse flow description ${format.toUpperCase()}: ${parseError instanceof Error ? parseError.message : String(parseError)}`, { cause: parseError });
   }
-  const result = FlowDescriptionSchema.safeParse(raw);
+  const result = FlowDefSchema.safeParse(raw);
   if (!result.success) {
     const issues = result.error.issues.map((issue) => `  - ${issue.path.join(".")}: ${issue.message}`).join(`
 `);
@@ -8347,65 +9075,6 @@ ${issues}`, {
   const description = result.data;
   return buildFlowFromDescription(description, options);
 }
-function buildFlowFromDescription(description, options) {
-  const steps = resolveSteps2(description.steps, description.name, options);
-  let flow;
-  switch (description.type) {
-    case "sequential":
-      flow = createSequentialFlow({
-        name: description.name,
-        steps
-      });
-      break;
-    case "cycle": {
-      const cycles = description.cycles === "Infinity" ? Infinity : description.cycles ?? 1;
-      const observer = description.observer ? resolveAgentReference(description.observer, description.name, options.agents) : undefined;
-      flow = createCycleFlow({
-        name: description.name,
-        steps,
-        cycles,
-        observer
-      });
-      break;
-    }
-    case "broadcast":
-      flow = createBroadcastFlow({
-        name: description.name,
-        steps,
-        separator: description.separator
-      });
-      break;
-  }
-  if (options.flowHooks) {
-    hookIntoFlow(flow, options.flowHooks);
-  }
-  return flow;
-}
-function isAgentStep2(step) {
-  return typeof step === "object" && step !== null && "agent" in step && typeof step.agent === "string";
-}
-function isNestedFlowStep(step) {
-  return typeof step === "object" && step !== null && "type" in step && "steps" in step && typeof step.name === "string";
-}
-function resolveSteps2(steps, flowName, options) {
-  return steps.map((step, stepIndex) => {
-    if (isAgentStep2(step)) {
-      return resolveAgentReference(step.agent, flowName, options.agents);
-    }
-    if (isNestedFlowStep(step)) {
-      return buildFlowFromDescription(step, options);
-    }
-    throw new StrategyValidationError(`Flow "${flowName}" step ${stepIndex} is neither an agent reference nor a flow definition.`);
-  });
-}
-function resolveAgentReference(agentName, flowName, agents) {
-  const agent = agents[agentName];
-  if (!agent) {
-    const available = Object.keys(agents).join(", ");
-    throw new StrategyValidationError(`Flow "${flowName}" references agent "${agentName}" which is not defined. ` + `Available agents: [${available}].`);
-  }
-  return agent;
-}
 // src/hooks/built-in/token-tracking/token-tracking.constants.ts
 var MODEL_CATALOG = {
   "openai/gpt-4o": { contextWindow: 128000, maxOutputTokens: 16384 },
@@ -8592,81 +9261,15 @@ function getSandbox(boxed) {
   return boxed[SANDBOX_KEY];
 }
 // src/strategy/exporter/exporter.ts
-import YAML6 from "yaml";
+import YAML7 from "yaml";
 function exportStrategy(strategy, options) {
   const format = options?.format ?? "json";
   const indent = options?.indent ?? 2;
   if (format === "yaml") {
-    return YAML6.stringify(strategy.raw, { indent });
+    return YAML7.stringify(strategy.raw, { indent });
   }
   return JSON.stringify(strategy.raw, null, indent);
 }
-// src/strategy/loader/project-loader.ts
-import { dirname as dirname9, resolve as resolve6 } from "path";
-import stripJsonComments3 from "strip-json-comments";
-async function importIfExists(filePath, label) {
-  const file = Bun.file(filePath);
-  if (!await file.exists()) {
-    throw new StrategyValidationError(`${label} not found: ${filePath}`);
-  }
-  try {
-    await import(filePath);
-  } catch (importError) {
-    throw new StrategyValidationError(`Failed to import ${label} "${filePath}": ${importError instanceof Error ? importError.message : String(importError)}`, { cause: importError });
-  }
-}
-async function importIfPresent(filePath) {
-  const file = Bun.file(filePath);
-  if (!await file.exists())
-    return;
-  try {
-    await import(filePath);
-  } catch (importError) {
-    throw new StrategyValidationError(`Failed to import "${filePath}": ${importError instanceof Error ? importError.message : String(importError)}`, { cause: importError });
-  }
-}
-async function loadProject(manifestPath) {
-  const file = Bun.file(manifestPath);
-  if (!await file.exists()) {
-    throw new StrategyValidationError(`Project manifest not found: ${manifestPath}`);
-  }
-  const content = await file.text();
-  let raw;
-  try {
-    raw = JSON.parse(stripJsonComments3(content));
-  } catch (parseError) {
-    throw new StrategyValidationError(`Failed to parse comma-project.json: ${parseError instanceof Error ? parseError.message : String(parseError)}`, { cause: parseError });
-  }
-  const result = CommaProjectManifestSchema.safeParse(raw);
-  if (!result.success) {
-    const issues = result.error.issues.map((issue) => `  - ${issue.path.join(".")}: ${issue.message}`).join(`
-`);
-    throw new StrategyValidationError(`Project manifest validation failed:
-${issues}`, { cause: result.error });
-  }
-  const manifest = result.data;
-  const manifestDir = dirname9(manifestPath);
-  if (manifest.entry) {
-    const entryPath = resolve6(manifestDir, manifest.entry);
-    await importIfExists(entryPath, "Entry file");
-  } else {
-    const defaultEntryPath = resolve6(manifestDir, "index.ts");
-    await importIfPresent(defaultEntryPath);
-  }
-  if (manifest.tools) {
-    for (const toolPath of manifest.tools) {
-      const resolvedToolPath = resolve6(manifestDir, toolPath);
-      await importIfExists(resolvedToolPath, "Tool file");
-    }
-  }
-  return {
-    name: manifest.name,
-    version: manifest.version,
-    description: manifest.description,
-    manifest,
-    manifestDir
-  };
-}
 // src/timeline/projections/conversation-context.ts
 function projectConversationContext(events, agentName) {
   const records = [];
@@ -8806,6 +9409,8 @@ export {
   unregisterProviderDefinition,
   unregisterProvider,
   unregisterModel,
+  unregisterFlow,
+  unregisterAgent,
   unifiedDiff,
   trashWorkspaceDir,
   toolError,
@@ -8832,11 +9437,15 @@ export {
   resetProviderRegistry,
   resetModelRegistry,
   resetGlobalDefaults,
+  resetFlowRegistry,
   resetCatalog,
+  resetAgentRegistry,
   registerTool,
   registerProviderDefinition,
   registerProvider,
   registerModel,
+  registerFlow,
+  registerAgent,
   refreshCatalog,
   recordsToMessages,
   recordToJsonlLine,
@@ -8872,6 +9481,7 @@ export {
   isLLMAgentDef,
   isKnownProvider,
   isFlowDef,
+  isCustomAgentDef,
   isAgentStep,
   inSandbox,
   hookIntoFlow,
@@ -8880,6 +9490,8 @@ export {
   getSandbox,
   getReverseModelIndex,
   getRegisteredToolNames,
+  getRegisteredFlowNames,
+  getRegisteredAgentNames,
   getQualifiedModelMetadata,
   getProvidersForModel,
   getProviderPackage,
@@ -8902,6 +9514,8 @@ export {
   detectNewline,
   denyCommandsPolicy,
   defineTool,
+  defineFlowType,
+  defineAgentType,
   createUserAgent,
   createTokenTracker,
   createTimeline,
@@ -8943,15 +9557,18 @@ export {
   PERMISSIVE_SANDBOX_CONFIG,
   OAuthCredentialSchema,
   ModelResolutionError,
+  LLMAgentDescriptionSchema,
   HookExecutionError,
   FlowExecutionError,
-  FlowDescriptionSchema,
+  FlowDefSchema as FlowDescriptionSchema,
   DEFAULT_SANDBOX_CONFIG,
   DEFAULT_FORBIDDEN_GLOBS,
   DEFAULT_DAEMON_SANDBOX_CONFIG,
+  CustomFlowDefSchema,
   CustomCredentialSchema,
+  CustomAgentDescriptionSchema,
+  CustomAgentDefSchema,
   CredentialSchema,
-  CommaProjectManifestSchema,
   CommaAgentsError,
   BOM,
   BINARY_DETECTION_SAMPLE_BYTES,