openclaw-weiyuan-init 1.0.115 → 1.0.116

package/lib/identity.js

@@ -50,7 +50,7 @@ function normalizeBusinessServerUrl(serverUrl) {
   try {
     const url = new URL(String(serverUrl).trim());
     const rawPath = String(url.pathname || '/');
-    if (/^\/(?:api\/)?agent-register(?:\/|$)/.test(rawPath)) {
+    if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(rawPath)) {
       url.pathname = '/api';
     } else if (!rawPath || rawPath === '/') {
       url.pathname = '/api';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-weiyuan-init",
-  "version": "1.0.115",
+  "version": "1.0.116",
   "description": "OpenClaw Weiyuan Skill 一键初始化工具",
   "main": "bin/cli.js",
   "bin": {

package/workspace-weiyuan/weiyuan/src/cli.ts

@@ -4,7 +4,7 @@ import { createInterface } from "node:readline/promises"
 import { stdin as input, stdout as output } from "node:process"
 import { spawnSync } from "node:child_process"
 import type { WeiyuanIdentityFileV1 } from "./types"
-import { DEFAULT_IDENTITY_PATH, normalizeServerBaseUrl, readIdentity, writeIdentity } from "./weiyuanFile"
+import { DEFAULT_IDENTITY_PATH, healIdentityServerBaseUrl, normalizeServerBaseUrl, readIdentity, writeIdentity } from "./weiyuanFile"
 import { sha256Hex } from "./crypto"
 import { signedFetch, signedRequest } from "./http"
 import { bodyHashBase64, canonicalRequest, newKeyPair, signEd25519Base64 } from "./signing"
@@ -1203,6 +1203,41 @@ async function fetchOptionalJson(url: string): Promise<Record<string, unknown> |
   }
 }
 
+async function reportAgentRuntimeVersion(options: {
+  apiBaseUrl: string
+  identity: WeiyuanIdentityFileV1
+  skillVersion?: string
+  targetAccountId?: string
+}): Promise<Record<string, unknown> | null> {
+  const apiBaseUrl = normalizeServerBaseUrl(String(options.apiBaseUrl || "").trim())
+  const skillVersion = String(options.skillVersion || "").trim().replace(/^v/i, "")
+  const lobsterId = String(options.identity?.lobsterId || "").trim()
+  const identityHash = String(options.identity?.identityHash || "").trim()
+  const targetAccountId = String(options.targetAccountId || lobsterId).trim()
+  if (!apiBaseUrl || !lobsterId || !identityHash) return null
+  try {
+    const res = await fetch(`${apiBaseUrl}/agent/version/report`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        lobsterId,
+        identityHash,
+        skillVersion,
+        targetAccountId,
+      }),
+    })
+    const text = await res.text()
+    const parsed = text.trim() ? (JSON.parse(text) as any) : {}
+    if (!res.ok) throw new Error(String(parsed?.msg || parsed?.message || `http_${res.status}`))
+    return parsed?.data && typeof parsed.data === "object" ? parsed.data : parsed
+  } catch (error) {
+    return {
+      ok: false,
+      reportError: String((error as Error)?.message ?? error ?? "version_report_failed"),
+    }
+  }
+}
+
 async function downloadBinaryFile(url: string, outPath: string, errorPrefix: string): Promise<void> {
   let res: Response
   try {
@@ -2909,14 +2944,14 @@ function printCommandHelp(command: string): boolean {
       command: "member",
       usage: [
         "member list --project <projectId>",
-        "member add-web --project <projectId> --name <显示名称>",
+        "member add --project <projectId> --name <显示名称>",
         "member remove --project <projectId> --target <lobsterId> --reason <原因> [--confirm1 同意 --confirm2 同意]",
         "member leave --project <projectId> --reason <原因> [--confirm1 同意 --confirm2 同意]",
         "member profile-edit --project <projectId> [--nickname <项目昵称>] [--roleTitle <角色>] [--specialties <A,B>] [--taskPreferenceTags <X,Y>] [--syncAll]",
         "member profile-global-edit --project <projectId> [--nickname <全局昵称>] [--roleTitle <角色>] [--specialties <A,B>] [--taskPreferenceTags <X,Y>]",
       ],
       examples: [
-        "npm run weiyuan -- member add-web --project <projectId> --name 设计同学A",
+        "npm run weiyuan -- member add --project <projectId> --name 设计同学A",
         "npm run weiyuan -- member profile-edit --project <projectId> --nickname 小李 --roleTitle 研发",
         "npm run weiyuan -- member-profile-edit --project <projectId> --specialties 前端,交互 --taskPreferenceTags 重构,性能 --syncAll",
         "npm run weiyuan -- member profile-global-edit --project <projectId> --nickname 全局小李 --roleTitle 项目经理",
@@ -3573,6 +3608,7 @@ async function cmdRuntimeUpgrade(args: Argv): Promise<void> {
   const upgradeBaseUrl = inferUpgradeBaseUrl(apiBaseUrl, optString(args.flags, "upgrade"))
   const upgradeRules = buildUpgradeRules(upgradeBaseUrl)
   const currentVersion = await readLocalRuntimeVersion(weiyuanPath)
+  const targetAccountId = optString(args.flags, "target-account-id") ?? optString(args.flags, "target") ?? identity.lobsterId
   const latestVersion = await fetchRequiredText(upgradeRules.latestVersionUrl, "upgrade_latest_version_unavailable")
   const releaseNotes = await fetchOptionalJson(upgradeRules.releaseNotesUrl)
   const currentReady = await fs
@@ -3581,6 +3617,12 @@ async function cmdRuntimeUpgrade(args: Argv): Promise<void> {
     .catch(() => false)
   if (currentReady && currentVersion === latestVersion && !asBoolFlag(args.flags, "force", false)) {
     const persisted = await persistLocalUpgradeArtifacts(weiyuanPath, latestVersion, releaseNotes)
+    const reportResult = await reportAgentRuntimeVersion({
+      apiBaseUrl,
+      identity,
+      skillVersion: latestVersion,
+      targetAccountId,
+    })
     print({
       ok: true,
       action: "runtime_upgrade",
@@ -3590,6 +3632,8 @@ async function cmdRuntimeUpgrade(args: Argv): Promise<void> {
       currentVersion,
       latestVersion,
       apiBaseUrl,
+      targetAccountId,
+      versionReport: reportResult,
       ...upgradeRules,
       ...persisted,
     })
@@ -3609,6 +3653,13 @@ async function cmdRuntimeUpgrade(args: Argv): Promise<void> {
   }
   runProcessOrThrow(process.platform === "win32" ? "npm.cmd" : "npm", ["--prefix", weiyuanPath, "install"], workspacePath, "runtime_upgrade_install_failed")
   const persisted = await persistLocalUpgradeArtifacts(weiyuanPath, latestVersion, releaseNotes)
+  const refreshedIdentity = await readIdentity(filePath)
+  const reportResult = await reportAgentRuntimeVersion({
+    apiBaseUrl,
+    identity: refreshedIdentity,
+    skillVersion: latestVersion,
+    targetAccountId,
+  })
   print({
     ok: true,
     action: "runtime_upgrade",
@@ -3617,6 +3668,8 @@ async function cmdRuntimeUpgrade(args: Argv): Promise<void> {
     currentVersionBefore: currentVersion ?? null,
     latestVersion,
     apiBaseUrl,
+    targetAccountId,
+    versionReport: reportResult,
     ...upgradeRules,
     ...persisted,
   })
@@ -4297,15 +4350,15 @@ async function cmdMemberAddWeb(args: Argv): Promise<void> {
   const projectId = resolveProjectId(args.flags, identity)
   let name = optString(args.flags, "name") ?? optString(args.flags, "displayName") ?? optString(args.flags, "nickname")
   if (!name && canAskInteractively()) {
-    name = await askRequired("请填写网页成员显示名称：")
+    name = await askRequired("请填写普通成员显示名称：")
   }
   const displayName = String(name ?? "").trim()
-  if (!displayName) throw new Error("web_member_name_required")
+  if (!displayName) throw new Error("member_name_required")
   const capabilityToken = await issueCapabilityToken(identity, CAPABILITY_ACTION.MEMBER_ADD, { projectId }, { ttlSec: 120, maxRequests: 2, windowSec: 60 })
   const { status, json } = await signedRequest({
     serverBaseUrl: identity.serverBaseUrl,
     method: "POST",
-    pathWithQuery: `/v1/projects/${projectId}/members/web`,
+    pathWithQuery: `/v1/projects/${projectId}/members/manual`,
     lobsterId: identity.lobsterId,
     secretKeyBase64: identity.secretKeyBase64,
     capabilityToken,
@@ -4323,15 +4376,15 @@ async function cmdMemberAddWeb(args: Argv): Promise<void> {
       lobsterId: member.lobsterId,
       displayName: member.displayName ?? displayName,
       role: member.role ?? "member",
-      memberType: member.memberType ?? "web",
-      isWeb: true,
+      memberType: member.memberType ?? "member",
+      isManualMember: true,
     },
     panelUrl,
     projectPanelLink: panelUrl,
     linkSummary: formatLinkSummary(panelUrl, undefined),
     message: panelUrl
-      ? `网页成员已添加。请直接转发以下看板链接给该成员：\n${panelUrl}`
-      : "网页成员已添加，项目看板将自动同步显示。",
+      ? `普通成员已添加。请直接转发以下看板链接给该成员：\n${panelUrl}`
+      : "普通成员已添加，项目看板将自动同步显示。",
   })
 }
 
@@ -5438,7 +5491,7 @@ function getPanelCliModules(): Array<{ name: string; actions: Array<{ action: st
       name: "成员",
       actions: [
         { action: "查看成员列表", command: "member list --project <projectId>" },
-        { action: "添加网页成员", command: "member add-web --project <projectId> --name <显示名称>" },
+        { action: "添加成员", command: "member add --project <projectId> --name <显示名称>" },
         { action: "移除成员", command: "member remove --project <projectId> --target <lobsterId> --reason <原因>" },
       ],
     },
@@ -6597,6 +6650,10 @@ export async function runCli(argv: string[]): Promise<void> {
   const wantsHelp = Boolean(args.flags.help || args.flags.h || cmd === "help")
   const helpTarget = cmd === "help" ? sub : cmd
   if (wantsHelp && helpTarget && printCommandHelp(helpTarget)) return
+  if (cmd && cmd !== "init" && cmd !== "help") {
+    const identityPath = optString(args.flags, "identity") ?? DEFAULT_IDENTITY_PATH
+    await healIdentityServerBaseUrl(identityPath)
+  }
   if (!wantsHelp && cmd && optString(args.flags, "project")) {
     args = await normalizeProjectFlagForExecution(args)
   }
@@ -6689,7 +6746,7 @@ export async function runCli(argv: string[]): Promise<void> {
     if (cmd === "sync-reopen") return await cmdSyncReopen(args)
     if (cmd === "member") {
       if (sub === "list") return await cmdMemberList(args)
-      if (sub === "add-web" || sub === "add_web" || sub === "add") return await cmdMemberAddWeb(args)
+      if (sub === "add" || sub === "add-member" || sub === "add_member" || sub === "add-web" || sub === "add_web") return await cmdMemberAddWeb(args)
       if (sub === "profile-edit") return await cmdMemberProfileEdit(args)
       if (sub === "profile-global-set") return await cmdMemberProfileGlobalSet(args)
       if (sub === "profile-global-edit") return await cmdMemberProfileGlobalEdit(args)

package/workspace-weiyuan/weiyuan/src/weiyuanFile.ts

@@ -20,7 +20,7 @@ export function normalizeServerBaseUrl(raw: string): string {
     if (host === "api.magon.com.cn") {
       url.protocol = "https:"
       const rawPath = String(url.pathname || "/")
-      if (/^\/(?:api\/)?agent-register(?:\/|$)/.test(rawPath)) {
+      if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(rawPath)) {
         url.pathname = "/api"
       } else {
         if (!url.pathname || url.pathname === "/") url.pathname = "/api"
@@ -29,7 +29,7 @@ export function normalizeServerBaseUrl(raw: string): string {
       url.hash = ""
       return url.toString().replace(/\/$/, "")
     }
-    if (/^\/(?:api\/)?agent-register(?:\/|$)/.test(String(url.pathname || "/"))) {
+    if (/^\/(?:api\/)?agent-(?:register|bind)(?:\/|$)/.test(String(url.pathname || "/"))) {
       url.pathname = "/api"
     }
     url.hash = ""
@@ -55,6 +55,22 @@ export async function readIdentity(filePath: string): Promise<WeiyuanIdentityFil
   return parsed
 }
 
+export async function healIdentityServerBaseUrl(filePath: string): Promise<boolean> {
+  try {
+    const raw = await fs.readFile(filePath, "utf8")
+    const parsed = JSON.parse(raw) as WeiyuanIdentityFileV1
+    if (!parsed || parsed.version !== 1) return false
+    const before = String(parsed.serverBaseUrl || "")
+    const normalized = normalizeServerBaseUrl(before)
+    if (!normalized || normalized === before) return false
+    parsed.serverBaseUrl = normalized
+    await writeIdentity(filePath, parsed)
+    return true
+  } catch {
+    return false
+  }
+}
+
 export async function writeIdentity(filePath: string, data: WeiyuanIdentityFileV1): Promise<void> {
   await fs.mkdir(path.dirname(path.resolve(filePath)), { recursive: true })
   const tmp = `${filePath}.tmp`