@aigne/afs-cli 1.11.0-beta.10 → 1.11.0-beta.12

package/dist/credential/index.d.mts

@@ -1,4 +1,5 @@
 import "./cli-auth-context.mjs";
 import "./mcp-auth-context.mjs";
 import { CredentialStore, CredentialStoreOptions, Credentials, createCredentialStore } from "./store.mjs";
-import "./resolver.mjs";
+import "./resolver.mjs";
+import "./vault-store.mjs";

package/dist/credential/mcp-auth-context.cjs

@@ -15,6 +15,20 @@ let _aigne_afs_utils_schema = require("@aigne/afs/utils/schema");
 * Requires an MCP Server instance that supports elicitation.
 */
 /**
+* Send a logging message to the MCP client.
+* Falls back to console.error if sendLoggingMessage is not available.
+*/
+async function logToClient(server, level, message) {
+	try {
+		await server.sendLoggingMessage({
+			level,
+			data: message
+		});
+	} catch {
+		console.error(message);
+	}
+}
+/**
 * Create an MCP AuthContext for MCP-based credential collection.
 */
 function createMCPAuthContext(options) {
@@ -22,6 +36,7 @@ function createMCPAuthContext(options) {
 	const resolved = options.resolved ?? {};
 	const openURLFn = options.openURL;
 	return {
+		nonBlocking: true,
 		get resolved() {
 			return { ...resolved };
 		},
@@ -34,14 +49,14 @@ function createMCPAuthContext(options) {
 				} catch (err) {
 					if (!(err instanceof ElicitationUnsupportedError)) throw err;
 				}
-				return collectViaBrowser(schema, openURLFn);
+				return collectViaBrowser(server, schema, openURLFn);
 			}
 			try {
 				return await collectViaFormMode(server, schema);
 			} catch (err) {
 				if (!(err instanceof ElicitationUnsupportedError)) throw err;
 			}
-			return collectViaBrowser(schema, openURLFn);
+			return collectViaBrowser(server, schema, openURLFn);
 		},
 		async createCallbackServer() {
 			const authServer = await require_auth_server.createAuthServer();
@@ -64,7 +79,13 @@ function createMCPAuthContext(options) {
 				if (result.action === "decline") return "declined";
 				return "cancelled";
 			} catch {
-				return "cancelled";
+				try {
+					await logToClient(server, "notice", `${message}\n${url}`);
+					await (openURLFn ?? openURL)(url);
+					return "accepted";
+				} catch {
+					return "cancelled";
+				}
 			}
 		}
 	};
