agentscfg 0.1.0-alpha.2 → 0.1.0-alpha.4

package/README.md

@@ -19,7 +19,8 @@ agentscfg init
 # edit .agentscfg/instructions/* and .agentscfg/skills/*
 agentscfg plan
 agentscfg diff
-agentscfg sync
+agentscfg gen
+agentscfg import --from codex
 ```
 
 ## Commands
@@ -29,7 +30,8 @@ init [--force]
 validate
 plan [--to claude,opencode,codex] [--json]
 diff [--to ...]
-sync [--to ...] [--remove] [--adopt] [--force] [--allow-dirty]
+gen [--to ...] [--remove] [--adopt] [--force] [--allow-dirty]
+import --from <tool>
 doctor
 ```
 
@@ -61,12 +63,12 @@ Run `agentscfg <command> --help` for detailed help on each command.
 ## Outputs
 
 - Claude Code: `CLAUDE.md`, `.claude/skills/<skill>/...`
-- OpenCode: `.opencode/agent/default.md`, `.opencode/skill/<skill>/...`
+- OpenCode: `.opencode/skill/<skill>/...` (agent/config files come from `.agentscfg/targets/opencode/**`)
 - Codex CLI: `AGENTS.md`, `.codex/skills/<skill>/...`
 
 ### Target Mappings
 
-All files under `.agentscfg/targets/<tool>/` are synced into the tool's config
+All files under `.agentscfg/targets/<tool>/` are generated into the tool's config
 directory:
 
 - `.agentscfg/targets/claude/**` → `.claude/**`
@@ -82,13 +84,13 @@ MCP config:
 - Generated files include a `agentscfg:generated ... sha256=...` marker.
 - Guided mode (default) will not overwrite unmanaged files unless you pass
   `--adopt` or the file already contains the marker.
-- If a generated file's hash marker does not match, sync refuses to overwrite
+- If a generated file's hash marker does not match, gen refuses to overwrite
   unless `--force` is provided.
-- `sync` refuses to run on a dirty git working tree unless `--allow-dirty` is set.
+- `gen` refuses to run on a dirty git working tree unless `--allow-dirty` is set.
 
 ## Tips
 
-Add generated paths to `.gitignore` and use `agentscfg sync` to regenerate them:
+Add generated paths to `.gitignore` and use `agentscfg gen` to regenerate them:
 
 ```text
 .claude/

package/dist/cli.cjs

@@ -26790,6 +26790,9 @@ var findRepoRoot = (start3) => Effect_exports.gen(function* (_) {
   return yield* _(Effect_exports.fail(new RepoRootNotFound()));
 });
 
+// package.json
+var version = "0.1.0-alpha.4";
+
 // src/cli/commands/init.ts
 var import_node_path4 = __toESM(require("node:path"), 1);
 
@@ -27097,7 +27100,7 @@ var validateCommand = (repoRoot) => Effect_exports.gen(function* (_) {
 });
 
 // src/core/planner/plan.ts
-var import_node_path10 = __toESM(require("node:path"), 1);
+var import_node_path9 = __toESM(require("node:path"), 1);
 
 // src/io/hash.ts
 var import_node_crypto = require("node:crypto");
@@ -27173,29 +27176,6 @@ var compileInstructions = (cfg, instructions, outputs) => Effect_exports.gen(fun
     );
     outputsList.push({ path: outputs.codex, content, sha });
   }
-  if (outputs.opencode) {
-    const body = [
-      "---",
-      "name: default",
-      "purpose: Generated default agent from canonical instructions",
-      "---",
-      "",
-      "# Default Agent (Generated by agentscfg)",
-      "",
-      "## Base",
-      baseNormalized,
-      "",
-      includeProject ? "## Project" : void 0,
-      includeProject ? projectNormalized ?? "" : void 0,
-      "",
-      footer(".opencode/agent/default.md", includeProject, sha)
-    ].filter((line) => line !== void 0).join("\n");
-    const content = applyNewlines(
-      ensureTrailingNewline(normalizeLf(body)),
-      cfg.output.newlines
-    );
-    outputsList.push({ path: outputs.opencode, content, sha });
-  }
   return {
     sha,
     includeProject,
@@ -27214,6 +27194,7 @@ var extractMarkerSha = (content) => {
 var import_node_path6 = __toESM(require("node:path"), 1);
 var claudeInstructionPath = (repoRoot) => import_node_path6.default.join(repoRoot, "CLAUDE.md");
 var claudeSkillsRoot = (repoRoot) => import_node_path6.default.join(repoRoot, ".claude", "skills");
+var mcpConfigPath = (repoRoot) => import_node_path6.default.join(repoRoot, ".mcp.json");
 
 // src/adapters/codex.ts
 var import_node_path7 = __toESM(require("node:path"), 1);
@@ -27226,19 +27207,14 @@ var opencodeInstructionPath = (repoRoot) => import_node_path8.default.join(repoR
 var opencodeSkillsRoot = (repoRoot) => import_node_path8.default.join(repoRoot, ".opencode", "skill");
 var opencodeClaudeCompatSkillsRoot = (repoRoot) => import_node_path8.default.join(repoRoot, ".claude", "skills");
 
-// src/adapters/mcp.ts
-var import_node_path9 = __toESM(require("node:path"), 1);
-var mcpConfigPath = (repoRoot) => import_node_path9.default.join(repoRoot, ".mcp.json");
-
 // src/core/planner/plan.ts
 var expectedOutputPaths = (repoRoot) => /* @__PURE__ */ new Set([
   claudeInstructionPath(repoRoot),
   codexInstructionPath(repoRoot),
-  opencodeInstructionPath(repoRoot),
   mcpConfigPath(repoRoot)
 ]);
 var isExpectedOutput = (repoRoot, targetPath) => expectedOutputPaths(repoRoot).has(targetPath);
-var normalizeRel2 = (repoRoot, targetPath) => import_node_path10.default.relative(repoRoot, targetPath).replace(/\\/g, "/");
+var normalizeRel2 = (repoRoot, targetPath) => import_node_path9.default.relative(repoRoot, targetPath).replace(/\\/g, "/");
 var normalizeLf2 = (input) => input.replace(/\r\n?/g, "\n");
 var applyNewlines2 = (input, mode) => mode === "crlf" ? input.replace(/\n/g, "\r\n") : input;
 var ensureTrailingNewline2 = (input) => input.endsWith("\n") ? input : `${input}
