openxiangda 1.0.268 → 1.0.270

package/lib/config.js

@@ -9,7 +9,6 @@ const CONFIG_FILE = path.join(CONFIG_DIR, 'profiles.json');
 const GLOBAL_ENV_FILE = path.join(CONFIG_DIR, '.env');
 const PROJECT_DIR = '.openxiangda';
 const PROJECT_STATE_FILE = path.join(PROJECT_DIR, 'state.json');
-const LEGACY_PROJECT_CONFIG_FILE = path.join(PROJECT_DIR, 'profiles.json');
 const PROJECT_STATE_LOCK_TIMEOUT_MS = 15_000;
 const PROJECT_STATE_STALE_LOCK_MS = 30_000;
 const projectStateBaselines = new WeakMap();
@@ -47,74 +46,78 @@ function normalizeConfig(config) {
   };
 }
 
-function mergeConfigs(...configs) {
-  const merged = emptyConfig();
-  for (const config of configs) {
-    if (!config) continue;
-    const normalized = normalizeConfig(config);
-    merged.version = normalized.version || merged.version;
-    if (normalized.currentProfile) {
-      merged.currentProfile = normalized.currentProfile;
-    }
-    for (const [name, profile] of Object.entries(normalized.profiles)) {
-      merged.profiles[name] = mergeProfile(merged.profiles[name], profile);
-    }
-  }
-  return normalizeConfig(merged);
-}
+const configPaths = new WeakMap();
 
