@sybz-components/portal-dev 1.0.3 → 1.0.9

package/README.md

@@ -1,12 +1,13 @@
 # @sybz-components/portal-dev
 
-成华、石景山门户自动登录与本地前端联调 CLI。支持自动启动项目开发服务、识别图形验证码、登录门户，以及携带门户 Token 打开本地页面。
+成华、石景山门户自动登录 CLI，也可登录只需用户名和密码的自定义网站，并按需启动石景山门户本地联调。
 
 ## 环境要求
 
 - Node.js 18+
 - Google Chrome 或 Microsoft Edge
-- 目标项目已安装依赖，并提供 `dev` script
+
+macOS 会直接复用当前打开的 Google Chrome，在现有窗口中新建标签页完成登录和本地联调，不会启动独立的 Chrome 实例。Windows / Linux 使用独立浏览器实例作为兼容方案。
 
 ## 安装
 
@@ -24,7 +25,7 @@ pnpm add -g @sybz-components/portal-dev
 portal-dev config
 ```
 
-根据中文提示选择门户、输入账号和密码即可。密码输入时会显示为 `*`。账号配置属于当前电脑用户，与具体项目无关，只需配置一次。
+根据中文提示输入账号名称、用户名和密码即可。密码输入时会显示为 `*`。同一个门户可以重复执行该命令保存多个账号；账号名称相同时会更新原账号。
 
 默认配置文件位置：
 
@@ -33,7 +34,7 @@ portal-dev config
 
 程序会自动创建目录，并尽可能将配置文件权限设为仅当前用户可读写。
 
-配置完成后直接运行：
+配置完成后可以在任意目录直接运行：
 
 ```bash
 portal-dev
@@ -44,27 +45,94 @@ portal-dev
 ```bash
 portal-dev config --portal sjs
 portal-dev config --portal chenghua
+portal-dev config --portal custom
 ```
 
 ## 使用
 
-石景山门户会启动本地开发服务、进入智能体样板间，并携带门户 Token 打开本地页面：
+只登录石景山门户，不读取或启动任何前端项目：
 
 ```bash
 portal-dev
 ```
 
-成华门户完成自动登录后进入智能体广场：
+只登录成华门户并进入智能体广场，不读取或启动任何前端项目：
 
 ```bash
 portal-dev --portal chenghua
 ```
 
-不在项目目录时可以指定项目路径：
+配置多个账号后，不写账号名称会直接使用数组中的第一个账号：
+
+```bash
+portal-dev --portal sjs
+```
+
+在命令末尾写账号名称，可以使用指定账号：
+
+```bash
+portal-dev --portal sjs 测试账号
+```
+
+默认快捷命令：
+
+```bash
+portal-dev ds # 登录石景山
+portal-dev sc # 登录成华
+```
+
+配置并登录普通网站：
+
+```bash
+portal-dev config --portal custom
+portal-dev --portal custom 我的账号
+```
+
+配置时依次输入登录页 URL、用户名和密码。登录时会自动查找常见的用户名、邮箱、密码输入框，以及“登录”、“Login”或“Sign in”按钮；该模式不会执行验证码识别、样板间搜索或 Token 跳转。
+
+别名保存在 JSON 中，可以通过向导新增登录或联调命令：
+
+```bash
+portal-dev config command
+```
+
+例如配置一个别名为 `sjs-dev` 的联调命令后，只需运行：
 
 ```bash
-portal-dev --portal sjs --project .
-portal-dev --portal chenghua --project .
+portal-dev sjs-dev
+```
+
+执行时会登录指定账号、启动本地项目、进入样板间搜索智能体，从匹配的 iframe 地址取得 Token，然后保留查询参数打开本地页面。
+
+配置文件中的账号和快捷命令格式：
+
+```json
+{
+  "version": 4,
+  "profiles": {
+    "sjs": [{ "name": "我的账号", "username": "user1", "password": "******" }],
+    "chenghua": [{ "name": "测试账号", "username": "user2", "password": "******" }],
+    "custom": [
+      { "name": "内部系统", "loginUrl": "https://example.com/login", "username": "user3", "password": "******" }
+    ]
+  },
+  "commands": [
+    { "alias": "ds", "mode": "login", "portal": "sjs" },
+    { "alias": "sc", "mode": "login", "portal": "chenghua" },
+    {
+      "alias": "sjs-dev",
+      "mode": "dev",
+      "portal": "sjs",
+      "account": "测试账号",
+      "project": "/Users/你的名字/projects/agent-web",
+      "localOrigin": "http://localhost:5173",
+      "localPath": "/exhibition-hall",
+      "roomName": "3D智能展厅智能体",
+      "iframeHost": "hia.sjsdoubao.com:31118",
+      "iframePath": "/exhibition-hall"
+    }
+  ]
+}
 ```
 
 查看命令帮助：
