@sybz-components/portal-dev 1.0.9 → 1.0.11

package/README.md

@@ -9,6 +9,8 @@
 
 macOS 会直接复用当前打开的 Google Chrome，在现有窗口中新建标签页完成登录和本地联调，不会启动独立的 Chrome 实例。Windows / Linux 使用独立浏览器实例作为兼容方案。
 
+Windows 会优先读取 `CHROME_PATH`，然后自动查找 Chrome 和 Microsoft Edge 的常见安装位置。配置文件优先使用 `%APPDATA%`；自动启动前端项目时通过 `cmd.exe` 运行 npm、pnpm 或 Bun，结束时会清理对应的进程树。
+
 ## 安装
 
 全局安装：
@@ -50,6 +52,39 @@ portal-dev config --portal custom
 
 ## 使用
 
+列出所有已配置的石景山、成华和自定义网站账号，输入序号后直接登录：
+
+```bash
+portal-dev login
+```
+
+示例：
+
+```text
+请选择要登录的账号：
+  1. 石景山 - 测试账号
+  2. 成华 - 管理员
+  3. 自定义网站 - 内部系统
+请输入序号（1-3）：
+```
+
+### 本地调试
+
+修改 `portal-dev` 源码后不需要发布或全局安装，在本包目录直接运行：
+
+```bash
+pnpm dev sjs
+pnpm dev login
+```
+
+该命令直接执行当前源码，效果与发布后的 `portal-dev sjs` 一致。其他参数也可以原样传入，例如：
+
+```bash
+pnpm dev --portal sjs
+pnpm dev config --portal sjs
+pnpm dev --help
+```
+
 只登录石景山门户，不读取或启动任何前端项目：
 
 ```bash
@@ -74,13 +109,6 @@ portal-dev --portal sjs
 portal-dev --portal sjs 测试账号
 ```
 
-默认快捷命令：
-
-```bash
-portal-dev ds # 登录石景山
-portal-dev sc # 登录成华
-```
-
 配置并登录普通网站：
 
 ```bash
@@ -90,51 +118,63 @@ portal-dev --portal custom 我的账号
 
 配置时依次输入登录页 URL、用户名和密码。登录时会自动查找常见的用户名、邮箱、密码输入框，以及“登录”、“Login”或“Sign in”按钮；该模式不会执行验证码识别、样板间搜索或 Token 跳转。
 
-别名保存在 JSON 中，可以通过向导新增登录或联调命令：
-
-```bash
-portal-dev config command
-```
-
-例如配置一个别名为 `sjs-dev` 的联调命令后，只需运行：
+执行 `portal-dev config` 时，可以直接为账号设置快捷别名。石景山账号还可选择“只登录”或“本地联调”模式。例如将某个账号的别名配置为 `sjs-dev`：
 
 ```bash
+portal-dev config --portal sjs
 portal-dev sjs-dev
 ```
 
-执行时会登录指定账号、启动本地项目、进入样板间搜索智能体，从匹配的 iframe 地址取得 Token，然后保留查询参数打开本地页面。
+执行时会登录指定账号、在已配置 `project` 时启动本地项目、进入样板间搜索智能体，从匹配的 iframe 地址取得 Token，然后保留查询参数打开本地页面。
+
+`project` 是可选项，只在需要 CLI 自动启动前端开发服务时配置。不配置时不会启动项目，联调流程仍使用默认本地地址 `http://localhost:5173`。
 
