@eduwork/dsh-mail 0.1.2 → 0.2.1

package/lib/index.js

@@ -78,6 +78,43 @@ function pick(source, keys, forced) {
 	for (const key of keys) if (forced || source[key] !== void 0) result[key] = source[key];
 	return result;
 }
+/** Shared config references used by schema validators and plugin runtimes. */
+const write = Symbol.for("cosmokit.volatile.write");
+function snapshot(value, ancestors = /* @__PURE__ */ new Set()) {
+	if (typeof value === "function") throw new TypeError("volatile config cannot contain functions");
+	if (value === null || typeof value !== "object") return value;
+	if (ancestors.has(value)) throw new TypeError("volatile config cannot contain cycles");
+	ancestors.add(value);
+	try {
+		if (Array.isArray(value)) return Object.freeze(value.map((item) => snapshot(item, ancestors)));
+		if (Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) throw new TypeError("volatile config objects must be plain objects or arrays");
+		return Object.freeze(Object.fromEntries(Object.entries(value).map(([key, item]) => [key, snapshot(item, ancestors)])));
+	} finally {
+		ancestors.delete(value);
+	}
+}
+/**
+* Create a detached reference containing an immutable copy of the supplied data.
+* @param value - validated config data; class instances and functions are unsupported.
+* @returns a reference whose value is updated only by its owning runtime.
+*/
+function createVolatile(value) {
+	let current = snapshot(value);
+	return Object.freeze({
+		get: () => current,
+		[write]: (value) => {
+			current = value;
+		}
+	});
+}
+/**
+* Identify references across ESM/CJS copies of the shared library.
+* @param value - a parsed config value.
+* @returns whether the value implements the shared reference protocol.
+*/
+function isVolatile(value) {
+	return typeof value === "object" && value !== null && write in value;
+}
 /** Test values using `instanceof` with a `toStringTag` fallback. */
 function is(type, value) {
 	if (arguments.length === 1) return (value) => is(type, value);
@@ -158,26 +195,47 @@ function clone(source, refs = /* @__PURE__ */ new Map()) {
 	}
 	return result;
 }