@@ -110,4 +178,4 @@ pnpm portal:skill:install
 pnpm portal:release
 ```
 
-`portal:release` 会执行检查、升级 patch 版本并发布 npm 包，执行前请确认当前分支和版本状态。
+`portal:release` 会执行检查、升级 patch 版本、创建版本提交和 Git tag、发布 npm 包，最后将当前分支及 tags 推送到 Git 远端。执行前请确认当前分支、远端和工作区状态。

package/bin/portal-dev.mjs

@@ -34,13 +34,15 @@ if (args[0] === 'config') {
 } else if (args.includes('--help') || args.includes('-h')) {
   console.log(`用法：
   portal-dev
-  portal-dev config [--portal sjs|chenghua]
-  portal-dev --portal sjs [--project <目录>]
-  portal-dev --portal chenghua [--project <目录>]
+  portal-dev config [--portal sjs|chenghua|custom]
+  portal-dev config command
+  portal-dev <快捷命令别名>
+  portal-dev --portal sjs|chenghua|custom [账号名称]
   portal-dev skill install [Codex skills 目录]
 
 首次使用只需运行一次 portal-dev config。
-之后在项目目录运行 portal-dev 即可，默认使用石景山门户。`)
+默认快捷命令：portal-dev ds 登录石景山，portal-dev sc 登录成华。
+运行 portal-dev config command 可新增或修改快捷命令。`)
   process.exit(0)
 } else {
   const child = spawn(process.execPath, [resolve(packageDir, 'src/portal-dev.mjs'), ...args], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sybz-components/portal-dev",
-  "version": "1.0.3",
+  "version": "1.0.9",
   "description": "成华和石景山门户自动登录与本地前端联调 CLI",
   "type": "module",
   "bin": {
@@ -21,8 +21,8 @@
   },
   "scripts": {
     "skill:install": "node ./bin/portal-dev.mjs skill install",
-    "check": "node --check bin/portal-dev.mjs && node --check src/config-file.mjs && node --check src/configure.mjs && node --check src/portal-dev.mjs && node --check src/recognize-captcha.mjs",
-    "release": "pnpm check && npm version patch && npm publish"
+    "check": "node --check bin/portal-dev.mjs && node --check src/config-file.mjs && node --check src/configure.mjs && node --check src/macos-chrome.mjs && node --check src/portal-dev.mjs && node --check src/recognize-captcha.mjs",
+    "release": "pnpm check && npm version patch && npm publish && git push --follow-tags"
   },
   "dependencies": {
     "@napi-rs/canvas": "^1.0.3",

package/skills/portal-dev/SKILL.md

@@ -1,12 +1,14 @@
 ---
 name: portal-dev
-description: 启动前端项目的石景山门户本地联调，或自动登录成华门户。用户提到 dev:portal、门户联调、成华登录、石景山登录或从任意项目启动门户调试时使用。
+description: 启动前端项目的石景山门户本地联调，自动登录成华门户，或使用已配置的 URL 和账号密码登录普通网站。用户提到 dev:portal、门户联调、成华登录、石景山登录、自定义登录或从任意项目启动门户调试时使用。
 ---
 
 # 门户本地调试
 
 调用已安装的 `portal-dev` CLI，不要复制或改写登录自动化逻辑。
 
+macOS 会复用用户当前打开的 Google Chrome，并在现有窗口的标签页中完成登录；不要另外启动 Chrome。Windows / Linux 使用 CLI 内置的浏览器兼容方案。
+
 ## 执行
 
 缺少账号配置时先执行：
@@ -15,20 +17,35 @@ description: 启动前端项目的石景山门户本地联调，或自动登录
 portal-dev config --portal sjs
 ```
 
-石景山门户联调：
+只登录石景山门户（不依赖前端项目）：
+
+```bash
+portal-dev --portal sjs
+```
+
+只登录成华门户（不依赖前端项目）：
 
 ```bash
-portal-dev --portal sjs --project <project-directory>
+portal-dev --portal chenghua
 ```
 
-成华门户登录：
+登录已配置的普通网站（不走验证码和 Token 等特殊流程）：
 
 ```bash
-portal-dev --portal chenghua --project <project-directory>
+portal-dev --portal custom <账号名称>
 ```
 
+默认快捷命令：
+
+```bash
+portal-dev ds
+portal-dev sc
+```
+
+只有用户明确要求门户本地联调时才执行 JSON 中 `mode: "dev"` 的快捷命令，例如 `portal-dev sjs-dev`。项目、本地地址、路由、智能体名称和 iframe 识别参数均从该命令配置读取。脚本从门户 iframe URL 取得 Token 后，必须保留查询参数打开本地地址，且不得输出 Token。
+
 保持进程运行并告诉用户当前状态；只有用户明确要求停止时才终止。不得输出用户名、密码或门户 Token。
 
 ## 配置
 
-账号密码只从当前用户的专属配置文件读取，`portal-dev config` 会交互式创建该文件。缺少凭据时，引导用户在本机终端运行 `portal-dev config`，不索要或展示具体密码。
+账号密码只从当前用户的专属配置文件读取，每个门户可保存多个账号。`portal-dev config` 会新增账号或按账号名称更新已有账号；登录命令不写账号名称时使用数组第一个账号，在命令末尾追加账号名称时使用指定账号。普通网站使用 `portal-dev config --portal custom` 配置登录 URL、账号名称、用户名和密码。缺少凭据时，引导用户在本机终端运行 `portal-dev config`，不索要或展示具体密码。

package/src/config-file.mjs

@@ -2,6 +2,11 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'n
 import { homedir } from 'node:os'
 import { dirname, resolve } from 'node:path'
 
+const defaultCommands = () => [
+  { alias: 'ds', mode: 'login', portal: 'sjs' },
+  { alias: 'sc', mode: 'login', portal: 'chenghua' },
+]
+
 export const getPortalConfigPath = () => {
   const configRoot =
     process.platform === 'win32' ? resolve(homedir(), 'AppData', 'Roaming') : resolve(homedir(), '.config')
@@ -10,23 +15,39 @@ export const getPortalConfigPath = () => {
 
 export const readPortalConfig = () => {
   const configPath = getPortalConfigPath()
-  if (!existsSync(configPath)) return { version: 1, profiles: {} }
+  if (!existsSync(configPath)) return { version: 4, profiles: {}, commands: defaultCommands() }
   try {
     const config = JSON.parse(readFileSync(configPath, 'utf8'))
     if (!config || typeof config !== 'object' || Array.isArray(config)) throw new Error('根节点必须是对象')
-    return { ...config, profiles: config.profiles && typeof config.profiles === 'object' ? config.profiles : {} }
+    return {
+      ...config,
+      profiles: config.profiles && typeof config.profiles === 'object' ? config.profiles : {},
+      commands: Array.isArray(config.commands) ? config.commands : defaultCommands(),
+    }
   } catch (error) {
     throw new Error(`门户配置文件格式错误：${configPath}\n${error.message}`)
   }
 }
 
-export const writePortalProfile = (portal, profile) => {
+export const writePortalAccount = (portal, account) => {
   const configPath = getPortalConfigPath()
   const config = readPortalConfig()
+  const normalizedProfiles = {
+    ...config.profiles,
+    sjs: Array.isArray(config.profiles.sjs) ? config.profiles.sjs : [],
+    chenghua: Array.isArray(config.profiles.chenghua) ? config.profiles.chenghua : [],
+    custom: Array.isArray(config.profiles.custom) ? config.profiles.custom : [],
+  }
+  const accounts = normalizedProfiles[portal]
+  const accountIndex = accounts.findIndex((item) => item.name === account.name)
+  const nextAccounts = [...accounts]
+  if (accountIndex >= 0) nextAccounts[accountIndex] = account
+  else nextAccounts.push(account)
   const nextConfig = {
     ...config,
-    version: 1,
-    profiles: { ...config.profiles, [portal]: profile },
+    version: 4,
+    profiles: { ...normalizedProfiles, [portal]: nextAccounts },
+    commands: config.commands,
   }
   mkdirSync(dirname(configPath), { recursive: true, mode: 0o700 })
   writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`, { mode: 0o600 })
@@ -35,5 +56,23 @@ export const writePortalProfile = (portal, profile) => {
   } catch {
     // Windows 等不支持 POSIX 权限的环境由系统用户目录权限保护。
   }
-  return configPath
+  return { configPath, accountCount: nextAccounts.length }
+}
+
+export const writePortalCommand = (command) => {
+  const configPath = getPortalConfigPath()
+  const config = readPortalConfig()
+  const commandIndex = config.commands.findIndex((item) => item.alias === command.alias)
+  const nextCommands = [...config.commands]
+  if (commandIndex >= 0) nextCommands[commandIndex] = command
+  else nextCommands.push(command)
+  const nextConfig = { ...config, version: 4, commands: nextCommands }
+  mkdirSync(dirname(configPath), { recursive: true, mode: 0o700 })
+  writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`, { mode: 0o600 })
+  try {
+    chmodSync(configPath, 0o600)
+  } catch {
+    // Windows 等不支持 POSIX 权限的环境由系统用户目录权限保护。
+  }
+  return { configPath, commandCount: nextCommands.length }
 }

package/src/configure.mjs

@@ -1,5 +1,5 @@
 import { createInterface } from 'node:readline/promises'
-import { writePortalProfile } from './config-file.mjs'
+import { writePortalAccount, writePortalCommand } from './config-file.mjs'
 
 const args = process.argv.slice(2)
 const readArg = (name) => {
@@ -52,18 +52,90 @@ const askPassword = (message) => {
   })
 }
 
+if (args[0] === 'command') {
+  const commandRl = createInterface({ input: process.stdin, output: process.stdout })
+  const alias = (await commandRl.question('请输入快捷命令别名（例如：ds、sc、sjs-dev）：')).trim()
+  if (!alias || !/^[a-zA-Z][\w-]*$/.test(alias)) {
+    commandRl.close()
+    throw new Error('别名只能包含字母、数字、下划线和短横线，并且必须以字母开头')
+  }
+  const modeAnswer = (await commandRl.question('请选择命令类型（1=只登录，2=石景山联调，默认1）：')).trim()
+  const mode = modeAnswer === '2' ? 'dev' : 'login'
+  const portalAnswer =
+    mode === 'dev' ? 'sjs' : (await commandRl.question('请选择门户（1=石景山，2=成华，3=自定义，默认石景山）：')).trim()
+  const portal =
+    portalAnswer === '3' || portalAnswer === 'custom'
+      ? 'custom'
+      : portalAnswer === '2' || portalAnswer === 'chenghua'
+        ? 'chenghua'
+        : 'sjs'
+  const account = (await commandRl.question('请输入账号名称（直接回车使用该门户第一个账号）：')).trim()
+  const command = { alias, mode, portal, ...(account ? { account } : {}) }
+
+  if (mode === 'dev') {
+    const project = (await commandRl.question('请输入前端项目绝对路径：')).trim()
+    if (!project) {
+      commandRl.close()
+      throw new Error('联调命令必须配置前端项目路径')
+    }
+    command.project = project
+    command.localOrigin =
+      (await commandRl.question('请输入本地服务地址（默认 http://localhost:5173）：')).trim() || 'http://localhost:5173'
+    command.localPath =
+      (await commandRl.question('请输入本地接收 Token 的路由（默认 /exhibition-hall）：')).trim() || '/exhibition-hall'
+    command.roomName =
+      (await commandRl.question('请输入样板间智能体名称（默认 3D智能展厅智能体）：')).trim() || '3D智能展厅智能体'
+    command.iframeHost =
+      (await commandRl.question('请输入门户 iframe 域名（默认 hia.sjsdoubao.com:31118）：')).trim() ||
+      'hia.sjsdoubao.com:31118'
+    command.iframePath =
+      (await commandRl.question('请输入门户 iframe 路径（默认 /exhibition-hall）：')).trim() || '/exhibition-hall'
+  }
+  commandRl.close()
+  const { configPath, commandCount } = writePortalCommand(command)
+  console.log(`快捷命令配置完成：portal-dev ${alias}`)
+  console.log(`当前共 ${commandCount} 个快捷命令，配置文件：${configPath}`)
+  process.exit(0)
+}
+
 const rl = createInterface({ input: process.stdin, output: process.stdout })
 const portalArg = readArg('--portal')
-const portalAnswer = portalArg || (await rl.question('请选择门户（1=石景山，2=成华，直接回车默认石景山）：'))
-const portal = portalAnswer === '2' || portalAnswer === 'chenghua' ? 'chenghua' : 'sjs'
-const portalName = portal === 'chenghua' ? '成华' : '石景山'
-const username = (await rl.question(`请输入${portalName}门户账号：`)).trim()
+const portalAnswer = portalArg || (await rl.question('请选择门户（1=石景山，2=成华，3=自定义，直接回车默认石景山）：'))
+const portal =
+  portalAnswer === '3' || portalAnswer === 'custom'
+    ? 'custom'
+    : portalAnswer === '2' || portalAnswer === 'chenghua'
+      ? 'chenghua'
+      : 'sjs'
+const portalName = portal === 'custom' ? '自定义网站' : portal === 'chenghua' ? '成华' : '石景山'
+const name = (await rl.question('请输入账号名称（例如：我的账号、测试账号）：')).trim()
+if (!name) {
+  rl.close()
+  throw new Error('账号名称不能为空')
+}
+let loginUrl
+if (portal === 'custom') {
+  loginUrl = (await rl.question('请输入登录页 URL（例如：https://example.com/login）：')).trim()
+  try {
+    if (!['http:', 'https:'].includes(new URL(loginUrl).protocol)) throw new Error()
+  } catch {
+    rl.close()
+    throw new Error('登录页 URL 必须是有效的 http 或 https 地址')
+  }
+}
+const username = (await rl.question(`请输入${portalName}账号：`)).trim()
 rl.close()
 if (!username) throw new Error('账号不能为空')
-const password = await askPassword(`请输入${portalName}门户密码（输入内容会隐藏）：`)
+const password = await askPassword(`请输入${portalName}密码（输入内容会隐藏）：`)
 if (!password) throw new Error('密码不能为空')
 
-const configPath = writePortalProfile(portal, { username, password })
+const { configPath, accountCount } = writePortalAccount(portal, {
+  name,
+  username,
+  password,
+  ...(loginUrl ? { loginUrl } : {}),
+})
 
-console.log(`配置完成：${configPath}`)
-console.log(`现在进入前端项目目录，运行：${portal === 'sjs' ? 'portal-dev' : 'portal-dev --portal chenghua'}`)
+console.log(`配置完成：${portalName}现有 ${accountCount} 个账号`)
+console.log(`配置文件：${configPath}`)
+console.log(`现在可以在任意目录运行：portal-dev --portal ${portal}`)

package/src/macos-chrome.mjs

@@ -0,0 +1,169 @@
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
+
+const execFileAsync = promisify(execFile)
+const sleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds))
+const escapeAppleScript = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\r?\n/g, ' ')
+
+const runAppleScript = async (script) => {
+  const { stdout } = await execFileAsync('/usr/bin/osascript', ['-e', script])
+  return stdout.trim()
+}
+
+const openTab = async (url) => {
+  const result = await runAppleScript(`
+    tell application "Google Chrome"
+      activate
+      if (count windows) = 0 then make new window
+      set currentWindow to front window
+      tell currentWindow
+        set newTab to make new tab with properties {URL:"${escapeAppleScript(url)}"}
+        set active tab index to (count tabs)
+      end tell
+      return "tab id " & (id of newTab) & " of window id " & (id of currentWindow)
+    end tell
+  `)
+  const match = result.match(/tab id (\d+) of window id (\d+)/)
+  if (!match) throw new Error(`无法识别 Chrome 新标签页：${result}`)
+  return { tabId: Number(match[1]), windowId: Number(match[2]) }
+}
+
+const execute = (tab, javascript) =>
+  runAppleScript(
+    `tell application "Google Chrome" to return (execute tab id ${tab.tabId} of window id ${tab.windowId} javascript "${escapeAppleScript(javascript)}") as text`,
+  )
+
+const pageState = async (tab) =>
+  JSON.parse(
+    await execute(
+      tab,
+      `(() => JSON.stringify({url: location.href, frameUrls: Array.from(document.querySelectorAll('iframe')).map((frame) => frame.src).filter(Boolean)}))()`,
+    ),
+  )
+
+const findTargetUrl = (state, iframeHost, iframePath) =>
+  state.frameUrls
+    .map((value) => {
+      try {
+        return new URL(value, state.url)
+      } catch {
+        return undefined
+      }
+    })
+    .find((url) => url?.host === iframeHost && url.pathname.startsWith(iframePath) && url.searchParams.has('token'))
+
+const clickText = async (tab, text) =>
+  (await execute(
+    tab,
+    `(() => {
+      const label = ${JSON.stringify(text)};
+      const visible = (element) => { const style = getComputedStyle(element); const rect = element.getBoundingClientRect(); return style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0; };
+      const candidates = Array.from(document.querySelectorAll('button, a, [role="button"], div, span')).filter((element) => visible(element) && (element.textContent || '').includes(label)).sort((a, b) => (a.textContent || '').length - (b.textContent || '').length);
+      if (!candidates[0]) return 'false'; candidates[0].click(); return 'true';
+    })()`,
+  )) === 'true'
+
+const fillSearch = async (tab, roomName) =>
+  (await execute(
+    tab,
+    `(() => {
+      const input = document.querySelector('input[placeholder*="搜索"], input[placeholder*="查找"], input[type="search"]');
+      if (!input) return 'false';
+      const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value').set;
+      setter.call(input, ${JSON.stringify(roomName)}); input.dispatchEvent(new Event('input', {bubbles:true})); input.dispatchEvent(new Event('change', {bubbles:true})); return 'true';
+    })()`,
+  )) === 'true'
+
+const fillAndSubmit = async (tab, { username, password, captchaText, custom }) =>
+  JSON.parse(
+    await execute(
+      tab,
+      `(() => {
+        const values = ${JSON.stringify({ username, password, captchaText })};
+        const visible = (element) => { const style = getComputedStyle(element); const rect = element.getBoundingClientRect(); return style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0; };
+        const inputs = Array.from(document.querySelectorAll('input')).filter(visible);
+        const setValue = (element, value) => { const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value').set; setter.call(element, value); element.dispatchEvent(new Event('input', {bubbles:true})); element.dispatchEvent(new Event('change', {bubbles:true})); };
+        const usernameInput = inputs.find((input) => input.autocomplete === 'username' || ['username','account','login','user','email'].includes(input.name) || /用户名|账号|邮箱|手机/.test(input.placeholder));
+        const passwordInput = inputs.find((input) => input.autocomplete === 'current-password' || input.name === 'password' || input.type === 'password' || input.placeholder.includes('密码'));
+        const captchaInput = inputs.find((input) => /验证码/.test(input.placeholder) || /captcha|code/i.test(input.name));
+        if (!usernameInput || !passwordInput || (!${custom} && !captchaInput)) return JSON.stringify({submitted:false});
+        setValue(usernameInput, values.username); setValue(passwordInput, values.password); if (captchaInput) setValue(captchaInput, values.captchaText);
+        const button = Array.from(document.querySelectorAll('button, input[type="submit"], [role="button"], .btn-box .btn')).filter(visible).find((element) => element.type === 'submit' || /登录|Login|Sign in/i.test(element.textContent || element.value || ''));
+        if (!button) return JSON.stringify({submitted:false}); button.click(); return JSON.stringify({submitted:true});
+      })()`,
+    ),
+  )
+
+const login = async (tab, config, recognizeCaptcha, custom) => {
+  for (let attempt = 1; attempt <= (custom ? 1 : 3); attempt += 1) {
+    let captchaText = ''
+    if (!custom) {
+      const captchaUrl = await execute(
+        tab,
+        `(() => { const image = document.querySelector('img.code-img, img[class*="captcha" i], img[alt*="验证码"], img[title*="验证码"]'); return image ? (image.currentSrc || image.src || '') : ''; })()`,
+      )
+      if (!captchaUrl) throw new Error('未找到图形验证码')
+      captchaText = await recognizeCaptcha(captchaUrl)
+      console.log(`已识别图形验证码（第 ${attempt}/3 次）`)
+    }
+    const result = await fillAndSubmit(tab, { ...config, captchaText, custom })
+    if (!result.submitted) throw new Error('登录表单字段不完整或未找到登录按钮')
+    await sleep(1800)
+    const state = await pageState(tab)
+    if (custom || !state.url.includes('/passport/login/')) return
+    if (attempt < 3)
+      await execute(
+        tab,
+        `(() => { const image = document.querySelector('img.code-img, img[class*="captcha" i]'); if (image) image.click(); return ''; })()`,
+      )
+  }
+  throw new Error('自动登录失败，已达到最多重试次数')
+}
+
+export const runInExistingChrome = async ({
+  config,
+  devMode,
+  localOrigin,
+  localPath,
+  iframeHost,
+  iframePath,
+  roomName,
+  portal,
+  portalName,
+  recognizeCaptcha,
+}) => {
+  console.log('正在使用当前打开的 Google Chrome 登录门户。')
+  const tab = await openTab(config.loginUrl)
+  await sleep(800)
+  const state = await pageState(tab)
+  if (portal === 'custom') await login(tab, config, recognizeCaptcha, true)
+  else if (state.url.includes('/passport/login/') || portal === 'chenghua')
+    await login(tab, config, recognizeCaptcha, false)
+
+  if (!devMode) {
+    if (portal === 'chenghua') {
+      await execute(tab, `location.href = 'https://www.chenghua-ai.com/chat/pages/application'; ''`)
+    }
+    console.log(`${portalName}登录流程已完成，按 Ctrl+C 结束。`)
+    await new Promise(() => undefined)
+  }
+
+  let sampleRoomClicked = false
+  let searched = false
+  for (let index = 0; index < 180; index += 1) {
+    const currentState = await pageState(tab)
+    const targetUrl = findTargetUrl(currentState, iframeHost, iframePath)
+    if (targetUrl) {
+      const destination = new URL(`${localPath || targetUrl.pathname}${targetUrl.search}${targetUrl.hash}`, localOrigin)
+      await openTab(destination.href)
+      console.log(`门户本地调试已就绪：${localOrigin}${targetUrl.pathname}`)
+      console.log('Token 未打印、未写入文件。按 Ctrl+C 结束。')
+      return new Promise(() => undefined)
+    }
+    if (!sampleRoomClicked) sampleRoomClicked = await clickText(tab, '智能体样板间')
+    else if (!searched) searched = await fillSearch(tab, roomName)
+    else (await clickText(tab, roomName)) || (await clickText(tab, '3D智能展厅'))
+    await sleep(1000)
+  }
+  throw new Error(`未找到目标智能体入口：${roomName}`)
+}

package/src/portal-dev.mjs

@@ -4,20 +4,41 @@ import { dirname, resolve } from 'node:path'
 import { chromium } from 'playwright-core'
 import { readPortalConfig } from './config-file.mjs'
 import { recognizeCaptcha } from './recognize-captcha.mjs'
+import { runInExistingChrome } from './macos-chrome.mjs'
 
 const sleep = (milliseconds) => new Promise((resolvePromise) => setTimeout(resolvePromise, milliseconds))
 const args = process.argv.slice(2)
+const portalConfig = readPortalConfig()
+const commandAlias = args[0] && args[0] !== 'dev' && !args[0].startsWith('-') ? args[0] : undefined
+const savedCommand = commandAlias ? portalConfig.commands.find((command) => command?.alias === commandAlias) : undefined
+if (commandAlias && !savedCommand)
+  throw new Error(`未找到快捷命令“${commandAlias}”，请运行 portal-dev config command 创建`)
 const readArg = (name) => {
   const index = args.indexOf(name)
   return index >= 0 ? args[index + 1] : undefined
 }
+const readPositionalAccount = () => {
+  const valueOptions = new Set(['--portal', '--project'])
+  for (let index = 0; index < args.length; index += 1) {
+    const argument = args[index]
+    if (valueOptions.has(argument)) {
+      index += 1
+      continue
+    }
+    if (argument === 'dev' || argument === commandAlias || argument.startsWith('-')) continue
+    return argument
+  }
+  return undefined
+}
 
-const portal = readArg('--portal') || 'sjs'
-if (!['sjs', 'chenghua'].includes(portal)) throw new Error(`不支持的门户：${portal}，可选值为 sjs、chenghua`)
-const loginOnly = args.includes('--login-only') || portal === 'chenghua'
+const portal = savedCommand?.portal || readArg('--portal') || 'sjs'
+if (!['sjs', 'chenghua', 'custom'].includes(portal))
+  throw new Error(`不支持的门户：${portal}，可选值为 sjs、chenghua、custom`)
+const devMode = savedCommand?.mode === 'dev' || args[0] === 'dev'
+if (devMode && portal !== 'sjs') throw new Error('门户联调目前只支持石景山；成华和自定义命令只负责登录')
 
 const findProject = () => {
-  const explicit = readArg('--project')
+  const explicit = savedCommand?.project || readArg('--project')
   if (explicit) return resolve(explicit)
   let current = process.cwd()
   while (true) {
@@ -29,34 +50,59 @@ const findProject = () => {
   throw new Error('未找到前端项目，请先进入项目目录，或使用 --project <路径> 指定')
 }
 
-const projectDir = findProject()
-if (!existsSync(resolve(projectDir, 'package.json')))
+const projectDir = devMode ? findProject() : undefined
+if (projectDir && !existsSync(resolve(projectDir, 'package.json')))
   throw new Error(`目标项目不存在或缺少 package.json：${projectDir}`)
-const portalProfile = readPortalConfig().profiles[portal] || {}
+const configuredAccounts = portalConfig.profiles[portal]
+const portalAccounts = Array.isArray(configuredAccounts)
+  ? configuredAccounts.filter(
+      (account) => account?.name && typeof account.username === 'string' && typeof account.password === 'string',
+    )
+  : []
+if (!portalAccounts.length) {
+  throw new Error(
+    `尚未配置${portal === 'custom' ? '自定义网站' : portal === 'chenghua' ? '成华' : '石景山'}账号，请先运行 portal-dev config --portal ${portal}`,
+  )
+}
+
+const selectAccount = () => {
+  const accountName = savedCommand?.account || readPositionalAccount()
+  if (accountName) {
+    const matched = portalAccounts.find((account) => account.name === accountName)
+    if (!matched) throw new Error(`未找到账号“${accountName}”，请检查账号名称或重新配置`)
+    return matched
+  }
+  return portalAccounts[0]
+}
+
+const portalAccount = selectAccount()
 
 const configs = {
   sjs: {
     loginUrl: 'http://115.190.54.111:1880/passport/login/userLogin',
-    username: portalProfile.username,
-    password: portalProfile.password,
+    username: portalAccount.username,
+    password: portalAccount.password,
   },
   chenghua: {
     loginUrl: 'https://www.chenghua-ai.com/passport/login/userLogin',
-    username: portalProfile.username,
-    password: portalProfile.password,
+    username: portalAccount.username,
+    password: portalAccount.password,
+  },
+  custom: {
+    loginUrl: portalAccount.loginUrl,
+    username: portalAccount.username,
+    password: portalAccount.password,
   },
 }
 const config = configs[portal]
-if (!config.username || !config.password) {
-  throw new Error(
-    `尚未配置${portal === 'chenghua' ? '成华' : '石景山'}门户账号，请先运行 portal-dev config --portal ${portal}`,
-  )
-}
+if (!config.username || !config.password) throw new Error(`账号“${portalAccount.name}”的配置不完整，请重新配置`)
+if (portal === 'custom' && !config.loginUrl) throw new Error(`账号“${portalAccount.name}”缺少登录页 URL，请重新配置`)
 
-const localOrigin = 'http://localhost:5173'
-const iframeHost = 'hia.sjsdoubao.com:31118'
-const iframePath = '/exhibition-hall'
-const roomName = '3D智能展厅智能体'
+const localOrigin = (savedCommand?.localOrigin || 'http://localhost:5173').replace(/\/$/, '')
+const localPath = savedCommand?.localPath
+const iframeHost = savedCommand?.iframeHost || 'hia.sjsdoubao.com:31118'
+const iframePath = savedCommand?.iframePath || '/exhibition-hall'
+const roomName = savedCommand?.roomName || '3D智能展厅智能体'
 const chromeCandidates = {
   darwin: [
     '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
@@ -82,7 +128,7 @@ const isReady = async () => {
 }
 
 let devServer
-if (!loginOnly && !(await isReady())) {
+if (devMode && !(await isReady())) {
   const packageJson = JSON.parse(readFileSync(resolve(projectDir, 'package.json'), 'utf8'))
   if (!packageJson.scripts?.dev) throw new Error(`目标项目没有 dev script：${projectDir}`)
   const runner = existsSync(resolve(projectDir, 'bun.lock'))
@@ -100,6 +146,22 @@ if (!loginOnly && !(await isReady())) {
   if (!(await isReady())) throw new Error(`本地开发服务启动超时：${localOrigin}`)
 }
 
+if (process.platform === 'darwin') {
+  await runInExistingChrome({
+    config,
+    devMode,
+    localOrigin,
+    localPath,
+    iframeHost,
+    iframePath,
+    roomName,
+    portal,
+    portalName:
+      portal === 'custom' ? `自定义网站“${portalAccount.name}”` : `${portal === 'chenghua' ? '成华' : '石景山'}门户`,
+    recognizeCaptcha,
+  })
+}
+
 const browser = await chromium.launch({ headless: false, executablePath })
 const context = await browser.newContext()
 const page = await context.newPage()
@@ -184,10 +246,58 @@ const login = async () => {
   throw new Error('自动登录失败，已达到最多重试次数')
 }
 
-if (page.url().includes('/passport/login/') || portal === 'chenghua') await login()
-if (loginOnly) {
-  await page.goto('https://www.chenghua-ai.com/chat/pages/application', { waitUntil: 'domcontentloaded' })
-  console.log('成华门户登录已完成，按 Ctrl+C 结束。')
+const loginWithoutCaptcha = async () => {
+  const usernameInput = await visibleLocator([
+    'input[autocomplete="username"]',
+    'input[name="username"]',
+    'input[name="account"]',
+    'input[name="login"]',
+    'input[name="user"]',
+    'input[name="email"]',
+    'input[type="email"]',
+    'input[type="tel"]',
+    'input[placeholder*="用户名"]',
+    'input[placeholder*="账号"]',
+    'input[placeholder*="邮箱"]',
+    'input[placeholder*="手机"]',
+  ])
+  const passwordInput = await visibleLocator([
+    'input[autocomplete="current-password"]',
+    'input[name="password"]',
+    'input[type="password"]',
+    'input[placeholder*="密码"]',
+  ])
+  if (!usernameInput || !passwordInput) throw new Error('未找到常见的用户名或密码输入框')
+  await usernameInput.fill(config.username)
+  await passwordInput.fill(config.password)
+  const button = await visibleLocator([
+    'button[type="submit"]',
+    'input[type="submit"]',
+    'button:has-text("登录")',
+    '[role="button"]:has-text("登录")',
+    'button:has-text("Login")',
+    '[role="button"]:has-text("Login")',
+    'button:has-text("Sign in")',
+    '[role="button"]:has-text("Sign in")',
+  ])
+  if (!button) throw new Error('未找到常见的登录按钮')
+  const originalUrl = page.url()
+  await button.click()
+  await Promise.race([
+    page.waitForURL((url) => url.href !== originalUrl, { timeout: 15000 }),
+    passwordInput.waitFor({ state: 'hidden', timeout: 15000 }),
+  ]).catch(() => undefined)
+  console.log(`自定义网站“${portalAccount.name}”已填写账号密码并点击登录。`)
+}
+
+if (portal === 'custom') await loginWithoutCaptcha()
+else if (page.url().includes('/passport/login/') || portal === 'chenghua') await login()
+if (!devMode) {
+  if (portal === 'chenghua')
+    await page.goto('https://www.chenghua-ai.com/chat/pages/application', { waitUntil: 'domcontentloaded' })
+  console.log(
+    `${portal === 'custom' ? `自定义网站“${portalAccount.name}”` : `${portal === 'chenghua' ? '成华' : '石景山'}门户`}登录流程已完成，按 Ctrl+C 结束。`,
+  )
   await new Promise(() => undefined)
 }
 
@@ -226,7 +336,7 @@ for (let index = 0; index < 180; index += 1) {
 }
 
 if (!targetUrl) throw new Error(`未找到目标智能体入口：${roomName}`)
-const destination = new URL(`${targetUrl.pathname}${targetUrl.search}${targetUrl.hash}`, localOrigin)
+const destination = new URL(`${localPath || targetUrl.pathname}${targetUrl.search}${targetUrl.hash}`, localOrigin)
 await context.newPage().then((localPage) => localPage.goto(destination.href))
 console.log(`门户本地调试已就绪：${localOrigin}${targetUrl.pathname}`)
 console.log('Token 未打印、未写入文件。按 Ctrl+C 结束。')