-配置文件中的账号和快捷命令格式：
+配置文件中，别名、模式和联调参数都直接属于对应账号，不再有独立的 `commands`：
 
 ```json
 {
-  "version": 4,
+  "version": 5,
   "profiles": {
-    "sjs": [{ "name": "我的账号", "username": "user1", "password": "******" }],
-    "chenghua": [{ "name": "测试账号", "username": "user2", "password": "******" }],
+    "sjs": [
+      {
+        "name": "测试账号",
+        "username": "user1",
+        "password": "******",
+        "alias": "sjs-dev",
+        "mode": "dev",
+        "project": "/Users/你的名字/projects/agent-web",
+        "localOrigin": "http://localhost:5173",
+        "localPath": "/exhibition-hall",
+        "roomName": "3D智能展厅智能体",
+        "iframeHost": "hia.sjsdoubao.com:31118",
+        "iframePath": "/exhibition-hall"
+      }
+    ],
+    "chenghua": [
+      {
+        "name": "成华账号",
+        "username": "user2",
+        "password": "******",
+        "alias": "ch",
+        "mode": "login"
+      }
+    ],
     "custom": [
-      { "name": "内部系统", "loginUrl": "https://example.com/login", "username": "user3", "password": "******" }
+      {
+        "name": "内部系统",
+        "loginUrl": "https://example.com/login",
+        "username": "user3",
+        "password": "******",
+        "alias": "internal",
+        "mode": "login"
+      }
     ]
-  },
-  "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"
-    }
-  ]
+  }
 }
 ```
 
+首次读取旧版 `version: 4` 配置时，CLI 会自动将 `commands` 合并到对应 profile 并升级为 `version: 5`。
+
 查看命令帮助：
 
 ```bash
@@ -178,4 +218,4 @@ pnpm portal:skill:install
 pnpm portal:release
 ```
 
-`portal:release` 会执行检查、升级 patch 版本、创建版本提交和 Git tag、发布 npm 包，最后将当前分支及 tags 推送到 Git 远端。执行前请确认当前分支、远端和工作区状态。
+`portal:release` 会检查工作区和 npm 登录状态、升级 patch 版本并公开发布到 npm。只有确认新版本能从 npm registry 查询到之后，才会创建版本提交和 `portal-dev-v<版本号>` Git tag，并将当前分支及 tags 推送到 Git 远端。发布失败时会恢复本地版本号，避免留下无法安装的空版本。执行前请先提交当前改动，并确认当前分支和远端正确。

package/bin/portal-dev.mjs

@@ -2,10 +2,44 @@
 import { cpSync, existsSync, mkdirSync, rmSync } from 'node:fs'
 import { spawn } from 'node:child_process'
 import { dirname, resolve } from 'node:path'
+import { createInterface } from 'node:readline/promises'
 import { fileURLToPath } from 'node:url'
+import { readPortalConfig } from '../src/config-file.mjs'
 
 const packageDir = resolve(dirname(fileURLToPath(import.meta.url)), '..')