@@ -147,13 +168,14 @@ async function collectViaURLMode(server, schema) {
 /**
 * Fallback: collect credentials by opening a browser directly.
 * Used when MCP client doesn't support elicitation protocol.
+* Sends a logging notification to the client so the user can see the URL.
 */
-async function collectViaBrowser(schema, openURLFn) {
+async function collectViaBrowser(server, schema, openURLFn) {
 	const properties = schema.properties || {};
 	if (Object.keys(properties).length === 0) return {};
 	const authServer = await require_auth_server.createAuthServer();
 	const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;
-	console.error(`\nPlease fill in credentials in your browser:\n${formURL}`);
+	await logToClient(server, "notice", `Please fill in credentials in your browser:\n${formURL}`);
 	try {
 		await (openURLFn ?? openURL)(formURL);
 	} catch {}

package/dist/credential/mcp-auth-context.mjs

@@ -14,6 +14,20 @@ import { getSensitiveFields } from "@aigne/afs/utils/schema";
 * Requires an MCP Server instance that supports elicitation.
 */
 /**
+* Send a logging message to the MCP client.
+* Falls back to console.error if sendLoggingMessage is not available.
+*/
+async function logToClient(server, level, message) {
+	try {
+		await server.sendLoggingMessage({
+			level,
+			data: message
+		});
+	} catch {
+		console.error(message);
+	}
+}
+/**
 * Create an MCP AuthContext for MCP-based credential collection.
 */
 function createMCPAuthContext(options) {
@@ -21,6 +35,7 @@ function createMCPAuthContext(options) {
 	const resolved = options.resolved ?? {};
 	const openURLFn = options.openURL;
 	return {
+		nonBlocking: true,
 		get resolved() {
 			return { ...resolved };
 		},
@@ -33,14 +48,14 @@ function createMCPAuthContext(options) {
 				} catch (err) {
 					if (!(err instanceof ElicitationUnsupportedError)) throw err;
 				}
-				return collectViaBrowser(schema, openURLFn);
+				return collectViaBrowser(server, schema, openURLFn);
 			}
 			try {
 				return await collectViaFormMode(server, schema);
 			} catch (err) {
 				if (!(err instanceof ElicitationUnsupportedError)) throw err;
 			}
-			return collectViaBrowser(schema, openURLFn);
+			return collectViaBrowser(server, schema, openURLFn);
 		},
 		async createCallbackServer() {
 			const authServer = await createAuthServer();
@@ -63,7 +78,13 @@ function createMCPAuthContext(options) {
 				if (result.action === "decline") return "declined";
 				return "cancelled";
 			} catch {
-				return "cancelled";
+				try {
+					await logToClient(server, "notice", `${message}\n${url}`);
+					await (openURLFn ?? openURL)(url);
+					return "accepted";
+				} catch {
+					return "cancelled";
+				}
 			}
 		}
 	};
@@ -146,13 +167,14 @@ async function collectViaURLMode(server, schema) {
 /**
 * Fallback: collect credentials by opening a browser directly.
 * Used when MCP client doesn't support elicitation protocol.
+* Sends a logging notification to the client so the user can see the URL.
 */
-async function collectViaBrowser(schema, openURLFn) {
+async function collectViaBrowser(server, schema, openURLFn) {
 	const properties = schema.properties || {};
 	if (Object.keys(properties).length === 0) return {};
 	const authServer = await createAuthServer();
 	const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;
-	console.error(`\nPlease fill in credentials in your browser:\n${formURL}`);
+	await logToClient(server, "notice", `Please fill in credentials in your browser:\n${formURL}`);
 	try {
 		await (openURLFn ?? openURL)(formURL);
 	} catch {}

package/dist/credential/mcp-auth-context.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-auth-context.mjs","names":[],"sources":["../../src/credential/mcp-auth-context.ts"],"sourcesContent":["/**\n * MCP AuthContext implementation.\n *\n * Uses MCP elicitation protocol to collect credentials:\n * - Non-sensitive fields: form mode (Client renders UI)\n * - Sensitive fields: URL mode (local HTTP server, data never passes through Client/LLM)\n *\n * Requires an MCP Server instance that supports elicitation.\n */\n\nimport { execFile } from \"node:child_process\";\nimport { randomBytes } from \"node:crypto\";\nimport type { AuthContext, CallbackServer, JSONSchema7 } from \"@aigne/afs\";\nimport { getSensitiveFields } from \"@aigne/afs/utils/schema\";\nimport type { Server } from \"@modelcontextprotocol/sdk/server/index.js\";\nimport { createAuthServer } from \"./auth-server.js\";\n\nexport interface MCPAuthContextOptions {\n  /** The MCP Server instance (for sending elicitation requests) */\n  server: Server;\n  /** Pre-resolved fields from Step 2 (env/store/config) */\n  resolved?: Record<string, unknown>;\n  /** Override browser URL opener (for testing). Falls back to platform-default open. */\n  openURL?: (url: string) => Promise<void>;\n}\n\n/**\n * Create an MCP AuthContext for MCP-based credential collection.\n */\nexport function createMCPAuthContext(options: MCPAuthContextOptions): AuthContext {\n  const { server } = options;\n  const resolved = options.resolved ?? {};\n  const openURLFn = options.openURL;\n\n  return {\n    get resolved() {\n      return { ...resolved };\n    },\n\n    async collect(schema: JSONSchema7): Promise<Record<string, unknown> | null> {\n      const properties = (schema as any).properties;\n      if (!properties || typeof properties !== \"object\") return {};\n\n      const sensitiveFields = new Set(getSensitiveFields(schema));\n      const hasSensitive = sensitiveFields.size > 0;\n\n      // Strategy: try elicitation first, fall back to browser if client doesn't support it.\n      // ElicitationUnsupportedError means \"not supported\" → try next mode.\n      // null means \"user declined/cancelled\" → stop and return null.\n\n      if (hasSensitive) {\n        // Sensitive fields: try URL mode (data stays local, never through Client/LLM)\n        try {\n          return await collectViaURLMode(server, schema);\n        } catch (err) {\n          if (!(err instanceof ElicitationUnsupportedError)) throw err;\n        }\n        // URL mode not supported — browser fallback (also keeps data local)\n        return collectViaBrowser(schema, openURLFn);\n      }\n\n      // Non-sensitive only: try form mode (Client renders UI)\n      try {\n        return await collectViaFormMode(server, schema);\n      } catch (err) {\n        if (!(err instanceof ElicitationUnsupportedError)) throw err;\n      }\n\n      // Form mode not supported — browser fallback\n      return collectViaBrowser(schema, openURLFn);\n    },\n\n    async createCallbackServer(): Promise<CallbackServer> {\n      const authServer = await createAuthServer();\n      return {\n        callbackURL: authServer.callbackURL,\n        waitForCallback: authServer.waitForCallback.bind(authServer),\n        close: authServer.close.bind(authServer),\n      };\n    },\n\n    async requestOpenURL(\n      url: string,\n      message: string,\n    ): Promise<\"accepted\" | \"declined\" | \"cancelled\"> {\n      try {\n        const elicitationId = randomBytes(16).toString(\"hex\");\n        const result = await server.elicitInput({\n          mode: \"url\",\n          message,\n          url,\n          elicitationId,\n        });\n\n        if (result.action === \"accept\") return \"accepted\";\n        if (result.action === \"decline\") return \"declined\";\n        return \"cancelled\";\n      } catch {\n        // Client doesn't support elicitation — try direct open\n        return \"cancelled\";\n      }\n    },\n  };\n}\n\n/** Sentinel error: elicitation mode not supported by client */\nclass ElicitationUnsupportedError extends Error {\n  constructor(mode: string) {\n    super(`Client does not support ${mode} elicitation`);\n  }\n}\n\n/**\n * Collect non-sensitive fields via MCP form mode elicitation.\n *\n * @throws ElicitationUnsupportedError if client doesn't support form mode\n * @returns collected values, or null if user declined/cancelled\n */\nasync function collectViaFormMode(\n  server: Server,\n  schema: JSONSchema7,\n): Promise<Record<string, unknown> | null> {\n  const properties = (schema as any).properties || {};\n  const required = (schema as any).required || [];\n\n  // Build elicitation form schema (simplified for MCP form mode)\n  const formProperties: Record<string, any> = {};\n  for (const [key, prop] of Object.entries(properties) as [string, any][]) {\n    formProperties[key] = {\n      type: \"string\",\n      ...(prop.description ? { description: prop.description } : {}),\n      ...(prop.title ? { title: prop.title } : {}),\n      ...(prop.default != null ? { default: prop.default } : {}),\n    };\n  }\n\n  try {\n    const result = await server.elicitInput({\n      mode: \"form\",\n      message: \"Please provide the required configuration:\",\n      requestedSchema: {\n        type: \"object\" as const,\n        properties: formProperties,\n        required,\n      },\n    });\n\n    if (result.action === \"accept\" && result.content) {\n      return result.content as Record<string, unknown>;\n    }\n\n    // User declined or cancelled\n    return null;\n  } catch {\n    // Client doesn't support form elicitation\n    throw new ElicitationUnsupportedError(\"form\");\n  }\n}\n\n/**\n * Collect fields containing sensitive data via URL mode.\n * Starts a local HTTP server, sends URL mode elicitation so Client opens the browser.\n * Form data goes directly from browser to local server (never through Client/LLM).\n *\n * @throws ElicitationUnsupportedError if client doesn't support URL mode\n * @returns collected values, or null if user declined/cancelled\n */\nasync function collectViaURLMode(\n  server: Server,\n  schema: JSONSchema7,\n): Promise<Record<string, unknown> | null> {\n  const authServer = await createAuthServer();\n\n  try {\n    const elicitationId = randomBytes(16).toString(\"hex\");\n    const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;\n\n    // Send URL mode elicitation to client — let errors propagate\n    let elicitResult: { action: string };\n    try {\n      elicitResult = await server.elicitInput({\n        mode: \"url\",\n        message: \"Please fill in the credential form in your browser:\",\n        url: formURL,\n        elicitationId,\n      });\n    } catch {\n      // Client doesn't support URL elicitation\n      throw new ElicitationUnsupportedError(\"url\");\n    }\n\n    if (elicitResult.action !== \"accept\") {\n      // User declined or cancelled\n      return null;\n    }\n\n    // Client accepted — wait for form submission with timeout\n    const result = await authServer.waitForForm(schema as Record<string, any>, {\n      title: \"AFS Credential Collection\",\n      timeout: 120_000, // 2-minute safety timeout\n    });\n\n    // Notify client that elicitation is complete\n    try {\n      const notifyComplete = server.createElicitationCompletionNotifier(elicitationId);\n      await notifyComplete();\n    } catch {\n      // Notification failure is non-critical\n    }\n\n    return result;\n  } finally {\n    authServer.close();\n  }\n}\n\n/**\n * Fallback: collect credentials by opening a browser directly.\n * Used when MCP client doesn't support elicitation protocol.\n */\nasync function collectViaBrowser(\n  schema: JSONSchema7,\n  openURLFn?: (url: string) => Promise<void>,\n): Promise<Record<string, unknown> | null> {\n  const properties = (schema as any).properties || {};\n  if (Object.keys(properties).length === 0) return {};\n\n  const authServer = await createAuthServer();\n  const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;\n\n  console.error(`\\nPlease fill in credentials in your browser:\\n${formURL}`);\n\n  try {\n    await (openURLFn ?? openURL)(formURL);\n  } catch {\n    // Browser failed to open; URL is already printed above\n  }\n\n  try {\n    const result = await authServer.waitForForm(schema as Record<string, any>, {\n      title: \"AFS Credential Collection\",\n    });\n    return result;\n  } finally {\n    authServer.close();\n  }\n}\n\n/**\n * Open a URL in the default browser.\n */\nfunction openURL(url: string): Promise<void> {\n  const cmd =\n    process.platform === \"darwin\" ? \"open\" : process.platform === \"win32\" ? \"cmd\" : \"xdg-open\";\n\n  const args = process.platform === \"win32\" ? [\"/c\", \"start\", \"\", url] : [url];\n\n  return new Promise((resolve, reject) => {\n    execFile(cmd, args, (err) => {\n      if (err) reject(err);\n      else resolve();\n    });\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"mcp-auth-context.mjs","names":[],"sources":["../../src/credential/mcp-auth-context.ts"],"sourcesContent":["/**\n * MCP AuthContext implementation.\n *\n * Uses MCP elicitation protocol to collect credentials:\n * - Non-sensitive fields: form mode (Client renders UI)\n * - Sensitive fields: URL mode (local HTTP server, data never passes through Client/LLM)\n *\n * Requires an MCP Server instance that supports elicitation.\n */\n\nimport { execFile } from \"node:child_process\";\nimport { randomBytes } from \"node:crypto\";\nimport type { AuthContext, CallbackServer, JSONSchema7 } from \"@aigne/afs\";\nimport { getSensitiveFields } from \"@aigne/afs/utils/schema\";\nimport type { Server } from \"@modelcontextprotocol/sdk/server/index.js\";\nimport { createAuthServer } from \"./auth-server.js\";\n\nexport interface MCPAuthContextOptions {\n  /** The MCP Server instance (for sending elicitation requests) */\n  server: Server;\n  /** Pre-resolved fields from Step 2 (env/store/config) */\n  resolved?: Record<string, unknown>;\n  /** Override browser URL opener (for testing). Falls back to platform-default open. */\n  openURL?: (url: string) => Promise<void>;\n}\n\n/**\n * Send a logging message to the MCP client.\n * Falls back to console.error if sendLoggingMessage is not available.\n */\nasync function logToClient(\n  server: Server,\n  level: \"info\" | \"notice\" | \"warning\" | \"error\",\n  message: string,\n): Promise<void> {\n  try {\n    await server.sendLoggingMessage({ level, data: message });\n  } catch {\n    // Logging capability not available — fall back to stderr\n    console.error(message);\n  }\n}\n\n/**\n * Create an MCP AuthContext for MCP-based credential collection.\n */\nexport function createMCPAuthContext(options: MCPAuthContextOptions): AuthContext {\n  const { server } = options;\n  const resolved = options.resolved ?? {};\n  const openURLFn = options.openURL;\n\n  return {\n    nonBlocking: true,\n\n    get resolved() {\n      return { ...resolved };\n    },\n\n    async collect(schema: JSONSchema7): Promise<Record<string, unknown> | null> {\n      const properties = (schema as any).properties;\n      if (!properties || typeof properties !== \"object\") return {};\n\n      const sensitiveFields = new Set(getSensitiveFields(schema));\n      const hasSensitive = sensitiveFields.size > 0;\n\n      // Strategy: try elicitation first, fall back to browser if client doesn't support it.\n      // ElicitationUnsupportedError means \"not supported\" → try next mode.\n      // null means \"user declined/cancelled\" → stop and return null.\n\n      if (hasSensitive) {\n        // Sensitive fields: try URL mode (data stays local, never through Client/LLM)\n        try {\n          return await collectViaURLMode(server, schema);\n        } catch (err) {\n          if (!(err instanceof ElicitationUnsupportedError)) throw err;\n        }\n        // URL mode not supported — browser fallback (also keeps data local)\n        return collectViaBrowser(server, schema, openURLFn);\n      }\n\n      // Non-sensitive only: try form mode (Client renders UI)\n      try {\n        return await collectViaFormMode(server, schema);\n      } catch (err) {\n        if (!(err instanceof ElicitationUnsupportedError)) throw err;\n      }\n\n      // Form mode not supported — browser fallback\n      return collectViaBrowser(server, schema, openURLFn);\n    },\n\n    async createCallbackServer(): Promise<CallbackServer> {\n      const authServer = await createAuthServer();\n      return {\n        callbackURL: authServer.callbackURL,\n        waitForCallback: authServer.waitForCallback.bind(authServer),\n        close: authServer.close.bind(authServer),\n      };\n    },\n\n    async requestOpenURL(\n      url: string,\n      message: string,\n    ): Promise<\"accepted\" | \"declined\" | \"cancelled\"> {\n      try {\n        const elicitationId = randomBytes(16).toString(\"hex\");\n        const result = await server.elicitInput({\n          mode: \"url\",\n          message,\n          url,\n          elicitationId,\n        });\n\n        if (result.action === \"accept\") return \"accepted\";\n        if (result.action === \"decline\") return \"declined\";\n        return \"cancelled\";\n      } catch {\n        // Client doesn't support elicitation — notify via logging and open browser directly\n        try {\n          await logToClient(server, \"notice\", `${message}\\n${url}`);\n          await (openURLFn ?? openURL)(url);\n          return \"accepted\";\n        } catch {\n          return \"cancelled\";\n        }\n      }\n    },\n  };\n}\n\n/** Sentinel error: elicitation mode not supported by client */\nclass ElicitationUnsupportedError extends Error {\n  constructor(mode: string) {\n    super(`Client does not support ${mode} elicitation`);\n  }\n}\n\n/**\n * Collect non-sensitive fields via MCP form mode elicitation.\n *\n * @throws ElicitationUnsupportedError if client doesn't support form mode\n * @returns collected values, or null if user declined/cancelled\n */\nasync function collectViaFormMode(\n  server: Server,\n  schema: JSONSchema7,\n): Promise<Record<string, unknown> | null> {\n  const properties = (schema as any).properties || {};\n  const required = (schema as any).required || [];\n\n  // Build elicitation form schema (simplified for MCP form mode)\n  const formProperties: Record<string, any> = {};\n  for (const [key, prop] of Object.entries(properties) as [string, any][]) {\n    formProperties[key] = {\n      type: \"string\",\n      ...(prop.description ? { description: prop.description } : {}),\n      ...(prop.title ? { title: prop.title } : {}),\n      ...(prop.default != null ? { default: prop.default } : {}),\n    };\n  }\n\n  try {\n    const result = await server.elicitInput({\n      mode: \"form\",\n      message: \"Please provide the required configuration:\",\n      requestedSchema: {\n        type: \"object\" as const,\n        properties: formProperties,\n        required,\n      },\n    });\n\n    if (result.action === \"accept\" && result.content) {\n      return result.content as Record<string, unknown>;\n    }\n\n    // User declined or cancelled\n    return null;\n  } catch {\n    // Client doesn't support form elicitation\n    throw new ElicitationUnsupportedError(\"form\");\n  }\n}\n\n/**\n * Collect fields containing sensitive data via URL mode.\n * Starts a local HTTP server, sends URL mode elicitation so Client opens the browser.\n * Form data goes directly from browser to local server (never through Client/LLM).\n *\n * @throws ElicitationUnsupportedError if client doesn't support URL mode\n * @returns collected values, or null if user declined/cancelled\n */\nasync function collectViaURLMode(\n  server: Server,\n  schema: JSONSchema7,\n): Promise<Record<string, unknown> | null> {\n  const authServer = await createAuthServer();\n\n  try {\n    const elicitationId = randomBytes(16).toString(\"hex\");\n    const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;\n\n    // Send URL mode elicitation to client — let errors propagate\n    let elicitResult: { action: string };\n    try {\n      elicitResult = await server.elicitInput({\n        mode: \"url\",\n        message: \"Please fill in the credential form in your browser:\",\n        url: formURL,\n        elicitationId,\n      });\n    } catch {\n      // Client doesn't support URL elicitation\n      throw new ElicitationUnsupportedError(\"url\");\n    }\n\n    if (elicitResult.action !== \"accept\") {\n      // User declined or cancelled\n      return null;\n    }\n\n    // Client accepted — wait for form submission with timeout\n    const result = await authServer.waitForForm(schema as Record<string, any>, {\n      title: \"AFS Credential Collection\",\n      timeout: 120_000, // 2-minute safety timeout\n    });\n\n    // Notify client that elicitation is complete\n    try {\n      const notifyComplete = server.createElicitationCompletionNotifier(elicitationId);\n      await notifyComplete();\n    } catch {\n      // Notification failure is non-critical\n    }\n\n    return result;\n  } finally {\n    authServer.close();\n  }\n}\n\n/**\n * Fallback: collect credentials by opening a browser directly.\n * Used when MCP client doesn't support elicitation protocol.\n * Sends a logging notification to the client so the user can see the URL.\n */\nasync function collectViaBrowser(\n  server: Server,\n  schema: JSONSchema7,\n  openURLFn?: (url: string) => Promise<void>,\n): Promise<Record<string, unknown> | null> {\n  const properties = (schema as any).properties || {};\n  if (Object.keys(properties).length === 0) return {};\n\n  const authServer = await createAuthServer();\n  const formURL = `${authServer.baseURL}/auth?nonce=${authServer.nonce}`;\n\n  await logToClient(server, \"notice\", `Please fill in credentials in your browser:\\n${formURL}`);\n\n  try {\n    await (openURLFn ?? openURL)(formURL);\n  } catch {\n    // Browser failed to open; URL is already sent to client via logging\n  }\n\n  try {\n    const result = await authServer.waitForForm(schema as Record<string, any>, {\n      title: \"AFS Credential Collection\",\n    });\n    return result;\n  } finally {\n    authServer.close();\n  }\n}\n\n/**\n * Open a URL in the default browser.\n */\nfunction openURL(url: string): Promise<void> {\n  const cmd =\n    process.platform === \"darwin\" ? \"open\" : process.platform === \"win32\" ? \"cmd\" : \"xdg-open\";\n\n  const args = process.platform === \"win32\" ? [\"/c\", \"start\", \"\", url] : [url];\n\n  return new Promise((resolve, reject) => {\n    execFile(cmd, args, (err) => {\n      if (err) reject(err);\n      else resolve();\n    });\n  });\n}\n"],"mappings":"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"}

package/dist/credential/resolver.cjs

@@ -56,7 +56,8 @@ async function resolveCredentials(options) {
 		}
 	} catch {}
 	missing = getRequiredMissing(resolved);
-	if (missing.length === 0 && !options.forceCollect) {
+	const allStillMissing = getAllMissing(resolved);
+	if (missing.length === 0 && !options.forceCollect && (allStillMissing.length === 0 || !authContext || providerAuth)) {
 		const { sensitive: sensitive$1, nonSensitive: nonSensitive$1 } = (0, _aigne_afs_utils_schema.separateSensitiveValues)(schema, resolved);
 		return {
 			values: { ...resolved },
@@ -79,7 +80,11 @@ async function resolveCredentials(options) {
 		...authContext,
 		get resolved() {
 			return { ...resolved };
-		}
+		},
+		persistCredentials: credentialStore ? async (creds) => {
+			const { sensitive: bgSensitive } = (0, _aigne_afs_utils_schema.separateSensitiveValues)(schema, creds);
+			if (Object.keys(bgSensitive).length > 0) await credentialStore.set(mount.uri, bgSensitive);
+		} : void 0
 	});
 	else {
 		const fieldsForForm = allFields.filter((f) => known[f] === void 0);

package/dist/credential/resolver.mjs

@@ -55,7 +55,8 @@ async function resolveCredentials(options) {
 		}
 	} catch {}
 	missing = getRequiredMissing(resolved);
-	if (missing.length === 0 && !options.forceCollect) {
+	const allStillMissing = getAllMissing(resolved);
+	if (missing.length === 0 && !options.forceCollect && (allStillMissing.length === 0 || !authContext || providerAuth)) {
 		const { sensitive: sensitive$1, nonSensitive: nonSensitive$1 } = separateSensitiveValues(schema, resolved);
 		return {
 			values: { ...resolved },
@@ -78,7 +79,11 @@ async function resolveCredentials(options) {
 		...authContext,
 		get resolved() {
 			return { ...resolved };
-		}
+		},
+		persistCredentials: credentialStore ? async (creds) => {
+			const { sensitive: bgSensitive } = separateSensitiveValues(schema, creds);
+			if (Object.keys(bgSensitive).length > 0) await credentialStore.set(mount.uri, bgSensitive);
+		} : void 0
 	});
 	else {
 		const fieldsForForm = allFields.filter((f) => known[f] === void 0);

package/dist/credential/resolver.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.mjs","names":["resolved"],"sources":["../../src/credential/resolver.ts"],"sourcesContent":["/**\n * 4-Step Credential Resolution Flow\n *\n * Step 1: Determine missing fields (from provider schema vs known values)\n * Step 2: Silent resolution (config > env > credential store)\n * Step 3: Interactive collection (provider auth() or default collect())\n * Step 4: Unified persistence (sensitive → credentials.toml, non-sensitive → config options)\n */\n\nimport type { AuthContext, JSONSchema7, MountConfig } from \"@aigne/afs\";\nimport { resolveEnvFromSchema, separateSensitiveValues } from \"@aigne/afs/utils/schema\";\nimport type { CredentialStore } from \"./store.js\";\n\nexport interface ResolveCredentialsOptions {\n  /** Mount configuration */\n  mount: MountConfig;\n  /** JSON Schema for this provider (from z.toJSONSchema() or manifest) */\n  schema: JSONSchema7;\n  /** Auth context for interactive collection (CLI or MCP) */\n  authContext?: AuthContext;\n  /** Credential store for reading/writing credentials */\n  credentialStore?: CredentialStore;\n  /** Provider class with optional auth() method */\n  providerAuth?: (context: AuthContext) => Promise<Record<string, unknown> | null>;\n  /** Environment variables (defaults to process.env) */\n  env?: Record<string, string | undefined>;\n  /** Force interactive collection even when all fields are resolved silently.\n   *  Used for retry after health-check failure with stale env/store values. */\n  forceCollect?: boolean;\n}\n\nexport interface ResolveCredentialsResult {\n  /** All resolved values (merged from all sources) */\n  values: Record<string, unknown>;\n  /** Values to persist as sensitive credentials */\n  sensitive: Record<string, string>;\n  /** Values to persist as non-sensitive config options */\n  nonSensitive: Record<string, unknown>;\n  /** Whether any interactive collection was needed */\n  collected: boolean;\n}\n\n/**\n * Execute the 4-step credential resolution flow.\n *\n * Returns all resolved values plus their split into sensitive/non-sensitive\n * for persistence. The caller is responsible for actual persistence.\n *\n * @returns null if user declined/cancelled collection\n */\nexport async function resolveCredentials(\n  options: ResolveCredentialsOptions,\n): Promise<ResolveCredentialsResult | null> {\n  const { mount, schema, authContext, credentialStore, providerAuth, env = process.env } = options;\n\n  const properties = (schema as any).properties;\n  if (!properties || typeof properties !== \"object\" || Object.keys(properties).length === 0) {\n    // No fields to resolve\n    return { values: {}, sensitive: {}, nonSensitive: {}, collected: false };\n  }\n\n  const allFields = Object.keys(properties);\n  const requiredFields = ((schema as any).required ?? []) as string[];\n\n  // Only required fields without a schema default truly block silent resolution —\n  // optional fields and fields with defaults should not trigger interactive auth.\n  const requiredWithoutDefault = requiredFields.filter(\n    (f) => properties[f] && properties[f].default === undefined,\n  );\n\n  // ─── Step 1: Determine known values from mount config ─────────────────\n  const known: Record<string, unknown> = {};\n\n  // Extract values from mount.auth, mount.token, mount.options\n  if (mount.auth !== undefined) known.auth = mount.auth;\n  if (mount.token !== undefined) known.token = mount.token;\n  if (mount.options) {\n    for (const [k, v] of Object.entries(mount.options)) {\n      if (v !== undefined) known[k] = v;\n    }\n  }\n\n  // Check which fields are still missing — allFields for Step 1 optimization,\n  // requiredWithoutDefault for the Step 2→3 decision on interactive auth.\n  const getAllMissing = (resolved: Record<string, unknown>) =>\n    allFields.filter((f) => resolved[f] === undefined);\n  const getRequiredMissing = (resolved: Record<string, unknown>) =>\n    requiredWithoutDefault.filter((f) => resolved[f] === undefined);\n\n  let missing = getAllMissing(known);\n  if (missing.length === 0) {\n    // All fields already provided via config — short circuit\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, known);\n    return { values: { ...known }, sensitive, nonSensitive, collected: false };\n  }\n\n  // ─── Step 2: Silent resolution ────────────────────────────────────────\n  const resolved: Record<string, unknown> = { ...known };\n\n  // 2a. Environment variables from schema env declarations\n  const envResolved = resolveEnvFromSchema(schema, env as Record<string, string | undefined>);\n  for (const [field, value] of Object.entries(envResolved)) {\n    if (resolved[field] === undefined) {\n      resolved[field] = value;\n    }\n  }\n\n  // 2b. Credential store — keyed by URI (credentials belong to the resource, not the path)\n  const storeResolved: Record<string, unknown> = {};\n  if (credentialStore) {\n    try {\n      const stored = await credentialStore.get(mount.uri);\n      if (stored) {\n        for (const [field, value] of Object.entries(stored)) {\n          if (field.startsWith(\"env:\")) {\n            // Reconstruct env Record from flattened env:KEY credential entries\n            if (resolved.env === undefined) resolved.env = {};\n            (resolved.env as Record<string, string>)[field.slice(4)] = value;\n            if (storeResolved.env === undefined) storeResolved.env = {};\n            (storeResolved.env as Record<string, string>)[field.slice(4)] = value;\n          } else {\n            if (resolved[field] === undefined) {\n              resolved[field] = value;\n            }\n            storeResolved[field] = value;\n          }\n        }\n      }\n    } catch {\n      // Credential store read failure is non-fatal\n    }\n  }\n\n  missing = getRequiredMissing(resolved);\n  if (missing.length === 0 && !options.forceCollect) {\n    // All fields resolved silently\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, resolved);\n    return { values: { ...resolved }, sensitive, nonSensitive, collected: false };\n  }\n\n  // ─── Step 3: Interactive collection ───────────────────────────────────\n  if (!authContext) {\n    // No auth context available — can't collect. Return what we have.\n    // Caller should attempt mount with partial values and let the provider error if needed.\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, resolved);\n    return { values: { ...resolved }, sensitive, nonSensitive, collected: false };\n  }\n\n  let collected: Record<string, unknown> | null = null;\n\n  if (providerAuth) {\n    // Provider has custom auth() — delegate to it\n    collected = await providerAuth({\n      ...authContext,\n      get resolved() {\n        return { ...resolved };\n      },\n    });\n  } else {\n    // Show all fields not explicitly provided via config/CLI args.\n    // Env and store values are pre-filled as defaults so the user can verify/override.\n    const fieldsForForm = allFields.filter((f) => known[f] === undefined);\n    const defaults: Record<string, unknown> = { ...envResolved };\n    for (const [f, v] of Object.entries(storeResolved)) {\n      if (defaults[f] === undefined) defaults[f] = v;\n    }\n    const missingSchema = buildMissingFieldsSchema(schema, fieldsForForm, defaults);\n    collected = await authContext.collect(missingSchema);\n  }\n\n  if (collected === null) {\n    // User declined/cancelled\n    return null;\n  }\n\n  // Merge collected values\n  for (const [field, value] of Object.entries(collected)) {\n    if (value !== undefined) {\n      resolved[field] = value;\n    }\n  }\n\n  // ─── Step 4: Split for persistence ────────────────────────────────────\n  // Only split the newly collected values (not the ones from config/env/store)\n  const { sensitive, nonSensitive } = separateSensitiveValues(schema, collected);\n\n  return { values: { ...resolved }, sensitive, nonSensitive, collected: true };\n}\n\n/**\n * Build a JSON Schema containing only the specified fields from the original schema.\n * Fields with env-resolved values get a `default` so the collection form can pre-fill them.\n */\nfunction buildMissingFieldsSchema(\n  schema: JSONSchema7,\n  fields: string[],\n  envDefaults?: Record<string, unknown>,\n): JSONSchema7 {\n  const properties = (schema as any).properties ?? {};\n  const required = ((schema as any).required ?? []) as string[];\n\n  const fieldProperties: Record<string, unknown> = {};\n  const fieldRequired: string[] = [];\n\n  for (const field of fields) {\n    if (properties[field]) {\n      let prop = properties[field];\n      // Pre-fill with env value so user can see and override\n      if (envDefaults?.[field] !== undefined && prop.default === undefined) {\n        prop = { ...prop, default: envDefaults[field] };\n      }\n      fieldProperties[field] = prop;\n      if (required.includes(field)) {\n        fieldRequired.push(field);\n      }\n    }\n  }\n\n  return {\n    type: \"object\",\n    properties: fieldProperties,\n    ...(fieldRequired.length > 0 ? { required: fieldRequired } : {}),\n  } as JSONSchema7;\n}\n"],"mappings":"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"}
+{"version":3,"file":"resolver.mjs","names":["resolved"],"sources":["../../src/credential/resolver.ts"],"sourcesContent":["/**\n * 4-Step Credential Resolution Flow\n *\n * Step 1: Determine missing fields (from provider schema vs known values)\n * Step 2: Silent resolution (config > env > credential store)\n * Step 3: Interactive collection (provider auth() or default collect())\n * Step 4: Unified persistence (sensitive → credentials.toml, non-sensitive → config options)\n */\n\nimport type { AuthContext, JSONSchema7, MountConfig } from \"@aigne/afs\";\nimport { resolveEnvFromSchema, separateSensitiveValues } from \"@aigne/afs/utils/schema\";\nimport type { CredentialStore } from \"./store.js\";\n\nexport interface ResolveCredentialsOptions {\n  /** Mount configuration */\n  mount: MountConfig;\n  /** JSON Schema for this provider (from z.toJSONSchema() or manifest) */\n  schema: JSONSchema7;\n  /** Auth context for interactive collection (CLI or MCP) */\n  authContext?: AuthContext;\n  /** Credential store for reading/writing credentials */\n  credentialStore?: CredentialStore;\n  /** Provider class with optional auth() method */\n  providerAuth?: (context: AuthContext) => Promise<Record<string, unknown> | null>;\n  /** Environment variables (defaults to process.env) */\n  env?: Record<string, string | undefined>;\n  /** Force interactive collection even when all fields are resolved silently.\n   *  Used for retry after health-check failure with stale env/store values. */\n  forceCollect?: boolean;\n}\n\nexport interface ResolveCredentialsResult {\n  /** All resolved values (merged from all sources) */\n  values: Record<string, unknown>;\n  /** Values to persist as sensitive credentials */\n  sensitive: Record<string, string>;\n  /** Values to persist as non-sensitive config options */\n  nonSensitive: Record<string, unknown>;\n  /** Whether any interactive collection was needed */\n  collected: boolean;\n}\n\n/**\n * Execute the 4-step credential resolution flow.\n *\n * Returns all resolved values plus their split into sensitive/non-sensitive\n * for persistence. The caller is responsible for actual persistence.\n *\n * @returns null if user declined/cancelled collection\n */\nexport async function resolveCredentials(\n  options: ResolveCredentialsOptions,\n): Promise<ResolveCredentialsResult | null> {\n  const { mount, schema, authContext, credentialStore, providerAuth, env = process.env } = options;\n\n  const properties = (schema as any).properties;\n  if (!properties || typeof properties !== \"object\" || Object.keys(properties).length === 0) {\n    // No fields to resolve\n    return { values: {}, sensitive: {}, nonSensitive: {}, collected: false };\n  }\n\n  const allFields = Object.keys(properties);\n  const requiredFields = ((schema as any).required ?? []) as string[];\n\n  // Only required fields without a schema default truly block silent resolution —\n  // optional fields and fields with defaults should not trigger interactive auth.\n  const requiredWithoutDefault = requiredFields.filter(\n    (f) => properties[f] && properties[f].default === undefined,\n  );\n\n  // ─── Step 1: Determine known values from mount config ─────────────────\n  const known: Record<string, unknown> = {};\n\n  // Extract values from mount.auth, mount.token, mount.options\n  if (mount.auth !== undefined) known.auth = mount.auth;\n  if (mount.token !== undefined) known.token = mount.token;\n  if (mount.options) {\n    for (const [k, v] of Object.entries(mount.options)) {\n      if (v !== undefined) known[k] = v;\n    }\n  }\n\n  // Check which fields are still missing — allFields for Step 1 optimization,\n  // requiredWithoutDefault for the Step 2→3 decision on interactive auth.\n  const getAllMissing = (resolved: Record<string, unknown>) =>\n    allFields.filter((f) => resolved[f] === undefined);\n  const getRequiredMissing = (resolved: Record<string, unknown>) =>\n    requiredWithoutDefault.filter((f) => resolved[f] === undefined);\n\n  let missing = getAllMissing(known);\n  if (missing.length === 0) {\n    // All fields already provided via config — short circuit\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, known);\n    return { values: { ...known }, sensitive, nonSensitive, collected: false };\n  }\n\n  // ─── Step 2: Silent resolution ────────────────────────────────────────\n  const resolved: Record<string, unknown> = { ...known };\n\n  // 2a. Environment variables from schema env declarations\n  const envResolved = resolveEnvFromSchema(schema, env as Record<string, string | undefined>);\n  for (const [field, value] of Object.entries(envResolved)) {\n    if (resolved[field] === undefined) {\n      resolved[field] = value;\n    }\n  }\n\n  // 2b. Credential store — keyed by URI (credentials belong to the resource, not the path)\n  const storeResolved: Record<string, unknown> = {};\n  if (credentialStore) {\n    try {\n      const stored = await credentialStore.get(mount.uri);\n      if (stored) {\n        for (const [field, value] of Object.entries(stored)) {\n          if (field.startsWith(\"env:\")) {\n            // Reconstruct env Record from flattened env:KEY credential entries\n            if (resolved.env === undefined) resolved.env = {};\n            (resolved.env as Record<string, string>)[field.slice(4)] = value;\n            if (storeResolved.env === undefined) storeResolved.env = {};\n            (storeResolved.env as Record<string, string>)[field.slice(4)] = value;\n          } else {\n            if (resolved[field] === undefined) {\n              resolved[field] = value;\n            }\n            storeResolved[field] = value;\n          }\n        }\n      }\n    } catch {\n      // Credential store read failure is non-fatal\n    }\n  }\n\n  missing = getRequiredMissing(resolved);\n  const allStillMissing = getAllMissing(resolved);\n  if (\n    missing.length === 0 &&\n    !options.forceCollect &&\n    (allStillMissing.length === 0 || !authContext || providerAuth)\n  ) {\n    // All required fields resolved silently, and either:\n    // - all fields resolved, or\n    // - no auth context to collect interactively, or\n    // - provider has custom auth (OAuth etc.) — don't trigger heavy auth flow for optional fields\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, resolved);\n    return { values: { ...resolved }, sensitive, nonSensitive, collected: false };\n  }\n\n  // ─── Step 3: Interactive collection ───────────────────────────────────\n  if (!authContext) {\n    // No auth context available — can't collect. Return what we have.\n    // Caller should attempt mount with partial values and let the provider error if needed.\n    const { sensitive, nonSensitive } = separateSensitiveValues(schema, resolved);\n    return { values: { ...resolved }, sensitive, nonSensitive, collected: false };\n  }\n\n  let collected: Record<string, unknown> | null = null;\n\n  if (providerAuth) {\n    // Provider has custom auth() — delegate to it.\n    // Inject persistCredentials so non-blocking auth flows can store\n    // credentials in the background (e.g., MCP browser auth).\n    collected = await providerAuth({\n      ...authContext,\n      get resolved() {\n        return { ...resolved };\n      },\n      persistCredentials: credentialStore\n        ? async (creds: Record<string, unknown>) => {\n            const { sensitive: bgSensitive } = separateSensitiveValues(schema, creds);\n            if (Object.keys(bgSensitive).length > 0) {\n              await credentialStore.set(mount.uri, bgSensitive);\n            }\n          }\n        : undefined,\n    });\n  } else {\n    // Show all fields not explicitly provided via config/CLI args.\n    // Env and store values are pre-filled as defaults so the user can verify/override.\n    const fieldsForForm = allFields.filter((f) => known[f] === undefined);\n    const defaults: Record<string, unknown> = { ...envResolved };\n    for (const [f, v] of Object.entries(storeResolved)) {\n      if (defaults[f] === undefined) defaults[f] = v;\n    }\n    const missingSchema = buildMissingFieldsSchema(schema, fieldsForForm, defaults);\n    collected = await authContext.collect(missingSchema);\n  }\n\n  if (collected === null) {\n    // User declined/cancelled\n    return null;\n  }\n\n  // Merge collected values\n  for (const [field, value] of Object.entries(collected)) {\n    if (value !== undefined) {\n      resolved[field] = value;\n    }\n  }\n\n  // ─── Step 4: Split for persistence ────────────────────────────────────\n  // Only split the newly collected values (not the ones from config/env/store)\n  const { sensitive, nonSensitive } = separateSensitiveValues(schema, collected);\n\n  return { values: { ...resolved }, sensitive, nonSensitive, collected: true };\n}\n\n/**\n * Build a JSON Schema containing only the specified fields from the original schema.\n * Fields with env-resolved values get a `default` so the collection form can pre-fill them.\n */\nfunction buildMissingFieldsSchema(\n  schema: JSONSchema7,\n  fields: string[],\n  envDefaults?: Record<string, unknown>,\n): JSONSchema7 {\n  const properties = (schema as any).properties ?? {};\n  const required = ((schema as any).required ?? []) as string[];\n\n  const fieldProperties: Record<string, unknown> = {};\n  const fieldRequired: string[] = [];\n\n  for (const field of fields) {\n    if (properties[field]) {\n      let prop = properties[field];\n      // Pre-fill with env value so user can see and override\n      if (envDefaults?.[field] !== undefined && prop.default === undefined) {\n        prop = { ...prop, default: envDefaults[field] };\n      }\n      fieldProperties[field] = prop;\n      if (required.includes(field)) {\n        fieldRequired.push(field);\n      }\n    }\n  }\n\n  return {\n    type: \"object\",\n    properties: fieldProperties,\n    ...(fieldRequired.length > 0 ? { required: fieldRequired } : {}),\n  } as JSONSchema7;\n}\n"],"mappings":"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"}

package/dist/credential/vault-store.d.mts

@@ -0,0 +1 @@
+import { AFSModule } from "@aigne/afs";

package/dist/daemon/config-manager.cjs

@@ -0,0 +1,279 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+const require_loader = require('../config/loader.cjs');
+let node_fs_promises = require("node:fs/promises");
+let node_path = require("node:path");
+let smol_toml = require("smol-toml");
+let _aigne_afs = require("@aigne/afs");
+let node_fs = require("node:fs");
+
+//#region src/daemon/config-manager.ts
+/**
+* ConfigManager Implementation
+*
+* Manages config.toml read/write operations for the daemon.
+* Implements the ConfigManager interface from @aigne/afs-explorer.
+*/
+var DaemonConfigManager = class {
+	cwd;
+	afs;
+	onConfigChanged;
+	watcher;
+	_selfWriteTimestamp = 0;
+	_debounceTimer;
+	_failures = [];
+	/** Tracks mount paths that originated from config.toml. Only these are eligible for unmount on reload. */
+	configManagedPaths;
+	registry;
+	constructor(options) {
+		this.cwd = options.cwd;
+		this.afs = options.afs;
+		this.registry = options.registry;
+		this.onConfigChanged = options.onConfigChanged;
+		this.configManagedPaths = new Set(options.configMountPaths ?? []);
+		if (options.failures) this._failures = [...options.failures];
+	}
+	async getConfig() {
+		return new require_loader.ConfigLoader().load(this.cwd);
+	}
+	async getMountList() {
+		const mounts = this.afs.getMounts();
+		return {
+			mounts: await Promise.all(mounts.map(async (m) => {
+				const ctor = m.module.constructor;
+				const manifest = typeof ctor.manifest === "function" ? ctor.manifest() : null;
+				let url;
+				try {
+					if (typeof m.module.stat === "function") url = (await m.module.stat("/", {}))?.data?.meta?.url || void 0;
+				} catch {}
+				return {
+					namespace: m.namespace,
+					path: m.path,
+					name: m.module.name,
+					description: m.module.description,
+					accessMode: m.module.accessMode,
+					category: manifest?.category || void 0,
+					tags: manifest?.tags || void 0,
+					uri: manifest?.uriTemplate || void 0,
+					url
+				};
+			})),
+			failures: this._failures
+		};
+	}
+	async addMount(mount) {
+		const uri = mount.uri;
+		const path = mount.path;
+		if (!uri || !path) throw new Error("uri and path are required");
+		const mountConfig = await this.buildMountWithCredentials(uri, path, mount.auth, {
+			description: mount.description,
+			access_mode: mount.accessMode,
+			namespace: mount.namespace,
+			options: mount.options
+		});
+		const provider = await (this.registry ?? new _aigne_afs.ProviderRegistry()).createProvider(mountConfig);
+		await this.afs.mount(provider, path, { namespace: mountConfig.namespace ?? null });
+		await this.persistAddMount(mountConfig);
+		this.configManagedPaths.add(path);
+	}
+	async removeMount(path) {
+		this.afs.unmount(path);
+		await this.persistRemoveMount(path);
+		this.configManagedPaths.delete(path);
+	}
+	async updateMount(path, updates) {
+		const config = await this.readConfigFile();
+		const entry = (config.mounts ?? []).find((m) => m.path === path);
+		if (!entry) throw new Error(`Mount "${path}" not found in config`);
+		if (updates.description !== void 0) entry.description = updates.description;
+		if (updates.accessMode !== void 0) entry.access_mode = updates.accessMode;
+		if (updates.auth !== void 0) entry.auth = updates.auth;
+		await this.writeConfigFile(config);
+		try {
+			this.afs.unmount(path);
+		} catch {}
+		const mount = await this.buildMountWithCredentials(entry.uri, entry.path, entry.auth, {
+			description: entry.description,
+			access_mode: entry.access_mode,
+			namespace: entry.namespace,
+			options: entry.options
+		});
+		const provider = await new _aigne_afs.ProviderRegistry().createProvider(mount);
+		await this.afs.mount(provider, path, { namespace: entry.namespace ?? null });
+	}
+	async testMount(uri, auth) {
+		try {
+			const registry = new _aigne_afs.ProviderRegistry();
+			const mount = await this.buildMountWithCredentials(uri, "/test", auth);
+			const provider = await registry.createProvider(mount);
+			await provider.list("/", {});
+			const providerName = provider.name;
+			try {
+				await provider.close?.();
+			} catch {}
+			return {
+				success: true,
+				providerName
+			};
+		} catch (err) {
+			return {
+				success: false,
+				error: err instanceof Error ? err.message : String(err)
+			};
+		}
+	}
+	async reloadConfig() {
+		const newConfig = await new require_loader.ConfigLoader().load(this.cwd);
+		const currentMounts = new Set(this.afs.getMounts().map((m) => m.path));
+		const newMountPaths = new Set(newConfig.mounts.map((m) => m.path));
+		const removed = [];
+		for (const path of this.configManagedPaths) if (!newMountPaths.has(path)) {
+			try {
+				this.afs.unmount(path);
+				removed.push(path);
+			} catch {}
+			this.configManagedPaths.delete(path);
+		}
+		const added = [];
+		const registry = new _aigne_afs.ProviderRegistry();
+		for (const mount of newConfig.mounts) if (!currentMounts.has(mount.path)) try {
+			const provider = await registry.createProvider(mount);
+			await this.afs.mount(provider, mount.path, { namespace: mount.namespace ?? null });
+			added.push(mount.path);
+			this.configManagedPaths.add(mount.path);
+		} catch (err) {
+			console.warn(`[reload] Failed to mount ${mount.path}: ${err instanceof Error ? err.message : String(err)}`);
+		}
+		if (this.onConfigChanged && (added.length > 0 || removed.length > 0)) this.onConfigChanged(added, removed);
+	}
+	/**
+	* Start watching config file for external changes.
+	*/
+	startWatching() {
+		const configPath = this.getConfigPath();
+		try {
+			this.watcher = (0, node_fs.watch)((0, node_path.dirname)(configPath), (_event, filename) => {
+				if (filename !== "config.toml") return;
+				if (Date.now() - this._selfWriteTimestamp < 500) return;
+				if (this._debounceTimer) clearTimeout(this._debounceTimer);
+				this._debounceTimer = setTimeout(() => {
+					this.reloadConfig().catch((err) => {
+						console.warn(`[watch] Reload failed: ${err instanceof Error ? err.message : String(err)}`);
+					});
+				}, 300);
+			});
+		} catch {}
+	}
+	async getRegistry() {
+		try {
+			const { scanInstalledProviders } = await import("@aigne/afs-registry");
+			return (await scanInstalledProviders()).map((m) => ({
+				name: m.name,
+				description: m.description,
+				category: m.category,
+				uriTemplate: m.uriTemplate,
+				tags: m.tags
+			}));
+		} catch {
+			return [];
+		}
+	}
+	stopWatching() {
+		if (this.watcher) {
+			this.watcher.close();
+			this.watcher = void 0;
+		}
+		if (this._debounceTimer) {
+			clearTimeout(this._debounceTimer);
+			this._debounceTimer = void 0;
+		}
+	}
+	/**
+	* Build a MountConfig with proper credential mapping.
+	*
+	* Uses the provider schema to:
+	* 1. Resolve credentials from env vars (e.g. AIGNE_HUB_API_KEY)
+	* 2. Resolve credentials from the credential store (vault)
+	* 3. Map generic `auth` to the provider's specific credential field (e.g. apiKey)
+	*/
+	async buildMountWithCredentials(uri, path, auth, extra) {
+		const mount = {
+			uri,
+			path,
+			auth,
+			description: extra?.description,
+			access_mode: extra?.access_mode,
+			namespace: extra?.namespace,
+			options: extra?.options ? { ...extra.options } : void 0
+		};
+		try {
+			const info = await new _aigne_afs.ProviderRegistry().getProviderInfo(uri);
+			if (!info?.schema) return mount;
+			const { getSensitiveFields, resolveEnvFromSchema } = await import("@aigne/afs/utils/schema");
+			const opts = mount.options ?? {};
+			const envResolved = resolveEnvFromSchema(info.schema);
+			for (const [field, value] of Object.entries(envResolved)) if (opts[field] === void 0) opts[field] = value;
+			try {
+				const { createCredentialStore } = await Promise.resolve().then(() => require("../credential/store.cjs"));
+				const stored = await createCredentialStore().get(uri);
+				if (stored) {
+					for (const [field, value] of Object.entries(stored)) if (!field.startsWith("env:") && opts[field] === void 0) opts[field] = value;
+				}
+			} catch {}
+			if (auth) {
+				const sensitiveFields = getSensitiveFields(info.schema);
+				for (const field of sensitiveFields) if (field !== "auth" && field !== "token" && opts[field] === void 0) {
+					opts[field] = auth;
+					break;
+				}
+			}
+			if (Object.keys(opts).length > 0) mount.options = opts;
+		} catch {}
+		return mount;
+	}
+	getConfigPath() {
+		return (0, node_path.join)(this.cwd, ".afs-config", "config.toml");
+	}
+	async readConfigFile() {
+		const configPath = this.getConfigPath();
+		try {
+			return (0, smol_toml.parse)(await (0, node_fs_promises.readFile)(configPath, "utf-8"));
+		} catch {
+			return { mounts: [] };
+		}
+	}
+	async writeConfigFile(config) {
+		const configPath = this.getConfigPath();
+		const configDir = (0, node_path.dirname)(configPath);
+		try {
+			await (0, node_fs_promises.mkdir)(configDir, { recursive: true });
+		} catch {}
+		this._selfWriteTimestamp = Date.now();
+		await (0, node_fs_promises.writeFile)(configPath, (0, smol_toml.stringify)(config), "utf-8");
+	}
+	async persistAddMount(mount) {
+		const config = await this.readConfigFile();
+		const mounts = config.mounts ?? [];
+		const entry = {
+			path: mount.path,
+			uri: mount.uri
+		};
+		if (mount.description) entry.description = mount.description;
+		if (mount.access_mode) entry.access_mode = mount.access_mode;
+		if (mount.auth) entry.auth = mount.auth;
+		if (mount.namespace) entry.namespace = mount.namespace;
+		if (mount.options) entry.options = mount.options;
+		const existing = mounts.findIndex((m) => m.path === mount.path);
+		if (existing >= 0) mounts[existing] = entry;
+		else mounts.push(entry);
+		config.mounts = mounts;
+		await this.writeConfigFile(config);
+	}
+	async persistRemoveMount(path) {
+		const config = await this.readConfigFile();
+		config.mounts = (config.mounts ?? []).filter((m) => m.path !== path);
+		await this.writeConfigFile(config);
+	}
+};
+
+//#endregion
+exports.DaemonConfigManager = DaemonConfigManager;