@@ -27250,8 +27226,8 @@ var walkFiles = (dirPath, baseRel = "") => Effect_exports.gen(function* (_) {
   }
   const entries2 = yield* _(readdir(dirPath));
   for (const entry of entries2) {
-    const nextRel = baseRel ? import_node_path10.default.join(baseRel, entry.name) : entry.name;
-    const nextAbs = import_node_path10.default.join(dirPath, entry.name);
+    const nextRel = baseRel ? import_node_path9.default.join(baseRel, entry.name) : entry.name;
+    const nextAbs = import_node_path9.default.join(dirPath, entry.name);
     if (!shouldIncludePath(nextRel)) {
       continue;
     }
@@ -27340,7 +27316,7 @@ var diffDir = (sourceDir, targetDir, remove8) => Effect_exports.gen(function* (_
       ops.push({
         rel,
         from: src.abs,
-        to: import_node_path10.default.join(targetDir, rel),
+        to: import_node_path9.default.join(targetDir, rel),
         mode: src.mode,
         kind: "add"
       });
@@ -27396,8 +27372,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
   const instructionOutputs = yield* _(
     compileInstructions(ws.cfg, ws.instructions, {
       claude: targets.has("claude") ? claudeInstructionPath(ws.repoRoot) : void 0,
-      codex: targets.has("codex") ? codexInstructionPath(ws.repoRoot) : void 0,
-      opencode: targets.has("opencode") ? opencodeInstructionPath(ws.repoRoot) : void 0
+      codex: targets.has("codex") ? codexInstructionPath(ws.repoRoot) : void 0
     })
   );
   const normalizeOutputContent = (input) => applyNewlines2(
@@ -27428,7 +27403,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
     );
     warnings.push(...result.warnings);
     if (result.op) {
-      mkdirs.add(import_node_path10.default.dirname(output.path));
+      mkdirs.add(import_node_path9.default.dirname(output.path));
       ops.push(result.op);
     }
     if (result.adopted) {
@@ -27448,7 +27423,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
     );
     warnings.push(...result.warnings);
     if (result.op) {
-      mkdirs.add(import_node_path10.default.dirname(output.path));
+      mkdirs.add(import_node_path9.default.dirname(output.path));
       ops.push(result.op);
     }
     if (result.adopted) {
@@ -27458,7 +27433,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
   const skillTargets = buildSkillTargets(ws.repoRoot, ws.cfg, targets);
   for (const skill of ws.skills) {
     for (const target of skillTargets) {
-      const destDir = import_node_path10.default.join(target.root, skill.name);
+      const destDir = import_node_path9.default.join(target.root, skill.name);
       const managed = managedData ? isManagedPath(ws.repoRoot, destDir, managedData) : false;
       const destExists = yield* _(exists4(destDir));
       if (destExists && !managed && managedData) {
@@ -27472,7 +27447,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
           `Managed tracking missing for ${normalizeRel2(
             ws.repoRoot,
             destDir
-          )}. Run sync with --adopt to establish ownership.`
+          )}. Run gen with --adopt to establish ownership.`
         );
         continue;
       }
@@ -27491,18 +27466,18 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
   const targetDirMappings = [
     {
       name: "claude",
-      source: import_node_path10.default.join(ws.root, "targets", "claude"),
-      dest: import_node_path10.default.join(ws.repoRoot, ".claude")
+      source: import_node_path9.default.join(ws.root, "targets", "claude"),
+      dest: import_node_path9.default.join(ws.repoRoot, ".claude")
     },
     {
       name: "opencode",
-      source: import_node_path10.default.join(ws.root, "targets", "opencode"),
-      dest: import_node_path10.default.join(ws.repoRoot, ".opencode")
+      source: import_node_path9.default.join(ws.root, "targets", "opencode"),
+      dest: import_node_path9.default.join(ws.repoRoot, ".opencode")
     },
     {
       name: "codex",
-      source: import_node_path10.default.join(ws.root, "targets", "codex"),
-      dest: import_node_path10.default.join(ws.repoRoot, ".codex")
+      source: import_node_path9.default.join(ws.root, "targets", "codex"),
+      dest: import_node_path9.default.join(ws.repoRoot, ".codex")
     }
   ];
   for (const mapping of targetDirMappings) {
@@ -27523,7 +27498,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
         `Managed tracking missing for ${normalizeRel2(
           ws.repoRoot,
           mapping.dest
-        )}. Run sync with --adopt to establish ownership.`
+        )}. Run gen with --adopt to establish ownership.`
       );
       continue;
     }
@@ -27548,7 +27523,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
       for (const dir of dirs) {
         if (skillNames.has(dir.name))
           continue;
-        const removePath = import_node_path10.default.join(target.root, dir.name);
+        const removePath = import_node_path9.default.join(target.root, dir.name);
         if (managedData && isManagedPath(ws.repoRoot, removePath, managedData)) {
           ops.push({ type: "RemovePath", path: removePath });
         } else if (!managedData) {
@@ -27556,7 +27531,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
             `Managed tracking missing for ${normalizeRel2(
               ws.repoRoot,
               removePath
-            )}. Run sync with --adopt to establish ownership.`
+            )}. Run gen with --adopt to establish ownership.`
           );
         } else {
           warnings.push(
@@ -27573,7 +27548,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
   if (!managedData && options.adopt) {
     const base = defaultManaged();
     const updated = adopted.length ? addAdopted(ws.repoRoot, base, adopted, /* @__PURE__ */ new Date()) : base;
-    mkdirs.add(import_node_path10.default.dirname(managedPathValue));
+    mkdirs.add(import_node_path9.default.dirname(managedPathValue));
     ops.push({
       type: "WriteFile",
       path: managedPathValue,
@@ -27583,7 +27558,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
   } else if ((options.adopt || !managedData) && adopted.length > 0) {
     const base = managedData ?? defaultManaged();
     const updated = addAdopted(ws.repoRoot, base, adopted, /* @__PURE__ */ new Date());
-    mkdirs.add(import_node_path10.default.dirname(managedPathValue));
+    mkdirs.add(import_node_path9.default.dirname(managedPathValue));
     ops.push({
       type: "WriteFile",
       path: managedPathValue,
@@ -27592,7 +27567,7 @@ var planWorkspace = (ws, options) => Effect_exports.gen(function* (_) {
     });
   } else if (!managedData) {
     warnings.push(
-      "managed tracking missing; run sync with --adopt to establish ownership"
+      "managed tracking missing; run gen with --adopt to establish ownership"
     );
   }
   const orderedMkdirs = Array.from(mkdirs).filter((dir) => dir && dir !== ".").sort((a, b) => a.localeCompare(b));
@@ -27628,7 +27603,7 @@ var planCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
 });
 
 // src/core/planner/diff.ts
-var import_node_path11 = __toESM(require("node:path"), 1);
+var import_node_path10 = __toESM(require("node:path"), 1);
 
 // node_modules/diff/libesm/diff/base.js
 var Diff = class {
@@ -28075,7 +28050,7 @@ var renderDiff = (repoRoot, plan) => Effect_exports.gen(function* (_) {
     if (op.type === "WriteFile") {
       const existsNow = yield* _(exists4(op.path));
       const before2 = existsNow ? yield* _(readFileString(op.path)) : "";
-      const relPath = import_node_path11.default.relative(repoRoot, op.path).replace(/\\/g, "/");
+      const relPath = import_node_path10.default.relative(repoRoot, op.path).replace(/\\/g, "/");
       const patch9 = createTwoFilesPatch(
         relPath,
         relPath,
@@ -28165,8 +28140,8 @@ var isDirty = (repoRoot) => Effect_exports.tryPromise({
   catch: (err) => new IoError("Failed to check git status", String(err))
 });
 
-// src/cli/commands/sync.ts
-var syncCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
+// src/cli/commands/gen.ts
+var genCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
   const gitRepo = yield* _(isGitRepo(repoRoot));
   if (gitRepo) {
     const dirty = yield* _(isDirty(repoRoot));
@@ -28174,7 +28149,7 @@ var syncCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
       return yield* _(
         Effect_exports.fail(
           new DirtyRepoError(
-            "Refusing to sync: git working tree is dirty. Commit/stash, or pass --allow-dirty."
+            "Refusing to run gen: git working tree is dirty. Commit/stash, or pass --allow-dirty."
           )
         )
       );
@@ -28188,11 +28163,11 @@ var syncCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
 });
 
 // src/cli/commands/doctor.ts
-var import_node_path12 = __toESM(require("node:path"), 1);
+var import_node_path11 = __toESM(require("node:path"), 1);
 var doctorCommand = (repoRoot) => Effect_exports.gen(function* (_) {
-  const root = import_node_path12.default.join(repoRoot, ".agentscfg");
-  const configPath = import_node_path12.default.join(root, "agentscfg.jsonc");
-  const basePath = import_node_path12.default.join(root, "instructions", "BASE.md");
+  const root = import_node_path11.default.join(repoRoot, ".agentscfg");
+  const configPath = import_node_path11.default.join(root, "agentscfg.jsonc");
+  const basePath = import_node_path11.default.join(root, "instructions", "BASE.md");
   const workspacePresent = yield* _(exists4(root));
   const configPresent = yield* _(exists4(configPath));
   const basePresent = yield* _(exists4(basePath));
@@ -28226,11 +28201,10 @@ var doctorCommand = (repoRoot) => Effect_exports.gen(function* (_) {
   }
   const outputPaths = [
     claudeInstructionPath(repoRoot),
-    import_node_path12.default.join(repoRoot, ".claude"),
-    opencodeInstructionPath(repoRoot),
-    import_node_path12.default.join(repoRoot, ".opencode"),
+    import_node_path11.default.join(repoRoot, ".claude"),
+    import_node_path11.default.join(repoRoot, ".opencode"),
     codexInstructionPath(repoRoot),
-    import_node_path12.default.join(repoRoot, ".codex"),
+    import_node_path11.default.join(repoRoot, ".codex"),
     mcpConfigPath(repoRoot),
     claudeSkillsRoot(repoRoot),
     opencodeSkillsRoot(repoRoot),
@@ -28263,15 +28237,15 @@ var doctorCommand = (repoRoot) => Effect_exports.gen(function* (_) {
 });
 
 // src/cli/commands/status.ts
-var import_node_path13 = __toESM(require("node:path"), 1);
+var import_node_path12 = __toESM(require("node:path"), 1);
 var getInstructionPath = (target, repoRoot) => {
   switch (target) {
     case "claude":
       return claudeInstructionPath(repoRoot);
-    case "opencode":
-      return opencodeInstructionPath(repoRoot);
     case "codex":
       return codexInstructionPath(repoRoot);
+    case "opencode":
+      return null;
   }
 };
 var getSkillsRoot = (target, repoRoot) => {
@@ -28316,31 +28290,48 @@ var statusCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
   const pendingWritePaths = new Set(
     plan.ops.filter((op) => op.type === "WriteFile").map((op) => op.path)
   );
-  const pendingCopyPaths = new Set(
-    plan.ops.filter((op) => op.type === "CopyDir").map((op) => op.to)
-  );
+  const joinRelPath = (root, rel) => import_node_path12.default.join(root, ...rel.split("/"));
+  const pendingCopyFilePaths = /* @__PURE__ */ new Set();
+  for (const op of plan.ops) {
+    if (op.type !== "CopyDir")
+      continue;
+    for (const file of op.files) {
+      pendingCopyFilePaths.add(joinRelPath(op.to, file.rel));
+    }
+  }
+  const hasPendingCopyFor = (targetPath) => pendingCopyFilePaths.has(targetPath);
+  const hasPendingCopyUnder = (targetDir) => {
+    for (const p of pendingCopyFilePaths) {
+      if (p === targetDir || p.startsWith(targetDir + import_node_path12.default.sep)) {
+        return true;
+      }
+    }
+    return false;
+  };
   for (const target of targetNames) {
     const enabled2 = ws.cfg.targets[target].enabled;
     const instructionPath = getInstructionPath(target, repoRoot);
     const skillsRootPath = getSkillsRoot(target, repoRoot);
-    const instructionExists = yield* _(exists4(instructionPath));
+    const instructionExists = instructionPath ? yield* _(exists4(instructionPath)) : false;
     const skillsRootExists = yield* _(exists4(skillsRootPath));
     let instructionStatus;
-    if (!enabled2) {
-      instructionStatus = instructionExists ? "synced" : "missing";
-    } else if (!instructionExists) {
-      instructionStatus = "missing";
-    } else if (pendingWritePaths.has(instructionPath)) {
-      instructionStatus = "outdated";
-    } else {
-      instructionStatus = "synced";
+    if (instructionPath) {
+      if (!enabled2) {
+        instructionStatus = instructionExists ? "synced" : "missing";
+      } else if (!instructionExists) {
+        instructionStatus = "missing";
+      } else if (pendingWritePaths.has(instructionPath) || hasPendingCopyFor(instructionPath)) {
+        instructionStatus = "outdated";
+      } else {
+        instructionStatus = "synced";
+      }
     }
     let skillsStatus;
     if (!enabled2) {
       skillsStatus = skillsRootExists ? "synced" : "missing";
     } else if (!skillsRootExists && ws.skills.length > 0) {
       skillsStatus = "missing";
-    } else if (Array.from(pendingCopyPaths).some((p) => p.startsWith(skillsRootPath))) {
+    } else if (hasPendingCopyUnder(skillsRootPath)) {
       skillsStatus = "outdated";
     } else {
       skillsStatus = "synced";
@@ -28348,12 +28339,12 @@ var statusCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
     targets.push({
       name: target,
       enabled: enabled2,
-      instruction: {
-        path: import_node_path13.default.relative(repoRoot, instructionPath),
-        status: instructionStatus
-      },
+      instruction: instructionPath ? {
+        path: import_node_path12.default.relative(repoRoot, instructionPath),
+        status: instructionStatus ?? "missing"
+      } : void 0,
       skillsRoot: {
-        path: import_node_path13.default.relative(repoRoot, skillsRootPath),
+        path: import_node_path12.default.relative(repoRoot, skillsRootPath),
         status: skillsStatus
       }
     });
@@ -28373,19 +28364,19 @@ var statusCommand = (repoRoot, options) => Effect_exports.gen(function* (_) {
 });
 
 // src/cli/commands/clean.ts
-var import_node_path14 = __toESM(require("node:path"), 1);
+var import_node_path13 = __toESM(require("node:path"), 1);
 var normalizeRel3 = (relPath) => relPath.replace(/\\/g, "/");
 var expandManagedPaths = (repoRoot, managedData) => Effect_exports.gen(function* (_) {
   const paths = [];
   for (const entry of managedData.managed) {
     if (entry.endsWith("/**")) {
       const prefix = entry.slice(0, -3);
-      const dirPath = import_node_path14.default.join(repoRoot, prefix);
+      const dirPath = import_node_path13.default.join(repoRoot, prefix);
       if (yield* _(exists4(dirPath))) {
         paths.push(dirPath);
       }
     } else {
-      const filePath = import_node_path14.default.join(repoRoot, entry);
+      const filePath = import_node_path13.default.join(repoRoot, entry);
       if (yield* _(exists4(filePath))) {
         paths.push(filePath);
       }
@@ -28394,7 +28385,7 @@ var expandManagedPaths = (repoRoot, managedData) => Effect_exports.gen(function*
   return paths;
 });
 var cleanCommand = (repoRoot, dryRun) => Effect_exports.gen(function* (_) {
-  const workspaceRoot = import_node_path14.default.join(repoRoot, ".agentscfg");
+  const workspaceRoot = import_node_path13.default.join(repoRoot, ".agentscfg");
   if (!(yield* _(exists4(workspaceRoot)))) {
     return yield* _(
       Effect_exports.fail(
@@ -28407,7 +28398,7 @@ var cleanCommand = (repoRoot, dryRun) => Effect_exports.gen(function* (_) {
   const removed = [];
   const skipped = [];
   for (const targetPath of pathsToRemove) {
-    const rel = normalizeRel3(import_node_path14.default.relative(repoRoot, targetPath));
+    const rel = normalizeRel3(import_node_path13.default.relative(repoRoot, targetPath));
     if (dryRun) {
       removed.push(rel);
     } else {
@@ -28426,6 +28417,209 @@ var cleanCommand = (repoRoot, dryRun) => Effect_exports.gen(function* (_) {
   };
 });
 
+// src/cli/commands/import.ts
+var import_node_path14 = __toESM(require("node:path"), 1);
+var normalizeLf3 = (input) => input.replace(/\r\n?/g, "\n");
+var ensureTrailingNewline3 = (input) => input.endsWith("\n") ? input : `${input}
+`;
+var stripGeneratedFooter = (lines) => {
+  let end3 = lines.length;
+  while (end3 > 0 && lines[end3 - 1]?.trim() === "") {
+    end3 -= 1;
+  }
+  if (end3 > 0 && /agentscfg:generated/i.test(lines[end3 - 1] ?? "")) {
+    end3 -= 1;
+  }
+  while (end3 > 0 && lines[end3 - 1]?.trim() === "") {
+    end3 -= 1;
+  }
+  return lines.slice(0, end3);
+};
+var normalizeSection = (lines) => {
+  const trimmed2 = stripGeneratedFooter(lines);
+  if (trimmed2[0] === "") {
+    trimmed2.shift();
+  }
+  return trimmed2.join("\n");
+};
+var extractInstructions = (content) => {
+  const normalized = normalizeLf3(content);
+  const lines = normalized.split("\n");
+  const baseIndex = lines.findIndex((line) => line.trim() === "## Base");
+  if (baseIndex === -1) {
+    const base2 = ensureTrailingNewline3(
+      stripGeneratedFooter(lines).join("\n")
+    );
+    return { base: base2, project: void 0, parsed: false };
+  }
+  const projectIndex = lines.findIndex(
+    (line, idx) => idx > baseIndex && line.trim() === "## Project"
+  );
+  const baseLines = projectIndex === -1 ? lines.slice(baseIndex + 1) : lines.slice(baseIndex + 1, projectIndex);
+  const base = ensureTrailingNewline3(normalizeSection(baseLines));
+  if (projectIndex === -1) {
+    return { base, project: void 0, parsed: true };
+  }
+  const projectLines = lines.slice(projectIndex + 1);
+  const project = ensureTrailingNewline3(normalizeSection(projectLines));
+  return { base, project, parsed: true };
+};
+var walkFiles2 = (dirPath, baseRel = "", exclude3) => Effect_exports.gen(function* (_) {
+  const results = [];
+  if (!(yield* _(exists4(dirPath)))) {
+    return results;
+  }
+  const entries2 = yield* _(readdir(dirPath));
+  for (const entry of entries2) {
+    const nextRel = baseRel ? import_node_path14.default.join(baseRel, entry.name) : entry.name;
+    const nextRelNormalized = nextRel.replace(/\\/g, "/");
+    if (!shouldIncludePath(nextRelNormalized)) {
+      continue;
+    }
+    if (exclude3 && exclude3(nextRelNormalized)) {
+      continue;
+    }
+    const nextAbs = import_node_path14.default.join(dirPath, entry.name);
+    if (entry.isDirectory()) {
+      const nested3 = yield* _(walkFiles2(nextAbs, nextRel, exclude3));
+      results.push(...nested3);
+    } else if (entry.isFile()) {
+      const st = yield* _(stat(nextAbs));
+      results.push({
+        rel: nextRelNormalized,
+        abs: nextAbs,
+        mode: st.mode
+      });
+    }
+  }
+  return results.sort((a, b) => a.rel.localeCompare(b.rel));
+});
+var copyDir = (sourceRoot, destRoot, exclude3) => Effect_exports.gen(function* (_) {
+  const files = yield* _(walkFiles2(sourceRoot, "", exclude3));
+  for (const file of files) {
+    const destPath = import_node_path14.default.join(destRoot, file.rel);
+    yield* _(copyFile(file.abs, destPath, file.mode));
+  }
+  return files.length;
+});
+var ensureWorkspace = (repoRoot) => Effect_exports.gen(function* (_) {
+  const root = import_node_path14.default.join(repoRoot, ".agentscfg");
+  if (!(yield* _(exists4(root)))) {
+    return yield* _(Effect_exports.fail(new WorkspaceMissing()));
+  }
+  const configPath = import_node_path14.default.join(root, "agentscfg.jsonc");
+  if (!(yield* _(exists4(configPath)))) {
+    return yield* _(Effect_exports.fail(new InvalidConfig("Missing agentscfg.jsonc")));
+  }
+  return {
+    root,
+    instructionsRoot: import_node_path14.default.join(root, "instructions"),
+    basePath: import_node_path14.default.join(root, "instructions", "BASE.md"),
+    projectPath: import_node_path14.default.join(root, "instructions", "PROJECT.md"),
+    skillsRoot: import_node_path14.default.join(root, "skills"),
+    targetsRoot: import_node_path14.default.join(root, "targets"),
+    mcpRoot: import_node_path14.default.join(root, "mcp"),
+    mcpPath: import_node_path14.default.join(root, "mcp", "mcp.json")
+  };
+});
+var resolveSource = (repoRoot, from) => {
+  switch (from) {
+    case "claude":
+      return {
+        instructionPath: claudeInstructionPath(repoRoot),
+        skillsRoot: claudeSkillsRoot(repoRoot),
+        targetsRoot: import_node_path14.default.join(repoRoot, ".claude")
+      };
+    case "opencode":
+      return {
+        instructionPath: opencodeInstructionPath(repoRoot),
+        skillsRoot: opencodeSkillsRoot(repoRoot),
+        targetsRoot: import_node_path14.default.join(repoRoot, ".opencode")
+      };
+    case "codex":
+      return {
+        instructionPath: codexInstructionPath(repoRoot),
+        skillsRoot: codexSkillsRoot(repoRoot),
+        targetsRoot: import_node_path14.default.join(repoRoot, ".codex")
+      };
+  }
+};
+var buildTargetExcludes = (from) => {
+  if (from === "opencode") {
+    return (rel) => rel === "skill" || rel.startsWith("skill/");
+  }
+  if (from === "claude" || from === "codex") {
+    return (rel) => rel === "skills" || rel.startsWith("skills/");
+  }
+  return void 0;
+};
+var importCommand = (repoRoot, from) => Effect_exports.gen(function* (_) {
+  if (typeof from !== "string") {
+    return yield* _(
+      Effect_exports.fail(new InvalidConfig("Missing --from (claude|opencode|codex)"))
+    );
+  }
+  const source = from.trim().toLowerCase();
+  if (source !== "claude" && source !== "opencode" && source !== "codex") {
+    return yield* _(
+      Effect_exports.fail(new InvalidConfig("Invalid --from (claude|opencode|codex)"))
+    );
+  }
+  const ws = yield* _(ensureWorkspace(repoRoot));
+  const tool = source;
+  const mapping = resolveSource(repoRoot, tool);
+  const warnings = [];
+  if (!(yield* _(exists4(mapping.instructionPath)))) {
+    return yield* _(
+      Effect_exports.fail(new IoError(`Missing source instructions at ${mapping.instructionPath}`))
+    );
+  }
+  const instructionContent = yield* _(readFileString(mapping.instructionPath));
+  const parsed = extractInstructions(instructionContent);
+  yield* _(writeFileAtomic(ws.basePath, parsed.base));
+  let projectWritten = false;
+  let projectRemoved = false;
+  if (parsed.project !== void 0) {
+    yield* _(writeFileAtomic(ws.projectPath, parsed.project));
+    projectWritten = true;
+  } else if (yield* _(exists4(ws.projectPath))) {
+    yield* _(rm(ws.projectPath));
+    projectRemoved = true;
+  }
+  let skillsCount = 0;
+  if (yield* _(exists4(mapping.skillsRoot))) {
+    skillsCount = yield* _(copyDir(mapping.skillsRoot, ws.skillsRoot));
+  } else {
+    warnings.push(`No skills found at ${mapping.skillsRoot}`);
+  }
+  let targetsCount = 0;
+  if (yield* _(exists4(mapping.targetsRoot))) {
+    const destRoot = import_node_path14.default.join(ws.targetsRoot, tool);
+    targetsCount = yield* _(
+      copyDir(mapping.targetsRoot, destRoot, buildTargetExcludes(tool))
+    );
+  } else {
+    warnings.push(`No target config found at ${mapping.targetsRoot}`);
+  }
+  let mcpCopied = false;
+  const mcpSource = mcpConfigPath(repoRoot);
+  if (yield* _(exists4(mcpSource))) {
+    yield* _(copyFile(mcpSource, ws.mcpPath));
+    mcpCopied = true;
+  }
+  if (!parsed.parsed) {
+    warnings.push("Instructions did not match generated format; imported as BASE.md");
+  }
+  return {
+    from: tool,
+    instructions: { base: true, project: projectWritten, removedProject: projectRemoved },
+    skills: { files: skillsCount },
+    targets: { files: targetsCount },
+    mcp: { copied: mcpCopied },
+    warnings
+  };
+});
+
 // src/cli/render.ts
 var import_node_path15 = __toESM(require("node:path"), 1);
 
@@ -28487,7 +28681,7 @@ var renderPlanSummary = (plan) => {
 };
 var renderWarnings = (warnings) => warnings.length > 0 ? `${yellow("Warnings:")}
 ${warnings.map((w) => yellow(`  - ${w}`)).join("\n")}` : "";
-var renderSyncSummary = (plan) => {
+var renderGenSummary = (plan) => {
   const lines = [];
   const writeOps = plan.ops.filter((op) => op.type === "WriteFile");
   const copyOps = plan.ops.filter((op) => op.type === "CopyDir");
@@ -28559,8 +28753,10 @@ var renderStatusReport = (report) => {
   for (const target of report.targets) {
     const enabledLabel = target.enabled ? "" : dim(" (disabled)");
     lines.push(bold(`${target.name}${enabledLabel}`));
-    const instIcon = statusIcon(target.instruction.status);
-    lines.push(`  ${instIcon} ${target.instruction.path}`);
+    if (target.instruction) {
+      const instIcon = statusIcon(target.instruction.status);
+      lines.push(`  ${instIcon} ${target.instruction.path}`);
+    }
     const skillsIcon = statusIcon(target.skillsRoot.status);
     lines.push(`  ${skillsIcon} ${target.skillsRoot.path}/`);
   }
@@ -28621,8 +28817,31 @@ var renderDoctorReport = (report) => {
   }
   return lines.join("\n");
 };
+var renderImportSummary = (result) => {
+  const lines = [];
+  lines.push(green(`\u2713 Imported from ${result.from}`));
+  const instructionParts = ["BASE.md"];
+  if (result.instructions.project)
+    instructionParts.push("PROJECT.md");
+  lines.push(cyan(`  \u25CB instructions: ${instructionParts.join(", ")}`));
+  lines.push(
+    cyan(
+      `  \u25CB skills: ${result.skills.files} file${result.skills.files === 1 ? "" : "s"}`
+    )
+  );
+  lines.push(
+    cyan(
+      `  \u25CB targets: ${result.targets.files} file${result.targets.files === 1 ? "" : "s"}`
+    )
+  );
+  lines.push(
+    cyan(`  \u25CB mcp: ${result.mcp.copied ? "copied" : "not found"}`)
+  );
+  return lines.join("\n");
+};
 
 // src/cli/args.ts
+var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set(["--to", "--from"]);
 var parseArgs = (argv) => {
   const args2 = [...argv];
   const command = args2.shift() ?? "help";
@@ -28638,7 +28857,7 @@ var parseArgs = (argv) => {
       if (value3 !== void 0) {
         flags[flag] = value3;
       } else if (args2[0] && !args2[0].startsWith("--")) {
-        if (flag === "--to") {
+        if (FLAGS_WITH_VALUES.has(flag)) {
           flags[flag] = args2.shift();
         } else {
           flags[flag] = true;
@@ -28682,12 +28901,14 @@ Usage: agentscfg <command> [options]
 Commands:
   init        Initialize a new .agentscfg workspace
   validate    Validate workspace structure
-  status      Show sync status at a glance
-  plan        Show what sync would do without making changes
+  status      Show generation status at a glance
+  plan        Show what gen would do without making changes
   diff        Show file diffs for planned changes
-  sync        Apply planned changes to target files
+  gen         Apply planned changes to target files
+  import      Import config from an existing agent setup
   clean       Remove all generated files
   doctor      Diagnose workspace health
+  version     Show CLI version
 
 Run 'agentscfg <command> --help' for command-specific help.`;
 var INIT_HELP = `agentscfg init - Initialize a new .agentscfg workspace
@@ -28719,7 +28940,7 @@ Checks that:
 
 Example:
   agentscfg validate`;
-var PLAN_HELP = `agentscfg plan - Show what sync would do without making changes
+var PLAN_HELP = `agentscfg plan - Show what gen would do without making changes
 
 Usage: agentscfg plan [options]
 
@@ -28747,9 +28968,9 @@ Shows unified diffs for all files that would change.
 Examples:
   agentscfg diff
   agentscfg diff --to codex`;
-var SYNC_HELP = `agentscfg sync - Apply planned changes to target files
+var GEN_HELP = `agentscfg gen - Apply planned changes to target files
 
-Usage: agentscfg sync [options]
+Usage: agentscfg gen [options]
 
 Options:
   --to <targets>     Comma-separated targets: claude,opencode,codex
@@ -28757,19 +28978,19 @@ Options:
   --remove           Remove orphaned managed files
   --adopt            Adopt unmanaged files that match expected content
   --force            Overwrite unmanaged files (use with caution)
-  --allow-dirty      Allow sync even with uncommitted git changes
+  --allow-dirty      Allow gen even with uncommitted git changes
 
 Safety:
-  By default, sync refuses to run if git has uncommitted changes.
+  By default, gen refuses to run if git has uncommitted changes.
   Use --allow-dirty to override (not recommended).
 
   Files not generated by agentscfg are protected. Use --adopt to
   take ownership of matching files, or --force to overwrite.
 
 Examples:
-  agentscfg sync
-  agentscfg sync --to claude --allow-dirty
-  agentscfg sync --remove --adopt`;
+  agentscfg gen
+  agentscfg gen --to claude --allow-dirty
+  agentscfg gen --remove --adopt`;
 var DOCTOR_HELP = `agentscfg doctor - Diagnose workspace health
 
 Usage: agentscfg doctor
@@ -28782,7 +29003,20 @@ Checks for:
 
 Example:
   agentscfg doctor`;
-var STATUS_HELP = `agentscfg status - Show sync status at a glance
+var IMPORT_HELP = `agentscfg import - Import config from an existing agent setup
+
+Usage: agentscfg import --from <tool>
+
+Options:
+  --from <tool>  Source tool: claude, opencode, codex
+
+Imports instructions, skills, targets, and MCP config into .agentscfg/.
+Requires an existing .agentscfg/ workspace (run agentscfg init).
+
+Examples:
+  agentscfg import --from codex
+  agentscfg import --from claude`;
+var STATUS_HELP = `agentscfg status - Show generation status at a glance
 
 Usage: agentscfg status [options]
 
@@ -28815,15 +29049,25 @@ Removes all files managed by agentscfg:
 Examples:
   agentscfg clean --dry-run
   agentscfg clean`;
+var VERSION_HELP = `agentscfg version - Show CLI version
+
+Usage: agentscfg version
+
+Displays the current version of the agentscfg CLI.
+
+Example:
+  agentscfg version`;
 var COMMAND_HELP = {
   init: INIT_HELP,
   validate: VALIDATE_HELP,
   status: STATUS_HELP,
   plan: PLAN_HELP,
   diff: DIFF_HELP,
-  sync: SYNC_HELP,
+  gen: GEN_HELP,
+  import: IMPORT_HELP,
   clean: CLEAN_HELP,
-  doctor: DOCTOR_HELP
+  doctor: DOCTOR_HELP,
+  version: VERSION_HELP
 };
 var getHelp = (command) => {
   if (command && command in COMMAND_HELP) {
@@ -28877,6 +29121,10 @@ var run = async () => {
     info(getHelp(command));
     return;
   }
+  if (command === "version") {
+    info(`agentscfg v${version}`);
+    return;
+  }
   try {
     repoRoot = await findRepoRoot(cwd).pipe(Effect_exports.runPromise);
   } catch (err) {
@@ -28926,11 +29174,11 @@ var run = async () => {
       console.log(diff8 || "(no changes)");
       return;
     }
-    case "sync": {
-      const plan = await syncCommand(repoRoot, buildOptions(flags)).pipe(
+    case "gen": {
+      const plan = await genCommand(repoRoot, buildOptions(flags)).pipe(
         Effect_exports.runPromise
       );
-      info(renderSyncSummary(plan));
+      info(renderGenSummary(plan));
       const warnings = renderWarnings(plan.warnings);
       if (warnings)
         info(warnings);
@@ -28956,6 +29204,16 @@ var run = async () => {
       info(renderDoctorReport(report));
       return;
     }
+    case "import": {
+      const result = await importCommand(repoRoot, flags["--from"]).pipe(
+        Effect_exports.runPromise
+      );
+      info(renderImportSummary(result));
+      const warnings = renderWarnings(result.warnings);
+      if (warnings)
+        info(warnings);
+      return;
+    }
     case "help":
     default: {
       info(getHelp(flags["--help"] ? void 0 : void 0));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentscfg",
-  "version": "0.1.0-alpha.2",
+  "version": "0.1.0-alpha.4",
   "type": "module",
   "main": "./dist/cli.cjs",
   "bin": {