-const args = process.argv.slice(2)
+let args = process.argv.slice(2)
+
+if (args[0] === 'login') {
+  const portalNames = { sjs: '石景山', chenghua: '成华', custom: '自定义网站' }
+  const { profiles } = readPortalConfig()
+  const options = Object.keys(portalNames).flatMap((portal) =>
+    (Array.isArray(profiles[portal]) ? profiles[portal] : [])
+      .filter(
+        (account) =>
+          account?.name &&
+          typeof account.username === 'string' &&
+          typeof account.password === 'string' &&
+          (portal !== 'custom' || account.loginUrl),
+      )
+      .map((account) => ({ portal, account })),
+  )
+
+  if (!options.length) throw new Error('没有可登录的已配置账号，请先运行 portal-dev config')
+
+  console.log('请选择要登录的账号：')
+  options.forEach(({ portal, account }, index) => {
+    console.log(`  ${index + 1}. ${portalNames[portal]} - ${account.name}`)
+  })
+
+  const readline = createInterface({ input: process.stdin, output: process.stdout })
+  const answer = (await readline.question(`请输入序号（1-${options.length}）：`)).trim()
+  readline.close()
+  const selectedIndex = Number(answer) - 1
+  if (!Number.isInteger(selectedIndex) || !options[selectedIndex]) throw new Error(`无效的选项：${answer || '(空)'}`)
+
+  const selected = options[selectedIndex]
+  args = ['--profile', selected.account.name, '--portal', selected.portal]
+}
 
 if (args[0] === 'skill' && args[1] === 'install') {
   const homeDir = process.env.HOME || process.env.USERPROFILE
@@ -34,15 +68,15 @@ if (args[0] === 'config') {
 } else if (args.includes('--help') || args.includes('-h')) {
   console.log(`用法：
   portal-dev
+  portal-dev login
   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 ds 登录石景山，portal-dev sc 登录成华。
-运行 portal-dev config command 可新增或修改快捷命令。`)
+运行 portal-dev login 可列出所有已配置账号，输入序号直接登录。
+每个账号都可在 portal-dev config 时配置别名和登录/联调模式。`)
   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.9",
+  "version": "1.0.11",
   "description": "成华和石景山门户自动登录与本地前端联调 CLI",
   "type": "module",
   "bin": {
@@ -20,9 +20,10 @@
     "registry": "https://registry.npmjs.org"
   },
   "scripts": {
+    "dev": "node ./bin/portal-dev.mjs",
     "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/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"
+    "release": "node ./scripts/release.mjs"
   },
   "dependencies": {
     "@napi-rs/canvas": "^1.0.3",

package/skills/portal-dev/SKILL.md

@@ -11,6 +11,14 @@ macOS 会复用用户当前打开的 Google Chrome，并在现有窗口的标签
 
 ## 执行
 
+需要让用户从所有已配置账号中选择时执行：
+
+```bash
+portal-dev login
+```
+
+该命令会显示石景山、成华和自定义网站的可登录账号，输入序号后直接登录。
+
 缺少账号配置时先执行：
 
 ```bash
@@ -35,17 +43,10 @@ portal-dev --portal chenghua
 portal-dev --portal custom <账号名称>
 ```
 
-默认快捷命令：
-
-```bash
-portal-dev ds
-portal-dev sc
-```
-
-只有用户明确要求门户本地联调时才执行 JSON 中 `mode: "dev"` 的快捷命令，例如 `portal-dev sjs-dev`。项目、本地地址、路由、智能体名称和 iframe 识别参数均从该命令配置读取。脚本从门户 iframe URL 取得 Token 后，必须保留查询参数打开本地地址，且不得输出 Token。
+每个 profile 可以直接配置 `alias` 和 `mode`。只有用户明确要求门户本地联调时才执行 `mode: "dev"` 的快捷别名，例如 `portal-dev sjs-dev`。`project` 仅用于需要 CLI 自动启动前端项目的情况，未配置时直接使用默认本地地址 `http://localhost:5173`。本地地址、路由、智能体名称和 iframe 识别参数均从该 profile 读取。脚本从门户 iframe URL 取得 Token 后，必须保留查询参数打开本地地址，且不得输出 Token。
 
 保持进程运行并告诉用户当前状态；只有用户明确要求停止时才终止。不得输出用户名、密码或门户 Token。
 
 ## 配置
 
-账号密码只从当前用户的专属配置文件读取，每个门户可保存多个账号。`portal-dev config` 会新增账号或按账号名称更新已有账号；登录命令不写账号名称时使用数组第一个账号，在命令末尾追加账号名称时使用指定账号。普通网站使用 `portal-dev config --portal custom` 配置登录 URL、账号名称、用户名和密码。缺少凭据时，引导用户在本机终端运行 `portal-dev config`，不索要或展示具体密码。
+账号密码只从当前用户的专属配置文件读取，每个门户可保存多个账号。`portal-dev config` 会新增账号或按账号名称更新已有账号，并在 profile 中直接配置别名和模式；登录命令不写账号名称时使用数组第一个账号，在命令末尾追加账号名称时使用指定账号。普通网站使用 `portal-dev config --portal custom` 配置登录 URL、账号名称、用户名和密码。缺少凭据时，引导用户在本机终端运行 `portal-dev config`，不索要或展示具体密码。

package/src/config-file.mjs

@@ -2,33 +2,54 @@ 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')
+    process.platform === 'win32'
+      ? process.env.APPDATA || resolve(homedir(), 'AppData', 'Roaming')
+      : resolve(homedir(), '.config')
   return resolve(configRoot, 'sybz-components', 'portal-dev.json')
 }
 
 export const readPortalConfig = () => {
   const configPath = getPortalConfigPath()
-  if (!existsSync(configPath)) return { version: 4, profiles: {}, commands: defaultCommands() }
+  if (!existsSync(configPath)) return { version: 5, profiles: {} }
   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 : {},
-      commands: Array.isArray(config.commands) ? config.commands : defaultCommands(),
+    const profiles = config.profiles && typeof config.profiles === 'object' ? structuredClone(config.profiles) : {}
+
+    for (const command of Array.isArray(config.commands) ? config.commands : []) {
+      if (!command?.alias || !['sjs', 'chenghua', 'custom'].includes(command.portal)) continue
+      const accounts = Array.isArray(profiles[command.portal]) ? profiles[command.portal] : []
+      const accountIndex = command.account
+        ? accounts.findIndex((account) => account?.name === command.account)
+        : accounts.length
+          ? 0
+          : -1
+      if (accountIndex < 0) continue
+      const { portal: _portal, account: _account, ...profileOptions } = command
+      accounts[accountIndex] = { ...accounts[accountIndex], ...profileOptions }
+      profiles[command.portal] = accounts
     }
+
+    const normalizedConfig = { version: 5, profiles }
+    if (config.version !== 5 || Object.hasOwn(config, 'commands')) writeConfig(configPath, normalizedConfig)
+    return normalizedConfig
   } catch (error) {
     throw new Error(`门户配置文件格式错误：${configPath}\n${error.message}`)
   }
 }
 