-function mergeProfile(previous = {}, next = {}) {
-  const merged = {
-    ...previous,
-    ...next,
-  };
-  const baseUrlChanged =
-    previous.baseUrl && next.baseUrl && previous.baseUrl !== next.baseUrl;
-  for (const key of ['token', 'user', 'tenant']) {
-    if (
-      !baseUrlChanged &&
-      !Object.prototype.hasOwnProperty.call(next, key) &&
-      previous[key] != null
-    ) {
-      merged[key] = previous[key];
-    }
+function workspaceRoot(cwd = process.cwd()) {
+  const start = path.resolve(cwd);
+  if (!fs.existsSync(start)) return start;
+  let directory = start;
+  while (directory !== os.homedir()) {
+    if (['app-workspace.config.ts', 'app-workspace.config.js', 'openxiangda.config.ts', '.openxiangda/profiles.json']
+      .some(file => fs.existsSync(path.join(directory, file)))) return directory;
+    if (fs.existsSync(path.join(directory, '.git'))) return start;
+    const parent = path.dirname(directory);
+    if (parent === directory) break;
+    directory = parent;
   }
-  return merged;
+  return start;
 }
 
-function isConfigEqual(left, right) {
-  return JSON.stringify(normalizeConfig(left)) === JSON.stringify(normalizeConfig(right));
+function getConfigFile(config, cwd = process.cwd()) {
+  return configPaths.get(config) || path.join(workspaceRoot(cwd), PROJECT_DIR, 'profiles.json');
 }
 
-function loadConfig(cwd = process.cwd()) {
-  ensureUserConfigDir();
-  const globalConfig = readJson(CONFIG_FILE, null);
-  const legacyConfig = readJson(path.join(cwd, LEGACY_PROJECT_CONFIG_FILE), null);
-
-  if (legacyConfig?.profiles && Object.keys(legacyConfig.profiles).length > 0) {
-    const migrated = mergeConfigs(legacyConfig, globalConfig);
-    if (!globalConfig || !isConfigEqual(globalConfig, migrated)) {
-      saveConfig(migrated);
+function assertConfigFile(file) {
+  if (file === CONFIG_FILE) throw new Error('请进入项目工作区后登录；不再使用用户主目录的全局登录态');
+  for (const target of [path.dirname(file), file]) {
+    try {
+      const info = fs.lstatSync(target);
+      if (info.isSymbolicLink() || (target === file && (!info.isFile() || info.size > 1024 * 1024))) {
+        throw new Error(`工作区登录态必须是普通文件: ${file}`);
+      }
+    } catch (error) {
+      if (error.code !== 'ENOENT') throw error;
     }
-    return migrated;
   }
+}
 
-  return normalizeConfig(globalConfig);
+function loadConfig(cwd = process.cwd(), options = {}) {
+  const file = options.exact
+    ? path.join(path.resolve(cwd), PROJECT_DIR, 'profiles.json')
+    : getConfigFile(null, cwd);
+  assertConfigFile(file);
+  let config;
+  try {
+    config = JSON.parse(fs.readFileSync(file, 'utf8'));
+    if (!config || typeof config !== 'object' || Array.isArray(config) ||
+        !config.profiles || typeof config.profiles !== 'object' || Array.isArray(config.profiles)) {
+      throw new Error('invalid configuration');
+    }
+  } catch (error) {
+    if (error.code !== 'ENOENT') throw new Error(`工作区登录态无法解析，请在当前工作区重新登录: ${file}`);
+  }
+  const result = normalizeConfig(config);
+  configPaths.set(result, file);
+  return result;
 }
 
 function saveConfig(config) {
-  ensureUserConfigDir();
-  const normalized = normalizeConfig(config);
-  const tempFile = `${CONFIG_FILE}.${process.pid}.tmp`;
-  fs.writeFileSync(tempFile, `${JSON.stringify(normalized, null, 2)}\n`, {
-    mode: 0o600,
-  });
-  fs.renameSync(tempFile, CONFIG_FILE);
+  const file = getConfigFile(config);
+  assertConfigFile(file);
+  const directory = path.dirname(file);
+  fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
+  fs.chmodSync(directory, 0o700);
+  const ignore = path.join(directory, '.gitignore');
+  let current = '';
   try {
-    fs.chmodSync(CONFIG_FILE, 0o600);
-  } catch {
-    // chmod is best-effort on non-POSIX filesystems.
-  }
+    if (!fs.lstatSync(ignore).isFile() || fs.lstatSync(ignore).isSymbolicLink()) throw new Error('登录态忽略文件必须是普通文件');
+    current = fs.readFileSync(ignore, 'utf8');
+  } catch (error) { if (error.code !== 'ENOENT') throw error; }
+  const missing = ['/profiles.json', '/profiles.json.*'].filter(entry => !current.split(/\r?\n/).includes(entry));
+  if (missing.length) fs.writeFileSync(ignore, `${current}${current && !current.endsWith('\n') ? '\n' : ''}${missing.join('\n')}\n`, { mode: 0o600 });
+  atomicWriteJson(file, normalizeConfig(config));
+  fs.chmodSync(file, 0o600);
+  configPaths.set(config, file);
 }
 
 function normalizeBaseUrl(value) {
@@ -441,6 +444,7 @@ module.exports = {
   GLOBAL_ENV_FILE,
   PROJECT_STATE_FILE,
   getProfile,
+  getConfigFile,
   loadGlobalEnv,
   loadConfig,
   loadProjectState,

package/lib/design-gates.js

@@ -540,6 +540,23 @@ const RESOURCE_EXPLAINS = {
       'openxiangda function invoke summarize_customer --body-json \'{"input":{}}\'',
     ],
   },
+  webhook: {
+    dir: 'src/resources/webhooks/*.json',
+    minimalManifest: {
+      code: 'yuquan_access',
+      name: '玉泉门禁开门事件',
+      targetFunctionCode: 'qfyy_access_event',
+      idempotencyQueryParam: 'nonce',
+      maxBodyBytes: 262144,
+      status: 'active',
+    },
+    commands: [
+      'openxiangda resource validate webhook --profile <name>',
+      'openxiangda resource plan webhook --only yuquan_access --profile <name> --json',
+      'openxiangda resource publish webhook --only yuquan_access --change <id> --profile <name>',
+      'openxiangda webhook deliveries yuquan_access --profile <name> --json',
+    ],
+  },
   connector: {
     dir: 'src/resources/connectors/*.json',
     minimalManifest: {
@@ -633,6 +650,7 @@ function getResourceExplain(type) {
     auth: 'auth-config',
     authconfigs: 'auth-config',
     functions: 'function',
+    webhooks: 'webhook',
     connectors: 'connector',
   };
   const key = aliases[rawKey] || rawKey;

package/lib/migration-advice.js

@@ -0,0 +1,19 @@
+// Static guidance: no registry requests, installation or workspace mutations.
+function migrationAdvice() {
+  return {
+    generation: 'v1',
+    message: '建议评估升级到 OpenXiangda 2.0；新应用优先使用 V2，现有应用先核实能力覆盖、迁移成本与验收方案。',
+    launcherInstallCommand: 'npm install -g openxiangda@latest --registry=https://registry.npmjs.org',
+    nodeRequirement: '>=24',
+    assessCommand: 'openxiangda migrate assess --to v2',
+    guide: 'https://github.com/1377385356/openxiangda/blob/master/docs/getting-started.md#upgrade',
+    workspacePolicy: '更新统一入口后旧项目仍使用 V1；不会自动转换应用、数据或流程。',
+  };
+}
+
+function printMigrationAdvice() {
+  const advice = migrationAdvice();
+  process.stderr.write(`\n${advice.message}\nNode.js 24+：${advice.launcherInstallCommand}\n使用新版全局入口在旧项目评估：${advice.assessCommand}\n${advice.workspacePolicy}\nCLI / Skill / MCP 安装升级说明：${advice.guide}\n`);
+}
+
+module.exports = { migrationAdvice, printMigrationAdvice };

package/lib/release-plan.js

@@ -102,6 +102,7 @@ const DIRECT_RESOURCE_TYPE_BY_KEY = Object.freeze({
   menus: 'menu',
   dataViews: 'data-view',
   storageConfigs: 'storage',
+  webhooks: 'webhook',
   authConfigs: 'auth-config',
   routes: 'route',
   publicAccessPolicies: 'public-access',
@@ -116,6 +117,7 @@ const DIRECT_RESOURCE_RELEASE_ORDER = Object.freeze([
   'roles',
   'connectors',
   'storageConfigs',
+  'webhooks',
   'authConfigs',
   'routes',
   'publicAccessPolicies',

package/lib/workspace-init.js

@@ -41,6 +41,7 @@ function initWorkspace(options = {}) {
     throw new Error('workspace init 绑定应用时必须同时提供 --profile 和 --app-type');
   }
 
+  const resolvedProfile = profileName ? getProfile(loadConfig(targetDir, { exact: true }), profileName) : null;
   ensureCanInitialize(targetDir, force, templateDir);
   copyTemplate(templateDir, targetDir, {
     __WORKSPACE_PACKAGE_NAME__: packageName,
@@ -49,8 +50,7 @@ function initWorkspace(options = {}) {
 
   let bound = null;
   if (profileName && appType) {
-    const config = loadConfig();
-    const resolved = getProfile(config, profileName);
+    const resolved = resolvedProfile;
     const state = {
       version: 1,
       profiles: {
@@ -125,11 +125,18 @@ function ensureCanInitialize(targetDir, force, templateDir) {
   const entries = fs
     .readdirSync(targetDir)
     .filter(name => !['.DS_Store'].includes(name));
-  if (entries.length > 0 && !force) {
+  if (entries.length > 0 && !force && !isAuthOnlyWorkspace(targetDir, entries)) {
     throw new Error(`目标目录非空: ${targetDir}。如需写入请传 --force`);
   }
 }
 
+function isAuthOnlyWorkspace(targetDir, entries) {
+  if (entries.length !== 1 || entries[0] !== '.openxiangda') return false;
+  const directory = path.join(targetDir, '.openxiangda');
+  if (!fs.lstatSync(directory).isDirectory() || fs.lstatSync(directory).isSymbolicLink()) return false;
+  return fs.readdirSync(directory).every(name => ['profiles.json', '.gitignore'].includes(name) && fs.lstatSync(path.join(directory, name)).isFile() && !fs.lstatSync(path.join(directory, name)).isSymbolicLink());
+}
+
 function normalizeRuntime(value) {
   return value === 'react-spa' || value === 'spa' ? 'react-spa' : 'legacy';
 }
@@ -154,7 +161,7 @@ function copyTemplate(sourceDir, targetDir, replacements, baseDir = sourceDir) {
 function shouldSkipTemplateEntry(baseDir, sourcePath, entryName) {
   if (TEMPLATE_IGNORE_NAMES.has(entryName)) return true;
   const relativePath = path.relative(baseDir, sourcePath).split(path.sep).join('/');
-  return TEMPLATE_IGNORE_PATHS.has(relativePath);
+  return TEMPLATE_IGNORE_PATHS.has(relativePath) || /^\.openxiangda\/(profiles\.json|session\.json)(\.|$)/.test(relativePath);
 }
 
 function applyReplacements(content, replacements) {

package/openxiangda-skills/SKILL.md

@@ -19,6 +19,10 @@ If the workspace contains `app-workspace.config.ts`, forms/pages/resource manife
 
 For an existing V1 project, proactively check whether V2 covers its required capabilities, whether it is still in testing, and whether migration cost is manageable. When those conditions hold, recommend V2 first and explain the benefit, rebuild scope and verification cost. Use the unified entry's `openxiangda migrate assess --to v2` for source pointers; confirm the project design, data/workflow mapping, acceptance and rollback before implementing migration. Keep unknown conditions explicit and continue current maintenance with the matching engine until migration is authorized.
 
+## Installation and upgrade
+
+For CLI, Skill and MCP setup or upgrades, read the [unified installation guide](https://github.com/1377385356/openxiangda/blob/master/docs/getting-started.md#upgrade). Install the global launcher with Node.js 24+ using `npm install -g openxiangda@latest --registry=https://registry.npmjs.org`. Use that global command for `migrate assess`; a project-local V1 CLI does not implement it. Workspace updates remain on `legacy-v1`. Refresh matching skills after dependency updates and restart a configured V2 MCP client to load its new project version. Never automatically replace a V1 project dependency with V2.
+
 ## 1.x Delivery V2 is the normal 1.x release path
 
 When `app-workspace.config.ts` declares `deliveryVersion: 2`, all later V1 SDD,
@@ -185,6 +189,8 @@ Treat resource declarations as environment mapping and release-observability met
 
 An App Function may declare metadata-only top-level `secretRefs: [{ name, required }]` only with `function_v2` + `trusted_node_v2`; source resolves values with `await ctx.secrets.get(name)` and uses `ctx.utils.http` for controlled public HTTPS. Create/rotate values through hidden TTY or `openxiangda secret ... --value-stdin --change <change> --profile <name>`. Never put values in arguments, files, manifests, state, plans, logs, errors, or chat. Secret bindings require `backend_release_v2` and whole-app `atomic_staged_children_v2`; a missing capability is fail-closed and never uses the legacy source PATCH. For whole-app activation use exact-scope `resource publish <type> --only <code> --stage-only`, then pass the returned verified `stagedResource` to `release app-finalize`; an active Backend Release is never labeled staged.
 
+Inbound third-party callbacks use `src/resources/webhooks/<code>.json` and the public path returned after publish. A Webhook binds one fixed same-app Function; it never stores Secret values or provider signature rules. The Function reads the exact `input.rawBody`, verifies before any data/helper/network call, and protects business writes with `input.idempotencyKey`. Use `openxiangda webhook deliveries|delivery` for receipts and read `references/webhooks.md` through the workflow-automation skill for the full contract.
+
 The lease is app-level promotion ownership, while worktree ownership prevents two Codex tasks from editing through the same source directory. Different worktrees may keep developing and validating; only the clean synchronized main checkout publishes. Use full resource/runtime publish only when the approved bundle intentionally covers the whole dependency closure.
 
 ## Always
@@ -229,3 +235,5 @@ The lease is app-level promotion ownership, while worktree ownership prevents tw
 - `../openxiangda-open-api/SKILL.md`
 
 Load a reference only when the selected subskill explicitly requires it. Workspace `AGENTS.md` remains authoritative for project-specific constraints.
+
+平台登录态只使用当前工作区的 `.openxiangda/profiles.json`，不再读取或合并全局 profiles。升级后请进入每个项目运行 `openxiangda login <platform-url>`。登录文件自动加入 Git 忽略规则，不得提交或打包。