lshed 0.4.0 → 0.7.0

package/dist/cli.js

@@ -3,8 +3,8 @@
 // src/cli.ts
 import { Command } from "commander";
 import { createRequire } from "module";
-import os2 from "os";
-import path17 from "path";
+import os4 from "os";
+import path19 from "path";
 
 // src/adapters/claude-code.ts
 import { promises as fs4 } from "fs";
@@ -166,14 +166,62 @@ var pluginInstaller = {
   }
 };
 
-// src/adapters/claude-mcp.ts
-import { promises as fs3 } from "fs";
-import path3 from "path";
+// src/adapters/json-entries.ts
+import { promises as fs2 } from "fs";
+import path2 from "path";
+var JsonEntries = class {
+  constructor(spec) {
+    this.spec = spec;
+    this.name = spec.name;
+    this.secretKeys = spec.secretKeys;
+    this.secretRootIds = spec.secretRootIds;
+    this.expandsEnv = spec.expandsEnv;
+  }
+  spec;
+  kind = "entry";
+  name;
+  secretKeys;
+  secretRootIds;
+  expandsEnv;
+  file() {
+    return this.spec.file();
+  }
+  async load() {
+    const p = await this.file();
+    try {
+      return JSON.parse(await fs2.readFile(p, "utf8"));
+    } catch (e) {
+      if (e.code === "ENOENT") return {};
+      throw new Error(`${p} \uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: ${e.message}`);
+    }
+  }
+  section(all) {
+    const s = this.spec.under ? all[this.spec.under] : all;
+    return s && typeof s === "object" && !Array.isArray(s) ? s : {};
+  }
+  async read() {
+    const out = { ...this.section(await this.load()) };
+    for (const k of this.spec.skip ?? []) delete out[k];
+    return out;
+  }
+  async write(id, value) {
+    const p = await this.file();
+    const all = await this.load();
+    const sect = { ...this.section(all) };
+    if (value === null) delete sect[id];
+    else sect[id] = value;
+    const next = this.spec.under ? { ...all, [this.spec.under]: sect } : sect;
+    await fs2.mkdir(path2.dirname(p), { recursive: true });
+    const tmp = `${p}.lshed-${process.pid}.tmp`;
+    await fs2.writeFile(tmp, JSON.stringify(next, null, 2) + "\n");
+    await fs2.rename(tmp, p);
+  }
+};
 
 // src/fsutil.ts
-import { promises as fs2 } from "fs";
+import { promises as fs3 } from "fs";
 import { createHash } from "crypto";