+const writeConfig = (configPath, config) => {
+  mkdirSync(dirname(configPath), { recursive: true, mode: 0o700 })
+  writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 })
+  try {
+    chmodSync(configPath, 0o600)
+  } catch {
+    // Windows 等不支持 POSIX 权限的环境由系统用户目录权限保护。
+  }
+}
+
 export const writePortalAccount = (portal, account) => {
   const configPath = getPortalConfigPath()
   const config = readPortalConfig()
@@ -44,35 +65,9 @@ export const writePortalAccount = (portal, account) => {
   if (accountIndex >= 0) nextAccounts[accountIndex] = account
   else nextAccounts.push(account)
   const nextConfig = {
-    ...config,
-    version: 4,
+    version: 5,
     profiles: { ...normalizedProfiles, [portal]: nextAccounts },
-    commands: config.commands,
-  }
-  mkdirSync(dirname(configPath), { recursive: true, mode: 0o700 })
-  writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`, { mode: 0o600 })
-  try {
-    chmodSync(configPath, 0o600)
-  } catch {
-    // Windows 等不支持 POSIX 权限的环境由系统用户目录权限保护。
   }
+  writeConfig(configPath, nextConfig)
   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 { writePortalAccount, writePortalCommand } from './config-file.mjs'
+import { writePortalAccount } from './config-file.mjs'
 
 const args = process.argv.slice(2)
 const readArg = (name) => {
@@ -52,52 +52,6 @@ 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=成华，3=自定义，直接回车默认石景山）：'))
@@ -113,6 +67,28 @@ if (!name) {
   rl.close()
   throw new Error('账号名称不能为空')
 }
+const alias = (await rl.question('请输入快捷命令别名（可直接回车跳过）：')).trim()
+if (alias && !/^[a-zA-Z][\w-]*$/.test(alias)) {
+  rl.close()
+  throw new Error('别名只能包含字母、数字、下划线和短横线，并且必须以字母开头')
+}
+const modeAnswer = portal === 'sjs' ? (await rl.question('请选择模式（1=只登录，2=本地联调，默认1）：')).trim() : '1'
+const mode = modeAnswer === '2' ? 'dev' : 'login'
+const profileOptions = { ...(alias ? { alias } : {}), mode }
+if (mode === 'dev') {
+  const project = (await rl.question('请输入需要自动启动的前端项目绝对路径（可直接回车跳过）：')).trim()
+  if (project) profileOptions.project = project
+  profileOptions.localOrigin =
+    (await rl.question('请输入本地服务地址（默认 http://localhost:5173）：')).trim() || 'http://localhost:5173'
+  profileOptions.localPath =
+    (await rl.question('请输入本地接收 Token 的路由（默认 /exhibition-hall）：')).trim() || '/exhibition-hall'
+  profileOptions.roomName =
+    (await rl.question('请输入样板间智能体名称（默认 3D智能展厅智能体）：')).trim() || '3D智能展厅智能体'
+  profileOptions.iframeHost =
+    (await rl.question('请输入门户 iframe 域名（默认 hia.sjsdoubao.com:31118）：')).trim() || 'hia.sjsdoubao.com:31118'
+  profileOptions.iframePath =
+    (await rl.question('请输入门户 iframe 路径（默认 /exhibition-hall）：')).trim() || '/exhibition-hall'
+}
 let loginUrl
 if (portal === 'custom') {
   loginUrl = (await rl.question('请输入登录页 URL（例如：https://example.com/login）：')).trim()
@@ -134,8 +110,9 @@ const { configPath, accountCount } = writePortalAccount(portal, {
   username,
   password,
   ...(loginUrl ? { loginUrl } : {}),
+  ...profileOptions,
 })
 
 console.log(`配置完成：${portalName}现有 ${accountCount} 个账号`)
 console.log(`配置文件：${configPath}`)
-console.log(`现在可以在任意目录运行：portal-dev --portal ${portal}`)
+console.log(`现在可以在任意目录运行：portal-dev ${alias || `--portal ${portal} ${name}`}`)

package/src/macos-chrome.mjs

@@ -3,6 +3,18 @@ import { promisify } from 'node:util'
 
 const execFileAsync = promisify(execFile)
 const sleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds))
+const waitForExitSignal = () =>
+  new Promise((resolve) => {
+    const keepAlive = setInterval(() => undefined, 60_000)
+    const finish = () => {
+      clearInterval(keepAlive)
+      process.removeListener('SIGINT', finish)
+      process.removeListener('SIGTERM', finish)
+      resolve()
+    }
+    process.once('SIGINT', finish)
+    process.once('SIGTERM', finish)
+  })
 const escapeAppleScript = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\r?\n/g, ' ')
 
 const runAppleScript = async (script) => {
@@ -74,6 +86,28 @@ const fillSearch = async (tab, roomName) =>
     })()`,
   )) === 'true'
 
