@iannuttall/dotagents 0.1.2 → 0.1.3

package/README.md

@@ -30,7 +30,7 @@ Global home affects all projects. Project folder only affects the current direct
 ## What it does
 
 - Keeps `.agents` as the source of truth.
-- Creates symlinks for Claude, Codex, Factory, Cursor, and OpenCode (based on your selection).
+- Creates symlinks for Claude, Codex, Factory, Cursor, OpenCode, and Gemini (based on your selection).
 - Always creates a backup before any overwrite so changes are reversible.
 
 ## Where it links (global scope)
@@ -39,6 +39,10 @@ Global home affects all projects. Project folder only affects the current direct
 
 `.agents/AGENTS.md` → `~/.claude/CLAUDE.md` (fallback when no CLAUDE.md)
 
+`.agents/GEMINI.md` → `~/.gemini/GEMINI.md` (if present)
+
+`.agents/AGENTS.md` → `~/.gemini/GEMINI.md` (fallback when no GEMINI.md)
+
 `.agents/commands` → `~/.claude/commands`
 
 `.agents/commands` → `~/.factory/commands`
@@ -47,6 +51,10 @@ Global home affects all projects. Project folder only affects the current direct
 
 `.agents/commands` → `~/.cursor/commands`
 
+`.agents/commands` → `~/.config/opencode/commands`
+
+`.agents/commands` → `~/.gemini/commands`
+
 `.agents/hooks` → `~/.claude/hooks`
 
 `.agents/hooks` → `~/.factory/hooks`
@@ -57,8 +65,6 @@ Global home affects all projects. Project folder only affects the current direct
 
 `.agents/AGENTS.md` → `~/.config/opencode/AGENTS.md`
 
-`.agents/commands` → `~/.opencode/commands`
-
 `.agents/skills` → `~/.claude/skills`
 
 `.agents/skills` → `~/.factory/skills`
@@ -67,9 +73,11 @@ Global home affects all projects. Project folder only affects the current direct
 
 `.agents/skills` → `~/.cursor/skills`
 
-`.agents/skills` → `~/.opencode/skills`
+`.agents/skills` → `~/.config/opencode/skills`
+
+`.agents/skills` → `~/.gemini/skills`
 
-Project scope links only commands/hooks/skills into the project’s client folders (no AGENTS/CLAUDE rules).
+Project scope links only commands/hooks/skills into the project’s client folders (no AGENTS/CLAUDE/GEMINI rules).
 
 ## Development
 
@@ -100,7 +108,8 @@ bun run build
 - Codex prompts always symlink to `.agents/commands` (canonical source).
 - Skills require a valid `SKILL.md` with `name` + `description` frontmatter.
 - Claude prompt precedence: if `.agents/CLAUDE.md` exists, it links to `.claude/CLAUDE.md`. Otherwise `.agents/AGENTS.md` is used. After adding or removing `.agents/CLAUDE.md`, re-run dotagents and apply/repair links to update the symlink. Factory/Codex always link to `.agents/AGENTS.md`.
-- Project scope creates `.agents` plus client folders for commands/hooks/skills only. Rule files (`AGENTS.md`/`CLAUDE.md`) are left to the repo root so you can manage them explicitly.
+- Gemini context file precedence: if `.agents/GEMINI.md` exists, it links to `.gemini/GEMINI.md`. Otherwise `.agents/AGENTS.md` is used. After adding or removing `.agents/GEMINI.md`, re-run dotagents and apply/repair links to update the symlink.
+- Project scope creates `.agents` plus client folders for commands/hooks/skills only. Rule files (`AGENTS.md`/`CLAUDE.md`/`GEMINI.md`) are left to the repo root so you can manage them explicitly.
 - Backups are stored under `.agents/backup/<timestamp>` and can be restored via “Undo last change.”
 
 ## License

package/dist/cli.js

@@ -3621,7 +3621,7 @@ var require_gray_matter = __commonJS((exports, module) => {
 });
 
 // src/cli.tsx
