@yancyyu/openhermit 1.6.11 → 1.6.12

package/bin/hermit.mjs

@@ -84,7 +84,8 @@ const ccConnectConfigPath =
   process.env.HERMIT_CC_CONNECT_CONFIG ||
   process.env.CC_CONNECT_CONFIG ||
   path.join(hermitHome, 'cc-connect', 'config.toml');
-const bootstrapProjectName = '__openhermit_bootstrap__';
+const bootstrapProjectName = 'default';
+const legacyBootstrapProjectName = '__openhermit_bootstrap__';
 
 // ---------------------------------------------------------------------------
 // Update command
@@ -216,21 +217,37 @@ callback_path = "/openhermit-bootstrap"
 `;
 }
 
-function migrateManagedBootstrapProject(raw) {
-  const projectPattern = /(^|\n)(#.*\n)*\[\[projects\]\]\nname\s*=\s*"__openhermit_bootstrap__"[\s\S]*?(?=\n(#.*\n)*\[\[projects\]\]|\s*$)/m;
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function findProjectBlock(raw, name) {
+  const projectPattern = new RegExp(
+    `\\[\\[projects\\]\\]\\nname\\s*=\\s*"${escapeRegExp(name)}"[\\s\\S]*?(?=\\n\\[\\[projects\\]\\]|\\s*$)`
+  );
   const match = raw.match(projectPattern);
-  if (!match) return raw;
+  return match ? { pattern: projectPattern, match } : null;
+}
 
-  const block = match[0];
-  const isLegacyManagedBootstrap =
-    block.includes('type = "feishu"') &&
-    block.includes('app_id = "placeholder"') &&
-    block.includes('app_secret = "placeholder"');
+function isManagedBootstrapBlock(block) {
+  return (
+    block.includes('disabled_commands = ["*"]') &&
+    (block.includes('app_id = "placeholder"') ||
+      block.includes('channel_token = "openhermit-bootstrap"') ||
+      block.includes('callback_path = "/openhermit-bootstrap"'))
+  );
+}
+
+function migrateManagedBootstrapProject(raw) {
+  const legacyBlock = findProjectBlock(raw, legacyBootstrapProjectName);
+  if (!legacyBlock || !isManagedBootstrapBlock(legacyBlock.match[0])) return raw;
 
-  if (!isLegacyManagedBootstrap) return raw;
+  const withoutLegacy = raw.replace(legacyBlock.pattern, '').replace(/\n{3,}/g, '\n\n').trimEnd();
+  if (findProjectBlock(withoutLegacy, bootstrapProjectName)) {
+    return `${withoutLegacy}\n`;
+  }
 
-  const prefix = match[1] === '\n' ? '\n' : '';
-  return raw.replace(projectPattern, `${prefix}${buildBootstrapProjectToml().trimStart()}`);
+  return `${withoutLegacy}\n${buildBootstrapProjectToml()}`;
 }
 
 function ensureCcConnectConfig() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yancyyu/openhermit",
   "type": "module",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {