veryfront 0.1.157 → 0.1.159

package/esm/src/routing/api/module-loader/loader.d.ts

@@ -1,4 +1,11 @@
 import type { APIRoute, LoadModuleOptions } from "./types.js";
+import type { FileSystem } from "../../../platform/compat/fs.js";
 export declare function toCjsDestructureBindings(bindings: string): string;
 export declare function loadHandlerModule(options: LoadModuleOptions): Promise<APIRoute | null>;
+export declare function getNodeExternalPackagesToResolve(userDeps: Map<string, string>): string[];
+export declare function resolveNodePackageToFileUrl(projectDir: string, packageName: string, fs: FileSystem, pathToFileURL: typeof import("node:url").pathToFileURL): Promise<string | null>;
+export declare function loadVeryfrontExportsMap(projectDir: string, fs: FileSystem): Promise<Record<string, {
+    import?: string;
+}>>;
+export declare function rewriteNodeExternalImports(code: string, projectDir: string, fs: FileSystem, userDeps: Map<string, string>): Promise<string>;
 //# sourceMappingURL=loader.d.ts.map

package/esm/src/routing/api/module-loader/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/routing/api/module-loader/loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAgL9D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAejE;AAgBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAyBtF"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/routing/api/module-loader/loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA4KjE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAejE;AAgBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAyBtF;AAuaD,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,EAAE,CAUxF;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,cAAc,UAAU,EAAE,aAAa,GACrD,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,GACb,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAW9C;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,CA6EjB"}

package/esm/src/routing/api/module-loader/loader.js

@@ -512,105 +512,115 @@ async function loadModuleFromCode(code, projectDir, fs, userDeps = new Map()) {
         await fs.remove(tempDir, { recursive: true });
     }
 }
-async function rewriteExternalImports(code, projectDir, fs, userDeps = new Map()) {
+export function getNodeExternalPackagesToResolve(userDeps) {
+    const externalPackagesToResolve = ["zod"];
+    for (const name of userDeps.keys()) {
+        if (!externalPackagesToResolve.includes(name)) {
+            externalPackagesToResolve.push(name);
+        }
+    }
+    return externalPackagesToResolve;
+}
+export async function resolveNodePackageToFileUrl(projectDir, packageName, fs, pathToFileURL) {
+    const packagePath = pathHelper.join(projectDir, "node_modules", packageName);
+    const packageJsonPath = pathHelper.join(packagePath, "package.json");
+    try {
+        const pkgJson = JSON.parse(await fs.readTextFile(packageJsonPath));
+        let entryPoint;
+        if (pkgJson.exports) {
+            entryPoint = resolveExportEntry(pkgJson.exports["."]);
+        }
+        entryPoint ||= pkgJson.module || pkgJson.main || "index.js";
+        if (!entryPoint)
+            return null;
+        return pathToFileURL(pathHelper.join(packagePath, entryPoint)).href;
+    }
+    catch (_) {
+        /* expected: package.json may not exist or be invalid */
+        return null;
+    }
+}
+export async function loadVeryfrontExportsMap(projectDir, fs) {
+    const vfPackagePath = pathHelper.join(projectDir, "node_modules", "veryfront");
+    const vfPackageJsonPath = pathHelper.join(vfPackagePath, "package.json");
+    try {
+        const pkgJson = JSON.parse(await fs.readTextFile(vfPackageJsonPath));
+        return pkgJson.exports || {};
+    }
+    catch (_error) {
+        logger.debug("Could not read veryfront package.json");
+        return {};
+    }
+}
+export async function rewriteNodeExternalImports(code, projectDir, fs, userDeps) {
+    const { pathToFileURL } = await import("node:url");
     let transformed = code;
-    if (isNode) {
-        try {
-            const { pathToFileURL } = await import("node:url");
-            logger.debug(`Rewriting external imports for Node.js, projectDir: ${projectDir}`);
-            const resolvePackageToFileUrl = async (packageName) => {
-                const packagePath = pathHelper.join(projectDir, "node_modules", packageName);
-                const packageJsonPath = pathHelper.join(packagePath, "package.json");
-                try {
-                    const pkgJson = JSON.parse(await fs.readTextFile(packageJsonPath));
-                    let entryPoint;
-                    if (pkgJson.exports) {
-                        entryPoint = resolveExportEntry(pkgJson.exports["."]);
-                    }
-                    entryPoint ||= pkgJson.module || pkgJson.main || "index.js";
-                    if (!entryPoint)
-                        return null;
-                    return pathToFileURL(pathHelper.join(packagePath, entryPoint)).href;
-                }
-                catch (_) {
-                    /* expected: package.json may not exist or be invalid */
-                    return null;
-                }
-            };
-            const externalPackagesToResolve = ["zod"];
-            for (const name of userDeps.keys()) {
-                if (!externalPackagesToResolve.includes(name)) {
-                    externalPackagesToResolve.push(name);
-                }
-            }
-            for (const pkg of externalPackagesToResolve) {
-                const escapedPkg = pkg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-                // Match both exact imports (from "pkg") and subpath imports (from "pkg/sub")
-                const staticImportRegex = new RegExp(`from\\s*["']${escapedPkg}(/[^"']*)?["']`, "g");
-                const dynamicImportRegex = new RegExp(`import\\s*\\(\\s*["']${escapedPkg}(/[^"']*)?["']\\s*\\)`, "g");
-                const needsStatic = staticImportRegex.test(transformed);
-                staticImportRegex.lastIndex = 0;
-                const needsDynamic = dynamicImportRegex.test(transformed);
-                dynamicImportRegex.lastIndex = 0;
-                if (!needsStatic && !needsDynamic)
-                    continue;
-                const packageDir = pathToFileURL(pathHelper.join(projectDir, "node_modules", pkg)).href;
-                const resolvedUrl = await resolvePackageToFileUrl(pkg);
-                if (needsStatic) {
-                    transformed = transformed.replace(staticImportRegex, (_, subpath) => {
-                        if (subpath) {
-                            const subUrl = `${packageDir}${subpath}`;
-                            logger.debug(`Resolved ${pkg}${subpath} -> ${subUrl}`);
-                            return `from "${subUrl}"`;
-                        }
-                        if (!resolvedUrl)
-                            return `from "${pkg}"`;
-                        logger.debug(`Resolved ${pkg} -> ${resolvedUrl}`);
-                        return `from "${resolvedUrl}"`;
-                    });
-                }
-                if (needsDynamic) {
-                    transformed = transformed.replace(dynamicImportRegex, (_, subpath) => {
-                        if (subpath) {
-                            const subUrl = `${packageDir}${subpath}`;
-                            return `import("${subUrl}")`;
-                        }
-                        if (!resolvedUrl)
-                            return `import("${pkg}")`;
-                        return `import("${resolvedUrl}")`;
-                    });
-                }
-            }
-            const vfPackagePath = pathHelper.join(projectDir, "node_modules", "veryfront");
-            const vfPackageJsonPath = pathHelper.join(vfPackagePath, "package.json");
-            let exportsMap = {};
-            try {
-                const pkgJson = JSON.parse(await fs.readTextFile(vfPackageJsonPath));
-                exportsMap = pkgJson.exports || {};
-            }
-            catch (_error) {
-                logger.debug(`Could not read veryfront package.json: `);
-            }
-            transformed = transformed.replace(/from\s+["'](veryfront\/[^"']+)["']/g, (match, fullSpecifier) => {
-                const subpath = "./" + fullSpecifier.replace("veryfront/", "");
-                const exportEntry = exportsMap[subpath];
-                if (!exportEntry?.import) {
-                    logger.warn(`No export found for ${subpath}`);
-                    return match;
+    logger.debug(`Rewriting external imports for Node.js, projectDir: ${projectDir}`);
+    for (const pkg of getNodeExternalPackagesToResolve(userDeps)) {
+        const escapedPkg = pkg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        const staticImportRegex = new RegExp(`from\\s*["']${escapedPkg}(/[^"']*)?["']`, "g");
+        const dynamicImportRegex = new RegExp(`import\\s*\\(\\s*["']${escapedPkg}(/[^"']*)?["']\\s*\\)`, "g");
+        const needsStatic = staticImportRegex.test(transformed);
+        staticImportRegex.lastIndex = 0;
+        const needsDynamic = dynamicImportRegex.test(transformed);
+        dynamicImportRegex.lastIndex = 0;
+        if (!needsStatic && !needsDynamic)
+            continue;
+        const packageDir = pathToFileURL(pathHelper.join(projectDir, "node_modules", pkg)).href;
+        const resolvedUrl = await resolveNodePackageToFileUrl(projectDir, pkg, fs, pathToFileURL);
+        if (needsStatic) {
+            transformed = transformed.replace(staticImportRegex, (_, subpath) => {
+                if (subpath) {
+                    const subUrl = `${packageDir}${subpath}`;
+                    logger.debug(`Resolved ${pkg}${subpath} -> ${subUrl}`);
+                    return `from "${subUrl}"`;
                 }
-                const resolvedPath = pathHelper.join(vfPackagePath, exportEntry.import);
-                logger.debug(`Resolved ${fullSpecifier} -> ${resolvedPath}`);
-                return `from "${pathToFileURL(resolvedPath).href}"`;
+                if (!resolvedUrl)
+                    return `from "${pkg}"`;
+                logger.debug(`Resolved ${pkg} -> ${resolvedUrl}`);
+                return `from "${resolvedUrl}"`;
             });
-            transformed = transformed.replace(/from\s+["']veryfront["']/g, () => {
-                const exportEntry = exportsMap["."];
-                if (!exportEntry?.import)
-                    return 'from "veryfront"';
-                const resolvedPath = pathHelper.join(vfPackagePath, exportEntry.import);
-                logger.debug(`Resolved veryfront -> ${resolvedPath}`);
-                return `from "${pathToFileURL(resolvedPath).href}"`;
+        }
+        if (needsDynamic) {
+            transformed = transformed.replace(dynamicImportRegex, (_, subpath) => {
+                if (subpath) {
+                    return `import("${packageDir}${subpath}")`;
+                }
+                if (!resolvedUrl)
+                    return `import("${pkg}")`;
+                return `import("${resolvedUrl}")`;
             });
         }
+    }
+    const vfPackagePath = pathHelper.join(projectDir, "node_modules", "veryfront");
+    const exportsMap = await loadVeryfrontExportsMap(projectDir, fs);
+    transformed = transformed.replace(/from\s+["'](veryfront\/[^"']+)["']/g, (match, fullSpecifier) => {
+        const subpath = "./" + fullSpecifier.replace("veryfront/", "");
+        const exportEntry = exportsMap[subpath];
+        if (!exportEntry?.import) {
+            logger.warn(`No export found for ${subpath}`);
+            return match;
+        }
+        const resolvedPath = pathHelper.join(vfPackagePath, exportEntry.import);
+        logger.debug(`Resolved ${fullSpecifier} -> ${resolvedPath}`);
+        return `from "${pathToFileURL(resolvedPath).href}"`;
+    });
+    transformed = transformed.replace(/from\s+["']veryfront["']/g, () => {
+        const exportEntry = exportsMap["."];
+        if (!exportEntry?.import)
+            return 'from "veryfront"';
+        const resolvedPath = pathHelper.join(vfPackagePath, exportEntry.import);
+        logger.debug(`Resolved veryfront -> ${resolvedPath}`);
+        return `from "${pathToFileURL(resolvedPath).href}"`;
+    });
+    return transformed;
+}
+async function rewriteExternalImports(code, projectDir, fs, userDeps = new Map()) {
+    let transformed = code;
+    if (isNode) {
+        try {
+            transformed = await rewriteNodeExternalImports(transformed, projectDir, fs, userDeps);
+        }
         catch (e) {
             logger.warn(`Failed to import node:module: ${e}`);
         }

package/esm/src/utils/version-constant.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.157";
+export declare const VERSION = "0.1.159";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.157";
+export const VERSION = "0.1.159";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.157",
+  "version": "0.1.159",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/cli/mcp/remote-file-tools.ts

@@ -87,6 +87,15 @@ function getBranchParam(branch?: string): string {
   return branch ? `?branch_id=${branch}` : "";
 }
 
+function buildProjectApiPath(project: string, resource: string, branch?: string): string {
+  const normalizedResource = resource.startsWith("/") ? resource.slice(1) : resource;
+  return `/${project}${getBranchPath(branch)}/${normalizedResource}`;
+}
+
+function buildProjectFilePath(project: string, filePath: string, branch?: string): string {
+  return buildProjectApiPath(project, `files/${encodeFilePath(filePath)}`, branch);
+}
+
 interface RemoteFile {
   id?: string;
   path: string;
@@ -214,9 +223,9 @@ export const vfRemoteListFiles: MCPTool<RemoteListFilesInput, RemoteListFilesOut
         params.set("limit", String(input.limit));
         params.set("fields", "(path,type,size)");
 
-        const apiPath = `/${input.project}${
-          getBranchPath(input.branch)
-        }/files?${params.toString()}`;
+        const apiPath = `${
+          buildProjectApiPath(input.project, "files", input.branch)
+        }?${params.toString()}`;
         const result = await apiRequest<FileListResponse>("GET", apiPath);
         if (!result.ok) return { success: false, error: result.error };
 
@@ -260,9 +269,7 @@ export const vfRemoteGetFile: MCPTool<RemoteGetFileInput, RemoteGetFileOutput> =
     withSpan(
       "cli.mcp.tool.vf_remote_get_file",
       async () => {
-        const apiPath = `/${input.project}${getBranchPath(input.branch)}/files/${
-          encodeFilePath(input.path)
-        }`;
+        const apiPath = buildProjectFilePath(input.project, input.path, input.branch);
         const result = await apiRequest<RemoteFile>("GET", apiPath);
         if (!result.ok) return { success: false, error: result.error };
 
@@ -314,7 +321,7 @@ export const vfRemoteUpdateFile: MCPTool<RemoteUpdateFileInput, RemoteUpdateFile
     withSpan(
       "cli.mcp.tool.vf_remote_update_file",
       async () => {
-        const apiPath = `/${input.project}/files/${encodeFilePath(input.path)}${
+        const apiPath = `${buildProjectFilePath(input.project, input.path)}${
           getBranchParam(input.branch)
         }`;
         const result = await apiRequest<{ id: string; path: string }>("PUT", apiPath, {
@@ -362,7 +369,7 @@ export const vfRemoteDeleteFile: MCPTool<RemoteDeleteFileInput, RemoteDeleteFile
   description: "Delete a file from a remote Veryfront project.",
   inputSchema: remoteDeleteFileInput,
   execute: async (input) => {
-    const apiPath = `/${input.project}/files/${encodeFilePath(input.path)}${
+    const apiPath = `${buildProjectFilePath(input.project, input.path)}${
       getBranchParam(input.branch)
     }`;
     const result = await apiRequest<void>("DELETE", apiPath);
@@ -405,7 +412,7 @@ export const vfRemoteSearchFiles: MCPTool<RemoteSearchFilesInput, RemoteSearchFi
     withSpan(
       "cli.mcp.tool.vf_remote_search_files",
       async () => {
-        const apiPath = `/${input.project}${getBranchPath(input.branch)}/files/search`;
+        const apiPath = buildProjectApiPath(input.project, "files/search", input.branch);
         const result = await apiRequest<SearchResponse>("POST", apiPath, {
           body: {
             query: input.query,
@@ -455,7 +462,11 @@ export const vfRemoteMoveFile: MCPTool<RemoteMoveFileInput, RemoteMoveFileOutput
   description: "Move or rename a file in a remote Veryfront project.",
   inputSchema: remoteMoveFileInput,
   execute: async (input) => {
-    const apiPath = `/${input.project}/files/move${getBranchParam(input.branch)}`;
+    const apiPath = `${buildProjectApiPath(input.project, "files/move")}${
+      getBranchParam(
+        input.branch,
+      )
+    }`;
     const result = await apiRequest<{ source_path: string; destination_path: string }>(
       "POST",
       apiPath,
@@ -732,7 +743,7 @@ export const vfRemoteCloneProject: MCPTool<RemoteCloneProjectInput, RemoteCloneP
 
         const listResult = await apiRequest<FileListResponse>(
           "GET",
-          `/${input.source_project}/files?${params.toString()}`,
+          `${buildProjectApiPath(input.source_project, "files")}?${params.toString()}`,
         );
 
         if (!listResult.ok) {
@@ -750,7 +761,7 @@ export const vfRemoteCloneProject: MCPTool<RemoteCloneProjectInput, RemoteCloneP
         for (const file of sourceFiles) {
           const getResult = await apiRequest<RemoteFile>(
             "GET",
-            `/${input.source_project}/files/${encodeFilePath(file.path)}`,
+            buildProjectFilePath(input.source_project, file.path),
           );
 
           if (!getResult.ok || !getResult.data) {
@@ -760,7 +771,7 @@ export const vfRemoteCloneProject: MCPTool<RemoteCloneProjectInput, RemoteCloneP
 
           const createFileResult = await apiRequest<{ id: string; path: string }>(
             "PUT",
-            `/${createResult.slug}/files/${encodeFilePath(file.path)}`,
+            buildProjectFilePath(createResult.slug, file.path),
             { body: { content: getResult.data.content } },
           );
 

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.157",
+  "version": "0.1.159",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "exclude": [

package/src/src/agent/human-input.ts

@@ -0,0 +1,152 @@
+import { z } from "zod";
+import { AgUiRuntimeRunIdSchema } from "./runtime-ag-ui-contract.js";
+import { RunResumeSessionManager } from "./runtime/index.js";
+
+const TOOL_CALL_ID_SCHEMA = z.string().min(1).max(128);
+
+export const HumanInputOptionSchema = z.object({
+  value: z.string(),
+  label: z.string(),
+  description: z.string().optional(),
+  recommended: z.boolean().optional(),
+});
+
+const BaseHumanInputFieldSchema = z.object({
+  name: z.string().min(1).max(128),
+  label: z.string().min(1).max(256),
+  description: z.string().max(1024).optional(),
+  required: z.boolean().optional().default(false),
+  secret: z.boolean().optional().default(false),
+});
+
+export const HumanInputFieldSchema = z.discriminatedUnion("type", [
+  BaseHumanInputFieldSchema.extend({
+    type: z.enum(["text", "email", "url", "password", "number"]),
+    placeholder: z.string().max(512).optional(),
+    defaultValue: z.string().optional(),
+    pattern: z.string().max(512).optional(),
+    minLength: z.number().int().nonnegative().optional(),
+    maxLength: z.number().int().positive().optional(),
+    min: z.number().optional(),
+    max: z.number().optional(),
+  }),
+  BaseHumanInputFieldSchema.extend({
+    type: z.literal("textarea"),
+    placeholder: z.string().max(512).optional(),
+    defaultValue: z.string().optional(),
+    minLength: z.number().int().nonnegative().optional(),
+    maxLength: z.number().int().positive().optional(),
+    rows: z.number().int().positive().optional().default(3),
+  }),
+  BaseHumanInputFieldSchema.extend({
+    type: z.literal("select"),
+    options: z.array(HumanInputOptionSchema).min(1),
+    defaultValue: z.string().optional(),
+    placeholder: z.string().max(512).optional(),
+  }),
+  BaseHumanInputFieldSchema.extend({
+    type: z.literal("checkbox"),
+    defaultValue: z.boolean().optional().default(false),
+  }),
+  BaseHumanInputFieldSchema.extend({
+    type: z.literal("radio"),
+    options: z.array(HumanInputOptionSchema).min(1),
+    defaultValue: z.string().optional(),
+  }),
+  BaseHumanInputFieldSchema.extend({
+    type: z.literal("confirm"),
+    confirmLabel: z.string().max(64).optional().default("Yes"),
+    denyLabel: z.string().max(64).optional().default("No"),
+  }),
+]);
+
+export const HumanInputRequestSchema = z.object({
+  title: z.string().min(1).max(256),
+  description: z.string().max(2048).optional(),
+  fields: z.array(HumanInputFieldSchema).min(1),
+  submitLabel: z.string().max(64).optional().default("Submit"),
+  metadata: z.record(z.string(), z.unknown()).optional(),
+});
+
+export const HumanInputResponseValuesSchema = z.record(
+  z.string(),
+  z.union([z.string(), z.boolean(), z.number(), z.null()]),
+);
+
+export const HumanInputResultSchema = z.discriminatedUnion("submitted", [
+  z.object({
+    submitted: z.literal(true),
+    values: HumanInputResponseValuesSchema,
+  }),
+  z.object({
+    submitted: z.literal(false),
+    values: HumanInputResponseValuesSchema.default({}),
+  }),
+]);
+
+export const HumanInputPendingRequestSchema = z.object({
+  runId: AgUiRuntimeRunIdSchema,
+  toolCallId: TOOL_CALL_ID_SCHEMA,
+  request: HumanInputRequestSchema,
+});
+
+export type HumanInputOption = z.infer<typeof HumanInputOptionSchema>;
+export type HumanInputField = z.infer<typeof HumanInputFieldSchema>;
+export type HumanInputFieldInput = z.input<typeof HumanInputFieldSchema>;
+export type HumanInputRequest = z.infer<typeof HumanInputRequestSchema>;
+export type HumanInputRequestInput = z.input<typeof HumanInputRequestSchema>;
+export type HumanInputResult = z.infer<typeof HumanInputResultSchema>;
+export type HumanInputPendingRequest = z.infer<typeof HumanInputPendingRequestSchema>;
+
+type HumanInputResumeValue = {
+  result: unknown;
+  isError: boolean;
+};
+
+export interface WaitForHumanInputOptions {
+  sessionManager: RunResumeSessionManager<HumanInputResumeValue>;
+  runId: string;
+  toolCallId: string;
+  request: HumanInputRequestInput;
+  onRequest?: ((request: HumanInputPendingRequest) => void | Promise<void>) | undefined;
+}
+
+export class HumanInputResumeError extends Error {
+  constructor(readonly detail: unknown) {
+    super(
+      typeof detail === "string" ? detail : "Human input resume failed",
+    );
+    this.name = "HumanInputResumeError";
+  }
+}
+
+export class InvalidHumanInputResultError extends Error {
+  constructor(readonly detail: z.ZodIssue[]) {
+    super("Invalid human input resume payload");
+    this.name = "InvalidHumanInputResultError";
+  }
+}
+
+export async function waitForHumanInput(
+  options: WaitForHumanInputOptions,
+): Promise<HumanInputResult> {
+  const pendingRequest = HumanInputPendingRequestSchema.parse({
+    runId: options.runId,
+    toolCallId: options.toolCallId,
+    request: options.request,
+  });
+
+  await options.onRequest?.(pendingRequest);
+
+  const resumed = await options.sessionManager.waitForSignal(options.runId, options.toolCallId);
+  if (resumed.isError) {
+    throw new HumanInputResumeError(resumed.result);
+  }
+
+  const parsed = HumanInputResultSchema.safeParse(resumed.result);
+  if (!parsed.success) {
+    throw new InvalidHumanInputResultError(parsed.error.issues);
+  }
+
+  return parsed.data;
+}

package/src/src/agent/index.ts

@@ -162,6 +162,24 @@ export {
   AgUiRequestSchema,
   createAgUiHandler,
 } from "./ag-ui-handler.js";
+export {
+  type HumanInputField,
+  type HumanInputFieldInput,
+  HumanInputFieldSchema,
+  type HumanInputOption,
+  HumanInputOptionSchema,
+  type HumanInputPendingRequest,
+  HumanInputPendingRequestSchema,
+  type HumanInputRequest,
+  type HumanInputRequestInput,
+  HumanInputRequestSchema,
+  type HumanInputResult,
+  HumanInputResultSchema,
+  HumanInputResumeError,
+  InvalidHumanInputResultError,
+  waitForHumanInput,
+  type WaitForHumanInputOptions,
+} from "./human-input.js";
 export {
   type ChatHandlerBeforeStream,
   type ChatHandlerBeforeStreamContext,

package/src/src/mcp/server.ts

@@ -128,9 +128,8 @@ export class MCPServer {
   private sessionManager = new SessionManager();
   private taskStore = new TaskStore();
   private pendingTasks = new Map<string, Promise<void>>();
-  // TODO(#842): capabilities should be stored per-session (keyed by MCP-Session-Id)
-  // so concurrent clients don't overwrite each other's capability flags.
   private clientCapabilities: Record<string, unknown> = {};
+  private sessionCapabilities = new Map<string, Record<string, unknown>>();
 
   /** Callback for server-initiated notifications. Set by transport layer. */
   onNotification?: (notification: { jsonrpc: "2.0"; method: string; params?: unknown }) => void;
@@ -167,8 +166,11 @@ export class MCPServer {
     this.integrationsLoaded = false;
   }
 
-  clientSupportsElicitation(mode: "form" | "url"): boolean {
-    const raw = this.clientCapabilities.elicitation;
+  clientSupportsElicitation(mode: "form" | "url", sessionId?: string): boolean {
+    const capabilities = sessionId
+      ? this.sessionCapabilities.get(sessionId) ?? {}
+      : this.clientCapabilities;
+    const raw = capabilities.elicitation;
     if (!raw || typeof raw !== "object" || Array.isArray(raw)) return false;
     const elicitation = raw as Record<string, unknown>;
     // Per MCP spec: empty elicitation object implies basic form support (backwards compat)
@@ -650,7 +652,10 @@ export class MCPServer {
       // DELETE = terminate session
       if (request.method === "DELETE") {
         const sessionId = request.headers.get("MCP-Session-Id");
-        if (sessionId) this.sessionManager.terminate(sessionId);
+        if (sessionId) {
+          this.sessionManager.terminate(sessionId);
+          this.sessionCapabilities.delete(sessionId);
+        }
         return new dntShim.Response(null, { status: 200, headers: this.getCORSHeaders(requestOrigin) });
       }
 
@@ -692,7 +697,11 @@ export class MCPServer {
       if (rpcRequest.method === "initialize") {
         const context = this.extractRequestContext(request);
         const rpcResponse = await this.handleRequest(rpcRequest, context);
+        const clientCaps =
+          toParamsRecord(rpcRequest.params).capabilities as Record<string, unknown> ??
+            {};
         const sessionId = this.sessionManager.create();
+        this.sessionCapabilities.set(sessionId, clientCaps);
         responseHeaders["MCP-Session-Id"] = sessionId;
         return createJSONResponse(rpcResponse, { headers: responseHeaders });
       }