-import path2 from "path";
+import path3 from "path";
 
 // src/ignore.ts
 var DEFAULT_IGNORE = [
@@ -198,7 +246,7 @@ function isIgnored(rel, patterns) {
 // src/fsutil.ts
 async function exists(p) {
   try {
-    await fs2.access(p);
+    await fs3.access(p);
     return true;
   } catch {
     return false;
@@ -206,7 +254,7 @@ async function exists(p) {
 }
 async function isDir(p) {
   try {
-    return (await fs2.stat(p)).isDirectory();
+    return (await fs3.stat(p)).isDirectory();
   } catch {
     return false;
   }
@@ -216,14 +264,14 @@ async function listFiles(root, ignore = DEFAULT_IGNORE) {
   if (!await isDir(root)) return [""];
   const out = [];
   async function walk2(dir, rel) {
-    const entries = await fs2.readdir(dir, { withFileTypes: true });
+    const entries = await fs3.readdir(dir, { withFileTypes: true });
     for (const e of entries) {
       const r = rel ? `${rel}/${e.name}` : e.name;
       if (isIgnored(r, ignore)) continue;
-      const full = path2.join(dir, e.name);
+      const full = path3.join(dir, e.name);
       let st;
       try {
-        st = await fs2.stat(full);
+        st = await fs3.stat(full);
       } catch {
         continue;
       }
@@ -235,28 +283,28 @@ async function listFiles(root, ignore = DEFAULT_IGNORE) {
   return out.sort();
 }
 async function hashFile(p) {
-  return createHash("sha256").update(await fs2.readFile(p)).digest("hex");
+  return createHash("sha256").update(await fs3.readFile(p)).digest("hex");
 }
 async function hashTree(root, ignore = DEFAULT_IGNORE) {
   if (!await exists(root)) return null;
   const h = createHash("sha256");
   for (const rel of await listFiles(root, ignore)) {
-    h.update(rel).update("\0").update(await fs2.readFile(rel ? path2.join(root, rel) : root)).update("\0");
+    h.update(rel).update("\0").update(await fs3.readFile(rel ? path3.join(root, rel) : root)).update("\0");
   }
   return h.digest("hex");
 }
 async function copyTree(src, dst, ignore = DEFAULT_IGNORE) {
-  await fs2.rm(dst, { recursive: true, force: true });
-  await fs2.mkdir(path2.dirname(dst), { recursive: true });
-  const srcRoot = path2.resolve(src);
-  await fs2.cp(src, dst, {
+  await fs3.rm(dst, { recursive: true, force: true });
+  await fs3.mkdir(path3.dirname(dst), { recursive: true });
+  const srcRoot = path3.resolve(src);
+  await fs3.cp(src, dst, {
     recursive: true,
     dereference: true,
     filter: async (from) => {
-      const rel = path2.relative(srcRoot, path2.resolve(from)).split(path2.sep).join("/");
+      const rel = path3.relative(srcRoot, path3.resolve(from)).split(path3.sep).join("/");
       if (isIgnored(rel, ignore)) return false;
       try {
-        if ((await fs2.lstat(from)).isSymbolicLink()) await fs2.stat(from);
+        if ((await fs3.lstat(from)).isSymbolicLink()) await fs3.stat(from);
       } catch {
         return false;
       }
@@ -265,15 +313,15 @@ async function copyTree(src, dst, ignore = DEFAULT_IGNORE) {
   });
 }
 async function removeTree(p) {
-  await fs2.rm(p, { recursive: true, force: true });
+  await fs3.rm(p, { recursive: true, force: true });
 }
 async function diffTrees(local, shed, ignore = DEFAULT_IGNORE) {
   const l = new Set(await listFiles(local, ignore));
   const s = new Set(await listFiles(shed, ignore));
   const out = [];
   for (const f of [.../* @__PURE__ */ new Set([...l, ...s])].sort()) {
-    const lp = f ? path2.join(local, f) : local;
-    const sp = f ? path2.join(shed, f) : shed;
+    const lp = f ? path3.join(local, f) : local;
+    const sp = f ? path3.join(shed, f) : shed;
     if (l.has(f) && !s.has(f)) out.push({ status: "A", file: f });
     else if (!l.has(f) && s.has(f)) out.push({ status: "D", file: f });
     else if (await hashFile(lp) !== await hashFile(sp)) out.push({ status: "M", file: f });
@@ -281,48 +329,6 @@ async function diffTrees(local, shed, ignore = DEFAULT_IGNORE) {
   return out;
 }
 
-// src/adapters/claude-mcp.ts
-var ClaudeMcpEntries = class {
-  constructor(root) {
-    this.root = root;
-  }
-  root;
-  name = "mcp";
-  kind = "entry";
-  secretKeys = ["env", "headers"];
-  expandsEnv = true;
-  /** ~/.claude 의 형제 ~/.claude.json. CLAUDE_CONFIG_DIR 처럼 루트 안에 있으면 그것을 쓴다. */
-  async file() {
-    const inside = path3.join(this.root, ".claude.json");
-    return await exists(inside) ? inside : `${this.root}.json`;
-  }
-  async load() {
-    const p = await this.file();
-    try {
-      return JSON.parse(await fs3.readFile(p, "utf8"));
-    } catch (e) {
-      if (e.code === "ENOENT") return {};
-      throw new Error(`${p} \uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: ${e.message}`);
-    }
-  }
-  async read() {
-    const servers = (await this.load()).mcpServers;
-    return servers && typeof servers === "object" ? { ...servers } : {};
-  }
-  async write(id, value) {
-    const p = await this.file();
-    const all = await this.load();
-    const servers = { ...all.mcpServers ?? {} };
-    if (value === null) delete servers[id];
-    else servers[id] = value;
-    all.mcpServers = servers;
-    await fs3.mkdir(path3.dirname(p), { recursive: true });
-    const tmp = `${p}.lshed-${process.pid}.tmp`;
-    await fs3.writeFile(tmp, JSON.stringify(all, null, 2) + "\n");
-    await fs3.rename(tmp, p);
-  }
-};
-
 // src/adapters/claude-code.ts
 var CATEGORIES = [
   { name: "skills", root: "skills", kind: "dir" },
@@ -333,13 +339,42 @@ var CATEGORIES = [
 var ClaudeCodeAdapter = class {
   name = "claude-code";
   root;
-  mcp;
+  entryCats;
   constructor(root) {
     this.root = root ?? process.env.CLAUDE_CONFIG_DIR ?? path4.join(os.homedir(), ".claude");
-    this.mcp = new ClaudeMcpEntries(this.root);
+    const root_ = this.root;
+    this.entryCats = [
+      /**
+       * 사용자 범위 MCP (§7.4): ~/.claude 의 형제 ~/.claude.json 의 mcpServers. CLAUDE_CONFIG_DIR 처럼 루트 안에 있으면 그것.
+       * Claude Code 가 ${VAR} 를 모든 범위에서 스스로 확장하므로 자리표시자를 그대로 둔다.
+       */
+      new JsonEntries({
+        name: "mcp",
+        file: async () => {
+          const inside = path4.join(root_, ".claude.json");
+          return await exists(inside) ? inside : `${root_}.json`;
+        },
+        under: "mcpServers",
+        secretKeys: ["env", "headers"],
+        expandsEnv: true
+      }),
+      /**
+       * settings.json (§7.6): 최상위 키 하나 = 항목 하나 (hooks, permissions, env, model, ...).
+       * 병합하지 않는다. 키를 통째로 소유하고, 로컬 편집은 diff/save 로 되가져온다.
+       * enabledPlugins 는 플러그인 설치기가 만드는 상태라 담지 않는다. ${VAR} 는 Claude Code 가 안 채우므로 restore 가 채운다.
+       */
+      new JsonEntries({
+        name: "settings",
+        file: async () => path4.join(root_, "settings.json"),
+        secretKeys: [],
+        secretRootIds: ["env"],
+        expandsEnv: false,
+        skip: ["enabledPlugins"]
+      })
+    ];
   }
   entries() {
-    return [this.mcp];
+    return this.entryCats;
   }
   categories() {
     return CATEGORIES;
@@ -493,6 +528,8 @@ var ManifestSchema = z.object({
   agent: z.string().default("claude-code"),
   /** 창고에 담지 않을 이름들. 기본값(DEFAULT_IGNORE)에 더해진다. */
   ignore: z.array(z.string()).optional(),
+  /** 로컬에 있어도 창고에 넣지 않을 부품 ("id" 또는 "category/id"). init --exclude 가 적고 add/status 가 따른다. */
+  exclude: z.array(z.string()).optional(),
   components: ComponentsSchema.default({}),
   packages: z.array(PackageSchema).default([]),
   profiles: z.record(z.string(), ProfileSchema).default({})
@@ -558,12 +595,6 @@ function effectiveSource(category, c, kind = "dir") {
   const ext = kind === "file" ? ".md" : kind === "entry" ? ".json" : "";
   return c.source ?? `file:./${category}/${c.id}${ext}`;
 }
-function stringifyManifest(m) {
-  const out = { ...m };
-  if (!m.packages.length) delete out.packages;
-  if (!m.ignore?.length) delete out.ignore;
-  return YAML.stringify(out, { lineWidth: 0 });
-}
 function packagesOf(m, profile) {
   const ids = m.profiles[profile]?.[PACKAGES] ?? [];
   return ids.map((id) => m.packages.find((p) => p.id === id));
@@ -701,7 +732,8 @@ function abs(ctx, rel) {
 
 // src/core/init.ts
 import { promises as fs11 } from "fs";
-import path14 from "path";
+import path16 from "path";
+import YAML4 from "yaml";
 
 // src/core/instructions.ts
 import path10 from "path";
@@ -725,10 +757,6 @@ ${f.content.trimEnd()}
 `).join("\n");
 }
 
-// src/core/packages.ts
-import { promises as fs9 } from "fs";
-import path12 from "path";
-
 // src/lock.ts
 import { promises as fs8 } from "fs";
 import path11 from "path";
@@ -753,7 +781,12 @@ async function writeLock(shed, lock) {
   await fs8.writeFile(path11.join(shed, LOCK_FILE), "# generated by lshed \u2014 do not edit; 'lshed update' refreshes it\n" + YAML2.stringify(sorted));
 }
 
+// src/core/discover.ts
+import path13 from "path";
+
 // src/core/packages.ts
+import { promises as fs9 } from "fs";
+import path12 from "path";
 async function detectPackages(ctx, found) {
   const out = [];
   for (const inst of installersFor(ctx)) out.push(...await inst.detect(ctx, found));
@@ -868,10 +901,76 @@ async function updatePackages(ctx, pkgs, opts = {}) {
   return res;
 }
 
+// src/core/discover.ts
+var keyOf = (f) => `${f.category}/${f.id}`;
+async function discover(ctx, exclude = []) {
+  const isExcluded = (cat, id) => exclude.some((e) => e === id || e === `${cat}/${id}`);
+  const excluded = [];
+  const items = [];
+  const all = await ctx.adapter.scan();
+  const pkgs = await detectPackages(ctx, all);
+  const kept = pkgs.filter((p) => {
+    if (isExcluded("packages", p.id)) {
+      excluded.push(`packages/${p.id}`);
+      return false;
+    }
+    return true;
+  });
+  const generated = await detectGenerated(all, kept);
+  for (const p of kept) items.push({ kind: "package", category: "packages", id: p.id, pkg: p });
+  for (const cat of ctx.adapter.categories()) {
+    for (const f of all.filter((f2) => f2.category === cat.name)) {
+      if (pkgs.some((p) => p.path === f.path) || generated.has(keyOf(f))) continue;
+      if (isExcluded(f.category, f.id)) {
+        excluded.push(keyOf(f));
+        continue;
+      }
+      items.push({ kind: "component", category: cat.name, id: f.id, path: f.path, cat });
+    }
+  }
+  for (const cat of ctx.adapter.entries()) {
+    const all2 = await cat.read();
+    for (const id of Object.keys(all2).sort()) {
+      if (isExcluded(cat.name, id)) {
+        excluded.push(`${cat.name}/${id}`);
+        continue;
+      }
+      if (!/^[\w.-]+$/.test(id)) {
+        ctx.log(`  ! ${cat.name}/${id}: \uC774\uB984\uC5D0 \uC4F8 \uC218 \uC5C6\uB294 \uBB38\uC790\uAC00 \uC788\uC5B4 \uAC74\uB108\uB700`);
+        continue;
+      }
+      const owner = kept.find((p) => p.path && JSON.stringify(all2[id]).includes(p.path));
+      const warn = owner ? `\uD328\uD0A4\uC9C0 ${owner.id} \uC548\uC744 \uAC00\uB9AC\uD0B5\uB2C8\uB2E4. \uADF8 \uC124\uCE58\uAC00 \uB9CC\uB4E0 \uAC83\uC774\uBA74 exclude \uD558\uC138\uC694: ${cat.name}/${id}` : void 0;
+      items.push({ kind: "entry", category: cat.name, id, value: all2[id], cat, warn });
+    }
+  }
+  return { items, generated, excluded };
+}
+function notInManifest(m, d) {
+  return d.items.filter(
+    (f) => f.kind === "package" ? !m.packages.some((p) => p.id === f.id) : !(m.components[f.category] ?? []).some((c) => c.id === f.id)
+  );
+}
+function inManifestNotInProfile(m, profile, d) {
+  const p = m.profiles[profile] ?? {};
+  return d.items.filter((f) => !notInManifest(m, d).includes(f)).filter((f) => !(p[f.category] ?? []).includes(f.id)).map(keyOf);
+}
+function shortRev(rev) {
+  return /^[0-9a-f]{40}$/.test(rev) ? rev.slice(0, 7) : rev;
+}
+
+// src/core/ingest.ts
+import path15 from "path";
+import { isSeq, isMap } from "yaml";
+
 // src/core/entries.ts
 import { promises as fs10 } from "fs";
-import path13 from "path";
-var SECRET_KEY_RE = /key|token|secret|pass|auth|credential|cookie|session/i;
+import os2 from "os";
+import path14 from "path";
+var SECRET_WORDS = /* @__PURE__ */ new Set(["key", "apikey", "token", "secret", "password", "passwd", "auth", "authorization", "credential", "credentials", "cookie", "session"]);
+function isSecretKey(k) {
+  return k.split(/[^A-Za-z0-9]+|(?<=[a-z0-9])(?=[A-Z])/).some((w) => SECRET_WORDS.has(w.toLowerCase()));
+}
 var PLACEHOLDER_RE = /\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g;
 function placeholdersIn(v) {
   const out = /* @__PURE__ */ new Set();
@@ -888,27 +987,39 @@ function walk(v, onString, keyPath = []) {
   return v;
 }
 var envName = (...parts) => parts.join("_").replace(/[^A-Za-z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
-function mask(id, entry, cat) {
+function mask(id, entry, cat, home = os2.homedir()) {
+  entry = portable(entry, home);
   if (!entry || typeof entry !== "object" || Array.isArray(entry)) return entry;
-  const out = { ...entry };
-  for (const sk of cat.secretKeys) {
-    const sect = out[sk];
-    if (!sect || typeof sect !== "object" || Array.isArray(sect)) continue;
+  const maskSection = (sect, envLike) => {
     const masked = {};
     for (const [k, v] of Object.entries(sect)) {
-      if (typeof v !== "string" || !SECRET_KEY_RE.test(k) || PLACEHOLDER_RE.test(v)) {
+      if (typeof v !== "string" || !isSecretKey(k) || PLACEHOLDER_RE.test(v)) {
         masked[k] = v;
         PLACEHOLDER_RE.lastIndex = 0;
         continue;
       }
-      const name = sk === "env" ? envName(k) : envName(id, k);
+      const name = envLike ? envName(k) : envName(id, k);
       const scheme = /^(\w+) \S+$/.exec(v);
       masked[k] = scheme ? `${scheme[1]} \${${name}}` : `\${${name}}`;
     }
-    out[sk] = masked;
+    return masked;
+  };
+  if (cat.secretRootIds?.includes(id)) return maskSection(entry, true);
+  const out = { ...entry };
+  for (const sk of cat.secretKeys) {
+    const sect = out[sk];
+    if (!sect || typeof sect !== "object" || Array.isArray(sect)) continue;
+    out[sk] = maskSection(sect, sk === "env");
   }
   return out;
 }
+function portable(entry, home = os2.homedir()) {
+  if (!home || home === "/") return entry;
+  return walk(entry, (s) => s === home || s.startsWith(home + "/") ? "${HOME}" + s.slice(home.length) : s);
+}
+function envWithHome(env = process.env) {
+  return { HOME: os2.homedir(), ...env };
+}
 function suspiciousStrings(entry) {
   const out = [];
   walk(entry, (s, kp) => {
@@ -949,7 +1060,7 @@ function matches2(shed, local) {
   }
   return shed === local;
 }
-function remask(id, local, shed, cat) {
+function remask(id, local, shed, cat, home = os2.homedir()) {
   const keep = (l, s) => {
     if (typeof l === "string" && typeof s === "string" && stringMatches(s, l)) return s;
     if (Array.isArray(l) && Array.isArray(s)) return l.map((x2, i) => keep(x2, s[i]));
@@ -958,7 +1069,7 @@ function remask(id, local, shed, cat) {
     }
     return l;
   };
-  return mask(id, shed === null ? local : keep(local, shed), cat);
+  return mask(id, shed === null ? local : keep(local, portable(shed, home)), cat, home);
 }
 function diffEntry(shed, local) {
   const out = [];
@@ -990,124 +1101,115 @@ async function readEntryFile(p) {
   }
 }
 async function writeEntryFile(p, v) {
-  await fs10.mkdir(path13.dirname(p), { recursive: true });
+  await fs10.mkdir(path14.dirname(p), { recursive: true });
   await fs10.writeFile(p, JSON.stringify(v, null, 2) + "\n");
 }
 
+// src/core/ingest.ts
+function seqAt(doc, p) {
+  let node = doc.getIn(p);
+  if (!isSeq(node)) {
+    node = doc.createNode([]);
+    doc.setIn(p, node);
+  }
+  return node;
+}
+function pushUnique(seq, value) {
+  if (!seq.items.some((it) => (isMap(it) ? it.get("id") : String(it)) === value)) seq.add(value);
+}
+async function ingest(ctx, doc, profile, items, lock) {
+  const out = { managed: [], copied: 0, packages: [] };
+  for (const f of items) {
+    if (f.kind === "package") {
+      const p = f.pkg;
+      const node = doc.createNode(p.into ? { id: p.id, source: p.source, into: p.into } : { id: p.id, source: p.source });
+      if (p.into) node.comment = " install: ./setup    # \u2190 \uBCF5\uC6D0 \uD6C4 \uC2E4\uD589\uD560 \uBA85\uB839\uC774 \uC788\uC73C\uBA74 \uCC44\uC6B0\uC138\uC694 (--yes \uB85C \uC2E4\uD589)";
+      const seq = seqAt(doc, [PACKAGES]);
+      if (!seq.items.some((it) => isMap(it) && it.get("id") === p.id)) seq.add(node);
+      pushUnique(seqAt(doc, ["profiles", profile, PACKAGES]), p.id);
+      lock.packages[p.id] = { source: p.source, rev: p.rev };
+      out.packages.push(p.id);
+      ctx.log(`  \u2261 package ${p.id}  ${p.source} @${shortRev(p.rev)}  (\uCC38\uC870\uB9CC \uAE30\uB85D)`);
+      continue;
+    }
+    if (f.kind === "component") {
+      const dst = path15.join(ctx.shed, f.cat.root, f.cat.kind === "dir" ? f.id : `${f.id}.md`);
+      await copyTree(f.path, dst, ignoreOf(ctx));
+      ctx.log(`  + ${f.category}/${f.id}`);
+    } else {
+      const masked = mask(f.id, f.value, f.cat);
+      await writeEntryFile(path15.join(ctx.shed, f.category, `${f.id}.json`), masked);
+      const vars = placeholdersIn(masked).filter((v) => v !== "HOME");
+      ctx.log(`  + ${f.category}/${f.id}${vars.length ? `  (\uC2DC\uD06C\uB9BF \u2192 ${vars.map((v) => "${" + v + "}").join(", ")})` : ""}`);
+      for (const where of suspiciousStrings(masked)) ctx.log(`    ! ${where} \uAC00 \uC2DC\uD06C\uB9BF\uCC98\uB7FC \uBCF4\uC785\uB2C8\uB2E4. \uCC3D\uACE0\uC758 ${f.category}/${f.id}.json \uC5D0\uC11C \${VAR} \uB85C \uBC14\uAFB8\uC138\uC694`);
+      if (f.warn) ctx.log(`    ! ${f.warn}`);
+    }
+    const comps = seqAt(doc, ["components", f.category]);
+    if (!comps.items.some((it) => isMap(it) && it.get("id") === f.id)) comps.add(doc.createNode({ id: f.id }));
+    pushUnique(seqAt(doc, ["profiles", profile, f.category]), f.id);
+    out.managed.push(targetRel(f.cat, f.id));
+    out.copied++;
+  }
+  return out;
+}
+function tidy(doc) {
+  const pk = doc.get(PACKAGES);
+  if (isSeq(pk) && !pk.items.length) doc.delete(PACKAGES);
+}
+
 // src/core/init.ts
+var MANIFEST_HEADER = "# lshed manifest \u2014 edit freely. Reference: https://github.com/LeeSongHeon-LSH/lshed\n";
 async function init(ctx, opts = {}) {
   const profileName = opts.profile ?? "default";
-  const exclude = opts.exclude ?? [];
-  const skipped = [];
   if (await exists(manifestPath(ctx))) {
     throw new Error(`\uC774\uBBF8 \uCD08\uAE30\uD654\uB41C \uCC3D\uACE0\uC785\uB2C8\uB2E4: ${manifestPath(ctx)}
-  \uB2E4\uB978 \uD658\uACBD\uC758 \uC124\uC815\uC744 \uC774 \uCC3D\uACE0\uB85C \uAC00\uC838\uC624\uB824\uBA74 'lshed restore' \uD6C4 'lshed save' \uB97C \uC4F0\uC138\uC694.`);
-  }
-  const all = await ctx.adapter.scan();
-  const m = { version: 1, agent: ctx.adapter.name, components: {}, packages: [], profiles: { [profileName]: {} } };
-  const isExcluded = (cat, id) => exclude.some((e) => e === id || e === `${cat}/${id}`);
-  const pkgs = (await detectPackages(ctx, all)).filter((p) => !isExcluded("", p.id));
-  const generated = await detectGenerated(all, pkgs);
-  const found = all.filter((f) => !pkgs.some((p) => p.path === f.path) && !generated.has(`${f.category}/${f.id}`));
-  for (const p of pkgs) {
-    m.packages.push(p.into ? { id: p.id, source: p.source, into: p.into } : { id: p.id, source: p.source });
-    const rev = /^[0-9a-f]{40}$/.test(p.rev) ? p.rev.slice(0, 7) : p.rev;
-    ctx.log(`  \u2261 package ${p.id}  ${p.source} @${rev}  (\uCC38\uC870\uB9CC \uAE30\uB85D)`);
-  }
-  if (pkgs.length) m.profiles[profileName][PACKAGES] = pkgs.map((p) => p.id);
-  for (const [key, by] of generated) ctx.log(`  \xB7 ${key}  (${by} \uAC00 \uC0DD\uC131\uD55C \uAC83 \u2192 \uAC74\uB108\uB700)`);
-  const managed = [];
-  let copied = 0;
-  for (const cat of ctx.adapter.categories()) {
-    const mine = found.filter((f) => f.category === cat.name && !isExcluded(f.category, f.id));
-    for (const f of found.filter((f2) => f2.category === cat.name && isExcluded(f2.category, f2.id))) {
-      skipped.push(`${f.category}/${f.id}`);
-      ctx.log(`  - ${f.category}/${f.id}  (--exclude)`);
-    }
-    if (!mine.length) continue;
-    m.components[cat.name] = [];
-    m.profiles[profileName][cat.name] = [];
-    for (const f of mine) {
-      const dst = path14.join(ctx.shed, cat.root, cat.kind === "dir" ? f.id : `${f.id}.md`);
-      await copyTree(f.path, dst, ignoreOf(ctx));
-      m.components[cat.name].push({ id: f.id });
-      m.profiles[profileName][cat.name].push(f.id);
-      managed.push(targetRel(cat, f.id));
-      copied++;
-      ctx.log(`  + ${cat.name}/${f.id}`);
-    }
-  }
-  for (const cat of ctx.adapter.entries()) {
-    const all2 = await cat.read();
-    const ids = Object.keys(all2).sort();
-    for (const id of ids.filter((id2) => isExcluded(cat.name, id2))) {
-      skipped.push(`${cat.name}/${id}`);
-      ctx.log(`  - ${cat.name}/${id}  (--exclude)`);
-    }
-    const mine = ids.filter((id) => !isExcluded(cat.name, id));
-    if (!mine.length) continue;
-    m.components[cat.name] = [];
-    m.profiles[profileName][cat.name] = [];
-    for (const id of mine) {
-      if (!/^[\w.-]+$/.test(id)) {
-        ctx.log(`  ! ${cat.name}/${id}: \uC774\uB984\uC5D0 \uC4F8 \uC218 \uC5C6\uB294 \uBB38\uC790\uAC00 \uC788\uC5B4 \uAC74\uB108\uB700`);
-        continue;
-      }
-      const masked = mask(id, all2[id], cat);
-      await writeEntryFile(path14.join(ctx.shed, cat.name, `${id}.json`), masked);
-      m.components[cat.name].push({ id });
-      m.profiles[profileName][cat.name].push(id);
-      managed.push(targetRel(cat, id));
-      copied++;
-      const vars = placeholdersIn(masked);
-      ctx.log(`  + ${cat.name}/${id}${vars.length ? `  (\uC2DC\uD06C\uB9BF \u2192 ${vars.map((v) => "${" + v + "}").join(", ")})` : ""}`);
-      for (const where of suspiciousStrings(masked)) ctx.log(`    ! ${where} \uAC00 \uC2DC\uD06C\uB9BF\uCC98\uB7FC \uBCF4\uC785\uB2C8\uB2E4. \uCC3D\uACE0\uC758 ${cat.name}/${id}.json \uC5D0\uC11C \${VAR} \uB85C \uBC14\uAFB8\uC138\uC694`);
-    }
-  }
+  \uC774 \uD658\uACBD\uC5D0 \uC0C8\uB85C \uC0DD\uAE34 \uAC83\uC744 \uAE30\uC874 \uCC3D\uACE0\uC5D0 \uB123\uC73C\uB824\uBA74 'lshed add' \uB97C, \uB2E4\uB978 \uD658\uACBD\uC758 \uC124\uC815\uC744 \uAC00\uC838\uC624\uB824\uBA74 'lshed restore' \uD6C4 'lshed save' \uB97C \uC4F0\uC138\uC694.`);
+  }
+  const d = await discover(ctx, opts.exclude);
+  for (const [key, by] of d.generated) ctx.log(`  \xB7 ${key}  (${by} \uAC00 \uC0DD\uC131\uD55C \uAC83 \u2192 \uAC74\uB108\uB700)`);
+  for (const key of d.excluded) ctx.log(`  - ${key}  (--exclude)`);
+  const exclude = opts.exclude?.length ? { exclude: [...opts.exclude] } : {};
+  const doc = new YAML4.Document({ version: 1, agent: ctx.adapter.name, ...exclude, components: {}, packages: [], profiles: { [profileName]: {} } });
+  const lock = { version: 1, packages: {} };
+  await fs11.mkdir(ctx.shed, { recursive: true });
+  const res = await ingest(ctx, doc, profileName, d.items, lock);
+  const managed = [...res.managed];
+  let copied = res.copied;
   const instr = instructionsFile(ctx);
   if (await exists(instr)) {
     const text = await fs11.readFile(instr, "utf8");
     if (!isGenerated(text)) {
-      const dst = path14.join(ctx.shed, INSTRUCTIONS, "main.md");
-      await fs11.mkdir(path14.dirname(dst), { recursive: true });
+      const dst = path16.join(ctx.shed, INSTRUCTIONS, "main.md");
+      await fs11.mkdir(path16.dirname(dst), { recursive: true });
       await fs11.writeFile(dst, text);
       const fragRel = targetRel(INSTRUCTIONS, "main");
       await copyTree(dst, abs(ctx, fragRel), ignoreOf(ctx));
       managed.push(fragRel);
-      m.components[INSTRUCTIONS] = [{ id: "main" }];
-      m.profiles[profileName][INSTRUCTIONS] = ["main"];
+      doc.setIn(["components", INSTRUCTIONS], [{ id: "main" }]);
+      doc.setIn(["profiles", profileName, INSTRUCTIONS], ["main"]);
       copied++;
-      ctx.log(`  + ${INSTRUCTIONS}/main  (${path14.basename(instr)})`);
+      ctx.log(`  + ${INSTRUCTIONS}/main  (${path16.basename(instr)})`);
     }
   }
-  await fs11.mkdir(ctx.shed, { recursive: true });
-  let yamlText = stringifyManifest(m);
-  for (const p of pkgs) {
-    if (!p.into) continue;
-    yamlText = yamlText.replace(`    into: ${p.into}
-`, `    into: ${p.into}
-    # install: ./setup    # \u2190 \uBCF5\uC6D0 \uD6C4 \uC2E4\uD589\uD560 \uBA85\uB839\uC774 \uC788\uC73C\uBA74 \uCC44\uC6B0\uC138\uC694 (--yes \uB85C \uC2E4\uD589)
-`);
-  }
-  await fs11.writeFile(manifestPath(ctx), `# lshed manifest \u2014 edit freely. Reference: https://github.com/LeeSongHeon-LSH/lshed
-` + yamlText);
-  if (pkgs.length) {
-    await writeLock(ctx.shed, { version: 1, packages: Object.fromEntries(pkgs.map((p) => [p.id, { source: p.source, rev: p.rev }])) });
-  }
+  tidy(doc);
+  const yamlText = MANIFEST_HEADER + doc.toString({ lineWidth: 0 });
+  await fs11.writeFile(manifestPath(ctx), yamlText);
+  if (res.packages.length) await writeLock(ctx.shed, lock);
   await writeState(ctx.adapter, { profile: profileName, shed: ctx.shed, managed, appliedAt: (/* @__PURE__ */ new Date()).toISOString() });
   const parts = [`\uBD80\uD488 ${copied}\uAC1C`];
-  if (pkgs.length) parts.push(`\uD328\uD0A4\uC9C0 ${pkgs.length}\uAC1C`);
-  if (generated.size) parts.push(`\uC0DD\uC131\uBB3C ${generated.size}\uAC1C \uAC74\uB108\uB700`);
-  if (skipped.length) parts.push(`\uC81C\uC678 ${skipped.length}\uAC1C`);
+  if (res.packages.length) parts.push(`\uD328\uD0A4\uC9C0 ${res.packages.length}\uAC1C`);
+  if (d.generated.size) parts.push(`\uC0DD\uC131\uBB3C ${d.generated.size}\uAC1C \uAC74\uB108\uB700`);
+  if (d.excluded.length) parts.push(`\uC81C\uC678 ${d.excluded.length}\uAC1C`);
   ctx.log(`
 ${MANIFEST_FILE} \uC0DD\uC131: ${manifestPath(ctx)}  (${parts.join(", ")}, \uD504\uB85C\uD544 "${profileName}")`);
-  if (pkgs.some((p) => p.into)) ctx.log(`git \uD328\uD0A4\uC9C0\uC758 \uC124\uCE58 \uBA85\uB839(install:)\uC740 lshed.yaml \uC5D0\uC11C \uC9C1\uC811 \uCC44\uC6B0\uC138\uC694.`);
-  return { manifest: m, copied, skipped, packages: pkgs.map((p) => p.id), generated: [...generated.keys()] };
+  if (d.items.some((f) => f.kind === "package" && f.pkg.into)) ctx.log(`git \uD328\uD0A4\uC9C0\uC758 \uC124\uCE58 \uBA85\uB839(install:)\uC740 lshed.yaml \uC5D0\uC11C \uC9C1\uC811 \uCC44\uC6B0\uC138\uC694.`);
+  const manifest = parseManifest(yamlText);
+  return { manifest, copied, skipped: d.excluded, packages: res.packages, generated: [...d.generated.keys()] };
 }
 
 // src/core/restore.ts
 import { promises as fs12 } from "fs";
-import path15 from "path";
+import path17 from "path";
 async function restore(ctx, profileArg, opts = {}) {
   const backup = opts.backup ?? true;
   const state = await readState(ctx.adapter);
@@ -1126,7 +1228,7 @@ async function restore(ctx, profileArg, opts = {}) {
   const oldManaged = new Set(state?.managed ?? []);
   const toRemove = [...oldManaged].filter((r) => !newManaged.has(r)).sort();
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const backupDir = path15.join(ctx.adapter.root, LSHED_DIR, "backups", stamp);
+  const backupDir = path17.join(ctx.adapter.root, LSHED_DIR, "backups", stamp);
   const backedUp = [];
   const placed = [];
   const missingEnv = [];
@@ -1142,14 +1244,14 @@ async function restore(ctx, profileArg, opts = {}) {
       if (cur === void 0) return;
       backedUp.push(rel);
       if (opts.dryRun || !backup) return;
-      await writeEntryFile(path15.join(backupDir, en.cat.name, `${en.id}.json`), cur);
+      await writeEntryFile(path17.join(backupDir, en.cat.name, `${en.id}.json`), cur);
       return;
     }
     const from = abs(ctx, rel);
     if (!await exists(from)) return;
     backedUp.push(rel);
     if (opts.dryRun || !backup) return;
-    await copyTree(from, path15.join(backupDir, ...rel.split("/")), ignoreOf(ctx));
+    await copyTree(from, path17.join(backupDir, ...rel.split("/")), ignoreOf(ctx));
   }
   for (const rel of toRemove) {
     ctx.log(`  - ${rel}`);
@@ -1163,8 +1265,8 @@ async function restore(ctx, profileArg, opts = {}) {
     if (it.entry) {
       const shed = await readEntryFile(it.src);
       const local = (await entriesOf(it.entry))[it.id];
-      const vars = placeholdersIn(shed);
-      const ex = expand(shed);
+      const vars = placeholdersIn(shed).filter((v) => v !== "HOME");
+      const ex = expand(shed, envWithHome());
       if (ex.missing.length) missingEnv.push({ rel: it.rel, vars: ex.missing });
       const value = it.entry.expandsEnv ? shed : ex.value;
       const same2 = local !== void 0 && matches2(shed, local);
@@ -1260,10 +1362,71 @@ function formatDiff(diffs) {
   return lines.join("\n");
 }
 
+// src/core/add.ts
+import { promises as fs13 } from "fs";
+import YAML5 from "yaml";
+async function candidates(ctx, m, profile, d) {
+  d ??= await discover(ctx, m.exclude);
+  return { fresh: notInManifest(m, d), notInProfile: inManifestNotInProfile(m, profile, d), generated: d.generated };
+}
+async function add(ctx, keys = [], opts = {}) {
+  const state = await readState(ctx.adapter);
+  if (!state) throw new Error("\uC801\uC6A9\uB41C \uD504\uB85C\uD544\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \uBA3C\uC800 'lshed init' \uB610\uB294 'lshed restore <profile>' \uC744 \uC2E4\uD589\uD558\uC138\uC694.");
+  const m = await loadManifest(ctx);
+  const c = await candidates(ctx, m, state.profile);
+  if (!keys.length && !opts.all) {
+    if (!c.fresh.length) ctx.log("\uCC3D\uACE0\uC5D0 \uC5C6\uB294 \uC0C8 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.");
+    else {
+      ctx.log(`\uCC3D\uACE0\uC5D0 \uC5C6\uB294 \uD56D\uBAA9 ${c.fresh.length}\uAC1C (\uB123\uC73C\uB824\uBA74 lshed add <key...> \uB610\uB294 --all):`);
+      for (const f of c.fresh) ctx.log(`  ${f.kind === "package" ? "\u2261" : " "} ${keyOf(f)}${f.kind === "package" ? `  ${f.pkg.source}` : f.kind === "entry" && f.warn ? `  ! ${f.warn}` : ""}`);
+    }
+    hint(ctx, c, state.profile);
+    return [];
+  }
+  let chosen = c.fresh;
+  if (keys.length) {
+    chosen = keys.map((raw) => {
+      const [a, b] = raw.includes("/") ? raw.split("/", 2) : [void 0, raw];
+      const hits = c.fresh.filter((f) => f.id === b && (a === void 0 || f.category === a));
+      if (!hits.length) {
+        const known = (m.components[a ?? ""] ?? []).some((x2) => x2.id === b) || Object.values(m.components).some((cs) => cs.some((x2) => x2.id === b)) || m.packages.some((p) => p.id === b);
+        throw new Error(known ? `"${raw}" \uB294 \uC774\uBBF8 \uCC3D\uACE0\uC5D0 \uC788\uC2B5\uB2C8\uB2E4. \uD504\uB85C\uD544\uC5D0 \uB123\uC73C\uB824\uBA74 lshed.yaml \uC758 profiles \uB97C \uACE0\uCE58\uC138\uC694.` : `"${raw}" \uB294 \uB85C\uCEEC\uC5D0\uC11C \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4. 'lshed add' \uB85C \uD6C4\uBCF4\uB97C \uBCF4\uC138\uC694.`);
+      }
+      if (hits.length > 1) throw new Error(`"${raw}" \uAC00 \uBAA8\uD638\uD569\uB2C8\uB2E4: ${hits.map(keyOf).join(", ")}`);
+      return hits[0];
+    });
+  }
+  if (!chosen.length) {
+    ctx.log("\uCC3D\uACE0\uC5D0 \uC5C6\uB294 \uC0C8 \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.");
+    hint(ctx, c, state.profile);
+    return [];
+  }
+  const doc = YAML5.parseDocument(await fs13.readFile(manifestPath(ctx), "utf8"));
+  const lock = await readLock(ctx.shed);
+  const res = await ingest(ctx, doc, state.profile, chosen, lock);
+  tidy(doc);
+  await fs13.writeFile(manifestPath(ctx), doc.toString({ lineWidth: 0 }));
+  if (res.packages.length) await writeLock(ctx.shed, lock);
+  const managed = [.../* @__PURE__ */ new Set([...state.managed, ...res.managed])].sort();
+  await writeState(ctx.adapter, { ...state, managed, appliedAt: (/* @__PURE__ */ new Date()).toISOString() });
+  const added = chosen.map(keyOf);
+  ctx.log(`
+${added.length}\uAC1C\uB97C \uCC3D\uACE0\uC5D0 \uB123\uACE0 \uD504\uB85C\uD544 "${state.profile}" \uC5D0 \uCD94\uAC00\uD588\uC2B5\uB2C8\uB2E4. \uCC3D\uACE0\uB97C \uCEE4\uBC0B\uD558\uC138\uC694: ${ctx.shed}`);
+  if (res.packages.some((id) => chosen.find((f) => f.id === id && f.kind === "package" && f.pkg.into))) ctx.log(`git \uD328\uD0A4\uC9C0\uC758 \uC124\uCE58 \uBA85\uB839(install:)\uC740 lshed.yaml \uC5D0\uC11C \uC9C1\uC811 \uCC44\uC6B0\uC138\uC694.`);
+  hint(ctx, { ...c, fresh: c.fresh.filter((f) => !chosen.includes(f)) }, state.profile);
+  return added;
+}
+function hint(ctx, c, profile) {
+  const byPkg = /* @__PURE__ */ new Map();
+  for (const by of c.generated.values()) byPkg.set(by, (byPkg.get(by) ?? 0) + 1);
+  for (const [by, n] of byPkg) ctx.log(`  \xB7 \uD328\uD0A4\uC9C0 ${by} \uAC00 \uC0DD\uC131\uD55C \uAC83 ${n}\uAC1C\uB294 \uB2F4\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
+  if (c.notInProfile.length) ctx.log(`\uCC3D\uACE0\uC5D0\uB294 \uC788\uC9C0\uB9CC \uD504\uB85C\uD544 "${profile}" \uC774 \uC548 \uC4F0\uB294 \uAC83 ${c.notInProfile.length}\uAC1C: ${c.notInProfile.join(", ")}  \u2192 lshed.yaml \uC758 profiles \uC5D0 \uCD94\uAC00`);
+}
+
 // src/core/status.ts
 async function status(ctx) {
   const state = await readState(ctx.adapter);
-  if (!state) return { state: null, drifted: [], packages: [], missingEnv: [] };
+  if (!state) return { state: null, drifted: [], packages: [], missingEnv: [], fresh: [] };
   const d = await diff(ctx);
   const m = await loadManifest(ctx);
   const lock = await readLock(ctx.shed);
@@ -1271,10 +1434,11 @@ async function status(ctx) {
   const missingEnv = [];
   for (const it of planProfile(ctx, m, state.profile).filter((p) => p.entry)) {
     const shed = await readEntryFile(it.src);
-    const missing = shed === null ? [] : expand(shed).missing;
+    const missing = shed === null ? [] : expand(shed, envWithHome()).missing;
     if (missing.length) missingEnv.push({ rel: it.rel, vars: missing });
   }
-  return { state, drifted: d.map((x2) => `${x2.item.category}/${x2.item.id}`), packages, missingEnv };
+  const fresh = (await candidates(ctx, m, state.profile)).fresh.map(keyOf);
+  return { state, drifted: d.map((x2) => `${x2.item.category}/${x2.item.id}`), packages, missingEnv, fresh };
 }
 function formatStatus(s, adapterRoot) {
   if (!s.state) return `\uC801\uC6A9\uB41C \uD504\uB85C\uD544\uC774 \uC5C6\uC2B5\uB2C8\uB2E4 (${adapterRoot}).
@@ -1292,6 +1456,7 @@ function formatStatus(s, adapterRoot) {
     lines.push(`\uD328\uD0A4\uC9C0   ${p.pkg.id}  ${where}`);
   }
   for (const m of s.missingEnv) lines.push(`\uD658\uACBD\uBCC0\uC218 ${m.rel}: ${m.vars.join(", ")} \uC5C6\uC74C  \u2192 \uC178\uC5D0\uC11C export \uD558\uC138\uC694`);
+  if (s.fresh.length) lines.push(`\uCC3D\uACE0 \uBC16  ${s.fresh.length}\uAC1C: ${s.fresh.join(", ")}  \u2192 lshed add`);
   return lines.join("\n");
 }
 
@@ -1371,9 +1536,9 @@ function formatRows(rows, m) {
 }
 
 // src/core/remove.ts
-import { promises as fs13 } from "fs";
-import path16 from "path";
-import YAML3, { isSeq, isMap } from "yaml";
+import { promises as fs14 } from "fs";
+import path18 from "path";
+import YAML6, { isSeq as isSeq2, isMap as isMap2 } from "yaml";
 function resolveKey(m, raw) {
   const rows = listRows(m);
   const [a, b] = raw.includes("/") ? raw.split("/", 2) : [void 0, raw];
@@ -1387,13 +1552,13 @@ async function remove(ctx, raw) {
   const { category, id } = resolveKey(m, raw);
   const users = listRows(m).find((r) => r.category === category && r.id === id).usedBy;
   if (users.length) throw new Error(`${category}/${id} \uB294 \uD504\uB85C\uD544 ${users.join(", ")} \uC774 \uC4F0\uACE0 \uC788\uC2B5\uB2C8\uB2E4. \uBA3C\uC800 \uD504\uB85C\uD544\uC5D0\uC11C \uBE7C\uC138\uC694.`);
-  const text = await fs13.readFile(manifestPath(ctx), "utf8");
-  const doc = YAML3.parseDocument(text);
+  const text = await fs14.readFile(manifestPath(ctx), "utf8");
+  const doc = YAML6.parseDocument(text);
   let deleted;
   if (category === PACKAGES) {
     const seq = doc.get(PACKAGES);
-    if (!isSeq(seq)) throw new Error("packages \uAC00 \uBAA9\uB85D\uC774 \uC544\uB2D9\uB2C8\uB2E4");
-    const idx = seq.items.findIndex((it) => isMap(it) && it.get("id") === id);
+    if (!isSeq2(seq)) throw new Error("packages \uAC00 \uBAA9\uB85D\uC774 \uC544\uB2D9\uB2C8\uB2E4");
+    const idx = seq.items.findIndex((it) => isMap2(it) && it.get("id") === id);
     seq.delete(idx);
     if (!seq.items.length) doc.delete(PACKAGES);
     const lock = await readLock(ctx.shed);
@@ -1404,19 +1569,19 @@ async function remove(ctx, raw) {
     ctx.log(`  - package ${id}  (\uB9E4\uB2C8\uD398\uC2A4\uD2B8\xB7\uB77D\uC5D0\uC11C \uC81C\uAC70. \uB85C\uCEEC clone \uC740 \uADF8\uB300\uB85C)`);
   } else {
     const seq = doc.getIn(["components", category]);
-    if (!isSeq(seq)) throw new Error(`components.${category} \uAC00 \uBAA9\uB85D\uC774 \uC544\uB2D9\uB2C8\uB2E4`);
-    const idx = seq.items.findIndex((it) => isMap(it) && it.get("id") === id);
+    if (!isSeq2(seq)) throw new Error(`components.${category} \uAC00 \uBAA9\uB85D\uC774 \uC544\uB2D9\uB2C8\uB2E4`);
+    const idx = seq.items.findIndex((it) => isMap2(it) && it.get("id") === id);
     seq.delete(idx);
     if (!seq.items.length) doc.deleteIn(["components", category]);
     const src = sourcePath(ctx, category, findComponent(m, category, id));
-    const inside = !path16.relative(ctx.shed, src).startsWith("..");
+    const inside = !path18.relative(ctx.shed, src).startsWith("..");
     if (inside && await exists(src)) {
       await removeTree(src);
       deleted = src;
     }
     ctx.log(`  - ${category}/${id}${deleted ? "" : "  (\uCC3D\uACE0 \uBC16 \uACBD\uB85C\uB77C \uD30C\uC77C\uC740 \uB450\uC5C8\uC74C)"}`);
   }
-  await fs13.writeFile(manifestPath(ctx), doc.toString());
+  await fs14.writeFile(manifestPath(ctx), doc.toString());
   return { category, id, deleted };
 }
 async function prune(ctx, opts = {}) {
@@ -1441,21 +1606,105 @@ ${removed.length}\uAC1C \uC81C\uAC70. \uCC3D\uACE0\uB97C \uCEE4\uBC0B\uD558\uC13
   return removed;
 }
 
+// src/core/sync.ts
+import os3 from "os";
+async function sync(ctx, opts = {}) {
+  const shed = ctx.shed;
+  const push = opts.push ?? true;
+  if (!await isRepo(shed)) {
+    throw new Error(`\uCC3D\uACE0\uAC00 git \uC800\uC7A5\uC18C\uAC00 \uC544\uB2D9\uB2C8\uB2E4: ${shed}
+  cd ${shed} && git init && git add -A && git commit -m "my harness"
+  \uC6D0\uACA9\uC5D0 \uB450\uB824\uBA74: git remote add origin <url> && git push -u origin HEAD`);
+  }
+  const res = { committed: [], pulled: 0, pushed: false, unsaved: [] };
+  if (await readState(ctx.adapter)) {
+    try {
+      res.unsaved = (await diff(ctx)).map((d) => `${d.item.category}/${d.item.id}`);
+    } catch {
+    }
+    if (res.unsaved.length) ctx.log(`  ! \uB85C\uCEEC \uD3B8\uC9D1 ${res.unsaved.length}\uAC1C\uAC00 \uCC3D\uACE0\uC5D0 \uC5C6\uC2B5\uB2C8\uB2E4: ${res.unsaved.join(", ")}  \u2192 lshed save \uD6C4 \uB2E4\uC2DC sync`);
+  }
+  const dirty = (await git(["status", "--porcelain", "--untracked-files=all"], shed)).split("\n").filter(Boolean).map((l) => l.slice(3).trim());
+  if (dirty.length) {
+    const msg = opts.message ?? defaultMessage(dirty, (await readState(ctx.adapter))?.profile);
+    ctx.log(`  ${opts.dryRun ? "(dry-run) " : ""}commit ${dirty.length}\uAC1C: ${dirty.slice(0, 5).join(", ")}${dirty.length > 5 ? ` \uC678 ${dirty.length - 5}` : ""}`);
+    if (!opts.dryRun) {
+      await git(["add", "-A"], shed);
+      await git(["commit", "--quiet", "-m", msg], shed);
+    }
+    res.committed = dirty;
+  } else {
+    ctx.log("  = \uCC3D\uACE0\uC5D0 \uCEE4\uBC0B\uD560 \uBCC0\uACBD \uC5C6\uC74C");
+  }
+  const remote = await git(["remote", "get-url", "origin"], shed).catch(() => null);
+  if (!remote) {
+    ctx.log("  \xB7 origin \uC774 \uC5C6\uC5B4 pull/push \uB294 \uAC74\uB108\uB700 (git remote add origin <url>)");
+    return res;
+  }
+  if (opts.dryRun) {
+    ctx.log(`  (dry-run) pull --rebase, push \u2192 ${remote}`);
+    return res;
+  }
+  const before = await git(["rev-parse", "HEAD"], shed);
+  const branch2 = await git(["rev-parse", "--abbrev-ref", "HEAD"], shed);
+  const hasUpstream = await git(["rev-parse", "--abbrev-ref", "@{upstream}"], shed).then(() => true, () => false);
+  if (hasUpstream) {
+    try {
+      await git(["pull", "--rebase", "--quiet"], shed);
+    } catch (e) {
+      await git(["rebase", "--abort"], shed).catch(() => {
+      });
+      throw new Error(`pull \uC911 \uCDA9\uB3CC\uC774 \uB098\uC11C \uB418\uB3CC\uB838\uC2B5\uB2C8\uB2E4. \uCC3D\uACE0\uC5D0\uC11C \uC9C1\uC811 \uD574\uACB0\uD558\uC138\uC694:
+  cd ${shed} && git pull --rebase
+  (${firstLine(e.message)})`);
+    }
+    const after = await git(["rev-parse", "HEAD"], shed);
+    if (after !== before) {
+      const n = Number(await git(["rev-list", "--count", `${before}..${after}`], shed).catch(() => "0"));
+      res.pulled = Math.max(0, n - (res.committed.length ? 1 : 0));
+      if (res.pulled) ctx.log(`  \u2193 \uC6D0\uACA9 \uCEE4\uBC0B ${res.pulled}\uAC1C \uBC1B\uC74C`);
+    }
+  } else {
+    ctx.log(`  \xB7 \uBE0C\uB79C\uCE58 ${branch2} \uC5D0 upstream \uC774 \uC5C6\uC5B4 pull \uC740 \uAC74\uB108\uB700`);
+  }
+  if (push) {
+    const ahead = hasUpstream ? Number(await git(["rev-list", "--count", "@{upstream}..HEAD"], shed)) : 1;
+    if (ahead > 0) {
+      await git(hasUpstream ? ["push", "--quiet"] : ["push", "--quiet", "-u", "origin", branch2], shed);
+      res.pushed = true;
+      ctx.log(`  \u2191 push ${hasUpstream ? `${ahead}\uAC1C \uCEE4\uBC0B` : `(upstream \uC124\uC815: origin/${branch2})`}`);
+    } else {
+      ctx.log("  = \uC6D0\uACA9\uACFC \uAC19\uC74C");
+    }
+  }
+  if (res.pulled) ctx.log(`
+\uCC3D\uACE0\uAC00 \uBC14\uB00C\uC5C8\uC2B5\uB2C8\uB2E4. \uC774 \uAE30\uAE30\uC5D0 \uC801\uC6A9\uD558\uB824\uBA74: lshed restore`);
+  return res;
+}
+function defaultMessage(paths, profile) {
+  const parts = [...new Set(paths.map((p) => p.split("/").slice(0, 2).join("/")))];
+  const head2 = parts.slice(0, 3).join(", ") + (parts.length > 3 ? ` +${parts.length - 3}` : "");
+  return `lshed sync: ${head2}
+
+${os3.hostname()}${profile ? ` \xB7 profile ${profile}` : ""}`;
+}
+var firstLine = (s) => s.split("\n").find((l) => l.trim() && !l.startsWith("Command failed")) ?? s;
+
 // src/cli.ts
 var { version } = createRequire(import.meta.url)("../package.json");
 var program = new Command().name("lshed").description("Keep your coding-agent harness (skills, agents, commands, instructions) in a shed and restore it anywhere by profile.").version(version).option("--shed <dir>", "shed directory (default: $LSHED_HOME, then the shed recorded by the last restore)").option("--root <dir>", "agent config root (default: ~/.claude)");
 function adapterFromOpts() {
   const { root } = program.opts();
-  return new ClaudeCodeAdapter(root ? path17.resolve(root) : void 0);
+  return new ClaudeCodeAdapter(root ? path19.resolve(root) : void 0);
 }
 async function ctxFor(cmd) {
   const adapter = adapterFromOpts();
   const { shed: flag } = program.opts();
   let shed = flag ?? process.env.LSHED_HOME;
   if (!shed && cmd === "other") shed = (await readState(adapter))?.shed;
-  if (!shed && cmd === "init") shed = path17.join(os2.homedir(), "lshed");
+  if (!shed && cmd === "init") shed = path19.join(os4.homedir(), "lshed");
   if (!shed) throw new Error("\uCC3D\uACE0 \uC704\uCE58\uB97C \uBAA8\uB985\uB2C8\uB2E4. --shed <dir> \uB610\uB294 LSHED_HOME \uC744 \uC9C0\uC815\uD558\uC138\uC694.");
-  return { adapter, shed: path17.resolve(shed), log: (l) => console.log(l), exec: spawnExec };
+  return { adapter, shed: path19.resolve(shed), log: (l) => console.log(l), exec: spawnExec };
 }
 async function run(fn) {
   try {
@@ -1500,7 +1749,7 @@ program.command("status").description("show the applied profile, managed paths a
   const adapter = adapterFromOpts();
   const state = await readState(adapter);
   if (!state) {
-    console.log(formatStatus({ state: null, drifted: [], packages: [], missingEnv: [] }, adapter.root));
+    console.log(formatStatus({ state: null, drifted: [], packages: [], missingEnv: [], fresh: [] }, adapter.root));
     return;
   }
   const ctx = await ctxFor("other");
@@ -1514,6 +1763,14 @@ program.command("save [ids...]").description("copy local edits back into the she
   const ctx = await ctxFor("other");
   await save(ctx, ids);
 }));
+program.command("add [keys...]").description("put things that appeared locally since init into the shed and the current profile (lists candidates without keys)").option("--all", "add every candidate").action((keys, o) => run(async () => {
+  const ctx = await ctxFor("other");
+  await add(ctx, keys, { all: o.all });
+}));
+program.command("sync").description("commit the shed, pull --rebase and push (the shed must be a git repo with origin)").option("-m, --message <msg>", "commit message (default: names the changed parts)").option("--no-push", "commit and pull only").option("--dry-run", "show what would be committed and pushed").action((o) => run(async () => {
+  const ctx = await ctxFor("other");
+  await sync(ctx, { message: o.message, push: o.push, dryRun: o.dryRun });
+}));
 program.command("list").description("everything in the shed and which profiles use it").option("--unused", "only things no profile uses").action((o) => run(async () => {
   const ctx = await ctxFor("other");
   const m = await loadManifest(ctx);