@openclaw/line 2026.7.2-beta.4 → 2026.7.2-beta.7

package/dist/{setup-surface-Bili5gWy.js → setup-surface-DRQ7n0En.js}

@@ -1,7 +1,8 @@
-import { i as resolveLineAccount, n as normalizeAccountId, r as resolveDefaultLineAccountId, t as listLineAccountIds } from "./accounts-BUBOoW5Q.js";
+import { i as resolveLineAccount, n as normalizeAccountId, r as resolveDefaultLineAccountId, t as listLineAccountIds } from "./accounts-BqEVsDoB.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
-import { DEFAULT_ACCOUNT_ID, createAllowFromSection, createSetupInputPresenceValidator, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, formatDocsLink, mergeAllowFromEntries, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID, createAllowFromSection, createPromptParsedAllowFromForAccount, createSetupInputPresenceValidator, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, formatDocsLink, parseSetupEntriesWithParser, patchScopedAccountConfig, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup";
+import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 //#region extensions/line/src/account-helpers.ts
 function hasLineCredentials(account) {
 	if (account.tokenStatus && account.signingSecretStatus) return account.tokenStatus !== "missing" && account.signingSecretStatus !== "missing";
@@ -15,44 +16,19 @@ function parseLineAllowFromId(raw) {
 //#endregion
 //#region extensions/line/src/setup-core.ts
 function patchLineAccountConfig(params) {
-	const accountId = normalizeAccountId(params.accountId);
-	const lineConfig = params.cfg.channels?.line ?? {};
-	const clearFields = params.clearFields ?? [];
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		const nextLine = { ...lineConfig };
-		for (const field of clearFields) delete nextLine[field];
-		return {
-			...params.cfg,
-			channels: {
-				...params.cfg.channels,
-				line: {
-					...nextLine,
-					...params.enabled ? { enabled: true } : {},
-					...params.patch
-				}
-			}
-		};
-	}
-	const nextAccount = { ...lineConfig.accounts?.[accountId] };
-	for (const field of clearFields) delete nextAccount[field];
-	return {
-		...params.cfg,
-		channels: {
-			...params.cfg.channels,
-			line: {
-				...lineConfig,
-				...params.enabled ? { enabled: true } : {},
-				accounts: {
-					...lineConfig.accounts,
-					[accountId]: {
-						...nextAccount,
-						...params.enabled ? { enabled: true } : {},
-						...params.patch
-					}
-				}
-			}
-		}
-	};
+	return patchScopedAccountConfig({
+		cfg: params.cfg,
+		channelKey: "line",
+		accountId: params.accountId,
+		patch: params.patch,
+		accountPatch: {
+			...params.enabled ? { enabled: true } : {},
+			...params.patch
+		},
+		...params.clearFields ? { clearFields: params.clearFields } : {},
+		ensureChannelEnabled: Boolean(params.enabled),
+		ensureAccountEnabled: false
+	});
 }
 function isLineConfigured(cfg, accountId) {
 	return hasLineCredentials(resolveLineAccount({
@@ -85,26 +61,18 @@ const lineSetupAdapter = {
 		const typedInput = input;
 		const accessToken = typedInput.channelAccessToken ?? typedInput.token;
 		const normalizedAccountId = normalizeAccountId(accountId);
-		if (normalizedAccountId === DEFAULT_ACCOUNT_ID) return patchLineAccountConfig({
+		const useEnv = normalizedAccountId === DEFAULT_ACCOUNT_ID && Boolean(typedInput.useEnv);
+		return patchLineAccountConfig({
 			cfg,
 			accountId: normalizedAccountId,
 			enabled: true,
-			clearFields: typedInput.useEnv ? [
+			clearFields: useEnv ? [
 				"channelAccessToken",
 				"channelSecret",
 				"tokenFile",
 				"secretFile"
 			] : void 0,
-			patch: typedInput.useEnv ? {} : {
-				...typedInput.tokenFile ? { tokenFile: typedInput.tokenFile } : accessToken ? { channelAccessToken: accessToken } : {},
-				...typedInput.secretFile ? { secretFile: typedInput.secretFile } : typedInput.channelSecret ? { channelSecret: typedInput.channelSecret } : {}
-			}
-		});
-		return patchLineAccountConfig({
-			cfg,
-			accountId: normalizedAccountId,
-			enabled: true,
-			patch: {
+			patch: useEnv ? {} : {
 				...typedInput.tokenFile ? { tokenFile: typedInput.tokenFile } : accessToken ? { channelAccessToken: accessToken } : {},
 				...typedInput.secretFile ? { secretFile: typedInput.secretFile } : typedInput.channelSecret ? { channelSecret: typedInput.channelSecret } : {}
 			}
@@ -183,36 +151,78 @@ const LINE_ALLOW_FROM_HELP_LINES = [
 	t("wizard.line.multipleEntries"),
 	t("wizard.channels.docs", { link: formatDocsLink("/channels/line", "channels/line") })
 ];
-const lineDmPolicy = {
+const lineDmPolicy = createChannelDmPolicy({
 	label: "LINE",
 	channel,
-	policyKey: "channels.line.dmPolicy",
-	allowFromKey: "channels.line.allowFrom",
-	resolveConfigKeys: (cfg, accountId) => (accountId ?? resolveDefaultLineAccountId(cfg)) !== DEFAULT_ACCOUNT_ID ? {
-		policyKey: `channels.line.accounts.${accountId ?? resolveDefaultLineAccountId(cfg)}.dmPolicy`,
-		allowFromKey: `channels.line.accounts.${accountId ?? resolveDefaultLineAccountId(cfg)}.allowFrom`
-	} : {
-		policyKey: "channels.line.dmPolicy",
-		allowFromKey: "channels.line.allowFrom"
-	},
-	getCurrent: (cfg, accountId) => resolveLineAccount({
+	resolveAccount: (cfg, accountId) => resolveLineAccount({
 		cfg,
 		accountId: accountId ?? resolveDefaultLineAccountId(cfg)
-	}).config.dmPolicy ?? "pairing",
-	setPolicy: (cfg, policy, accountId) => patchLineAccountConfig({
+	}),
+	applyPatch: ({ cfg, account, patch }) => patchLineAccountConfig({
 		cfg,
-		accountId: accountId ?? resolveDefaultLineAccountId(cfg),
+		accountId: account.accountId,
 		enabled: true,
-		patch: policy === "open" ? {
-			dmPolicy: "open",
-			allowFrom: mergeAllowFromEntries(resolveLineAccount({
-				cfg,
-				accountId: accountId ?? resolveDefaultLineAccountId(cfg)
-			}).config.allowFrom, ["*"])
-		} : { dmPolicy: policy },
-		clearFields: policy === "pairing" || policy === "disabled" ? ["allowFrom"] : void 0
+		patch,
+		clearFields: patch.dmPolicy === "pairing" || patch.dmPolicy === "disabled" ? ["allowFrom"] : void 0
+	}),
+	promptAllowFrom: createPromptParsedAllowFromForAccount({
+		defaultAccountId: resolveDefaultLineAccountId,
+		noteTitle: t("wizard.line.allowlistTitle"),
+		noteLines: LINE_ALLOW_FROM_HELP_LINES,
+		message: t("wizard.line.allowFromPrompt"),
+		placeholder: "U1234567890abcdef1234567890abcdef",
+		parseEntries: (raw) => parseSetupEntriesWithParser(raw, (entry) => {
+			const id = parseLineAllowFromId(entry);
+			return id ? { value: id } : { error: t("wizard.line.allowFromInvalid") };
+		}),
+		getExistingAllowFrom: ({ cfg, accountId }) => resolveLineAccount({
+			cfg,
+			accountId
+		}).config.allowFrom ?? [],
+		applyAllowFrom: ({ cfg, accountId, allowFrom }) => patchLineAccountConfig({
+			cfg,
+			accountId,
+			enabled: true,
+			patch: { allowFrom }
+		})
 	})
-};
+});
+function createLineTokenCredential(params) {
+	return defineTokenCredential({
+		inputKey: params.inputKey,
+		configKey: params.configKey,
+		configuredFields: [params.configKey, params.fileKey],
+		providerHint: params.providerHint,
+		credentialLabel: params.credentialLabel,
+		preferredEnvVar: params.envVar,
+		helpTitle: t("wizard.line.messagingApiTitle"),
+		helpLines: LINE_SETUP_HELP_LINES,
+		envPrompt: params.envPrompt,
+		keepPrompt: params.keepPrompt,
+		inputPrompt: params.inputPrompt,
+		allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID,
+		resolveAccount: ({ cfg, accountId }) => resolveLineAccount({
+			cfg,
+			accountId
+		}),
+		accountConfigured: (account) => Boolean(normalizeOptionalString(account.channelAccessToken) && normalizeOptionalString(account.channelSecret)),
+		hasConfiguredValue: (account) => Boolean(normalizeOptionalString(account.config[params.configKey]) ?? normalizeOptionalString(account.config[params.fileKey])),
+		resolvedValue: (account) => normalizeOptionalString(account[params.configKey]),
+		envValue: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID ? normalizeOptionalString(process.env[params.envVar]) : void 0,
+		patchAccount: ({ cfg, accountId, patch, clearFields }) => patchLineAccountConfig({
+			cfg,
+			accountId,
+			enabled: true,
+			clearFields,
+			patch
+		}),
+		useEnv: { clearFields: [params.configKey, params.fileKey] },
+		set: {
+			clearFields: [params.fileKey],
+			value: "resolved"
+		}
+	});
+}
 const lineSetupWizard = {
 	channel,
 	status: createStandardChannelSetupStatus({
@@ -232,72 +242,26 @@ const lineSetupWizard = {
 		lines: LINE_SETUP_HELP_LINES,
 		shouldShow: ({ cfg, accountId }) => !isLineConfigured(cfg, accountId ?? resolveDefaultLineAccountId(cfg))
 	},
-	credentials: [defineTokenCredential({
+	credentials: [createLineTokenCredential({
 		inputKey: "token",
 		configKey: "channelAccessToken",
-		configuredFields: ["channelAccessToken", "tokenFile"],
+		fileKey: "tokenFile",
 		providerHint: channel,
 		credentialLabel: t("wizard.line.channelAccessToken"),
-		preferredEnvVar: "LINE_CHANNEL_ACCESS_TOKEN",
-		helpTitle: t("wizard.line.messagingApiTitle"),
-		helpLines: LINE_SETUP_HELP_LINES,
+		envVar: "LINE_CHANNEL_ACCESS_TOKEN",
 		envPrompt: t("wizard.line.tokenEnvPrompt"),
 		keepPrompt: t("wizard.line.tokenKeepPrompt"),
-		inputPrompt: t("wizard.line.tokenInputPrompt"),
-		allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID,
-		resolveAccount: ({ cfg, accountId }) => resolveLineAccount({
-			cfg,
-			accountId
-		}),
-		accountConfigured: (account) => Boolean(normalizeOptionalString(account.channelAccessToken) && normalizeOptionalString(account.channelSecret)),
-		hasConfiguredValue: (account) => Boolean(normalizeOptionalString(account.config.channelAccessToken) ?? normalizeOptionalString(account.config.tokenFile)),
-		resolvedValue: (account) => normalizeOptionalString(account.channelAccessToken),
-		envValue: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID ? normalizeOptionalString(process.env.LINE_CHANNEL_ACCESS_TOKEN) : void 0,
-		patchAccount: ({ cfg, accountId, patch, clearFields }) => patchLineAccountConfig({
-			cfg,
-			accountId,
-			enabled: true,
-			clearFields,
-			patch
-		}),
-		useEnv: { clearFields: ["channelAccessToken", "tokenFile"] },
-		set: {
-			clearFields: ["tokenFile"],
-			value: "resolved"
-		}
-	}), defineTokenCredential({
+		inputPrompt: t("wizard.line.tokenInputPrompt")
+	}), createLineTokenCredential({
 		inputKey: "password",
 		configKey: "channelSecret",
-		configuredFields: ["channelSecret", "secretFile"],
+		fileKey: "secretFile",
 		providerHint: "line-secret",
 		credentialLabel: t("wizard.line.channelSecret"),
-		preferredEnvVar: "LINE_CHANNEL_SECRET",
-		helpTitle: t("wizard.line.messagingApiTitle"),
-		helpLines: LINE_SETUP_HELP_LINES,
+		envVar: "LINE_CHANNEL_SECRET",
 		envPrompt: t("wizard.line.secretEnvPrompt"),
 		keepPrompt: t("wizard.line.secretKeepPrompt"),
-		inputPrompt: t("wizard.line.secretInputPrompt"),
-		allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID,
-		resolveAccount: ({ cfg, accountId }) => resolveLineAccount({
-			cfg,
-			accountId
-		}),
-		accountConfigured: (account) => Boolean(normalizeOptionalString(account.channelAccessToken) && normalizeOptionalString(account.channelSecret)),
-		hasConfiguredValue: (account) => Boolean(normalizeOptionalString(account.config.channelSecret) ?? normalizeOptionalString(account.config.secretFile)),
-		resolvedValue: (account) => normalizeOptionalString(account.channelSecret),
-		envValue: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID ? normalizeOptionalString(process.env.LINE_CHANNEL_SECRET) : void 0,
-		patchAccount: ({ cfg, accountId, patch, clearFields }) => patchLineAccountConfig({
-			cfg,
-			accountId,
-			enabled: true,
-			clearFields,
-			patch
-		}),
-		useEnv: { clearFields: ["channelSecret", "secretFile"] },
-		set: {
-			clearFields: ["secretFile"],
-			value: "resolved"
-		}
+		inputPrompt: t("wizard.line.secretInputPrompt")
 	})],
 	allowFrom: createAllowFromSection({
 		helpTitle: t("wizard.line.allowlistTitle"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/line",
-  "version": "2026.7.2-beta.4",
+  "version": "2026.7.2-beta.7",
   "description": "OpenClaw LINE channel plugin for LINE Bot API chats.",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.4"
+    "openclaw": ">=2026.7.2-beta.7"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -107,10 +107,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.4"
+      "pluginApi": ">=2026.7.2-beta.7"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.4"
+      "openclawVersion": "2026.7.2-beta.7"
     },
     "release": {
       "publishToClawHub": true,
@@ -124,7 +124,6 @@
   "files": [
     "dist/**",
     "openclaw.plugin.json",
-    "npm-shrinkwrap.json",
     "README.md"
   ],
   "bundledDependencies": [

package/dist/accounts-BUBOoW5Q.js

@@ -1,169 +0,0 @@
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId, normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-id";
-import { resolveAccountEntry } from "openclaw/plugin-sdk/account-resolution";
-import { tryReadSecretFileSync } from "openclaw/plugin-sdk/secret-file-runtime";
-//#region extensions/line/src/accounts.ts
-function readCredentialFile(filePath, configPath) {
-	return tryReadSecretFileSync(filePath, "LINE credential file", { rejectSymlink: true }, { configPath });
-}
-function resolveToken(params) {
-	const { accountId, baseConfig, accountConfig } = params;
-	if (accountConfig?.channelAccessToken?.trim()) return {
-		value: accountConfig.channelAccessToken.trim(),
-		source: "config",
-		status: "available"
-	};
-	if (accountConfig?.tokenFile?.trim()) {
-		const result = readCredentialFile(accountConfig.tokenFile, `channels.line.accounts.${accountId}.tokenFile`);
-		return result.status === "available" ? {
-			value: result.value,
-			source: "file",
-			status: "available"
-		} : {
-			value: "",
-			source: "file",
-			status: "configured_unavailable",
-			diagnostic: result.diagnostic
-		};
-	}
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		if (baseConfig?.channelAccessToken?.trim()) return {
-			value: baseConfig.channelAccessToken.trim(),
-			source: "config",
-			status: "available"
-		};
-		if (baseConfig?.tokenFile?.trim()) {
-			const result = readCredentialFile(baseConfig.tokenFile, "channels.line.tokenFile");
-			return result.status === "available" ? {
-				value: result.value,
-				source: "file",
-				status: "available"
-			} : {
-				value: "",
-				source: "file",
-				status: "configured_unavailable",
-				diagnostic: result.diagnostic
-			};
-		}
-		const envToken = process.env.LINE_CHANNEL_ACCESS_TOKEN?.trim();
-		if (envToken) return {
-			value: envToken,
-			source: "env",
-			status: "available"
-		};
-	}
-	return {
-		value: "",
-		source: "none",
-		status: "missing"
-	};
-}
-function resolveSecret(params) {
-	const { accountId, baseConfig, accountConfig } = params;
-	if (accountConfig?.channelSecret?.trim()) return {
-		value: accountConfig.channelSecret.trim(),
-		source: "config",
-		status: "available"
-	};
-	if (accountConfig?.secretFile?.trim()) {
-		const result = readCredentialFile(accountConfig.secretFile, `channels.line.accounts.${accountId}.secretFile`);
-		return result.status === "available" ? {
-			value: result.value,
-			source: "file",
-			status: "available"
-		} : {
-			value: "",
-			source: "file",
-			status: "configured_unavailable",
-			diagnostic: result.diagnostic
-		};
-	}
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		if (baseConfig?.channelSecret?.trim()) return {
-			value: baseConfig.channelSecret.trim(),
-			source: "config",
-			status: "available"
-		};
-		if (baseConfig?.secretFile?.trim()) {
-			const result = readCredentialFile(baseConfig.secretFile, "channels.line.secretFile");
-			return result.status === "available" ? {
-				value: result.value,
-				source: "file",
-				status: "available"
-			} : {
-				value: "",
-				source: "file",
-				status: "configured_unavailable",
-				diagnostic: result.diagnostic
-			};
-		}
-		const envSecret = process.env.LINE_CHANNEL_SECRET?.trim();
-		if (envSecret) return {
-			value: envSecret,
-			source: "env",
-			status: "available"
-		};
-	}
-	return {
-		value: "",
-		source: "none",
-		status: "missing"
-	};
-}
-function resolveLineAccount(params) {
-	const cfg = params.cfg;
-	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultLineAccountId(cfg));
-	const lineConfig = cfg.channels?.line;
-	const accounts = lineConfig?.accounts;
-	const accountConfig = resolveAccountEntry(accounts, accountId);
-	const token = resolveToken({
-		accountId,
-		baseConfig: lineConfig,
-		accountConfig
-	});
-	const secret = resolveSecret({
-		accountId,
-		baseConfig: lineConfig,
-		accountConfig
-	});
-	const { accounts: _ignoredAccounts, defaultAccount: _ignoredDefaultAccount, ...lineBase } = lineConfig ?? {};
-	const mergedConfig = {
-		...lineBase,
-		...accountConfig
-	};
-	const baseEnabled = lineConfig?.enabled !== false;
-	const accountEnabled = accountConfig?.enabled !== false;
-	const enabled = baseEnabled && accountEnabled;
-	return {
-		accountId,
-		name: accountConfig?.name ?? (accountId === DEFAULT_ACCOUNT_ID ? lineConfig?.name : void 0),
-		enabled,
-		channelAccessToken: token.value,
-		channelSecret: secret.value,
-		tokenSource: token.source,
-		signingSecretSource: secret.source,
-		tokenStatus: token.status,
-		signingSecretStatus: secret.status,
-		...[token.diagnostic, secret.diagnostic].some(Boolean) ? { credentialDiagnostics: [token.diagnostic, secret.diagnostic].filter((diagnostic) => Boolean(diagnostic)) } : {},
-		config: mergedConfig
-	};
-}
-function listLineAccountIds(cfg) {
-	const lineConfig = cfg.channels?.line;
-	const accounts = lineConfig?.accounts;
-	const ids = /* @__PURE__ */ new Set();
-	if (lineConfig?.channelAccessToken?.trim() || lineConfig?.tokenFile || process.env.LINE_CHANNEL_ACCESS_TOKEN?.trim()) ids.add(DEFAULT_ACCOUNT_ID);
-	if (accounts) for (const id of Object.keys(accounts)) ids.add(id);
-	return Array.from(ids);
-}
-function resolveDefaultLineAccountId(cfg) {
-	const preferred = normalizeOptionalAccountId((cfg.channels?.line)?.defaultAccount);
-	if (preferred && listLineAccountIds(cfg).some((accountId) => normalizeAccountId(accountId) === preferred)) return preferred;
-	const ids = listLineAccountIds(cfg);
-	if (ids.includes(DEFAULT_ACCOUNT_ID)) return DEFAULT_ACCOUNT_ID;
-	return ids[0] ?? DEFAULT_ACCOUNT_ID;
-}
-function normalizeAccountId$1(accountId) {
-	return normalizeAccountId(accountId);
-}
-//#endregion
-export { resolveLineAccount as i, normalizeAccountId$1 as n, resolveDefaultLineAccountId as r, listLineAccountIds as t };