+const waitForPortalReady = async (tab) => {
+  let stableCount = 0
+  for (let index = 0; index < 120; index += 1) {
+    const ready =
+      (await execute(
+        tab,
+        `(() => {
+          const visible = (element) => { const style = getComputedStyle(element); const rect = element.getBoundingClientRect(); return style.display !== 'none' && style.visibility !== 'hidden' && style.opacity !== '0' && rect.width > 0 && rect.height > 0; };
+          const loading = Array.from(document.querySelectorAll('.el-loading-mask, .ant-spin-spinning, .n-spin-body, .loading-mask, .loading-overlay, .v-loading-mask, [aria-busy="true"]')).some(visible);
+          return document.readyState === 'complete' && !loading ? 'true' : 'false';
+        })()`,
+      )) === 'true'
+    stableCount = ready ? stableCount + 1 : 0
+    if (stableCount >= 2) {
+      await sleep(800)
+      return
+    }
+    await sleep(500)
+  }
+  throw new Error('门户页面 loading 等待超时')
+}
+
 const fillAndSubmit = async (tab, { username, password, captchaText, custom }) =>
   JSON.parse(
     await execute(
@@ -83,13 +117,15 @@ const fillAndSubmit = async (tab, { username, password, captchaText, custom }) =
         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});
+        const attribute = (input, name) => input.getAttribute(name) || '';
+        const passwordInput = inputs.find((input) => attribute(input, 'autocomplete') === 'current-password' || /^password$/i.test(attribute(input, 'name')) || input.type === 'password' || /密码/.test(attribute(input, 'placeholder')));
+        const captchaInput = inputs.find((input) => /验证码/.test(attribute(input, 'placeholder')) || /captcha|code/i.test(attribute(input, 'name')));
+        const usernameInput = inputs.find((input) => attribute(input, 'autocomplete') === 'username' || /^(username|account|login|user|email|phone)$/i.test(attribute(input, 'name')) || /用户名|账号|邮箱|手机/.test(attribute(input, 'placeholder'))) || inputs.find((input) => input !== passwordInput && input !== captchaInput && /^(text|email|tel|number)$/.test(input.type));
+        const missing = [!usernameInput && '账号输入框', !passwordInput && '密码输入框', !${custom} && !captchaInput && '验证码输入框'].filter(Boolean);
+        if (missing.length) return JSON.stringify({submitted:false, reason:'未找到' + missing.join('、')});
         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});