-/** Deeply compare arrays, dates, regexps, buffers, and plain object fields. */
+/**
+* Compare values recursively, treating two volatile references as equal regardless of value.
+* Strict comparison distinguishes null/undefined, treats opaque objects by identity,
+* compares URLs by normalized href, treats array holes as undefined, and considers distinct cyclic structures unequal.
+* @param a - first value.
+* @param b - second value.
+* @param strict - whether to require strict data equality outside volatile references.
+* @returns whether the values compare equal.
+*/
 function deepEqual(a, b, strict) {
-	if (a === b) return true;
-	if (!strict && isNullable(a) && isNullable(b)) return true;
-	if (typeof a !== typeof b) return false;
-	if (typeof a !== "object") return false;
-	if (!a || !b) return false;
-	function check(test, then) {
-		return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
-	}
-	return check(Array.isArray, (a, b) => a.length === b.length && a.every((item, index) => deepEqual(item, b[index]))) ?? check(is("Date"), (a, b) => a.valueOf() === b.valueOf()) ?? check(is("RegExp"), (a, b) => a.source === b.source && a.flags === b.flags) ?? check(isArrayBufferLike, (a, b) => {
-		if (a.byteLength !== b.byteLength) return false;
-		const viewA = new Uint8Array(a);
-		const viewB = new Uint8Array(b);
-		for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
-		return true;
-	}) ?? Object.keys({
-		...a,
-		...b
-	}).every((key) => deepEqual(a[key], b[key], strict));
+	const ancestors = /* @__PURE__ */ new Set();
+	function compare(a, b) {
+		if (a === b) return true;
+		if (isVolatile(a) || isVolatile(b)) return isVolatile(a) && isVolatile(b);
+		if (!strict && isNullable(a) && isNullable(b)) return true;
+		if (typeof a !== typeof b || typeof a !== "object" || !a || !b) return false;
+		if (ancestors.has(a)) return false;
+		function check(test, then) {
+			return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
+		}
+		ancestors.add(a);
+		try {
+			return check(Array.isArray, (a, b) => {
+				if (a.length !== b.length) return false;
+				for (let index = 0; index < a.length; index++) if (!compare(a[index], b[index])) return false;
+				return true;
+			}) ?? check(is("Date"), (a, b) => a.valueOf() === b.valueOf()) ?? check(is("URL"), (a, b) => a.href === b.href) ?? check(is("RegExp"), (a, b) => a.source === b.source && a.flags === b.flags) ?? check(isArrayBufferLike, (a, b) => {
+				if (a.byteLength !== b.byteLength) return false;
+				const viewA = new Uint8Array(a);
+				const viewB = new Uint8Array(b);
+				for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
+				return true;
+			}) ?? ((!strict || [a, b].every((value) => Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) && Object.keys({
+				...a,
+				...b
+			}).every((key) => compare(a[key], b[key])));
+		} finally {
+			ancestors.delete(a);
+		}
+	}
+	return compare(a, b);
 }
 /** Time constants plus parsing and formatting helpers. */
 var Time;
@@ -426,6 +484,7 @@ Schema.prototype.pattern = function pattern(regexp) {
 	return schema;
 };
 Schema.prototype.simplify = function simplify(value) {
+	if (isVolatile(value)) value = value.get();
 	if (deepEqual(value, this.meta.default, this.type === "dict")) return null;
 	if (isNullable(value)) return value;
 	if (this.type === "object" || this.type === "dict") {
@@ -482,12 +541,49 @@ for (const key of [
 	};
 	return schema;
 } });
+Schema.prototype.volatile = function volatile() {
+	if (this.meta.volatile) throw new TypeError("volatile schema is already wrapped");
+	return this.extra("volatile", true);
+};
 const resolvers = {};
+const checkedVolatile = Symbol("checked-volatile-schema");
+function validateVolatileSchema(schema, path = [], blocked = false, seen = /* @__PURE__ */ new Map()) {
+	const states = seen.get(schema) ?? /* @__PURE__ */ new Set();
+	if (states.has(blocked)) return;
+	states.add(blocked);
+	seen.set(schema, states);
+	if (schema.meta?.volatile && blocked) throw new ValidationError("volatile fields require a fixed object path without an enclosing volatile field", { path });
+	const nested = blocked || !!schema.meta?.volatile;
+	if (schema.dict) for (const [key, child] of Object.entries(schema.dict)) validateVolatileSchema(child, [...path, key], nested, seen);
+	if (schema.sKey) validateVolatileSchema(schema.sKey, [...path, "<key>"], true, seen);
+	if (schema.inner && (schema.type !== "lazy" || schema.inner[kSchema])) validateVolatileSchema(schema.inner, [...path, "*"], true, seen);
+	if (schema.list) for (let index = 0; index < schema.list.length; index++) validateVolatileSchema(schema.list[index], [...path, String(index)], true, seen);
+}
 Schema.extend = function extend(type, resolve) {
 	resolvers[type] = resolve;
 };
 Schema.resolve = function resolve(data, schema, options = {}, strict = false) {
 	if (!schema) return [data];
+	if (!options[checkedVolatile]) {
+		validateVolatileSchema(schema, options.path);
+		options = {
+			...options,
+			[checkedVolatile]: true
+		};
+	}
+	if (schema.meta?.volatile) {
+		const inner = Schema(schema);
+		inner.meta = {
+			...schema.meta,
+			volatile: false
+		};
+		const [value, adapted] = Schema.resolve(data, inner, options, strict);
+		try {
+			return [createVolatile(value), adapted];
+		} catch (error) {
+			throw new ValidationError(error instanceof Error ? error.message : String(error), options);
+		}
+	}
 	if (options.ignore?.(data, schema)) return [data];
 	if (isNullable(data) && schema.type !== "lazy") {
 		if (schema.meta.required) throw new ValidationError(`missing required value`, options);
@@ -590,6 +686,7 @@ Schema.extend("lazy", (data, schema, options, strict) => {
 			...schema.meta,
 			...schema.inner.meta
 		};
+		validateVolatileSchema(schema.inner, options.path, true);
 	}
 	return Schema.resolve(data, schema.inner, options, strict);
 });
@@ -689,7 +786,7 @@ function property(data, key, schema, options) {
 	} catch (e) {
 		if (!options?.autofix) throw e;
 		delete data[key];
-		return schema.meta.default;
+		return schema.meta.volatile ? createVolatile(schema.meta.default) : schema.meta.default;
 	}
 }
 Schema.extend("array", (data, { inner, meta }, options) => {
@@ -848,20 +945,21 @@ defineMethod("transform", [
 const MailSettingsSchema = Schema.object({
 	readEnabled: Schema.boolean().default(DEFAULTS.readEnabled),
 	sendEnabled: Schema.boolean().default(DEFAULTS.sendEnabled),
-	email: Schema.string().default(DEFAULTS.email),
-	username: Schema.string().default(DEFAULTS.username),
-	fromName: Schema.string().default(DEFAULTS.fromName),
-	inboxFolder: Schema.string().default(DEFAULTS.inboxFolder),
-	imapHost: Schema.string().default(DEFAULTS.imapHost),
-	imapPort: Schema.number().default(DEFAULTS.imapPort),
+	email: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.email),
+	username: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.username),
+	fromName: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.fromName),
+	inboxFolder: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.inboxFolder),
+	imapHost: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.imapHost),
+	imapPort: Schema.number().step(1).min(1).max(65535).default(DEFAULTS.imapPort),
 	imapTls: Schema.union(["implicit", "starttls"]).default(DEFAULTS.imapTls),
-	smtpHost: Schema.string().default(DEFAULTS.smtpHost),
-	smtpPort: Schema.number().default(DEFAULTS.smtpPort),
+	smtpHost: Schema.string().pattern(/^[^\r\n\u0000]*$/u).default(DEFAULTS.smtpHost),
+	smtpPort: Schema.number().step(1).min(1).max(65535).default(DEFAULTS.smtpPort),
 	smtpTls: Schema.union(["implicit", "starttls"]).default(DEFAULTS.smtpTls),
-	maxBodyChars: Schema.number().default(DEFAULTS.maxBodyChars),
-	maxMessageBytes: Schema.number().default(DEFAULTS.maxMessageBytes),
-	maxAttachmentBytes: Schema.number().default(DEFAULTS.maxAttachmentBytes)
+	maxBodyChars: Schema.number().step(1).min(1e3).max(2e5).default(DEFAULTS.maxBodyChars),
+	maxMessageBytes: Schema.number().step(1).min(1048576).max(104857600).default(DEFAULTS.maxMessageBytes),
+	maxAttachmentBytes: Schema.number().step(1).min(1024).max(104857600).default(DEFAULTS.maxAttachmentBytes)
 });
+const Config = typeof Schema.string().volatile === "function" ? Schema.object(Object.fromEntries(Object.entries(MailSettingsSchema.dict).map(([key, field]) => [key, field.volatile()]))) : void 0;
 function settingsBase(config = {}) {
 	const base = { ...DEFAULTS };
 	for (const key of Object.keys(DEFAULTS)) if (config[key] !== void 0) base[key] = config[key];
@@ -910,6 +1008,7 @@ const SEND_APPROVAL_REASON = "Send this email through the configured SMTP accoun
 * after the user has explicitly enabled sending in Mail assistant settings.
 */
 function decideMailPermission(ctx, exec, next) {
+	if (exec.name === TOOL_NAMES.attachment) return decideAttachmentWrite(ctx, exec, next);
 	if (exec.name !== TOOL_NAMES.send) return next();
 	const agent = exec.agent;
 	if (agent === void 0) return Promise.resolve({
@@ -919,9 +1018,50 @@ function decideMailPermission(ctx, exec, next) {
 	if (ctx.permissionPresets.current(agent.session) === "danger-full-access") return next();
 	return Promise.resolve({
 		kind: "ask",
-		reason: SEND_APPROVAL_REASON
+		reason: SEND_APPROVAL_REASON,
+		displayReason: {
+			en: SEND_APPROVAL_REASON,
+			zh: "允许通过已配置的 SMTP 账号发送这封邮件。请核对工具调用中显示的收件人、主题和附件。"
+		}
 	});
 }
+async function decideAttachmentWrite(ctx, exec, next) {
+	if (!exec.agent) return {
+		kind: "deny",
+		reason: "Attachment downloads require an Agent-backed session"
+	};
+	if (!exec.agent.session.header?.cwd) return {
+		kind: "deny",
+		reason: "Attachment downloads require a session workspace"
+	};
+	const resolver = ctx.get?.("sandboxPolicy");
+	const policy = resolver ? resolver.resolve({ session: exec.agent.session }) : { mode: ctx.permissionPresets.current(exec.agent.session) };
+	if (policy?.mode === "danger-full-access") return next();
+	if (policy?.mode === "workspace-write") {
+		if (policy.workspaceRoot !== void 0) {
+			const options = {
+				cwd: exec.agent.session.header.cwd,
+				signal: exec.signal
+			};
+			const root = await ctx.fs.resolve(".", options);
+			const allowed = await ctx.fs.resolve(policy.workspaceRoot, options);
+			if (!ctx.fs.contains(allowed, root)) return {
+				kind: "deny",
+				reason: "Attachment workspace is outside the allowed write root"
+			};
+		}
+		return next();
+	}
+	const reason = "Save this mail attachment in the current workspace";
+	return {
+		kind: "ask",
+		reason,
+		displayReason: {
+			en: reason,
+			zh: "允许将这封邮件的附件保存到当前工作区"
+		}
+	};
+}
 Object.freeze({ SEND_APPROVAL_REASON });
 //#endregion
 //#region node_modules/pino-std-serializers/lib/err-helpers.js
@@ -101893,11 +102033,12 @@ async function readWorkspaceAttachments(ctx, paths, exec, maxBytes) {
 	if (!Array.isArray(paths) || paths.length > 10 || paths.some((path) => typeof path !== "string" || path.trim() === "")) throw new Error("attachments must be an array of at most 10 non-empty workspace paths");
 	const workspace = workspaceOf(exec);
 	const workspaceTarget = await ctx.fs.resolve(workspace, { signal: exec.signal });
+	const cwd = ctx.get?.("workingDirectory")?.get(exec.agent.session) ?? workspace;
 	const attachments = [];
 	let total = 0;
 	for (const raw of paths) {
 		const target = await ctx.fs.resolve(raw.trim(), {
-			cwd: workspace,
+			cwd,
 			signal: exec.signal
 		});
 		if (!ctx.fs.contains(workspaceTarget, target)) throw new Error(`Attachment is outside the session workspace: ${raw}`);
@@ -102412,14 +102553,16 @@ const inject = [
 	"permissionPresets"
 ];
 function apply(ctx, config = {}) {
-	const base = settingsBase(config);
+	const native = typeof ctx.settings.register !== "function";
+	const readLive = () => Object.fromEntries(Object.keys(DEFAULTS).map((key) => [key, config[key].get()]));
+	const base = native ? readLive() : settingsBase(config);
 	validateSettings(base);
-	const scope = ctx.settings.register(SETTINGS_NAMESPACE, MailSettingsSchema, {
+	const scope = native ? { get: readLive } : ctx.settings.register(SETTINGS_NAMESPACE, MailSettingsSchema, {
 		base,
 		applies: "live",
 		validate: validateSettings
 	});
-	const getSettings = () => currentSettings(ctx, scope, config);
+	const getSettings = () => currentSettings(ctx, scope, native ? {} : config);
 	ctx.on("tools/pre-execute", (exec, next) => decideMailPermission(ctx, exec, next));
 	installTools(ctx, getSettings);
 	ctx.tools.guard((exec) => {
@@ -102453,9 +102596,10 @@ function apply(ctx, config = {}) {
 var host_default = {
 	name,
 	inject,
+	Config,
 	apply
 };
 //#endregion
-export { DEFAULTS, MailSettingsSchema, PASSWORD_REF_NAME, SETTINGS_NAMESPACE, TOOL_NAMES, apply, host_default as default, inject, name, validateSettings };
+export { Config, DEFAULTS, MailSettingsSchema, PASSWORD_REF_NAME, SETTINGS_NAMESPACE, TOOL_NAMES, apply, host_default as default, inject, name, validateSettings };
 
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eduwork/dsh-mail",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "Standards-based IMAP/SMTP mail assistant for DeepSeek Harness with explicit read/send controls and approval-aware delivery",
   "keywords": [
     "deepseek-harness",
@@ -50,7 +50,8 @@
       "inject": [
         "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-ui-renderer",
-        "@deepseek-ai/dsh-client-ui-settings"
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-locale"
       ],
       "platform": "web",
       "immediately": true
@@ -78,7 +79,7 @@
     "prepare": "npm run build"
   },
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=24.18.0"
   },
   "license": "MIT",
   "publishConfig": {
@@ -86,22 +87,23 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ecnu/EduWork.git",
+    "url": "git+https://github.com/ECNU/EduWork.git",
     "directory": "packages/dsh-mail"
   },
   "bugs": {
-    "url": "https://github.com/ecnu/EduWork/issues"
+    "url": "https://github.com/ECNU/EduWork/issues"
   },
-  "homepage": "https://github.com/ecnu/EduWork/tree/main/packages/dsh-mail#readme",
+  "homepage": "https://github.com/ECNU/EduWork/tree/main/packages/dsh-mail#readme",
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "@deepseek-ai/dsh-permission-presets": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1 || 0.1.3-alpha.1 || 0.1.3-alpha.2 || 0.1.5-alpha.1 || 0.1.5-rc.1",
-    "react": "^18.2.0"
+    "@deepseek-ai/cordis": ">=4.0.5 <4.1.0",
+    "@deepseek-ai/dsh-api-remotes": ">=0.2.1-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.1-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.2.1-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-credentials": ">=0.2.1-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-permission-presets": ">=0.2.1-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-tools": ">=0.2.1-rc.2 <0.3.0-0",
+    "react": "^18.2.0",
+    "@deepseek-ai/dsh-client-locale": ">=0.2.1-rc.2 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -127,10 +129,13 @@
     },
     "react": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-client-locale": {
+      "optional": true
     }
   },
   "devDependencies": {
-    "@deepseek-ai/schemastery": "3.18.2",
+    "@deepseek-ai/schemastery": "3.18.5",
     "@types/node": "^26.0.0",
     "@types/react": "^18.3.28",
     "imapflow": "^1.7.0",
@@ -138,7 +143,10 @@
     "nodemailer": "^9.1.0",
     "react": "^18.3.1",
     "tsdown": "0.22.14",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "@deepseek-ai/dsh": "0.2.1-rc.2",
+    "@deepseek-ai/cordis": "4.0.5",
+    "semver": "7.7.4"
   },
   "directories": {
     "doc": "docs",