codebyplan 1.13.31 → 1.13.32

package/dist/cli.js

@@ -14,7 +14,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "1.13.31";
+    VERSION = "1.13.32";
     PACKAGE_NAME = "codebyplan";
   }
 });
@@ -1493,6 +1493,23 @@ function mergeBaseSettingsIntoSettings(settings, base) {
     if (base.permissions.skipDangerousModePermissionPrompt !== void 0 && existing.skipDangerousModePermissionPrompt === void 0) {
       existing.skipDangerousModePermissionPrompt = base.permissions.skipDangerousModePermissionPrompt;
     }
+    const baseEntryTier = /* @__PURE__ */ new Map();
+    for (const key of ["deny", "ask", "allow"]) {
+      const baseArr = base.permissions[key];
+      if (!baseArr) continue;
+      for (const entry of baseArr) {
+        baseEntryTier.set(entry, key);
+      }
+    }
+    if (baseEntryTier.size > 0) {
+      for (const key of ["deny", "ask", "allow"]) {
+        const current = existing[key];
+        if (!current) continue;
+        existing[key] = current.filter(
+          (entry) => !baseEntryTier.has(entry) || baseEntryTier.get(entry) === key
+        );
+      }
+    }
     for (const key of ["deny", "ask", "allow"]) {
       const incoming = base.permissions[key];
       if (!incoming || incoming.length === 0) continue;
@@ -1507,6 +1524,11 @@ function mergeBaseSettingsIntoSettings(settings, base) {
       }
       existing[key] = merged;
     }
+    for (const key of ["deny", "ask", "allow"]) {
+      if (existing[key]?.length === 0) {
+        delete existing[key];
+      }
+    }
     if (settings.permissions !== void 0 || Object.keys(existing).length > 0) {
       settings.permissions = existing;
     }
@@ -1550,17 +1572,20 @@ function stripBaseSettingsFromSettings(settings, base) {
     if (base.permissions.skipDangerousModePermissionPrompt !== void 0 && perms.skipDangerousModePermissionPrompt === base.permissions.skipDangerousModePermissionPrompt) {
       delete perms.skipDangerousModePermissionPrompt;
     }
+    const baseOwned = /* @__PURE__ */ new Set();
     for (const key of ["deny", "ask", "allow"]) {
-      const baseList = base.permissions[key];
-      if (!baseList || baseList.length === 0) continue;
-      const current = perms[key];
-      if (!current) continue;
-      const baseSet = new Set(baseList);
-      const filtered = current.filter((x) => !baseSet.has(x));
-      if (filtered.length === 0) {
-        delete perms[key];
-      } else {
-        perms[key] = filtered;
+      for (const entry of base.permissions[key] ?? []) baseOwned.add(entry);
+    }
+    if (baseOwned.size > 0) {
+      for (const key of ["deny", "ask", "allow"]) {
+        const current = perms[key];
+        if (!current) continue;
+        const filtered = current.filter((x) => !baseOwned.has(x));
+        if (filtered.length === 0) {
+          delete perms[key];
+        } else {
+          perms[key] = filtered;
+        }
       }
     }
     if (Object.keys(perms).length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebyplan",
-  "version": "1.13.31",
+  "version": "1.13.32",
   "description": "CLI for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {