@chrysb/alphaclaw 0.9.7 → 0.9.9

package/lib/server/onboarding/import/import-applier.js

@@ -55,6 +55,12 @@ const cleanupBootstrapArtifacts = (fs, openclawDir) => {
   }
 };
 
+const getDirectoryEntryName = (entry) => {
+  if (typeof entry === "string") return entry;
+  if (entry && typeof entry.name === "string") return entry.name;
+  return "";
+};
+
 const promoteCloneToTarget = ({
   fs,
   tempDir,
@@ -78,10 +84,12 @@ const promoteCloneToTarget = ({
       }
       const existingEntries = fs.readdirSync(targetDir);
       if (existingEntries.length > 0) {
-        return {
-          ok: false,
-          error: "Import target directory already exists and is not empty",
-        };
+        promoteCloneContentsToExistingTarget({ fs, sourceDir, targetDir });
+        if (sourceDir !== tempDir) {
+          fs.rmSync(tempDir, { recursive: true, force: true });
+        }
+        console.log(`[import] Merged ${sourceDir} into ${targetDir}`);
+        return { ok: true };
       }
       fs.rmSync(targetDir, { recursive: true, force: true });
     }
@@ -203,6 +211,19 @@ const movePath = (fs, src, dest) => {
   fs.copyFileSync(src, dest);
   fs.rmSync(src, { force: true });
 };
+const promoteCloneContentsToExistingTarget = ({ fs, sourceDir, targetDir }) => {
+  fs.mkdirSync(targetDir, { recursive: true });
+  const sourceEntries = fs.readdirSync(sourceDir, { withFileTypes: true });
+  for (const entry of sourceEntries) {
+    const entryName = getDirectoryEntryName(entry);
+    if (!entryName) continue;
+    const sourcePath = path.join(sourceDir, entryName);
+    const targetPath = path.join(targetDir, entryName);
+    removeIfExists(fs, targetPath);
+    movePath(fs, sourcePath, targetPath);
+  }
+  fs.rmSync(sourceDir, { recursive: true, force: true });
+};
 const buildTransformShim = (targetImportPath) =>
   [
     `export { default } from ${JSON.stringify(targetImportPath)};`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "publishConfig": {
     "access": "public"
   },
@@ -36,7 +36,7 @@
   "dependencies": {
     "express": "^4.21.0",
     "http-proxy": "^1.18.1",
-    "openclaw": "2026.4.14",
+    "openclaw": "2026.4.15",
     "patch-package": "^8.0.1",
     "ws": "^8.19.0"
   },

package/patches/openclaw+2026.4.15.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/openclaw/dist/server.impl-GQ72oJBa.js b/node_modules/openclaw/dist/server.impl-GQ72oJBa.js
+index 70c273a..04a6d54 100644
+--- a/node_modules/openclaw/dist/server.impl-GQ72oJBa.js
++++ b/node_modules/openclaw/dist/server.impl-GQ72oJBa.js
+@@ -22362,7 +22362,7 @@ function attachGatewayWsMessageHandler(params) {
+ 					close(1008, truncateCloseReason(authMessage));
+ 				};
+ 				const clearUnboundScopes = () => {
+-					if (scopes.length > 0) {
++					if (scopes.length > 0 && !sharedAuthOk) {
+ 						scopes = [];
+ 						connectParams.scopes = scopes;
+ 					}

package/patches/openclaw+2026.4.14.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/openclaw/dist/server.impl-BbJvXoPb.js b/node_modules/openclaw/dist/server.impl-BbJvXoPb.js
-index a5be9f5d..72e3db5b 100644
---- a/node_modules/openclaw/dist/server.impl-BbJvXoPb.js
-+++ b/node_modules/openclaw/dist/server.impl-BbJvXoPb.js
-@@ -22272,7 +22272,7 @@ function attachGatewayWsMessageHandler(params) {
- 					close(1008, truncateCloseReason(authMessage));
- 				};
- 				const clearUnboundScopes = () => {
--					if (scopes.length > 0) {
-+					if (scopes.length > 0 && !sharedAuthOk) {
- 						scopes = [];
- 						connectParams.scopes = scopes;
- 					}