+        if (!button) return JSON.stringify({submitted:false, reason:'未找到登录按钮'}); button.click(); return JSON.stringify({submitted:true});
       })()`,
     ),
   )
@@ -107,7 +143,7 @@ const login = async (tab, config, recognizeCaptcha, custom) => {
       console.log(`已识别图形验证码（第 ${attempt}/3 次）`)
     }
     const result = await fillAndSubmit(tab, { ...config, captchaText, custom })
-    if (!result.submitted) throw new Error('登录表单字段不完整或未找到登录按钮')
+    if (!result.submitted) throw new Error(result.reason || '登录表单字段不完整或未找到登录按钮')
     await sleep(1800)
     const state = await pageState(tab)
     if (custom || !state.url.includes('/passport/login/')) return
@@ -145,9 +181,13 @@ export const runInExistingChrome = async ({
       await execute(tab, `location.href = 'https://www.chenghua-ai.com/chat/pages/application'; ''`)
     }
     console.log(`${portalName}登录流程已完成，按 Ctrl+C 结束。`)
-    await new Promise(() => undefined)
+    await waitForExitSignal()
+    return
   }
 
+  console.log('正在等待门户页面加载完成。')
+  await waitForPortalReady(tab)
+  console.log('门户页面已加载，正在进入智能体样板间。')
   let sampleRoomClicked = false
   let searched = false
   for (let index = 0; index < 180; index += 1) {
@@ -158,7 +198,8 @@ export const runInExistingChrome = async ({
       await openTab(destination.href)
       console.log(`门户本地调试已就绪：${localOrigin}${targetUrl.pathname}`)
       console.log('Token 未打印、未写入文件。按 Ctrl+C 结束。')
-      return new Promise(() => undefined)
+      await waitForExitSignal()
+      return
     }
     if (!sampleRoomClicked) sampleRoomClicked = await clickText(tab, '智能体样板间')
     else if (!searched) searched = await fillSearch(tab, roomName)

package/src/portal-dev.mjs

@@ -10,15 +10,29 @@ const sleep = (milliseconds) => new Promise((resolvePromise) => setTimeout(resol
 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 selectedProfileName = readArg('--profile')
+const savedCommand = commandAlias
+  ? Object.entries(portalConfig.profiles)
+      .flatMap(([portal, profiles]) =>
+        (Array.isArray(profiles) ? profiles : []).map((profile) => ({ ...profile, portal })),
+      )
+      .find((profile) => profile.alias === commandAlias)
+  : selectedProfileName
+    ? Object.entries(portalConfig.profiles)
+        .flatMap(([portal, profiles]) =>
+          (Array.isArray(profiles) ? profiles : []).map((profile) => ({ ...profile, portal })),
+        )
+        .find((profile) => profile.portal === readArg('--portal') && profile.name === selectedProfileName)
+    : undefined
+if (commandAlias && !savedCommand)
+  throw new Error(`未找到快捷命令“${commandAlias}”，请运行 portal-dev config 为账号配置别名`)
+if (selectedProfileName && !savedCommand) throw new Error(`未找到账号“${selectedProfileName}”`)
 const readPositionalAccount = () => {
-  const valueOptions = new Set(['--portal', '--project'])
+  const valueOptions = new Set(['--portal', '--project', '--profile', '--host', '--port'])
   for (let index = 0; index < args.length; index += 1) {
     const argument = args[index]
     if (valueOptions.has(argument)) {
@@ -50,7 +64,8 @@ const findProject = () => {
   throw new Error('未找到前端项目，请先进入项目目录，或使用 --project <路径> 指定')
 }
 
-const projectDir = devMode ? findProject() : undefined
+const configuredProject = savedCommand?.project || readArg('--project')
+const projectDir = devMode && (configuredProject || args[0] === 'dev') ? findProject() : undefined
 if (projectDir && !existsSync(resolve(projectDir, 'package.json')))
   throw new Error(`目标项目不存在或缺少 package.json：${projectDir}`)
 const configuredAccounts = portalConfig.profiles[portal]
@@ -66,7 +81,8 @@ if (!portalAccounts.length) {
 }
 
 const selectAccount = () => {
-  const accountName = savedCommand?.account || readPositionalAccount()
+  if (savedCommand) return savedCommand
+  const accountName = readPositionalAccount()
   if (accountName) {
     const matched = portalAccounts.find((account) => account.name === accountName)
     if (!matched) throw new Error(`未找到账号“${accountName}”，请检查账号名称或重新配置`)
@@ -112,11 +128,16 @@ const chromeCandidates = {
     `${process.env.PROGRAMFILES || ''}\\Google\\Chrome\\Application\\chrome.exe`,
     `${process.env['PROGRAMFILES(X86)'] || ''}\\Google\\Chrome\\Application\\chrome.exe`,
     `${process.env.LOCALAPPDATA || ''}\\Google\\Chrome\\Application\\chrome.exe`,
+    `${process.env.PROGRAMFILES || ''}\\Microsoft\\Edge\\Application\\msedge.exe`,
+    `${process.env['PROGRAMFILES(X86)'] || ''}\\Microsoft\\Edge\\Application\\msedge.exe`,
+    `${process.env.LOCALAPPDATA || ''}\\Microsoft\\Edge\\Application\\msedge.exe`,
   ],
   linux: ['/usr/bin/google-chrome', '/usr/bin/google-chrome-stable', '/usr/bin/chromium', '/usr/bin/chromium-browser'],
 }
-const executablePath = chromeCandidates[process.platform]?.find(existsSync)
-if (!executablePath) throw new Error('未找到 Chrome 或 Edge，请先安装浏览器')
+const executablePath = [process.env.CHROME_PATH, ...(chromeCandidates[process.platform] || [])]
+  .filter(Boolean)
+  .find(existsSync)
+if (!executablePath) throw new Error('未找到 Chrome 或 Edge，请先安装浏览器，或通过 CHROME_PATH 指定可执行文件')
 
 const localUrl = new URL(localOrigin)
 const isReady = async () => {
@@ -128,7 +149,15 @@ const isReady = async () => {
 }
 
 let devServer
-if (devMode && !(await isReady())) {
+const stopDevServer = () => {
+  if (!devServer?.pid) return
+  if (process.platform === 'win32') {
+    spawn('taskkill.exe', ['/pid', String(devServer.pid), '/t', '/f'], { stdio: 'ignore' }).unref()
+  } else {
+    devServer.kill('SIGTERM')
+  }
+}
+if (devMode && projectDir && !(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'))
@@ -136,14 +165,24 @@ if (devMode && !(await isReady())) {
     : existsSync(resolve(projectDir, 'pnpm-lock.yaml'))
       ? 'pnpm'
       : 'npm'
+  const runnerArgs = ['run', 'dev', '--', '--host', localUrl.hostname, '--port', localUrl.port || '80']
   console.log(`正在启动项目开发服务：${projectDir}`)
-  devServer = spawn(runner, ['run', 'dev', '--', '--host', localUrl.hostname, '--port', localUrl.port || '80'], {
-    cwd: projectDir,
-    env: process.env,
-    stdio: 'inherit',
-  })
+  devServer =
+    process.platform === 'win32'
+      ? spawn(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', runner, ...runnerArgs], {
+          cwd: projectDir,
+          env: process.env,
+          stdio: 'inherit',
+        })
+      : spawn(runner, runnerArgs, {
+          cwd: projectDir,
+          env: process.env,
+          stdio: 'inherit',
+        })
   for (let index = 0; index < 120 && !(await isReady()); index += 1) await sleep(500)
   if (!(await isReady())) throw new Error(`本地开发服务启动超时：${localOrigin}`)
+} else if (devMode && !projectDir && !(await isReady())) {
+  console.log(`未配置 project，不自动启动前端项目，后续将直接打开默认地址：${localOrigin}`)
 }
 
 if (process.platform === 'darwin') {
@@ -160,11 +199,23 @@ if (process.platform === 'darwin') {
       portal === 'custom' ? `自定义网站“${portalAccount.name}”` : `${portal === 'chenghua' ? '成华' : '石景山'}门户`,
     recognizeCaptcha,
   })
+  stopDevServer()
+  process.exit(0)
 }
 
 const browser = await chromium.launch({ headless: false, executablePath })
 const context = await browser.newContext()
 const page = await context.newPage()
+let closing = false
+const shutdown = async () => {
+  if (closing) return
+  closing = true
+  stopDevServer()
+  await browser.close().catch(() => undefined)
+  process.exit(0)
+}
+process.on('SIGINT', shutdown)
+process.on('SIGTERM', shutdown)
 await page.goto(config.loginUrl, { waitUntil: 'domcontentloaded' })
 
 const visibleLocator = async (selectors) => {
@@ -188,6 +239,42 @@ const clickText = async (text) => {
   return false
 }
 
+const waitForPortalReady = async () => {
+  console.log('正在等待门户页面加载完成。')
+  let stableCount = 0
+  for (let index = 0; index < 120; index += 1) {
+    const ready = await page
+      .evaluate(() => {
+        const visible = (element) => {
+          const style = getComputedStyle(element)
+          const rect = element.getBoundingClientRect()
+          return (
+            style.display !== 'none' &&
+            style.visibility !== 'hidden' &&
+            style.opacity !== '0' &&
+            rect.width > 0 &&
+            rect.height > 0
+          )
+        }
+        const loading = Array.from(
+          document.querySelectorAll(
+            '.el-loading-mask, .ant-spin-spinning, .n-spin-body, .loading-mask, .loading-overlay, .v-loading-mask, [aria-busy="true"]',
+          ),
+        ).some(visible)
+        return document.readyState === 'complete' && !loading
+      })
+      .catch(() => false)
+    stableCount = ready ? stableCount + 1 : 0
+    if (stableCount >= 2) {
+      await sleep(800)
+      console.log('门户页面已加载，正在进入智能体样板间。')
+      return
+    }
+    await sleep(500)
+  }
+  throw new Error('门户页面 loading 等待超时')
+}
+
 const login = async () => {
   for (let attempt = 1; attempt <= 3; attempt += 1) {
     let captcha
@@ -209,6 +296,7 @@ const login = async () => {
         'input[name="username"]',
         'input[placeholder*="用户名"]',
         'input[placeholder*="账号"]',
+        'input[autocomplete="off"]:not([type="password"]):not([placeholder*="验证码"])',
       ])
       const passwordInput = await visibleLocator([
         'input[autocomplete="current-password"]',
@@ -301,6 +389,7 @@ if (!devMode) {
   await new Promise(() => undefined)
 }
 
+await waitForPortalReady()
 let sampleRoomClicked = false
 let searched = false
 let targetUrl
@@ -341,11 +430,4 @@ await context.newPage().then((localPage) => localPage.goto(destination.href))
 console.log(`门户本地调试已就绪：${localOrigin}${targetUrl.pathname}`)
 console.log('Token 未打印、未写入文件。按 Ctrl+C 结束。')
 
-const shutdown = async () => {
-  devServer?.kill('SIGTERM')
-  await browser.close().catch(() => undefined)
-  process.exit(0)
-}
-process.on('SIGINT', shutdown)
-process.on('SIGTERM', shutdown)
 await new Promise(() => undefined)