From c8576ec78bbc95c7a099abfc5419fd057f057d22 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 16 Mar 2026 02:25:02 +0000
Subject: [PATCH] fix: resolve line setup rebase drift

---
 extensions/line/src/setup-core.ts    |  2 +-
 extensions/line/src/setup-surface.ts | 69 ----------------------------
 2 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/extensions/line/src/setup-core.ts b/extensions/line/src/setup-core.ts
index 324197c70af..67c9c674df5 100644
--- a/extensions/line/src/setup-core.ts
+++ b/extensions/line/src/setup-core.ts
@@ -18,7 +18,7 @@ export function patchLineAccountConfig(params: {
   enabled?: boolean;
 }): OpenClawConfig {
   const accountId = normalizeAccountId(params.accountId);
-  const lineConfig = ((params.cfg.channels?.line ?? {}) as LineConfig) ?? {};
+  const lineConfig = (params.cfg.channels?.line ?? {}) as LineConfig;
   const clearFields = params.clearFields ?? [];
 
   if (accountId === DEFAULT_ACCOUNT_ID) {
diff --git a/extensions/line/src/setup-surface.ts b/extensions/line/src/setup-surface.ts
index 688cbf057e5..37167723cf7 100644
--- a/extensions/line/src/setup-surface.ts
+++ b/extensions/line/src/setup-surface.ts
@@ -10,7 +10,6 @@ import { DEFAULT_ACCOUNT_ID } from "../../../src/routing/session-key.js";
 import { formatDocsLink } from "../../../src/terminal/links.js";
 import {
   isLineConfigured,
-  lineSetupAdapter,
   listLineAccountIds,
   parseLineAllowFromId,
   patchLineAccountConfig,
@@ -36,74 +35,6 @@ const LINE_ALLOW_FROM_HELP_LINES = [
   `Docs: ${formatDocsLink("/channels/line", "channels/line")}`,
 ];
 
-function patchLineAccountConfig(params: {
-  cfg: OpenClawConfig;
-  accountId: string;
-  patch: Record<string, unknown>;
-  clearFields?: string[];
-  enabled?: boolean;
-}): OpenClawConfig {
-  const accountId = normalizeAccountId(params.accountId);
-  const lineConfig = (params.cfg.channels?.line ?? {}) as LineConfig;
-  const clearFields = params.clearFields ?? [];
-
-  if (accountId === DEFAULT_ACCOUNT_ID) {
-    const nextLine = { ...lineConfig } as Record<string, unknown>;
-    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] ?? {}),
-  } as Record<string, unknown>;
-  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,
-          },
-        },
-      },
-    },
-  };
-}
-
-function isLineConfigured(cfg: OpenClawConfig, accountId: string): boolean {
-  const resolved = resolveLineAccount({ cfg, accountId });
-  return Boolean(resolved.channelAccessToken.trim() && resolved.channelSecret.trim());
-}
-
-function parseLineAllowFromId(raw: string): string | null {
-  const trimmed = raw.trim().replace(/^line:(?:user:)?/i, "");
-  if (!/^U[a-f0-9]{32}$/i.test(trimmed)) {
-    return null;
-  }
-  return trimmed;
-}
 const lineDmPolicy: ChannelOnboardingDmPolicy = {
   label: "LINE",
   channel,