agentprofiles-cli 0.4.0 → 0.4.1

package/dist/index.js

@@ -1684,9 +1684,6 @@ tmp/
 .DS_Store
 `;
     GEMINI_GITIGNORE = `# Generated by agentprofiles
-# Shared Gemini state (all runtime/session data)
-_shared/
-
 # Runtime/session state per profile
 */antigravity
 */antigravity-browser-profile
@@ -2109,14 +2106,13 @@ var init_config = __esm({
           );
         }
         const profileDir = path3.join(this.contentDir, agent, profileName);
+        let profileDirExists = false;
         try {
           await fs3.access(profileDir);
+          profileDirExists = true;
           if (options.replaceExisting) {
             await fs3.rm(profileDir, { recursive: true, force: true });
-          } else {
-            throw new Error(
-              `Cannot adopt: profile '${profileName}' already exists for agent '${agent}'`
-            );
+            profileDirExists = false;
           }
         } catch (err) {
           if (err instanceof Error && "code" in err && err.code === "ENOENT") {
@@ -2124,11 +2120,15 @@ var init_config = __esm({
             throw err;
           }
         }
-        await fs3.mkdir(profileDir, { recursive: true });
+        if (!profileDirExists) {
+          await fs3.mkdir(profileDir, { recursive: true });
+        }
         const include = this.getProfileInclude(agent);
         if (!include) {
           throw new Error(`Agent '${agent}' has no .profileinclude \u2014 cannot use include strategy`);
         }
+        const backupBase = `${globalPath}.bak-${Date.now()}`;
+        let backupCreated = false;
         for (const entry of [...include.files, ...include.dirs]) {
           const isDir = include.dirs.includes(entry);
           const globalEntryPath = path3.join(globalPath, entry);
@@ -2143,25 +2143,42 @@ var init_config = __esm({
             continue;
           }
           if (entryStat) {
-            await movePath(globalEntryPath, profileEntryPath);
-          } else if (isDir) {
-            await fs3.mkdir(profileEntryPath, { recursive: true });
-            await fs3.writeFile(path3.join(profileEntryPath, ".gitkeep"), "");
-          } else {
-            continue;
+            const profileEntryExists = await pathExists(profileEntryPath);
+            if (profileDirExists && profileEntryExists) {
+              if (!backupCreated) {
+                await fs3.mkdir(backupBase, { recursive: true });
+                backupCreated = true;
+              }
+              const backupEntryPath = path3.join(backupBase, entry);
+              await fs3.mkdir(path3.dirname(backupEntryPath), { recursive: true });
+              await movePath(globalEntryPath, backupEntryPath);
+            } else {
+              await movePath(globalEntryPath, profileEntryPath);
+            }
+          } else if (!profileDirExists || !await pathExists(profileEntryPath)) {
+            if (isDir) {
+              await fs3.mkdir(profileEntryPath, { recursive: true });
+              await fs3.writeFile(path3.join(profileEntryPath, ".gitkeep"), "");
+            } else {
+              continue;
+            }
           }
+          if (!await pathExists(profileEntryPath)) continue;
           await fs3.mkdir(path3.dirname(globalEntryPath), { recursive: true });
           const relTarget = path3.relative(path3.dirname(globalEntryPath), profileEntryPath);
           await fs3.symlink(relTarget, globalEntryPath);
         }
-        const meta = {
-          name: profileName,
-          slug: profileName,
-          agent,
-          description: "Base profile (adopted from original config)",
-          created_at: (/* @__PURE__ */ new Date()).toISOString()
-        };
-        await fs3.writeFile(path3.join(profileDir, "meta.json"), JSON.stringify(meta, null, 2));
+        const metaPath = path3.join(profileDir, "meta.json");
+        if (!await pathExists(metaPath)) {
+          const meta = {
+            name: profileName,
+            slug: profileName,
+            agent,
+            description: "Base profile (adopted from original config)",
+            created_at: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          await fs3.writeFile(metaPath, JSON.stringify(meta, null, 2));
+        }
         await this.ensureIncludeAgentFiles(agent);
       }
       /**
@@ -2217,14 +2234,16 @@ var init_config = __esm({
             return "broken";
           }
           const absTarget = path3.isAbsolute(target) ? target : path3.resolve(path3.dirname(globalPath), target);
-          const contentDirAbs = path3.resolve(this.contentDir);
-          return absTarget.startsWith(contentDirAbs + path3.sep) ? "active" : "external";
+          const contentDirAbs2 = path3.resolve(this.contentDir);
+          return absTarget.startsWith(contentDirAbs2 + path3.sep) ? "active" : "external";
         }
         const basePath = path3.join(this.contentDir, agent, BASE_PROFILE_SLUG);
         if (!await pathExists(basePath)) {
           return "unmanaged";
         }
         const include = this.getProfileInclude(agent);
+        const contentDirAbs = path3.resolve(this.contentDir);
+        let managedSymlinkCount = 0;
         if (include) {
           for (const entry of [...include.files, ...include.dirs]) {
             const entryPath = path3.join(globalPath, entry);
@@ -2234,15 +2253,21 @@ var init_config = __esm({
             } catch {
               continue;
             }
-            if (entryStat.isSymbolicLink()) {
-              try {
-                await fs3.access(entryPath);
-              } catch {
-                return "broken";
-              }
+            if (!entryStat.isSymbolicLink()) continue;
+            const target = await fs3.readlink(entryPath);
+            const absTarget = path3.isAbsolute(target) ? target : path3.resolve(path3.dirname(entryPath), target);
+            if (!absTarget.startsWith(contentDirAbs + path3.sep)) continue;
+            try {
+              await fs3.access(entryPath);
+            } catch {
+              return "broken";
             }
+            managedSymlinkCount++;
           }
         }
+        if (managedSymlinkCount === 0) {
+          return "unmanaged";
+        }
         return "active";
       }
       /**
@@ -2476,14 +2501,13 @@ var init_config = __esm({
           );
         }
         const profileDir = path3.join(this.contentDir, agent, profileName);
+        let profileDirExists = false;
         try {
           await fs3.access(profileDir);
+          profileDirExists = true;
           if (options.replaceExisting) {
             await fs3.rm(profileDir, { recursive: true, force: true });
-          } else {
-            throw new Error(
-              `Cannot adopt: profile '${profileName}' already exists for agent '${agent}'`
-            );
+            profileDirExists = false;
           }
         } catch (err) {
           if (err instanceof Error && "code" in err && err.code === "ENOENT") {
@@ -2491,26 +2515,32 @@ var init_config = __esm({
             throw err;
           }
         }
-        await moveDirectory(globalPath, profileDir);
-        const meta = {
-          name: profileName,
-          slug: profileName,
-          agent,
-          description: "Base profile (adopted from original config)",
-          created_at: (/* @__PURE__ */ new Date()).toISOString()
-        };
-        await fs3.writeFile(path3.join(profileDir, "meta.json"), JSON.stringify(meta, null, 2));
-        try {
-          await atomicSymlink(profileDir, globalPath);
-        } catch (err) {
+        if (!profileDirExists) {
+          await moveDirectory(globalPath, profileDir);
+          const meta = {
+            name: profileName,
+            slug: profileName,
+            agent,
+            description: "Base profile (adopted from original config)",
+            created_at: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          await fs3.writeFile(path3.join(profileDir, "meta.json"), JSON.stringify(meta, null, 2));
           try {
-            await moveDirectory(profileDir, globalPath);
-          } catch (rollbackErr) {
-            throw new Error(
-              `Failed to create symlink and rollback failed: ${err instanceof Error ? err.message : String(err)}. Rollback error: ${rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr)}`
-            );
+            await atomicSymlink(profileDir, globalPath);
+          } catch (err) {
+            try {
+              await moveDirectory(profileDir, globalPath);
+            } catch (rollbackErr) {
+              throw new Error(
+                `Failed to create symlink and rollback failed: ${err instanceof Error ? err.message : String(err)}. Rollback error: ${rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr)}`
+              );
+            }
+            throw err;
           }
-          throw err;
+        } else {
+          const backupPath = `${globalPath}.bak-${Date.now()}`;
+          await moveDirectory(globalPath, backupPath);
+          await atomicSymlink(profileDir, globalPath);
         }
       }
       /**
@@ -2686,16 +2716,22 @@ var init_config = __esm({
             `Cannot adopt shared dir '${name}': status is '${status}' (expected 'unmanaged')`
           );
         }
+        let contentPathExists = false;
         try {
           await fs3.access(contentPath);
-          throw new Error(`Cannot adopt: shared dir content already exists at ${contentPath}`);
+          contentPathExists = true;
         } catch (err) {
           if (err instanceof Error && "code" in err && err.code === "ENOENT") {
           } else {
             throw err;
           }
         }
-        await moveDirectory(globalPath, contentPath);
+        if (!contentPathExists) {
+          await moveDirectory(globalPath, contentPath);
+        } else {
+          const backupPath = `${globalPath}.bak-${Date.now()}`;
+          await moveDirectory(globalPath, backupPath);
+        }
         await atomicSymlink(contentPath, globalPath);
       }
       /**
@@ -3797,7 +3833,7 @@ async function removeCommand(agent, name) {
     process.exit(1);
   }
   if (resolvedName === SHARED_PROFILE_SLUG) {
-    console.error(import_picocolors11.default.red(`Cannot remove reserved directory (${SHARED_PROFILE_SLUG}).`));
+    console.error(import_picocolors11.default.red(`Cannot remove reserved profile name (${SHARED_PROFILE_SLUG}).`));
     process.exit(1);
   }
   const activeProfile = await config.getActiveProfile(resolvedAgent);