@agentsky/sky 2.13.0 → 2.14.0

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   resolveSessionRef,
   streamEvents,
   uploadFile
-} from "./chunk-XJ5JLLXM.js";
+} from "./chunk-FOJP33RS.js";
 import {
   CLI_VERSION,
   USER_AGENT,
@@ -20,7 +20,7 @@ import {
   currentUniverse,
   loadConfig,
   saveConfig
-} from "./chunk-Z3FPPGWX.js";
+} from "./chunk-VJEE2ALN.js";
 import {
   AGENT_TYPES,
   MODEL_SUBSCRIPTION_PLAN_PHRASE,
@@ -40,12 +40,12 @@ import {
   skillRefSchema,
   splitMcpServers,
   supersededBy
-} from "./chunk-2IKEJ74C.js";
+} from "./chunk-7OM2B5SE.js";
 import "./chunk-MLKGABMK.js";
 
 // src/index.ts
-import { existsSync as existsSync9, readFileSync as readFileSync12, writeFileSync as writeFileSync6 } from "fs";
-import { basename as basename5, resolve as resolve7 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync13, writeFileSync as writeFileSync6 } from "fs";
+import { basename as basename6, resolve as resolve7 } from "path";
 import { createInterface as createInterface4 } from "readline";
 import { Command } from "commander";
 
@@ -699,7 +699,7 @@ async function createClone(local, opts) {
     console.log("Aborted \u2014 nothing sent.");
     return;
   }
-  const { servers: mcpServers, skipped } = mcpServersFromKept(local.keptServers);
+  const { servers: mcpServers2, skipped } = mcpServersFromKept(local.keptServers);
   if (skipped.length) {
     console.log(`  note: local (stdio) MCP servers have no cloud equivalent and were skipped: ${skipped.join(", ")}`);
   }
@@ -707,7 +707,7 @@ async function createClone(local, opts) {
     agentType: local.harness,
     ...local.model ? { llm: local.model } : {},
     ...local.prompt ? { prompt: local.prompt } : {},
-    ...mcpServers.length ? { mcpServers } : {}
+    ...mcpServers2.length ? { mcpServers: mcpServers2 } : {}
   };
   let sentLlm = local.model ?? null;
   let created;
@@ -820,16 +820,252 @@ async function clone(opts) {
 }
 
 // src/import-local.ts
-import { closeSync, existsSync as existsSync4, openSync, readdirSync, readFileSync as readFileSync5, readSync, statSync as statSync2 } from "fs";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { closeSync, existsSync as existsSync5, openSync, readdirSync as readdirSync2, readFileSync as readFileSync6, readSync, statSync as statSync3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join4 } from "path";
 import { createHash } from "crypto";
 
 // src/import-files.ts
 import { isUtf8 } from "buffer";
-import { existsSync as existsSync3, readFileSync as readFileSync4, statSync } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { dirname as dirname3, extname as extname2, isAbsolute, join as join3, relative as relative2, resolve as resolve3, sep as sep2, basename as basename4 } from "path";
+
+// src/import-workspace.ts
+import { spawnSync } from "child_process";
+import { existsSync as existsSync3, readdirSync, readFileSync as readFileSync4, realpathSync, statSync } from "fs";
 import { homedir as homedir2 } from "os";
-import { dirname as dirname2, extname as extname2, isAbsolute, join as join2, relative, resolve as resolve3, sep, basename as basename3 } from "path";
+import { basename as basename3, dirname as dirname2, join as join2, relative, sep } from "path";
+import { parse as parseToml2 } from "smol-toml";
+var MAX_TREE = 5e3;
+var SKILL_LINE = /Base directory for this skill: (\/[^\s"'\\<>]+)/g;
+function git(cwd, ...args) {
+  const run2 = spawnSync("git", ["-C", cwd, ...args], { encoding: "utf8", timeout: 1e4, maxBuffer: 32 * 1024 * 1024 });
+  return run2.status === 0 ? run2.stdout : null;
+}
+var isFile = (path) => {
+  try {
+    return statSync(path).isFile();
+  } catch {
+    return false;
+  }
+};
+var isDir = (path) => {
+  try {
+    return statSync(path).isDirectory();
+  } catch {
+    return false;
+  }
+};
+function sharedInstructionPaths(home = homedir2()) {
+  const rules = join2(home, ".agents", "rules");
+  let ruleFiles = [];
+  try {
+    ruleFiles = readdirSync(rules).filter((name) => name.endsWith(".md")).sort().map((name) => join2(rules, name));
+  } catch {
+  }
+  return [join2(home, "AGENTS.md"), join2(home, "MEMORY.md"), ...ruleFiles].filter(isFile);
+}
+function strings(value, out, depth = 0) {
+  if (depth > 12) return;
+  if (typeof value === "string") out.push(value);
+  else if (Array.isArray(value)) for (const item of value) strings(item, out, depth + 1);
+  else if (value && typeof value === "object") for (const item of Object.values(value)) strings(item, out, depth + 1);
+}
+function skillRoots(cwd, home) {
+  const claude = process.env.CLAUDE_CONFIG_DIR ?? join2(home, ".claude");
+  const codex = process.env.CODEX_HOME ?? join2(home, ".codex");
+  return [
+    ...cwd ? [join2(cwd, ".claude", "skills"), join2(cwd, ".agents", "skills")] : [],
+    join2(home, ".agents", "skills"),
+    join2(claude, "skills"),
+    join2(codex, "skills"),
+    join2(home, ".hermes", "skills")
+  ];
+}
+function pluginSkill(plugin, skill, home) {
+  const base = join2(process.env.CLAUDE_CONFIG_DIR ?? join2(home, ".claude"), "plugins");
+  const walk = (dir, depth) => {
+    if (depth > 7) return null;
+    let entries;
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return null;
+    }
+    for (const entry2 of entries) {
+      if (!entry2.isDirectory() || entry2.name === "node_modules" || entry2.name === ".git") continue;
+      const path = join2(dir, entry2.name);
+      if (entry2.name === skill && basename3(dir) === "skills" && path.includes(`${sep}${plugin}${sep}`) && isFile(join2(path, "SKILL.md"))) return path;
+      const found = walk(path, depth + 1);
+      if (found) return found;
+    }
+    return null;
+  };
+  return walk(base, 0);
+}
+function findSkill(name, cwd, home) {
+  const [scope, skill] = name.includes(":") ? name.split(":", 2) : [null, name];
+  if (scope && skill) return pluginSkill(scope, skill, home);
+  for (const root of skillRoots(cwd, home)) {
+    const direct = join2(root, name);
+    if (isFile(join2(direct, "SKILL.md"))) return realpathSync(direct);
+  }
+  return null;
+}
+function loadedSkills(records, touched, cwd, home = homedir2()) {
+  const dirs = /* @__PURE__ */ new Map();
+  const missing = /* @__PURE__ */ new Set();
+  const add = (dir, name = basename3(dir)) => {
+    if (!isFile(join2(dir, "SKILL.md"))) return false;
+    const real = realpathSync(dir);
+    if (![...dirs.values()].includes(real)) dirs.set(name, real);
+    return true;
+  };
+  for (const record of records) {
+    const texts = [];
+    strings(record, texts);
+    for (const text of texts) for (const match of text.matchAll(SKILL_LINE)) add(match[1].replace(/[.,;:)]+$/, ""));
+    const content = record?.message?.content;
+    if (!Array.isArray(content)) continue;
+    for (const block of content) {
+      const b = block;
+      if (b?.type !== "tool_use" || b.name !== "Skill" || typeof b.input?.skill !== "string") continue;
+      const name = b.input.skill.replace(/^\//, "");
+      if (!name || dirs.has(name) || [...dirs.keys()].some((key) => key.endsWith(`:${name}`) || name.endsWith(`:${key}`))) continue;
+      const dir = findSkill(name, cwd, home);
+      if (!dir || !add(dir, name)) missing.add(name);
+    }
+  }
+  for (const path of touched) if (basename3(path) === "SKILL.md") add(dirname2(path));
+  for (const name of dirs.keys()) missing.delete(name);
+  return { found: [...dirs].map(([name, dir]) => ({ name: name.replace(/[^A-Za-z0-9._:-]/g, "-"), dir })), missing: [...missing] };
+}
+function readJson2(path) {
+  try {
+    const value = JSON.parse(readFileSync4(path, "utf8"));
+    return value && typeof value === "object" ? value : null;
+  } catch {
+    return null;
+  }
+}
+function names(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const keys2 = Object.keys(value).sort();
+  return keys2.length ? keys2 : void 0;
+}
+function safeUrl(raw) {
+  try {
+    const url = new URL(raw);
+    if (!/^https?:$/.test(url.protocol)) return null;
+    const query = [.../* @__PURE__ */ new Set([...url.searchParams.keys()])].sort();
+    return { url: `${url.protocol}//${url.host}${url.pathname}`, ...query.length ? { query } : {} };
+  } catch {
+    return null;
+  }
+}
+function serverEntry(name, def, scope) {
+  if (!def || typeof def !== "object") return null;
+  const env = names(def.env);
+  const headers = names(def.headers ?? def.http_headers);
+  if (typeof def.url === "string") {
+    const url = safeUrl(def.url);
+    if (!url) return null;
+    const type = def.type === "sse" ? "sse" : "http";
+    return { name, scope, transport: type, ...url, ...headers ? { headers } : {}, ...env ? { env } : {} };
+  }
+  if (typeof def.command !== "string" || !def.command) return null;
+  const args = Array.isArray(def.args) ? def.args.filter((arg) => typeof arg === "string") : [];
+  return { name, scope, transport: "stdio", command: def.command, ...args.length ? { args } : {}, ...env ? { env } : {} };
+}
+function mcpServers(harness2, cwd, home = homedir2()) {
+  const out = [];
+  const push = (servers, scope) => {
+    if (!servers || typeof servers !== "object") return;
+    for (const [name, def] of Object.entries(servers)) {
+      const entry2 = serverEntry(name, def, scope);
+      if (entry2 && !out.some((existing) => existing.name === name)) out.push(entry2);
+    }
+  };
+  if (harness2 === "claude_code") {
+    const config = readJson2(join2(process.env.CLAUDE_CONFIG_DIR ? dirname2(process.env.CLAUDE_CONFIG_DIR) : home, ".claude.json"));
+    const projects = config?.projects && typeof config.projects === "object" ? config.projects : {};
+    const root = cwd ? git(cwd, "rev-parse", "--show-toplevel")?.trim() || cwd : "";
+    if (cwd) push(projects[cwd]?.mcpServers ?? projects[root]?.mcpServers, "local");
+    if (root) push(readJson2(join2(root, ".mcp.json"))?.mcpServers, "project");
+    push(config?.mcpServers, "user");
+  }
+  if (harness2 === "codex") {
+    try {
+      const config = parseToml2(readFileSync4(join2(process.env.CODEX_HOME ?? join2(home, ".codex"), "config.toml"), "utf8"));
+      push(config.mcp_servers, "user");
+    } catch {
+    }
+  }
+  return out;
+}
+function remoteWithoutCredentials(remote) {
+  return remote.trim().replace(/\/\/[^@/]+@/, "//").replace(/^[^@/]+@([^:]+):/, "$1:");
+}
+function workspaceState(cwd, harness2, skills2, home = homedir2()) {
+  const present = !!cwd && isDir(cwd);
+  const root = present ? git(cwd, "rev-parse", "--show-toplevel")?.trim() || null : null;
+  let gitState = null;
+  let tree = [];
+  let patch = null;
+  if (root) {
+    const dirty = (git(root, "status", "--porcelain=v1", "--untracked-files=normal") ?? "").split("\n").filter(Boolean).map((line) => line.slice(3));
+    const ahead = git(root, "rev-list", "--count", "@{upstream}..HEAD");
+    const remote = git(root, "remote", "get-url", "origin");
+    const branch = git(root, "rev-parse", "--abbrev-ref", "HEAD")?.trim() || null;
+    gitState = {
+      remote: remote ? remoteWithoutCredentials(remote) : null,
+      branch: branch === "HEAD" ? null : branch,
+      commit: git(root, "rev-parse", "HEAD")?.trim() || null,
+      dirty: dirty.slice(0, 500),
+      ahead: ahead === null ? null : Number(ahead.trim()) || 0
+    };
+    tree = (git(cwd, "-c", "core.quotePath=false", "ls-files") ?? "").split("\n").filter(Boolean);
+    if (dirty.length) patch = git(cwd, "diff", "HEAD", "--no-color", "--no-ext-diff", "--relative", "--", ".") || null;
+  }
+  return {
+    manifest: {
+      format: "agentsky.import-workspace",
+      format_version: 1,
+      harness: harness2,
+      cwd: cwd ? cwd.replace(home, "~") : null,
+      project: cwd ? basename3(root ?? cwd) : null,
+      git: gitState,
+      tree: tree.slice(0, MAX_TREE),
+      tree_truncated: tree.length > MAX_TREE,
+      skills: [...skills2.found.map((skill) => ({ name: skill.name, found: true })), ...skills2.missing.map((name) => ({ name, found: false }))],
+      mcp_servers: mcpServers(harness2, cwd, home)
+    },
+    patch
+  };
+}
+function skillFiles(skill) {
+  const out = [];
+  const walk = (dir, depth) => {
+    if (depth > 8 || out.length > 400) return;
+    let entries;
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry2 of entries) {
+      if (entry2.name === "node_modules" || entry2.name === ".git" || entry2.name === "__pycache__" || entry2.name === ".venv") continue;
+      const path = join2(dir, entry2.name);
+      if (entry2.isDirectory()) walk(path, depth + 1);
+      else if (entry2.isFile()) out.push({ path, name: `skills/${skill.name}/${relative(skill.dir, path).split(sep).join("/")}` });
+    }
+  };
+  if (existsSync3(skill.dir)) walk(skill.dir, 0);
+  return out;
+}
+
+// src/import-files.ts
 var MAX_ATTACHED_FILE_BYTES = 10 * 1024 * 1024;
 var SECRET_FILE = /(^|\/)(\.env(\..*)?|\.netrc|\.npmrc|\.pypirc|\.git-credentials|\.?credentials(\.json)?|auth\.json|\.claude\.json|id_(rsa|ed25519|ecdsa)[^/]*|.*\.(pem|key|p12|pfx|keystore|jks|kdbx|sqlite|db))$|\/\.ssh\/|\/\.aws\/|\/\.gnupg\/|\/\.docker\/config\.json$|\/Keychains\//i;
 var SKIP_DIR = /(^|\/)(node_modules|\.git|\.next|dist|build|__pycache__|\.venv)(\/|$)/;