-import path12 from "path";
+import path13 from "path";
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -4719,7 +4719,7 @@ function me() {
 
 // src/core/plan.ts
 import fs2 from "fs";
-import path4 from "path";
+import path5 from "path";
 
 // src/core/mappings.ts
 import path3 from "path";
@@ -4737,8 +4737,12 @@ function resolveRoots(opts) {
       factoryRoot: path.join(homeDir, ".factory"),
       codexRoot: path.join(homeDir, ".codex"),
       cursorRoot: path.join(homeDir, ".cursor"),
-      opencodeRoot: path.join(homeDir, ".opencode"),
+      opencodeRoot: path.join(homeDir, ".config", "opencode"),
       opencodeConfigRoot: path.join(homeDir, ".config", "opencode"),
+      geminiRoot: path.join(homeDir, ".gemini"),
+      githubRoot: path.join(projectRoot, ".github"),
+      copilotRoot: path.join(homeDir, ".copilot"),
+      ampcodeConfigRoot: path.join(homeDir, ".config", "amp"),
       projectRoot,
       homeDir
     };
@@ -4751,6 +4755,10 @@ function resolveRoots(opts) {
     cursorRoot: path.join(projectRoot, ".cursor"),
     opencodeRoot: path.join(projectRoot, ".opencode"),
     opencodeConfigRoot: path.join(homeDir, ".config", "opencode"),
+    geminiRoot: path.join(projectRoot, ".gemini"),
+    githubRoot: path.join(projectRoot, ".github"),
+    copilotRoot: path.join(homeDir, ".copilot"),
+    ampcodeConfigRoot: path.join(homeDir, ".config", "amp"),
     projectRoot,
     homeDir
   };
@@ -4819,24 +4827,36 @@ async function getMappings(opts) {
   const roots = resolveRoots(opts);
   const canonical = roots.canonicalRoot;
   const claudeOverride = path3.join(canonical, "CLAUDE.md");
+  const geminiOverride = path3.join(canonical, "GEMINI.md");
   const agentsFallback = path3.join(canonical, "AGENTS.md");
-  const agentsSource = await pathExists(claudeOverride) ? claudeOverride : agentsFallback;
-  const clients = new Set(opts.clients ?? ["claude", "factory", "codex", "cursor", "opencode"]);
+  const claudeSource = await pathExists(claudeOverride) ? claudeOverride : agentsFallback;
+  const geminiSource = await pathExists(geminiOverride) ? geminiOverride : agentsFallback;
+  const clients = new Set(opts.clients ?? ["claude", "factory", "codex", "cursor", "opencode", "gemini", "github", "ampcode"]);
+  const opencodeSkillsRoot = opts.scope === "global" ? roots.opencodeConfigRoot : roots.opencodeRoot;
   const mappings = [];
   const includeAgentFiles = opts.scope === "global";
   if (includeAgentFiles && clients.has("claude")) {
     mappings.push({
       name: "claude-md",
-      source: agentsSource,
+      source: claudeSource,
       targets: [path3.join(roots.claudeRoot, "CLAUDE.md")],
       kind: "file"
     });
   }
+  if (includeAgentFiles && clients.has("gemini")) {
+    mappings.push({
+      name: "gemini-md",
+      source: geminiSource,
+      targets: [path3.join(roots.geminiRoot, "GEMINI.md")],
+      kind: "file"
+    });
+  }
   if (includeAgentFiles) {
     const agentTargets = [
       clients.has("factory") ? path3.join(roots.factoryRoot, "AGENTS.md") : null,
       clients.has("codex") ? path3.join(roots.codexRoot, "AGENTS.md") : null,
-      clients.has("opencode") ? path3.join(roots.opencodeConfigRoot, "AGENTS.md") : null
+      clients.has("opencode") ? path3.join(roots.opencodeConfigRoot, "AGENTS.md") : null,
+      clients.has("ampcode") ? path3.join(roots.ampcodeConfigRoot, "AGENTS.md") : null
     ].filter(Boolean);
     if (agentTargets.length > 0) {
       mappings.push({
@@ -4855,7 +4875,8 @@ async function getMappings(opts) {
       clients.has("factory") ? path3.join(roots.factoryRoot, "commands") : null,
       clients.has("codex") ? path3.join(roots.codexRoot, "prompts") : null,
       clients.has("opencode") ? path3.join(roots.opencodeRoot, "commands") : null,
-      clients.has("cursor") ? path3.join(roots.cursorRoot, "commands") : null
+      clients.has("cursor") ? path3.join(roots.cursorRoot, "commands") : null,
+      clients.has("gemini") ? path3.join(roots.geminiRoot, "commands") : null
     ].filter(Boolean),
     kind: "dir"
   }, {
@@ -4873,20 +4894,40 @@ async function getMappings(opts) {
       clients.has("claude") ? path3.join(roots.claudeRoot, "skills") : null,
       clients.has("factory") ? path3.join(roots.factoryRoot, "skills") : null,
       clients.has("codex") ? path3.join(roots.codexRoot, "skills") : null,
-      clients.has("opencode") ? path3.join(roots.opencodeRoot, "skills") : null,
-      clients.has("cursor") ? path3.join(roots.cursorRoot, "skills") : null
+      clients.has("opencode") ? path3.join(opencodeSkillsRoot, "skills") : null,
+      clients.has("cursor") ? path3.join(roots.cursorRoot, "skills") : null,
+      clients.has("gemini") ? path3.join(roots.geminiRoot, "skills") : null,
+      clients.has("github") ? opts.scope === "global" ? path3.join(roots.copilotRoot, "skills") : path3.join(roots.githubRoot, "skills") : null
     ].filter(Boolean),
     kind: "dir"
   });
   return mappings;
 }
 
+// src/core/link-target.ts
+import path4 from "path";
+function getLinkTarget(source, target, kind) {
+  const resolvedSource = path4.resolve(source);
+  if (process.platform === "win32" && kind === "dir") {
+    return { link: resolvedSource, isRelative: false };
+  }
+  const relative = path4.relative(path4.dirname(target), resolvedSource);
+  if (!relative || path4.isAbsolute(relative)) {
+    return { link: resolvedSource, isRelative: false };
+  }
+  const resolvedRelative = path4.resolve(path4.dirname(target), relative);
+  if (resolvedRelative !== resolvedSource) {
+    return { link: resolvedSource, isRelative: false };
+  }
+  return { link: relative, isRelative: true };
+}
+
 // src/core/plan.ts
 async function getLinkTargetAbsolute(targetPath) {
   try {
     const link = await fs2.promises.readlink(targetPath);
-    if (!path4.isAbsolute(link)) {
-      return path4.resolve(path4.dirname(targetPath), link);
+    if (!path5.isAbsolute(link)) {
+      return path5.resolve(path5.dirname(targetPath), link);
     }
     return link;
   } catch {
@@ -4912,13 +4953,18 @@ async function analyzeTarget(source, target, kind, opts) {
     return { type: "link", source, target, kind };
   const stat = await fs2.promises.lstat(target);
   if (stat.isSymbolicLink()) {
+    const rawLink = await fs2.promises.readlink(target);
     const resolved = await getLinkTargetAbsolute(target);
-    if (resolved && path4.resolve(resolved) === path4.resolve(source)) {
+    if (resolved && path5.resolve(resolved) === path5.resolve(source)) {
+      const desired = getLinkTarget(source, target, kind);
+      if (desired.isRelative && path5.isAbsolute(rawLink)) {
+        return { type: "link", source, target, kind, replaceSymlink: true };
+      }
       return { type: "noop", source, target };
     }
     if (resolved && opts?.relinkableSources) {
-      const relinkable = new Set(opts.relinkableSources.map((p) => path4.resolve(p)));
-      if (relinkable.has(path4.resolve(resolved))) {
+      const relinkable = new Set(opts.relinkableSources.map((p) => path5.resolve(p)));
+      if (relinkable.has(path5.resolve(resolved))) {
         return { type: "link", source, target, kind, replaceSymlink: true };
       }
     }
@@ -4933,10 +4979,18 @@ async function buildLinkPlan(opts) {
   const tasks = [];
   for (const mapping of mappings) {
     tasks.push(...await ensureSourceTask(mapping.source, mapping.kind));
-    const relinkableSources = mapping.name === "claude-md" ? [
-      path4.join(path4.dirname(mapping.source), "AGENTS.md"),
-      path4.join(path4.dirname(mapping.source), "CLAUDE.md")
-    ] : undefined;
+    let relinkableSources;
+    if (mapping.name === "claude-md") {
+      relinkableSources = [
+        path5.join(path5.dirname(mapping.source), "AGENTS.md"),
+        path5.join(path5.dirname(mapping.source), "CLAUDE.md")
+      ];
+    } else if (mapping.name === "gemini-md") {
+      relinkableSources = [
+        path5.join(path5.dirname(mapping.source), "AGENTS.md"),
+        path5.join(path5.dirname(mapping.source), "GEMINI.md")
+      ];
+    }
     for (const target of mapping.targets) {
       tasks.push(await analyzeTarget(mapping.source, target, mapping.kind, { relinkableSources }));
     }
@@ -4948,12 +5002,12 @@ async function buildLinkPlan(opts) {
 
 // src/core/status.ts
 import fs3 from "fs";
-import path5 from "path";
+import path6 from "path";
 async function resolveLinkTarget(targetPath) {
   try {
     const link = await fs3.promises.readlink(targetPath);
-    if (!path5.isAbsolute(link))
-      return path5.resolve(path5.dirname(targetPath), link);
+    if (!path6.isAbsolute(link))
+      return path6.resolve(path6.dirname(targetPath), link);
     return link;
   } catch {
     return null;
@@ -4973,7 +5027,7 @@ async function getLinkStatus(opts) {
       const stat = await fs3.promises.lstat(target);
       if (stat.isSymbolicLink()) {
         const resolved = await resolveLinkTarget(target);
-        if (resolved && path5.resolve(resolved) === path5.resolve(mapping.source)) {
+        if (resolved && path6.resolve(resolved) === path6.resolve(mapping.source)) {
           targets.push({ path: target, status: "linked" });
         } else {
           targets.push({ path: target, status: "conflict" });
@@ -4989,11 +5043,11 @@ async function getLinkStatus(opts) {
 
 // src/core/migrate.ts
 import fs6 from "fs";
-import path9 from "path";
+import path10 from "path";
 
 // src/core/skills.ts
 var import_gray_matter = __toESM(require_gray_matter(), 1);
-import path6 from "path";
+import path7 from "path";
 var NAME_RE = /^[a-z0-9-]{1,64}$/;
 async function parseSkillFile(skillFile) {
   const raw = await readText(skillFile);
@@ -5015,13 +5069,13 @@ async function parseSkillFile(skillFile) {
   };
 }
 async function isSkillDir(dir) {
-  return await pathExists(path6.join(dir, "SKILL.md"));
+  return await pathExists(path7.join(dir, "SKILL.md"));
 }
 async function findSkillDirs(root) {
   const direct = await isSkillDir(root);
   if (direct)
     return [root];
-  const skillsDir = path6.join(root, "skills");
+  const skillsDir = path7.join(root, "skills");
   const skillsDirExists = await pathExists(skillsDir);
   if (skillsDirExists) {
     const children2 = await listDirs(skillsDir);
@@ -5044,35 +5098,35 @@ async function findSkillDirs(root) {
 
 // src/core/apply.ts
 import fs5 from "fs";
-import path8 from "path";
+import path9 from "path";
 
 // src/core/backup.ts
 import fs4 from "fs";
-import path7 from "path";
+import path8 from "path";
 var MANIFEST_NAME = "manifest.json";
 function backupPathFor(target, backupRoot) {
-  const root = path7.parse(target).root || path7.sep;
-  const rel = path7.relative(root, target);
-  return path7.join(backupRoot, rel);
+  const root = path8.parse(target).root || path8.sep;
+  const rel = path8.relative(root, target);
+  return path8.join(backupRoot, rel);
 }
 function hasParentPath(target, seen) {
-  const resolved = path7.resolve(target);
+  const resolved = path8.resolve(target);
   for (const parent of seen) {
     if (resolved === parent)
       return true;
-    if (resolved.startsWith(parent + path7.sep))
+    if (resolved.startsWith(parent + path8.sep))
       return true;
   }
   return false;
 }
 async function backupSymlink(target, dest) {
   const link = await fs4.promises.readlink(target);
-  await ensureDir(path7.dirname(dest));
+  await ensureDir(path8.dirname(dest));
   await fs4.promises.symlink(link, dest);
   await fs4.promises.unlink(target);
 }
 async function backupPathImpl(target, dest, kind) {
-  await ensureDir(path7.dirname(dest));
+  await ensureDir(path8.dirname(dest));
   try {
     await fs4.promises.rename(target, dest);
     return;
@@ -5089,11 +5143,11 @@ async function backupPathImpl(target, dest, kind) {
 }
 async function createBackupSession(opts) {
   const timestamp = opts.timestamp || new Date().toISOString().replace(/[:.]/g, "-");
-  const dir = path7.join(opts.canonicalRoot, "backup", timestamp);
+  const dir = path8.join(opts.canonicalRoot, "backup", timestamp);
   await ensureDir(dir);
   return {
     dir,
-    manifestPath: path7.join(dir, MANIFEST_NAME),
+    manifestPath: path8.join(dir, MANIFEST_NAME),
     createdAt: new Date().toISOString(),
     scope: opts.scope,
     operation: opts.operation,
@@ -5104,7 +5158,7 @@ async function createBackupSession(opts) {
 async function backupPath(target, session) {
   if (!await pathExists(target))
     return false;
-  const resolved = path7.resolve(target);
+  const resolved = path8.resolve(target);
   if (hasParentPath(resolved, session._seen))
     return false;
   const stat = await fs4.promises.lstat(target);
@@ -5120,7 +5174,7 @@ async function backupPath(target, session) {
   return true;
 }
 function recordCreatedPath(target, kind, session) {
-  const resolved = path7.resolve(target);
+  const resolved = path8.resolve(target);
   if (hasParentPath(resolved, session._seen))
     return;
   session.entries.push({ originalPath: resolved, kind, action: "create" });
@@ -5137,7 +5191,7 @@ async function finalizeBackup(session) {
   await fs4.promises.writeFile(session.manifestPath, JSON.stringify(manifest, null, 2), "utf8");
 }
 async function loadBackupManifest(dir) {
-  const manifestPath = path7.join(dir, MANIFEST_NAME);
+  const manifestPath = path8.join(dir, MANIFEST_NAME);
   if (!await pathExists(manifestPath))
     return null;
   const raw = await fs4.promises.readFile(manifestPath, "utf8");
@@ -5157,20 +5211,21 @@ async function createSource(task) {
   await ensureFile(task.path, DEFAULT_AGENTS);
 }
 async function createLink(source, target, kind, overwrite, backup) {
+  const linkTarget = getLinkTarget(source, target, kind);
   if (await pathExists(target)) {
     if (!overwrite)
       return { created: false, backedUp: false };
     const backedUp = backup ? await backupPath(target, backup) : false;
     if (await pathExists(target))
       await removePath(target);
-    await ensureDir(path8.dirname(target));
+    await ensureDir(path9.dirname(target));
     const type2 = kind === "dir" ? "junction" : "file";
-    await fs5.promises.symlink(source, target, type2);
+    await fs5.promises.symlink(linkTarget.link, target, type2);
     return { created: true, backedUp };
   }
-  await ensureDir(path8.dirname(target));
+  await ensureDir(path9.dirname(target));
   const type = kind === "dir" ? "junction" : "file";
-  await fs5.promises.symlink(source, target, type);
+  await fs5.promises.symlink(linkTarget.link, target, type);
   return { created: true, backedUp: false };
 }
 async function applyLinkPlan(plan, opts) {
@@ -5240,56 +5295,64 @@ async function isSymlink(p) {
 async function listFiles(dir) {
   try {
     const entries = await fs6.promises.readdir(dir, { withFileTypes: true });
-    return entries.filter((e2) => e2.isFile()).map((e2) => path9.join(dir, e2.name));
+    return entries.filter((e2) => e2.isFile()).map((e2) => path10.join(dir, e2.name));
   } catch {
     return [];
   }
 }
 function conflictLabel(targetPath, canonicalRoot) {
   if (targetPath.startsWith(canonicalRoot)) {
-    const rel = path9.relative(canonicalRoot, targetPath);
-    return rel || path9.basename(targetPath);
+    const rel = path10.relative(canonicalRoot, targetPath);
+    return rel || path10.basename(targetPath);
   }
-  return path9.basename(targetPath);
+  return path10.basename(targetPath);
 }
 async function scanMigration(opts) {
   const roots = resolveRoots(opts);
   const canonicalRoot = roots.canonicalRoot;
   const candidatesByTarget = new Map;
-  const clients = new Set(opts.clients ?? ["claude", "factory", "codex", "cursor", "opencode"]);
+  const clients = new Set(opts.clients ?? ["claude", "factory", "codex", "cursor", "opencode", "gemini", "github", "ampcode"]);
   const includeAgentFiles = opts.scope === "global";
-  const canonicalCommands = path9.join(canonicalRoot, "commands");
-  const canonicalHooks = path9.join(canonicalRoot, "hooks");
-  const canonicalSkills = path9.join(canonicalRoot, "skills");
-  const canonicalAgents = path9.join(canonicalRoot, "AGENTS.md");
-  const canonicalClaude = path9.join(canonicalRoot, "CLAUDE.md");
+  const canonicalCommands = path10.join(canonicalRoot, "commands");
+  const canonicalHooks = path10.join(canonicalRoot, "hooks");
+  const canonicalSkills = path10.join(canonicalRoot, "skills");
+  const canonicalAgents = path10.join(canonicalRoot, "AGENTS.md");
+  const canonicalClaude = path10.join(canonicalRoot, "CLAUDE.md");
+  const opencodeSkillsRoot = opts.scope === "global" ? roots.opencodeConfigRoot : roots.opencodeRoot;
   const sources = {
     commands: [
-      clients.has("claude") ? { label: "Claude commands", dir: path9.join(roots.claudeRoot, "commands") } : null,
-      clients.has("factory") ? { label: "Factory commands", dir: path9.join(roots.factoryRoot, "commands") } : null,
-      clients.has("codex") ? { label: "Codex prompts", dir: path9.join(roots.codexRoot, "prompts") } : null,
-      clients.has("cursor") ? { label: "Cursor commands", dir: path9.join(roots.cursorRoot, "commands") } : null,
-      clients.has("opencode") ? { label: "OpenCode commands", dir: path9.join(roots.opencodeRoot, "commands") } : null
+      clients.has("claude") ? { label: "Claude commands", dir: path10.join(roots.claudeRoot, "commands") } : null,
+      clients.has("factory") ? { label: "Factory commands", dir: path10.join(roots.factoryRoot, "commands") } : null,
+      clients.has("codex") ? { label: "Codex prompts", dir: path10.join(roots.codexRoot, "prompts") } : null,
+      clients.has("cursor") ? { label: "Cursor commands", dir: path10.join(roots.cursorRoot, "commands") } : null,
+      clients.has("opencode") ? { label: "OpenCode commands", dir: path10.join(roots.opencodeRoot, "commands") } : null,
+      clients.has("gemini") ? { label: "Gemini commands", dir: path10.join(roots.geminiRoot, "commands") } : null
     ].filter(Boolean),
     hooks: [
-      clients.has("claude") ? { label: "Claude hooks", dir: path9.join(roots.claudeRoot, "hooks") } : null,
-      clients.has("factory") ? { label: "Factory hooks", dir: path9.join(roots.factoryRoot, "hooks") } : null
+      clients.has("claude") ? { label: "Claude hooks", dir: path10.join(roots.claudeRoot, "hooks") } : null,
+      clients.has("factory") ? { label: "Factory hooks", dir: path10.join(roots.factoryRoot, "hooks") } : null
     ].filter(Boolean),
     skills: [
-      clients.has("claude") ? { label: "Claude skills", dir: path9.join(roots.claudeRoot, "skills") } : null,
-      clients.has("factory") ? { label: "Factory skills", dir: path9.join(roots.factoryRoot, "skills") } : null,
-      clients.has("codex") ? { label: "Codex skills", dir: path9.join(roots.codexRoot, "skills") } : null,
-      clients.has("cursor") ? { label: "Cursor skills", dir: path9.join(roots.cursorRoot, "skills") } : null,
-      clients.has("opencode") ? { label: "OpenCode skills", dir: path9.join(roots.opencodeRoot, "skills") } : null
+      clients.has("claude") ? { label: "Claude skills", dir: path10.join(roots.claudeRoot, "skills") } : null,
+      clients.has("factory") ? { label: "Factory skills", dir: path10.join(roots.factoryRoot, "skills") } : null,
+      clients.has("codex") ? { label: "Codex skills", dir: path10.join(roots.codexRoot, "skills") } : null,
+      clients.has("cursor") ? { label: "Cursor skills", dir: path10.join(roots.cursorRoot, "skills") } : null,
+      clients.has("opencode") ? { label: "OpenCode skills", dir: path10.join(opencodeSkillsRoot, "skills") } : null,
+      clients.has("gemini") ? { label: "Gemini skills", dir: path10.join(roots.geminiRoot, "skills") } : null,
+      clients.has("github") ? opts.scope === "global" ? { label: "GitHub Copilot skills", dir: path10.join(roots.copilotRoot, "skills") } : { label: "GitHub skills", dir: path10.join(roots.githubRoot, "skills") } : null
     ].filter(Boolean),
     agents: includeAgentFiles ? [
-      clients.has("claude") ? { label: "Claude AGENTS.md", file: path9.join(roots.claudeRoot, "AGENTS.md") } : null,
-      clients.has("factory") ? { label: "Factory AGENTS.md", file: path9.join(roots.factoryRoot, "AGENTS.md") } : null,
-      clients.has("codex") ? { label: "Codex AGENTS.md", file: path9.join(roots.codexRoot, "AGENTS.md") } : null,
-      clients.has("opencode") ? { label: "OpenCode AGENTS.md", file: path9.join(roots.opencodeConfigRoot, "AGENTS.md") } : null
+      clients.has("claude") ? { label: "Claude AGENTS.md", file: path10.join(roots.claudeRoot, "AGENTS.md") } : null,
+      clients.has("factory") ? { label: "Factory AGENTS.md", file: path10.join(roots.factoryRoot, "AGENTS.md") } : null,
+      clients.has("codex") ? { label: "Codex AGENTS.md", file: path10.join(roots.codexRoot, "AGENTS.md") } : null,
+      clients.has("opencode") ? { label: "OpenCode AGENTS.md", file: path10.join(roots.opencodeConfigRoot, "AGENTS.md") } : null,
+      clients.has("ampcode") ? { label: "Ampcode AGENTS.md", file: path10.join(roots.ampcodeConfigRoot, "AGENTS.md") } : null
     ].filter(Boolean) : [],
     claude: includeAgentFiles ? [
-      clients.has("claude") ? { label: "Claude CLAUDE.md", file: path9.join(roots.claudeRoot, "CLAUDE.md") } : null
+      clients.has("claude") ? { label: "Claude CLAUDE.md", file: path10.join(roots.claudeRoot, "CLAUDE.md") } : null
+    ].filter(Boolean) : [],
+    gemini: includeAgentFiles ? [
+      clients.has("gemini") ? { label: "Gemini GEMINI.md", file: path10.join(roots.geminiRoot, "GEMINI.md") } : null
     ].filter(Boolean) : []
   };
   const addCandidate = (candidate) => {
@@ -5302,7 +5365,7 @@ async function scanMigration(opts) {
       continue;
     const files = await listFiles(src.dir);
     for (const file of files) {
-      const targetPath = path9.join(canonicalCommands, path9.basename(file));
+      const targetPath = path10.join(canonicalCommands, path10.basename(file));
       addCandidate({ label: src.label, targetPath, kind: "file", action: "copy", sourcePath: file });
     }
   }
@@ -5311,7 +5374,7 @@ async function scanMigration(opts) {
       continue;
     const files = await listFiles(src.dir);
     for (const file of files) {
-      const targetPath = path9.join(canonicalHooks, path9.basename(file));
+      const targetPath = path10.join(canonicalHooks, path10.basename(file));
       addCandidate({ label: src.label, targetPath, kind: "file", action: "copy", sourcePath: file });
     }
   }
@@ -5321,8 +5384,8 @@ async function scanMigration(opts) {
     const skillDirs = await findSkillDirs(src.dir);
     for (const dir of skillDirs) {
       try {
-        const meta = await parseSkillFile(path9.join(dir, "SKILL.md"));
-        const targetPath = path9.join(canonicalSkills, meta.name);
+        const meta = await parseSkillFile(path10.join(dir, "SKILL.md"));
+        const targetPath = path10.join(canonicalSkills, meta.name);
         addCandidate({ label: src.label, targetPath, kind: "dir", action: "copy", sourcePath: dir });
       } catch {}
     }
@@ -5337,6 +5400,12 @@ async function scanMigration(opts) {
       continue;
     addCandidate({ label: src.label, targetPath: canonicalClaude, kind: "file", action: "copy", sourcePath: src.file });
   }
+  const canonicalGemini = path10.join(canonicalRoot, "GEMINI.md");
+  for (const src of sources.gemini) {
+    if (!await pathExists(src.file) || await isSymlink(src.file))
+      continue;
+    addCandidate({ label: src.label, targetPath: canonicalGemini, kind: "file", action: "copy", sourcePath: src.file });
+  }
   const auto = [];
   const conflicts = [];
   for (const [targetPath, list] of candidatesByTarget.entries()) {
@@ -5424,13 +5493,13 @@ async function applyMigration(plan, selections, opts) {
 
 // src/core/undo.ts
 import fs7 from "fs";
-import path10 from "path";
+import path11 from "path";
 async function listBackupDirs(canonicalRoot) {
-  const root = path10.join(canonicalRoot, "backup");
+  const root = path11.join(canonicalRoot, "backup");
   if (!await pathExists(root))
     return [];
   const entries = await fs7.promises.readdir(root, { withFileTypes: true });
-  return entries.filter((e2) => e2.isDirectory()).map((e2) => path10.join(root, e2.name));
+  return entries.filter((e2) => e2.isDirectory()).map((e2) => path11.join(root, e2.name));
 }
 async function findLatestBackup(canonicalRoot) {
   const dirs = await listBackupDirs(canonicalRoot);
@@ -5449,7 +5518,7 @@ async function restoreSymlink(entry) {
   if (!entry.backupPath)
     return;
   const link = await fs7.promises.readlink(entry.backupPath);
-  await ensureDir(path10.dirname(entry.originalPath));
+  await ensureDir(path11.dirname(entry.originalPath));
   await fs7.promises.symlink(link, entry.originalPath);
   await fs7.promises.unlink(entry.backupPath);
 }
@@ -5464,7 +5533,7 @@ async function restorePath(entry) {
     await restoreSymlink(entry);
     return;
   }
-  await ensureDir(path10.dirname(entry.originalPath));
+  await ensureDir(path11.dirname(entry.originalPath));
   try {
     await fs7.promises.rename(entry.backupPath, entry.originalPath);
     return;
@@ -5527,7 +5596,7 @@ async function undoLastChange(opts) {
 
 // src/core/preflight.ts
 import fs8 from "fs";
-import path11 from "path";
+import path12 from "path";
 async function needsLinkBackup(task, forceLinks) {
   if (task.type === "conflict")
     return forceLinks && task.target !== task.source;
@@ -5559,7 +5628,7 @@ async function preflightBackup(opts) {
   const targets = new Set;
   for (const task of opts.linkPlan.tasks) {
     if (await needsLinkBackup(task, opts.forceLinks)) {
-      targets.add(path11.resolve(task.target));
+      targets.add(path12.resolve(task.target));
     }
   }
   const migrationCandidates = collectMigrationCandidates(opts.migratePlan, opts.selections);
@@ -5567,7 +5636,7 @@ async function preflightBackup(opts) {
     if (!candidate.sourcePath)
       continue;
     if (await pathExists(candidate.targetPath)) {
-      targets.add(path11.resolve(candidate.targetPath));
+      targets.add(path12.resolve(candidate.targetPath));
     }
   }
   for (const target of targets) {
@@ -5579,8 +5648,8 @@ async function preflightBackup(opts) {
       await fs8.promises.readlink(target);
     }
     const dest = backupPathFor(target, opts.backup.dir);
-    await ensureDir(path11.dirname(dest));
-    await fs8.promises.access(path11.dirname(dest), fs8.constants.W_OK);
+    await ensureDir(path12.dirname(dest));
+    await fs8.promises.access(path12.dirname(dest), fs8.constants.W_OK);
   }
   return { targets: targets.size };
 }
@@ -5593,25 +5662,29 @@ function exitCancelled() {
 }
 function mergeAgentStatus(items) {
   const claudeEntry = items.find((s) => s.name === "claude-md") || null;
+  const geminiEntry = items.find((s) => s.name === "gemini-md") || null;
   const agentsEntry = items.find((s) => s.name === "agents-md") || null;
-  if (!claudeEntry && !agentsEntry)
+  if (!claudeEntry && !agentsEntry && !geminiEntry)
     return items;
   const merged = {
     name: "agents-md",
-    source: claudeEntry?.source || agentsEntry?.source || "",
+    source: claudeEntry?.source || geminiEntry?.source || agentsEntry?.source || "",
     targets: [
       ...claudeEntry?.targets || [],
+      ...geminiEntry?.targets || [],
       ...agentsEntry?.targets || []
     ]
   };
-  const withoutAgents = items.filter((s) => s.name !== "claude-md" && s.name !== "agents-md");
+  const withoutAgents = items.filter((s) => s.name !== "claude-md" && s.name !== "gemini-md" && s.name !== "agents-md");
   return [merged, ...withoutAgents];
 }
 function displayName(entry) {
   if (entry.name === "agents-md") {
-    const sourceFile = path12.basename(entry.source);
+    const sourceFile = path13.basename(entry.source);
     if (sourceFile === "CLAUDE.md")
       return "AGENTS.md (Claude override)";
+    if (sourceFile === "GEMINI.md")
+      return "AGENTS.md (Gemini override)";
     return "AGENTS.md";
   }
   return entry.name;
@@ -5683,7 +5756,10 @@ async function selectClients() {
     { label: "Factory", value: "factory" },
     { label: "Codex", value: "codex" },
     { label: "Cursor", value: "cursor" },
-    { label: "OpenCode", value: "opencode" }
+    { label: "OpenCode", value: "opencode" },
+    { label: "Gemini", value: "gemini" },
+    { label: "GitHub", value: "github" },
+    { label: "Ampcode", value: "ampcode" }
   ];
   const selected = await ae({
     message: "Select clients to manage",
@@ -5701,7 +5777,10 @@ function formatClients(clients) {
     factory: "Factory",
     codex: "Codex",
     cursor: "Cursor",
-    opencode: "OpenCode"
+    opencode: "OpenCode",
+    gemini: "Gemini",
+    github: "GitHub",
+    ampcode: "Ampcode"
   };
   return clients.map((c) => names[c]).join(", ");
 }
@@ -5732,7 +5811,7 @@ async function runChange(scope, clients) {
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   const migrate = await scanMigration({ scope, clients });
   const link = await buildLinkPlan({ scope, clients });
-  const backupDir = path12.join(roots.canonicalRoot, "backup", timestamp);
+  const backupDir = path13.join(roots.canonicalRoot, "backup", timestamp);
   spin.stop("Scan complete");
   const planSummary = [
     `Migration: ${migrate.auto.length} auto · ${migrate.conflicts.length} conflicts (choose sources)`,
@@ -5818,8 +5897,10 @@ async function run() {
     ].join(`
 `), "Overview");
     const options2 = [];
-    if (changes > 0)
-      options2.push({ label: `Apply ${changes} changes to .agents`, value: "change" });
+    if (changes > 0 || conflicts > 0) {
+      const label = conflicts > 0 && changes === 0 ? `Resolve ${conflicts} ${pluralize(conflicts, "conflict")}` : `Apply ${changes} ${pluralize(changes, "change")}`;
+      options2.push({ label, value: "change" });
+    }
     options2.push({ label: "View status", value: "status" });
     options2.push({ label: "Change clients", value: "clients" });
     options2.push({ label: "Undo last change", value: "undo" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iannuttall/dotagents",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Canonical .agents manager with symlinks for popular AI tools",
   "type": "module",
   "license": "MIT",