@@ -878,7 +1114,7 @@ function classify(path) {
   if (DOCUMENTS[ext]) return { kind: "document", mediaType: DOCUMENTS[ext] };
   if (IMAGES[ext]) return { kind: "image", mediaType: IMAGES[ext] };
   if (TEXT[ext]) return { kind: "text", mediaType: TEXT[ext] };
-  if (PLAIN_TEXT.has(ext) || PLAIN_NAMES.has(basename3(path))) return { kind: "text", mediaType: "text/plain" };
+  if (PLAIN_TEXT.has(ext) || PLAIN_NAMES.has(basename4(path))) return { kind: "text", mediaType: "text/plain" };
   return null;
 }
 var SHELL_READ = /(?:^|[\s;&|(`"'])(?:cat|head|tail|nl|less|more|wc|bat|sed\s+-n\s+(?:'[^']*'|"[^"]*"|\S+))(?:\s+-[\w-]+(?:\s+\d+)?)*\s+((?:~|\.{0,2}\/)?[\w@%+./~-]*[\w-]\.[\w]{1,10}|\/[\w@%+./-]+)/g;
@@ -892,7 +1128,7 @@ function shellText(input) {
   const command = Array.isArray(i.command) ? i.command.filter((part) => typeof part === "string").join(" ") : str(i.command);
   return [command, str(i.cmd), str(i.script)].filter(Boolean).join("\n");
 }
-function touchedPaths(records, cwd, home = homedir2()) {
+function touchedPaths(records, cwd, home = homedir3()) {
   const out = /* @__PURE__ */ new Set();
   const add = (raw, base) => {
     if (!raw || raw.length > 1e3) return;
@@ -935,79 +1171,110 @@ function touchedPaths(records, cwd, home = homedir2()) {
   return [...out];
 }
 function gitRoot(dir) {
-  for (let d = dir; ; d = dirname2(d)) {
-    if (existsSync3(join2(d, ".git"))) return d;
-    if (d === dirname2(d)) return null;
+  for (let d = dir; ; d = dirname3(d)) {
+    if (existsSync4(join3(d, ".git"))) return d;
+    if (d === dirname3(d)) return null;
   }
 }
-function instructionPaths(cwd, harness2, home = homedir2()) {
+function instructionPaths(cwd, harness2, home = homedir3()) {
   const out = [];
-  if (cwd && existsSync3(cwd)) {
+  if (cwd && existsSync4(cwd)) {
     const root = gitRoot(cwd) ?? cwd;
-    for (let d = resolve3(cwd); ; d = dirname2(d)) {
-      for (const name of INSTRUCTION_FILES) out.push(join2(d, name));
-      if (d === root || d === dirname2(d)) break;
+    for (let d = resolve3(cwd); ; d = dirname3(d)) {
+      for (const name of INSTRUCTION_FILES) out.push(join3(d, name));
+      if (d === root || d === dirname3(d)) break;
     }
   }
-  if (harness2 === "claude_code") out.push(join2(process.env.CLAUDE_CONFIG_DIR ?? join2(home, ".claude"), "CLAUDE.md"));
-  if (harness2 === "codex") out.push(join2(process.env.CODEX_HOME ?? join2(home, ".codex"), "AGENTS.md"));
+  if (harness2 === "claude_code") out.push(join3(process.env.CLAUDE_CONFIG_DIR ?? join3(home, ".claude"), "CLAUDE.md"));
+  if (harness2 === "codex") out.push(join3(process.env.CODEX_HOME ?? join3(home, ".codex"), "AGENTS.md"));
+  out.push(...sharedInstructionPaths(home));
   return out.filter((path) => {
     try {
-      return statSync(path).isFile();
+      return statSync2(path).isFile();
     } catch {
       return false;
     }
   });
 }
-function resourceName(path, cwd, home = homedir2()) {
-  const inside = cwd ? relative(resolve3(cwd), path) : "";
-  if (cwd && inside && !inside.startsWith("..") && !isAbsolute(inside)) return `workspace/${inside.split(sep).join("/")}`;
-  const underHome = relative(home, path);
+function resourceName(path, cwd, home = homedir3()) {
+  const inside = cwd ? relative2(resolve3(cwd), path) : "";
+  if (cwd && inside && !inside.startsWith("..") && !isAbsolute(inside)) return `workspace/${inside.split(sep2).join("/")}`;
+  const underHome = relative2(home, path);
   const shown = !underHome.startsWith("..") && !isAbsolute(underHome) ? `~/${underHome}` : path.replace(/^\/+/, "");
-  return `files/${shown.split(sep).join("/")}`;
+  return `files/${shown.split(sep2).join("/")}`;
 }
 var ORDER = { text: 0, document: 1, image: 2 };
+function resourceLine(name, mediaType, data) {
+  return redactLine(JSON.stringify({ type: "import.resource", name, media_type: mediaType, data: data.toString("base64") }), { requireStructured: true }).line + "\n";
+}
 function collectSessionFiles(records, opts) {
-  const home = opts.home ?? homedir2();
+  const home = opts.home ?? homedir3();
   const exclude = new Set((opts.exclude ?? []).map((path) => resolve3(path)));
   const leftOut = [];
   const candidates = [];
   const seen = /* @__PURE__ */ new Set();
-  for (const path of [...instructionPaths(opts.cwd, opts.harness, home), ...touchedPaths(records, opts.cwd, home)]) {
-    if (seen.has(path) || exclude.has(path)) continue;
+  const touched = touchedPaths(records, opts.cwd, home);
+  const skills2 = loadedSkills(records, touched, opts.cwd, home);
+  const consider = (path, name) => {
+    if (seen.has(path) || exclude.has(path)) return;
     seen.add(path);
     if (SECRET_FILE.test(path) || SKIP_DIR.test(path)) {
       leftOut.push({ path, reason: "credential or build file" });
-      continue;
+      return;
     }
     let size;
     try {
-      const stat = statSync(path);
-      if (!stat.isFile()) continue;
+      const stat = statSync2(path);
+      if (!stat.isFile()) return;
       size = stat.size;
     } catch {
       leftOut.push({ path, reason: "missing" });
-      continue;
+      return;
     }
     const type = classify(path);
     if (!type) {
       leftOut.push({ path, reason: "unsupported type" });
-      continue;
+      return;
     }
     if (size > MAX_ATTACHED_FILE_BYTES) {
       leftOut.push({ path, reason: "too large" });
-      continue;
+      return;
     }
-    candidates.push({ path, name: resourceName(path, opts.cwd, home), ...type, size });
-  }
+    candidates.push({ path, name, ...type, size });
+  };
+  for (const path of [...instructionPaths(opts.cwd, opts.harness, home), ...touched]) consider(path, resourceName(path, opts.cwd, home));
+  for (const skill of skills2.found) for (const file of skillFiles(skill)) consider(file.path, file.name);
   candidates.sort((a, b) => ORDER[a.kind] - ORDER[b.kind] || a.size - b.size);
   const lines = [];
   const attached = [];
   let bytes = 0;
+  const state = workspaceState(opts.cwd, opts.harness, skills2, home);
+  const described = !!opts.cwd || state.manifest.skills.length > 0 || state.manifest.mcp_servers.length > 0;
+  const generated = [
+    ...described ? [{ name: "agentsky/workspace.json", mediaType: "application/json", data: Buffer.from(JSON.stringify(state.manifest, null, 2)) }] : [],
+    ...state.patch ? [{ name: "agentsky/uncommitted.patch", mediaType: "text/x-diff", data: Buffer.from(state.patch) }] : []
+  ];
+  for (const file of generated) {
+    let line;
+    try {
+      line = resourceLine(file.name, file.mediaType, file.data);
+    } catch {
+      leftOut.push({ path: file.name, reason: "could not be redacted safely" });
+      continue;
+    }
+    const size = Buffer.byteLength(line);
+    if (bytes + size > opts.budget) {
+      leftOut.push({ path: file.name, reason: "over the upload budget" });
+      continue;
+    }
+    bytes += size;
+    lines.push(line);
+    attached.push({ name: file.name, kind: "text", bytes: file.data.length });
+  }
   for (const file of candidates) {
     let data;
     try {
-      data = readFileSync4(file.path);
+      data = readFileSync5(file.path);
     } catch {
       leftOut.push({ path: file.path, reason: "missing" });
       continue;
@@ -1018,7 +1285,7 @@ function collectSessionFiles(records, opts) {
     }
     let line;
     try {
-      line = redactLine(JSON.stringify({ type: "import.resource", name: file.name, media_type: file.mediaType, data: data.toString("base64") }), { requireStructured: true }).line + "\n";
+      line = resourceLine(file.name, file.mediaType, data);
     } catch {
       leftOut.push({ path: file.path, reason: file.kind === "text" && !isUtf8(data) ? "not valid UTF-8 text" : "could not be redacted safely" });
       continue;
@@ -1032,7 +1299,13 @@ function collectSessionFiles(records, opts) {
     lines.push(line);
     attached.push({ name: file.name, kind: file.kind, bytes: data.length });
   }
-  return { lines, bytes, attached, leftOut };
+  const setup = {
+    skills: skills2.found.map((skill) => skill.name),
+    missingSkills: skills2.missing,
+    mcpServers: state.manifest.mcp_servers.map((server) => server.name),
+    git: state.manifest.git !== null
+  };
+  return { lines, bytes, attached, leftOut, setup };
 }
 
 // src/import-local.ts
@@ -1107,16 +1380,16 @@ function sniffTitle(filePath) {
   }
 }
 function listClaudeCodeSessions(limit) {
-  const root = process.env.CLAUDE_CONFIG_DIR ?? join3(homedir3(), ".claude");
-  const projectsDir = join3(root, "projects");
-  if (!existsSync4(projectsDir)) return [];
+  const root = process.env.CLAUDE_CONFIG_DIR ?? join4(homedir4(), ".claude");
+  const projectsDir = join4(root, "projects");
+  if (!existsSync5(projectsDir)) return [];
   const sessions = [];
   try {
-    for (const encoded of readdirSync(projectsDir)) {
-      const projectDir = join3(projectsDir, encoded);
+    for (const encoded of readdirSync2(projectsDir)) {
+      const projectDir = join4(projectsDir, encoded);
       let entries;
       try {
-        entries = readdirSync(projectDir);
+        entries = readdirSync2(projectDir);
       } catch {
         continue;
       }
@@ -1124,22 +1397,22 @@ function listClaudeCodeSessions(limit) {
       for (const entry2 of entries) {
         if (!entry2.endsWith(".jsonl")) continue;
         const sessionId = entry2.slice(0, -6);
-        const mainFile = join3(projectDir, entry2);
+        const mainFile = join4(projectDir, entry2);
         let stat;
         try {
-          stat = statSync2(mainFile);
+          stat = statSync3(mainFile);
         } catch {
           continue;
         }
         if (!stat.isFile()) continue;
         let discoveryError;
         const subagentFiles = [];
-        const subagentDir = join3(projectDir, sessionId, "subagents");
-        if (existsSync4(subagentDir)) {
+        const subagentDir = join4(projectDir, sessionId, "subagents");
+        if (existsSync5(subagentDir)) {
           try {
-            const subFiles = readdirSync(subagentDir).filter((f) => f.endsWith(".jsonl")).sort();
+            const subFiles = readdirSync2(subagentDir).filter((f) => f.endsWith(".jsonl")).sort();
             for (const f of subFiles) {
-              subagentFiles.push(join3(subagentDir, f));
+              subagentFiles.push(join4(subagentDir, f));
             }
           } catch {
             discoveryError = "Cannot read all recorded subagent conversations. Fix local file access before importing this session.";
@@ -1161,17 +1434,17 @@ function listClaudeCodeSessions(limit) {
   return sessions.sort((a, b) => b.mtimeMs - a.mtimeMs).slice(0, limit);
 }
 function listCodexSessions(limit) {
-  const sessionsDir = join3(process.env.CODEX_HOME ?? process.env.CODEX_CONFIG_DIR ?? join3(homedir3(), ".codex"), "sessions");
+  const sessionsDir = join4(process.env.CODEX_HOME ?? process.env.CODEX_CONFIG_DIR ?? join4(homedir4(), ".codex"), "sessions");
   const records = [];
   function walk(dir) {
     let entries;
     try {
-      entries = readdirSync(dir, { withFileTypes: true });
+      entries = readdirSync2(dir, { withFileTypes: true });
     } catch {
       return;
     }
     for (const entry2 of entries) {
-      const full = join3(dir, entry2.name);
+      const full = join4(dir, entry2.name);
       if (entry2.isDirectory()) {
         walk(full);
         continue;
@@ -1189,7 +1462,7 @@ function listCodexSessions(limit) {
             sessionId: data.id,
             workspace: typeof data.cwd === "string" ? data.cwd : dir,
             title: sniffTitle(full),
-            mtimeMs: statSync2(full).mtimeMs,
+            mtimeMs: statSync3(full).mtimeMs,
             files: [full]
           },
           ...typeof parent === "string" ? { parent } : {}
@@ -1258,7 +1531,7 @@ async function mintTrace(base, harness2) {
 function loadSummaryFile(summaryPath) {
   let raw;
   try {
-    raw = readFileSync5(summaryPath, "utf8");
+    raw = readFileSync6(summaryPath, "utf8");
   } catch {
     throw new Error(`Cannot read summary file: ${summaryPath}`);
   }
@@ -1272,8 +1545,8 @@ function loadSummaryFile(summaryPath) {
   const p = pkg;
   if (p.format !== "asteroids.session-summary") throw new Error('Summary file must have format "asteroids.session-summary".');
   if (p.format_version !== 1) throw new Error("Summary file must have format_version 1.");
-  const redacted = redactLine2(raw.trimEnd());
-  return redacted;
+  const redacted2 = redactLine2(raw.trimEnd());
+  return redacted2;
 }
 var MAX_IMPORT_BYTES = 30 * 1024 * 1024;
 var SUMMARY_RESERVE_BYTES = 128 * 1024;
@@ -1299,9 +1572,9 @@ function prepareImport(session2, summaryPath, options = {}) {
   const source = new SessionSourceCollector();
   const records = [];
   for (const path of session2.files) {
-    const stat = statSync2(path);
+    const stat = statSync3(path);
     if (!stat.isFile() || (inputBytes += stat.size) > maximum) throw new Error("Selected transcript exceeds the 16 MiB limit or is not a regular file.");
-    const text = readFileSync5(path, "utf8");
+    const text = readFileSync6(path, "utf8");
     for (const raw of text.split("\n")) {
       if (!raw.trim()) continue;
       let record;
@@ -1340,8 +1613,8 @@ function prepareImport(session2, summaryPath, options = {}) {
   const sourceId = nativeId ?? session2.sessionId;
   if (!/^[A-Za-z0-9_-]{1,200}$/.test(sourceId) || redactLine2(JSON.stringify(sourceId)) !== JSON.stringify(sourceId)) throw new Error("The source conversation has an invalid identifier.");
   const meta = source.result();
-  const files2 = options.files === false ? { lines: [], bytes: 0, attached: [], leftOut: [] } : collectSessionFiles(records, { harness: session2.harness, cwd: meta.cwd ?? (session2.harness === "claude_code" ? session2.workspace : ""), budget: MAX_IMPORT_BYTES - outputBytes - SUMMARY_RESERVE_BYTES, exclude: session2.files });
-  const attachedNote = files2.attached.length ? ` The ${files2.attached.length} local ${files2.attached.length === 1 ? "file" : "files"} it read, wrote or ran under are attached as well (listed in artifacts).` : "";
+  const files2 = options.files === false ? { lines: [], bytes: 0, attached: [], leftOut: [], setup: { skills: [], missingSkills: [], mcpServers: [], git: false } } : collectSessionFiles(records, { harness: session2.harness, cwd: meta.cwd ?? (session2.harness === "claude_code" ? session2.workspace : ""), budget: MAX_IMPORT_BYTES - outputBytes - SUMMARY_RESERVE_BYTES, exclude: session2.files });
+  const attachedNote = files2.attached.length ? ` The ${files2.attached.length} local ${files2.attached.length === 1 ? "file" : "files"} it read, wrote or ran under, the skills it loaded and its workspace description (repository state and tool servers, agentsky/workspace.json) are attached as well (listed in artifacts).` : "";
   let summaryJson;
   if (summaryPath) {
     summaryJson = loadSummaryFile(summaryPath);
@@ -1361,7 +1634,7 @@ function prepareImport(session2, summaryPath, options = {}) {
         completed: [],
         pending: ["Read the complete imported transcript, reconcile the latest human instructions and completed work, then continue."],
         verification: [],
-        blockers: [leftOutLine(files2.leftOut)],
+        blockers: [leftOutLine(files2.leftOut), ...files2.setup.missingSkills.length ? [`Skills it loaded that are not on this computer any more: ${files2.setup.missingSkills.slice(0, 20).join(", ")}.`] : []],
         artifacts: files2.attached.slice(0, MAX_LISTED_ARTIFACTS).map((file) => ({ path: file.name, description: `Attached from the local ${file.kind === "text" ? "workspace" : file.kind} the conversation used (${file.bytes} bytes).` })),
         provenance: { native_checkpoint_sha256: digest.digest("hex"), selected_native_session_id: sourceId, context_bytes: outputBytes }
       }
@@ -1373,7 +1646,7 @@ function prepareImport(session2, summaryPath, options = {}) {
   if (encryptedReasoningCount > 0) gaps.push({ kind: "encrypted_reasoning", count: encryptedReasoningCount });
   if (compactionCount > 0) gaps.push({ kind: "compaction", count: compactionCount });
   if (unreadableCount > 0) gaps.push({ kind: "unreadable", count: unreadableCount });
-  return { body, transcriptLines: lines.length, outputBytes, redactionCount, gaps, attachedFiles: files2.attached, leftOutFiles: files2.leftOut };
+  return { body, transcriptLines: lines.length, outputBytes, redactionCount, gaps, attachedFiles: files2.attached, leftOutFiles: files2.leftOut, setup: files2.setup };
 }
 async function importSession(opts) {
   const base = (opts.agentUseUrl ?? agentUseBase()).replace(/\/$/, "");
@@ -1382,7 +1655,7 @@ async function importSession(opts) {
     throw new Error("Import requires HTTPS, or a loopback development server.");
   }
   opts.onProgress?.("Reading transcript and redacting secrets locally\u2026");
-  const { body, transcriptLines, outputBytes, redactionCount, gaps, attachedFiles, leftOutFiles } = prepareImport(opts.session, opts.summaryPath, { files: opts.files });
+  const { body, transcriptLines, outputBytes, redactionCount, gaps, attachedFiles, leftOutFiles, setup } = prepareImport(opts.session, opts.summaryPath, { files: opts.files });
   let traceId;
   let key;
   if (opts.importKey && opts.grantTraceId) {
@@ -1416,7 +1689,8 @@ async function importSession(opts) {
     redactionCount,
     gaps,
     attachedFiles,
-    leftOutFiles
+    leftOutFiles,
+    setup
   };
 }
 
@@ -1520,23 +1794,23 @@ async function headlessLogin(verifier, challenge) {
 }
 
 // src/local-agents.ts
-import { existsSync as existsSync5 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
-function localAgents(env = process.env, home = homedir4()) {
-  const claude = env.CLAUDE_CONFIG_DIR || join4(home, ".claude");
-  const codex = env.CODEX_HOME || join4(home, ".codex");
-  const cursor = join4(home, ".cursor");
+import { existsSync as existsSync6 } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join5 } from "path";
+function localAgents(env = process.env, home = homedir5()) {
+  const claude = env.CLAUDE_CONFIG_DIR || join5(home, ".claude");
+  const codex = env.CODEX_HOME || join5(home, ".codex");
+  const cursor = join5(home, ".cursor");
   return [
-    { id: "claude_code", name: "Claude Code", root: claude, skillsDir: join4(claude, "skills") },
-    { id: "codex", name: "Codex", root: codex, skillsDir: join4(codex, "skills") },
-    { id: "cursor", name: "Cursor", root: cursor, skillsDir: join4(cursor, "skills") }
+    { id: "claude_code", name: "Claude Code", root: claude, skillsDir: join5(claude, "skills") },
+    { id: "codex", name: "Codex", root: codex, skillsDir: join5(codex, "skills") },
+    { id: "cursor", name: "Cursor", root: cursor, skillsDir: join5(cursor, "skills") }
   ];
 }
-function detectLocalAgents(env = process.env, home = homedir4()) {
-  return localAgents(env, home).filter((agent2) => existsSync5(agent2.root));
+function detectLocalAgents(env = process.env, home = homedir5()) {
+  return localAgents(env, home).filter((agent2) => existsSync6(agent2.root));
 }
-function selectLocalAgents(ids, env = process.env, home = homedir4()) {
+function selectLocalAgents(ids, env = process.env, home = homedir5()) {
   if (!ids?.length) return detectLocalAgents(env, home);
   const known = localAgents(env, home);
   return ids.map((id) => {
@@ -1635,16 +1909,16 @@ async function readTurn(sessionId, opts = {}) {
 }
 
 // src/setup.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync9, writeFileSync as writeFileSync4 } from "fs";
-import { dirname as dirname4, join as join8 } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "fs";
+import { dirname as dirname5, join as join9 } from "path";
 import { createInterface as createInterface3 } from "readline";
 
 // src/mcp-register.ts
-import { spawnSync } from "child_process";
+import { spawnSync as spawnSync2 } from "child_process";
 
 // src/skill.ts
-import { mkdirSync, readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
-import { join as join5 } from "path";
+import { mkdirSync, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "fs";
+import { join as join6 } from "path";
 
 // src/catalog-file.ts
 var CATALOG_FILE = "catalog.md";
@@ -1661,8 +1935,8 @@ function entry(agent2) {
   const lines = [`### @${agent2.handle} \u2014 ${agent2.name}${engine}`, "", agent2.tagline];
   if (agent2.does.length) lines.push("", `Does: ${agent2.does.join("; ")}`);
   if (agent2.does_not.length) lines.push(`Does not: ${agent2.does_not.join("; ")}`);
-  const { mcp_servers: mcpServers, ...rest } = agent2.requirements;
-  if (typeof mcpServers === "boolean") lines.push(mcpServers ? "Can use MCP servers." : "Cannot use MCP servers.");
+  const { mcp_servers: mcpServers2, ...rest } = agent2.requirements;
+  if (typeof mcpServers2 === "boolean") lines.push(mcpServers2 ? "Can use MCP servers." : "Cannot use MCP servers.");
   const details = describe(rest);
   if (details) lines.push(`Details: ${details}`);
   const pricing = describe(agent2.pricing);
@@ -2085,7 +2359,7 @@ To set a per-repo default, create \`.agentsky.json\` at the git root:
 }
 function installedVersion(dir) {
   try {
-    const marker = JSON.parse(readFileSync6(join5(dir, SKILL_MARKER), "utf8"));
+    const marker = JSON.parse(readFileSync7(join6(dir, SKILL_MARKER), "utf8"));
     return typeof marker.version === "string" ? marker.version : null;
   } catch {
     return null;
@@ -2095,25 +2369,25 @@ function isInstalledSkill(dir) {
   return installedVersion(dir) !== null;
 }
 function installSkill(agent2, opts = {}) {
-  const dir = join5(agent2.skillsDir, SKILL_NAME);
+  const dir = join6(agent2.skillsDir, SKILL_NAME);
   const previous = installedVersion(dir);
   const outcome = previous === CLI_VERSION ? "current" : previous ? "updated" : "installed";
   if (opts.dryRun) return { agent: agent2.id, path: dir, outcome };
   if (outcome !== "current") {
     mkdirSync(dir, { recursive: true });
-    writeFileSync3(join5(dir, "SKILL.md"), skillDocument());
-    writeFileSync3(join5(dir, SKILL_MARKER), `${JSON.stringify({ version: CLI_VERSION }, null, 2)}
+    writeFileSync3(join6(dir, "SKILL.md"), skillDocument());
+    writeFileSync3(join6(dir, SKILL_MARKER), `${JSON.stringify({ version: CLI_VERSION }, null, 2)}
 `);
   }
   if (opts.catalog) {
     mkdirSync(dir, { recursive: true });
-    writeFileSync3(join5(dir, CATALOG_FILE), renderCatalog(opts.catalog, opts.now ?? /* @__PURE__ */ new Date()));
+    writeFileSync3(join6(dir, CATALOG_FILE), renderCatalog(opts.catalog, opts.now ?? /* @__PURE__ */ new Date()));
   }
-  const refsDir = join5(dir, REFERENCES_DIR);
+  const refsDir = join6(dir, REFERENCES_DIR);
   mkdirSync(refsDir, { recursive: true });
-  writeFileSync3(join5(refsDir, "import.md"), importReferenceDoc());
-  writeFileSync3(join5(refsDir, "workspaces.md"), workspacesReferenceDoc());
-  writeFileSync3(join5(refsDir, "focused-agents.md"), focusedAgentsReferenceDoc());
+  writeFileSync3(join6(refsDir, "import.md"), importReferenceDoc());
+  writeFileSync3(join6(refsDir, "workspaces.md"), workspacesReferenceDoc());
+  writeFileSync3(join6(refsDir, "focused-agents.md"), focusedAgentsReferenceDoc());
   return { agent: agent2.id, path: dir, outcome };
 }
 
@@ -2122,9 +2396,9 @@ var MCP_SERVER_NAME = SKILL_NAME;
 var CODEX_TOKEN_ENV = "AGENTSKY_API_KEY";
 function systemCommandRunner() {
   return {
-    has: (command) => spawnSync(command, ["--version"], { stdio: "ignore" }).status === 0,
+    has: (command) => spawnSync2(command, ["--version"], { stdio: "ignore" }).status === 0,
     run: (command, args) => {
-      const result = spawnSync(command, args, { encoding: "utf8" });
+      const result = spawnSync2(command, args, { encoding: "utf8" });
       return { status: result.status, stderr: result.stderr ?? "" };
     }
   };
@@ -2164,10 +2438,11 @@ function registerMcpServer(agent2, opts, runner = systemCommandRunner()) {
 }
 
 // src/setup-local.ts
-import { existsSync as existsSync6, readdirSync as readdirSync2, readFileSync as readFileSync7, statSync as statSync3 } from "fs";
-import { homedir as homedir5 } from "os";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join6, resolve as resolve4 } from "path";
-import { parse as parseToml2 } from "smol-toml";
+import { isUtf8 as isUtf82 } from "buffer";
+import { existsSync as existsSync7, readdirSync as readdirSync3, readFileSync as readFileSync8, statSync as statSync4 } from "fs";
+import { homedir as homedir6 } from "os";
+import { dirname as dirname4, isAbsolute as isAbsolute2, join as join7, resolve as resolve4 } from "path";
+import { parse as parseToml3 } from "smol-toml";
 var MAX_SKILL_FILE_BYTES = 1024 * 1024;
 var MAX_IMPORT_DEPTH = 5;
 var SKIPPED_DIRS = /* @__PURE__ */ new Set([".git", "node_modules"]);
@@ -2179,14 +2454,24 @@ function frontmatterName(skillMd) {
 function sensitive(name) {
   return name.startsWith(".env") || name.endsWith(".pem") || name.endsWith(".key");
 }
-function skillFiles(root, prefix) {
+function redacted(data) {
+  if (data.includes(0) || !isUtf82(data)) return new Uint8Array(data);
+  try {
+    const line = redactLine(JSON.stringify({ type: "import.resource", name: "skill", media_type: "text/plain", data: data.toString("base64") }), { requireStructured: true }).line;
+    return new Uint8Array(Buffer.from(JSON.parse(line).data, "base64"));
+  } catch {
+    return null;
+  }
+}
+function skillFiles2(root, prefix) {
   const files2 = [];
-  for (const entry2 of readdirSync2(root, { withFileTypes: true })) {
-    const path = join6(root, entry2.name);
+  for (const entry2 of readdirSync3(root, { withFileTypes: true })) {
+    const path = join7(root, entry2.name);
     if (entry2.isDirectory()) {
-      if (!SKIPPED_DIRS.has(entry2.name)) files2.push(...skillFiles(path, `${prefix}/${entry2.name}`));
-    } else if (entry2.isFile() && !sensitive(entry2.name) && statSync3(path).size <= MAX_SKILL_FILE_BYTES) {
-      files2.push({ path: `${prefix}/${entry2.name}`, bytes: new Uint8Array(readFileSync7(path)) });
+      if (!SKIPPED_DIRS.has(entry2.name)) files2.push(...skillFiles2(path, `${prefix}/${entry2.name}`));
+    } else if (entry2.isFile() && !sensitive(entry2.name) && statSync4(path).size <= MAX_SKILL_FILE_BYTES) {
+      const bytes = redacted(readFileSync8(path));
+      if (bytes) files2.push({ path: `${prefix}/${entry2.name}`, bytes });
     }
   }
   return files2;
@@ -2195,19 +2480,19 @@ function readLocalSkills(agents) {
   const skills2 = [];
   const ignored = [];
   for (const agent2 of agents) {
-    if (!existsSync6(agent2.skillsDir)) continue;
-    for (const entry2 of readdirSync2(agent2.skillsDir, { withFileTypes: true })) {
-      const dir = join6(agent2.skillsDir, entry2.name);
-      let isDir = entry2.isDirectory();
+    if (!existsSync7(agent2.skillsDir)) continue;
+    for (const entry2 of readdirSync3(agent2.skillsDir, { withFileTypes: true })) {
+      const dir = join7(agent2.skillsDir, entry2.name);
+      let isDir2 = entry2.isDirectory();
       if (entry2.isSymbolicLink()) {
         try {
-          isDir = statSync3(dir).isDirectory();
+          isDir2 = statSync4(dir).isDirectory();
         } catch {
-          isDir = false;
+          isDir2 = false;
         }
       }
-      if (!isDir || !existsSync6(join6(dir, "SKILL.md")) || isInstalledSkill(dir)) continue;
-      const name = frontmatterName(readFileSync7(join6(dir, "SKILL.md"), "utf8"));
+      if (!isDir2 || !existsSync7(join7(dir, "SKILL.md")) || isInstalledSkill(dir)) continue;
+      const name = frontmatterName(readFileSync8(join7(dir, "SKILL.md"), "utf8"));
       if (!name) {
         ignored.push({ agent: agent2.id, dir, reason: "SKILL.md has no name" });
         continue;
@@ -2217,7 +2502,7 @@ function readLocalSkills(agents) {
         ignored.push({ agent: agent2.id, dir, reason: `${taken.agent} already has a skill named ${name}` });
         continue;
       }
-      const files2 = skillFiles(dir, entry2.name);
+      const files2 = skillFiles2(dir, entry2.name);
       skills2.push({ name, agent: agent2.id, dir, files: files2, bytes: files2.reduce((sum, file) => sum + file.bytes.length, 0) });
     }
   }
@@ -2235,11 +2520,11 @@ function inlineImports(content, from, home, depth, seen) {
     }
     const target = fence ? void 0 : line.match(/^@(\S+\.(?:md|markdown|txt))$/i)?.[1];
     if (!target || depth >= MAX_IMPORT_DEPTH) return line;
-    const path = target.startsWith("~/") ? join6(home, target.slice(2)) : isAbsolute2(target) ? target : resolve4(dirname3(from), target);
+    const path = target.startsWith("~/") ? join7(home, target.slice(2)) : isAbsolute2(target) ? target : resolve4(dirname4(from), target);
     if (seen.includes(path)) return "";
     let imported;
     try {
-      imported = readFileSync7(path, "utf8");
+      imported = readFileSync8(path, "utf8");
     } catch {
       return line;
     }
@@ -2247,15 +2532,15 @@ function inlineImports(content, from, home, depth, seen) {
     return inlineImports(imported, path, home, depth + 1, seen).trim();
   }).join("\n");
 }
-function readGlobalInstructions(agents, home = homedir5()) {
+function readGlobalInstructions(agents, home = homedir6()) {
   const found = [];
   for (const agent2 of agents) {
     const file = INSTRUCTION_FILES2[agent2.id];
     if (!file) continue;
-    const path = join6(agent2.root, file);
+    const path = join7(agent2.root, file);
     let raw;
     try {
-      raw = readFileSync7(path, "utf8");
+      raw = readFileSync8(path, "utf8");
     } catch {
       continue;
     }
@@ -2272,9 +2557,9 @@ function combineInstructions(found) {
 
 ${item.content.trim()}`).join("\n\n");
 }
-function readJson2(path) {
+function readJson3(path) {
   try {
-    return JSON.parse(readFileSync7(path, "utf8"));
+    return JSON.parse(readFileSync8(path, "utf8"));
   } catch {
     return void 0;
   }
@@ -2288,15 +2573,15 @@ function bearerOf(def) {
   return match?.[1] ?? null;
 }
 function serversOf(agent2, home) {
-  if (agent2.id === "claude_code") return readJson2(join6(home, ".claude.json"))?.mcpServers ?? {};
-  if (agent2.id === "cursor") return readJson2(join6(agent2.root, "mcp.json"))?.mcpServers ?? {};
+  if (agent2.id === "claude_code") return readJson3(join7(home, ".claude.json"))?.mcpServers ?? {};
+  if (agent2.id === "cursor") return readJson3(join7(agent2.root, "mcp.json"))?.mcpServers ?? {};
   try {
-    return parseToml2(readFileSync7(join6(agent2.root, "config.toml"), "utf8")).mcp_servers ?? {};
+    return parseToml3(readFileSync8(join7(agent2.root, "config.toml"), "utf8")).mcp_servers ?? {};
   } catch {
     return {};
   }
 }
-function findLocalSecrets(agents, home = homedir5()) {
+function findLocalSecrets(agents, home = homedir6()) {
   const secrets2 = [];
   for (const agent2 of agents) {
     for (const [name, def] of Object.entries(serversOf(agent2, home))) {
@@ -2312,9 +2597,9 @@ function findLocalSecrets(agents, home = homedir5()) {
 
 // src/subscriptions.ts
 import { spawn as spawn3 } from "child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync8 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join7 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync9 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join8 } from "path";
 import { createInterface as createInterface2 } from "readline";
 var ALIASES = {
   claude: "anthropic",
@@ -2399,12 +2684,12 @@ async function connectClaude() {
   const expiry = sub.expiresAt ? ` (expires ~${sub.expiresAt.slice(0, 10)})` : "";
   console.log(`Connected Claude subscription${expiry}. Powers new eligible agents.`);
 }
-function codexSignIn(env = process.env, home = homedir6()) {
-  const path = join7(env.CODEX_HOME || join7(home, ".codex"), "auth.json");
-  if (!existsSync7(path)) {
+function codexSignIn(env = process.env, home = homedir7()) {
+  const path = join8(env.CODEX_HOME || join8(home, ".codex"), "auth.json");
+  if (!existsSync8(path)) {
     throw new ApiError(404, "no_codex_auth", `no ${path} \u2014 run \`codex login\` first`);
   }
-  const raw = readFileSync8(path, "utf8");
+  const raw = readFileSync9(path, "utf8");
   try {
     const parsed = JSON.parse(raw);
     return { path, raw, account: parsed.tokens?.account_id };
@@ -2412,12 +2697,12 @@ function codexSignIn(env = process.env, home = homedir6()) {
     throw new ApiError(400, "invalid_codex_auth", `${path} isn't valid JSON \u2014 re-run \`codex login\``);
   }
 }
-function cursorSignIn(env = process.env, home = homedir6()) {
-  const path = join7(env.XDG_CONFIG_HOME || join7(home, ".config"), "cursor", "auth.json");
-  if (!existsSync7(path)) {
+function cursorSignIn(env = process.env, home = homedir7()) {
+  const path = join8(env.XDG_CONFIG_HOME || join8(home, ".config"), "cursor", "auth.json");
+  if (!existsSync8(path)) {
     throw new ApiError(404, "no_cursor_auth", `no ${path} \u2014 run \`cursor-agent login\` first`);
   }
-  const raw = readFileSync8(path, "utf8");
+  const raw = readFileSync9(path, "utf8");
   try {
     const parsed = JSON.parse(raw);
     if (typeof parsed.accessToken !== "string" || typeof parsed.refreshToken !== "string") throw new Error("shape");
@@ -2487,20 +2772,20 @@ async function disconnect(name, opts) {
 // src/setup.ts
 var SETUP_STEPS = ["skill", "logins", "import", "secrets"];
 var PLAN_PROVIDERS = { claude: "anthropic", anthropic: "anthropic", chatgpt: "openai", codex: "openai", openai: "openai", cursor: "cursor" };
-function planProviders(names) {
-  if (!names?.length) return null;
-  return new Set(names.map((name) => {
+function planProviders(names2) {
+  if (!names2?.length) return null;
+  return new Set(names2.map((name) => {
     const provider = PLAN_PROVIDERS[name.toLowerCase()];
     if (!provider) throw new ApiError(400, "unknown_provider", `unknown plan "${name}" \u2014 use claude, chatgpt or cursor`);
     return provider;
   }));
 }
 function reportPath() {
-  return join8(dirname4(configPath()), "setup.json");
+  return join9(dirname5(configPath()), "setup.json");
 }
 function loadReport() {
   try {
-    const saved = JSON.parse(readFileSync9(reportPath(), "utf8"));
+    const saved = JSON.parse(readFileSync10(reportPath(), "utf8"));
     return { agents: saved.agents ?? [], plans: saved.plans ?? [], ...saved.secrets ? { secrets: saved.secrets } : {} };
   } catch {
     return { agents: [], plans: [] };
@@ -2513,7 +2798,7 @@ function mergeReport(base, next) {
   return { agents, plans, ...secrets2 ? { secrets: secrets2 } : {} };
 }
 function saveReport(report) {
-  mkdirSync2(dirname4(reportPath()), { recursive: true });
+  mkdirSync2(dirname5(reportPath()), { recursive: true });
   writeFileSync4(reportPath(), `${JSON.stringify(report, null, 2)}
 `, { mode: 384 });
 }
@@ -2863,17 +3148,17 @@ function renderArtifact(artifact2) {
 }
 
 // src/skills-store.ts
-import { readdirSync as readdirSync3, readFileSync as readFileSync10, statSync as statSync4 } from "fs";
-import { basename as basename4, join as join9, relative as relative2, resolve as resolve5 } from "path";
+import { readdirSync as readdirSync4, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
+import { basename as basename5, join as join10, relative as relative3, resolve as resolve5 } from "path";
 function skillBundle(dir) {
   const root = resolve5(dir);
-  const top = basename4(root);
+  const top = basename5(root);
   const files2 = [];
   const walk = (path) => {
-    for (const name of readdirSync3(path).sort()) {
-      const full = join9(path, name);
-      if (statSync4(full).isDirectory()) walk(full);
-      else files2.push({ path: `${top}/${relative2(root, full)}`, bytes: readFileSync10(full) });
+    for (const name of readdirSync4(path).sort()) {
+      const full = join10(path, name);
+      if (statSync5(full).isDirectory()) walk(full);
+      else files2.push({ path: `${top}/${relative3(root, full)}`, bytes: readFileSync11(full) });
     }
   };
   walk(root);
@@ -2883,7 +3168,7 @@ function skillBundle(dir) {
 async function uploadSkill(dir, displayName) {
   const form = new FormData();
   for (const file of skillBundle(dir)) form.append("files", new Blob([new Uint8Array(file.bytes)]), file.path);
-  form.append("displayName", displayName ?? basename4(resolve5(dir)));
+  form.append("displayName", displayName ?? basename5(resolve5(dir)));
   return apiForm("POST", "/skills", form);
 }
 async function listSkills() {
@@ -3001,19 +3286,19 @@ function renderPolicy(rule) {
 }
 
 // src/harness.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync11, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname5, join as join10, resolve as resolve6 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync3, readFileSync as readFileSync12, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname6, join as join11, resolve as resolve6 } from "path";
 var HARNESS_FILE = "harness.json";
 function harnessFilePath(dir) {
-  return join10(resolve6(dir), HARNESS_FILE);
+  return join11(resolve6(dir), HARNESS_FILE);
 }
 function readHarnessFile(dir) {
   const path = harnessFilePath(dir);
-  if (!existsSync8(path)) {
+  if (!existsSync9(path)) {
     throw new Error(`no ${HARNESS_FILE} found in ${resolve6(dir)} \u2014 run \`sky harness init\` first`);
   }
   try {
-    return JSON.parse(readFileSync11(path, "utf8"));
+    return JSON.parse(readFileSync12(path, "utf8"));
   } catch (err) {
     throw new Error(`could not parse ${path}: ${err instanceof Error ? err.message : String(err)}`);
   }
@@ -3040,10 +3325,10 @@ var INIT_COMMENT = `# harness.json \u2014 workspace harness profile skeleton
 `;
 function harnessInit(dir) {
   const path = harnessFilePath(dir);
-  if (existsSync8(path)) {
+  if (existsSync9(path)) {
     throw new Error(`${path} already exists \u2014 delete it to re-init`);
   }
-  mkdirSync3(dirname5(path), { recursive: true });
+  mkdirSync3(dirname6(path), { recursive: true });
   writeFileSync5(path, `${JSON.stringify(INIT_SKELETON, null, 2)}
 `);
   console.log(`Created ${path}`);
@@ -3815,8 +4100,8 @@ secrets.command("unset <id> <key>").action(
 program.command("launch").description("scaffold ./agent.toml if absent, create the agent, print its address").option("-f, --file <path>", "agent file", "agent.toml").option("--type <type>", "override the file's harness: hermes | claude_code | codex | openclaw | pi | dsh | kimi_code | opencode").option("--llm <llm>", "override the file's model (must suit the harness)").action(
   run(async (opts) => {
     const path = resolve7(opts.file);
-    if (!existsSync9(path)) {
-      const name = basename5(process.cwd()).replace(/[^a-zA-Z0-9 _-]/g, "") || "my-agent";
+    if (!existsSync10(path)) {
+      const name = basename6(process.cwd()).replace(/[^a-zA-Z0-9 _-]/g, "") || "my-agent";
       scaffoldAgentFile(path, name);
       console.log(`Scaffolded ${opts.file} \u2014 edit it anytime; re-apply with \`sky deploy\`.`);
     }
@@ -3890,7 +4175,7 @@ function formatRelative(msAgo) {
   if (hours < 48) return `${hours}h ago`;
   return `${Math.round(hours / 24)}d ago`;
 }
-program.command("import").description("import a local Claude Code or Codex session to AgentSky and continue it in the cloud").option("--current", "import the session this agent is running in (reads CLAUDE_CODE_SESSION_ID or CODEX_THREAD_ID, then falls back to most recent session in the cwd)").option("--all", "import all found sessions up to --limit").option("-y, --yes", "confirm transfer without prompting (default when --current or --session is given in non-TTY)").option("--json", "print one JSON result object per import and nothing else to stdout").option("--limit <n>", "maximum sessions to list or import", "10").option("--session <id>", "import one specific session by its ID").option("--harness <type>", "claude_code | codex | all (default: all)").option("--summary <path>", "attach a pre-written summary JSON (asteroids.session-summary v1) instead of the auto-generated one").option("--key <importKey>", "import grant key minted by the web page (skips sky auth login)").option("--trace <traceId>", "trace id paired with --key").option("--url <base>", "agent-use app URL (default: derived from SKY_API_URL or AGENT_USE_URL)").option("--no-files", "send the conversation only, without the local files it read, wrote or ran under").action(
+program.command("import").description("import a local Claude Code or Codex session to AgentSky and continue it in the cloud").option("--current", "import the session this agent is running in (reads CLAUDE_CODE_SESSION_ID or CODEX_THREAD_ID, then falls back to most recent session in the cwd)").option("--all", "import all found sessions up to --limit").option("-y, --yes", "confirm transfer without prompting (default when --current or --session is given in non-TTY)").option("--json", "print one JSON result object per import and nothing else to stdout").option("--limit <n>", "maximum sessions to list or import", "10").option("--session <id>", "import one specific session by its ID").option("--harness <type>", "claude_code | codex | all (default: all)").option("--summary <path>", "attach a pre-written summary JSON (asteroids.session-summary v1) instead of the auto-generated one").option("--key <importKey>", "import grant key minted by the web page (skips sky auth login)").option("--trace <traceId>", "trace id paired with --key").option("--url <base>", "agent-use app URL (default: derived from SKY_API_URL or AGENT_USE_URL)").option("--no-files", "send the conversation only, without its local files, skills, repository state or tool-server setup").action(
   run(
     async (opts) => {
       if (opts.key && !opts.trace) throw new Error("--key requires --trace <traceId>");
@@ -3972,7 +4257,7 @@ program.command("import").description("import a local Claude Code or Codex sessi
       toImport = [...new Map(toImport.map((session2) => [`${session2.harness}:${session2.sessionId}`, session2])).values()];
       if (!opts.json) {
         console.log(`Selected ${toImport.length} conversation(s), ${toImport.reduce((count, session2) => count + session2.files.length, 0)} transcript file(s). Destination: ${base}`);
-        console.log(opts.files === false ? "The recorded conversation is redacted locally. Local project files and login credentials are not transferred." : "The recorded conversation and the local files it read, wrote or ran under are attached; text is redacted locally. Credential files and login credentials are never transferred. Use --no-files to send the conversation only.");
+        console.log(opts.files === false ? "The recorded conversation is redacted locally. Local project files and login credentials are not transferred." : "The recorded conversation, the local files it read, wrote or ran under, the skills it loaded, its repository state and the names of its tool servers are attached; text is redacted locally. Credential files, tool-server keys and login credentials are never transferred. Use --no-files to send the conversation only.");
       }
       if (!autoConfirm) {
         if (nonInteractive) throw new Error("Use --yes to confirm this transfer in a non-interactive terminal.");
@@ -4014,9 +4299,13 @@ Importing ${label} \u2026
             gaps: result.gaps,
             attachedFiles: result.attachedFiles,
             leftOutFiles: result.leftOutFiles.map((file) => ({ reason: file.reason })),
+            skills: result.setup.skills,
+            missingSkills: result.setup.missingSkills,
+            mcpServers: result.setup.mcpServers,
             continueUrl: result.url
           }));
         } else {
+          if (result.setup.skills.length || result.setup.mcpServers.length) console.log(`  Carried ${result.setup.skills.length} ${result.setup.skills.length === 1 ? "skill" : "skills"} and the setup of ${result.setup.mcpServers.length} tool ${result.setup.mcpServers.length === 1 ? "server" : "servers"} (their keys stay on this computer).`);
           if (result.attachedFiles.length || result.leftOutFiles.length) console.log(`  Attached ${result.attachedFiles.length} local ${result.attachedFiles.length === 1 ? "file" : "files"}${result.leftOutFiles.length ? `; left out ${result.leftOutFiles.length} (credential, missing, unsupported or over the 30 MiB upload)` : ""}.`);
           console.log(`  \u2713 Imported. Continue here:
     ${result.url}
@@ -4084,7 +4373,7 @@ task.command("get <task> <path>").description("read one task file; prints it, or
 );
 task.command("put <task> <path> <local>").description("write a local file to <path> in the task's files (every session of the task sees it)").action(
   run(async (taskId, path, local) => {
-    const { file, conflict } = await writeTaskFile(taskId, path, readFileSync12(local), mediaTypeFor(local));
+    const { file, conflict } = await writeTaskFile(taskId, path, readFileSync13(local), mediaTypeFor(local));
     console.log(`${renderTaskFile(file)}${conflict ? "  (replaced a version you had not seen)" : ""}`);
   })
 );
@@ -4520,7 +4809,7 @@ harness.command("connect").description("run an ACP agent (the command after --)
 }));
 var traceCmd = program.command("trace").description("correlate this machine's agent work with the cloud sessions it starts (metadata only unless you choose content)");
 traceCmd.command("start").description("start a trace: a grant for this machine, a root span, and the spool the hooks write to").option("--name <name>", "a name for the task").option("--source <source>", "how this machine reports itself", "claude-code").option("--hooks [settings]", "also install the Claude Code hooks (default: ./.claude/settings.local.json)").option("--capture <scopes>", "also send content, redacted on this machine first: any of prompts,tool_output,files").option("--file <path>", "a file the files scope may send (repeatable)", collect).option("--dir <path>", "a folder whose files the files scope may send when a file tool touches them (repeatable)", collect).action(run(async (opts) => {
-  const { readState, writeState, record, installClaudeHooks, parseContentScopes, chosenPaths, fileEvent } = await import("./trace-DS35CFKV.js");
+  const { readState, writeState, record, installClaudeHooks, parseContentScopes, chosenPaths, fileEvent } = await import("./trace-YKEGRVJN.js");
   if (readState()) throw new Error("a trace is already running here \u2014 `sky trace stop` it first");
   const scopes = parseContentScopes(opts.capture);
   const chosen = chosenPaths(opts.file ?? [], opts.dir ?? []);
@@ -4555,7 +4844,7 @@ traceCmd.command("start").description("start a trace: a grant for this machine,
 }));
 traceCmd.command("hook").description("record one Claude Code hook event read from stdin (run by the installed hooks; never fails, prints nothing)").action(async () => {
   try {
-    const { readState, record, flush, grantSender, eventsForClaudeHook, contentForClaudeHook, clearState } = await import("./trace-DS35CFKV.js");
+    const { readState, record, flush, grantSender, eventsForClaudeHook, contentForClaudeHook, clearState } = await import("./trace-YKEGRVJN.js");
     const chunks = [];
     for await (const chunk of process.stdin) chunks.push(chunk);
     const input = JSON.parse(Buffer.concat(chunks).toString("utf8") || "{}");
@@ -4568,14 +4857,14 @@ traceCmd.command("hook").description("record one Claude Code hook event read fro
   }
 });
 traceCmd.command("flush").description("send what the spool holds, retrying with backoff").action(run(async () => {
-  const { readState, flush, grantSender } = await import("./trace-DS35CFKV.js");
+  const { readState, flush, grantSender } = await import("./trace-YKEGRVJN.js");
   const state = readState();
   if (!state) throw new Error("no trace is running here");
   const outcome = await flush(grantSender(state), { attempts: 4 });
   console.log(`sent ${outcome.sent}, refused ${outcome.refused}, given up ${outcome.expired}, still pending ${outcome.pending}${outcome.stopped ? ` (stopped: ${outcome.stopped})` : ""}`);
 }));
 traceCmd.command("status").description("the running trace and its spool").action(run(async () => {
-  const { readState, spoolStatus } = await import("./trace-DS35CFKV.js");
+  const { readState, spoolStatus } = await import("./trace-YKEGRVJN.js");
   const state = readState();
   if (!state) {
     console.log("No trace is running here.");
@@ -4585,7 +4874,7 @@ traceCmd.command("status").description("the running trace and its spool").action
   console.log(`${state.trace_id} as ${state.source}: ${spool.pending} pending, ${spool.dropped_full} dropped (spool full), ${spool.dropped_expired} given up, ${spool.refused} refused`);
 }));
 traceCmd.command("show [id]").description("the trace bundle: spans, the sessions they reach, cost counted once per session").option("--json", "print the bundle as JSON").action(run(async (id, opts) => {
-  const { readState } = await import("./trace-DS35CFKV.js");
+  const { readState } = await import("./trace-YKEGRVJN.js");
   const ref = id ?? readState()?.trace_id;
   if (!ref) throw new Error("name a trace, or start one here");
   const bundle = await api("GET", `/traces/${ref}`);
@@ -4612,7 +4901,7 @@ traceCmd.command("show [id]").description("the trace bundle: spans, the sessions
   for (const gap of bundle.gaps) console.log(`  gap: ${gap.span_id} ${gap.reason}`);
 }));
 traceCmd.command("stop").description("end the root span, send what is left, and revoke this machine's grant").action(run(async () => {
-  const { readState, record, flush, grantSender, clearState } = await import("./trace-DS35CFKV.js");
+  const { readState, record, flush, grantSender, clearState } = await import("./trace-YKEGRVJN.js");
   const state = readState();
   if (!state) throw new Error("no trace is running here");
   if (state.root_span) record(() => [{ span_id: state.root_span, kind: "end", outcome: "completed" }]);
@@ -4622,7 +4911,7 @@ traceCmd.command("stop").description("end the root span, send what is left, and
   console.log(`Stopped ${state.trace_id}${outcome.pending ? ` (${outcome.pending} events could not be sent)` : ""}`);
 }));
 traceCmd.command("sync [payload]").description("upload this machine's Claude Code and Codex sessions to the matching workspace's trace library, redacted here first").option("--enable", "turn sync on for this machine").option("--disable", "turn sync off; nothing more is uploaded").option("--route <match=workspace>", "send sessions whose folder path contains <match> to <workspace> (repeatable; replaces the saved rules)", collect).option("--default <workspace>", "where a session no rule matches goes").option("--keep-local", "keep sessions no rule matches on this machine (the default)").option("--session <ref>", "only this session: its id or transcript path (repeatable)", collect).option("--full", "re-read every session, not only files that changed").option("--limit <n>", "at most this many changed sessions this run", (v) => Number.parseInt(v, 10)).option("--dry-run", "show what would be uploaded without uploading").option("--hook", "run from a Claude Code SessionEnd hook or Codex notify: upload that session in the background and return at once").option("--install-schedule", "also sweep every 15 minutes (macOS launchd)").option("--status", "what sync has done on this machine").option("--quiet", "print only failures").action(async (payload, opts) => {
-  const lib = await import("./trace-library-B3NZ4OQM.js");
+  const lib = await import("./trace-library-6BK5GJVD.js");
   if (opts.hook) {
     try {
       let raw = payload ?? "";
@@ -4670,10 +4959,10 @@ traceCmd.command("sync [payload]").description("upload this machine's Claude Cod
       console.log(`A repository's .agentsky.json "workspace" wins over these rules.`);
     }
     if (opts.installSchedule) {
-      const { join: join11 } = await import("path");
-      const { homedir: homedir7 } = await import("os");
+      const { join: join12 } = await import("path");
+      const { homedir: homedir8 } = await import("os");
       const { execFileSync } = await import("child_process");
-      const log = join11(homedir7(), ".config", "sky", "trace-sync.log");
+      const log = join12(homedir8(), ".config", "sky", "trace-sync.log");
       const plist = lib.installLaunchd([process.execPath, process.argv[1], "trace", "sync", "--quiet"], log);
       try {
         execFileSync("launchctl", ["unload", plist], { stdio: "ignore" });
@@ -4683,11 +4972,11 @@ traceCmd.command("sync [payload]").description("upload this machine's Claude Cod
       console.log(`Sweeping every 15 minutes (${plist}); a full re-read runs weekly. Log: ${log}`);
     }
     if (opts.status) {
-      const { readFileSync: readFileSync13 } = await import("fs");
-      const { join: join11 } = await import("path");
+      const { readFileSync: readFileSync14 } = await import("fs");
+      const { join: join12 } = await import("path");
       let state = { sessions: {} };
       try {
-        state = JSON.parse(readFileSync13(join11(lib.syncConfigPath(), "..", "trace-sync-state.json"), "utf8"));
+        state = JSON.parse(readFileSync14(join12(lib.syncConfigPath(), "..", "trace-sync-state.json"), "utf8"));
       } catch {
       }
       const counts = /* @__PURE__ */ new Map();
@@ -4720,7 +5009,7 @@ traceCmd.command("sync [payload]").description("upload this machine's Claude Cod
   })();
 });
 traceCmd.command("search <query...>").description("search every session in a workspace's trace library (literal substring)").option("--workspace <slug>", "the workspace to search (default: the current one)").option("--limit <n>", "hits per page", (v) => Number.parseInt(v, 10), 20).option("--cursor <cursor>", "the next page of an earlier search").option("--json", "print the page as JSON").action(run(async (words, opts) => {
-  const { libraryRequest } = await import("./trace-library-B3NZ4OQM.js");
+  const { libraryRequest } = await import("./trace-library-6BK5GJVD.js");
   const workspace2 = opts.workspace ?? currentUniverse();
   if (!workspace2) throw new Error("name a workspace with --workspace");
   const params = new URLSearchParams({ q: words.join(" "), scope: "traces", limit: String(opts.limit), ...opts.cursor ? { cursor: opts.cursor } : {} });
@@ -4737,7 +5026,7 @@ traceCmd.command("search <query...>").description("search every session in a wor
   if (page.nextCursor) console.log(`More: sky trace search ${JSON.stringify(words.join(" "))} --workspace ${workspace2} --cursor ${page.nextCursor}`);
 }));
 traceCmd.command("library").description("list the sessions in a workspace's trace library, most recently updated first").option("--workspace <slug>", "the workspace (default: the current one)").option("--limit <n>", "how many", (v) => Number.parseInt(v, 10), 20).option("--json", "print the page as JSON").action(run(async (opts) => {
-  const { libraryRequest } = await import("./trace-library-B3NZ4OQM.js");
+  const { libraryRequest } = await import("./trace-library-6BK5GJVD.js");
   const workspace2 = opts.workspace ?? currentUniverse();
   if (!workspace2) throw new Error("name a workspace with --workspace");
   const page = await libraryRequest("GET", `/trace-library?limit=${opts.limit}`, workspace2);