@oxagen/cli 2.1.4-705 → 2.1.4-707

package/oxagen.mjs

@@ -24941,7 +24941,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname9, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-705";
+  if (true) return "2.1.4-707";
   try {
     const here = dirname9(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -57199,7 +57199,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-705",
+      version: "2.1.4-707",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -79849,9 +79849,10 @@ async function readImportDocuments(sources, target2, writer) {
       tooLong.push(source.path);
       continue;
     }
-    const filename = importFilename(source.path, source.folder);
+    const filename = source.filename ?? importFilename(source.path, source.folder);
     const document = { filename, content };
-    if (target2 !== void 0) document.target = target2;
+    const chosen = source.target ?? target2;
+    if (chosen !== void 0) document.target = chosen;
     if (source.source !== void 0) document.source = source.source;
     if (source.files !== void 0 && source.files.length > 0) {
       const files2 = [];
@@ -80042,12 +80043,19 @@ async function runMarkdownImport(documents, run3, writer) {
     return;
   }
   if (!run3.json) writeFileNotes(files2, writer);
+  let conflicts = 0;
   for (const row of records) {
     if (row.action !== null) continue;
+    conflicts += 1;
     writer.writeErr(
       `  Left out ${row.file}:${row.line} (${row.lineage}): it conflicts with ${row.conflict?.lineage ?? "a published record"}.`
     );
   }
+  if (conflicts > 0) {
+    writer.writeErr(
+      `  Left out ${conflicts} conflicting ${conflicts === 1 ? "record" : "records"}. Import ${conflicts === 1 ? "it" : "them"} in the app to choose which statement stays.`
+    );
+  }
   for (const policy of policies) {
     const issue = policy.issues[0];
     if (policy.action !== "skip" || issue === void 0) continue;
@@ -80096,17 +80104,79 @@ __export(steering_import_exports, {
   CATALOGUE_FOLDERS: () => CATALOGUE_FOLDERS,
   STEERING_IMPORT_CAPABILITIES: () => STEERING_IMPORT_CAPABILITIES,
   findMarkdownFiles: () => findMarkdownFiles,
-  handleSteeringImport: () => handleSteeringImport
+  handleSteeringImport: () => handleSteeringImport,
+  harnessHome: () => harnessHome
 });
 import { readdir as readdir4, realpath as realpath2, stat as stat4 } from "node:fs/promises";
+import { homedir as homedir12 } from "node:os";
 import { basename as basename8, extname, join as join51, relative as relative6, sep as sep7 } from "node:path";
+function envDir2(env, key) {
+  const value = env[key];
+  return value === void 0 || value.trim() === "" ? null : value;
+}
+function harnessHome(harness, env = process.env, home = homedir12()) {
+  switch (harness) {
+    case "claude-code": {
+      const config = envDir2(env, "CLAUDE_CONFIG_DIR") ?? join51(home, ".claude");
+      return {
+        harness,
+        folders: [
+          {
+            dir: skillsRoot("claude-code", env, home) ?? join51(config, "skills"),
+            mount: ".claude/skills"
+          },
+          { dir: join51(config, "commands"), mount: ".claude/commands" },
+          { dir: join51(config, "agents"), mount: ".claude/agents" }
+        ],
+        instructions: [
+          { file: join51(config, "CLAUDE.md"), filename: ".claude/CLAUDE.md" }
+        ]
+      };
+    }
+    case "codex": {
+      const codexHome = envDir2(env, "CODEX_HOME") ?? join51(home, ".codex");
+      return {
+        harness,
+        folders: [
+          {
+            dir: skillsRoot("codex", env, home) ?? join51(home, ".agents", "skills"),
+            mount: ".agents/skills"
+          }
+        ],
+        instructions: ["AGENTS.override.md", "AGENTS.md"].map((name) => ({
+          file: join51(codexHome, name),
+          filename: `.codex/${name}`
+        }))
+      };
+    }
+    case "cursor":
+      return {
+        harness,
+        folders: [
+          { dir: join51(home, ".cursor", "skills"), mount: ".cursor/skills" },
+          { dir: join51(home, ".cursor", "commands"), mount: ".cursor/commands" }
+        ],
+        instructions: []
+      };
+  }
+}
 function byName(a, b3) {
   return a.name < b3.name ? -1 : 1;
 }
 function under(root, path2) {
   return relative6(root, path2).split(sep7).join("/");
 }
-async function findMarkdownFiles(paths) {
+function isPersonal(rel) {
+  return classifyHarnessFile(rel)?.kind === "personal";
+}
+async function isFolder(path2) {
+  try {
+    return (await stat4(path2)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function findMarkdownFiles(paths, harness) {
   const sources = [];
   const unreadable = [];
   const seen = /* @__PURE__ */ new Set();
@@ -80140,7 +80210,7 @@ async function findMarkdownFiles(paths) {
     }
     return found;
   };
-  const walk2 = async (dir, root, folder, inCatalogue) => {
+  const walk2 = async (dir, frame) => {
     let entries2;
     try {
       entries2 = await readdir4(dir, { withFileTypes: true });
@@ -80149,27 +80219,31 @@ async function findMarkdownFiles(paths) {
       return;
     }
     entries2.sort(byName);
+    const { folder } = frame;
+    const named = (rel) => frame.fixedNames ? { filename: rel } : {};
     for (const entry2 of entries2) {
       const path2 = join51(dir, entry2.name);
-      const rel = under(root, path2);
+      const rel = frame.relOf(path2);
       if (entry2.isDirectory()) {
         if (entry2.name === "node_modules") continue;
         if (entry2.name.startsWith(".")) {
-          if (!inCatalogue && CATALOGUE_FOLDERS.has(entry2.name))
-            await walk2(path2, root, folder, true);
+          if (!frame.inCatalogue && CATALOGUE_FOLDERS.has(entry2.name))
+            await walk2(path2, { ...frame, inCatalogue: true });
           continue;
         }
-        await walk2(path2, root, folder, inCatalogue);
+        await walk2(path2, frame);
         continue;
       }
       if (!entry2.isFile() && !entry2.isSymbolicLink()) continue;
       const source = markdownImportSourceOf(rel);
-      if (inCatalogue) {
+      if (frame.inCatalogue) {
         if (source === null) continue;
         if (source.kind === "skill") {
+          if (entries2.some((e) => e.name === SESSION_MARKER)) continue;
           const skillDir = dir;
           await take(path2, {
             folder,
+            ...named(rel),
             source: { ...source, path: rel },
             files: (await filesUnder(skillDir, skillDir)).map((file) => ({
               path: under(skillDir, file),
@@ -80177,11 +80251,17 @@ async function findMarkdownFiles(paths) {
             }))
           });
         } else {
-          await take(path2, { folder, source: { ...source, path: rel } });
+          await take(path2, {
+            folder,
+            ...named(rel),
+            source: { ...source, path: rel }
+          });
         }
         continue;
       }
-      if (MARKDOWN_EXTENSIONS.has(extname(entry2.name).toLowerCase())) {
+      if (isPersonal(rel)) {
+        await take(path2, { folder, ...named(rel), target: "memories" });
+      } else if (MARKDOWN_EXTENSIONS.has(extname(entry2.name).toLowerCase())) {
         await take(
           path2,
           source === null ? { folder } : { folder, source: { ...source, path: rel } }
@@ -80192,18 +80272,28 @@ async function findMarkdownFiles(paths) {
     }
   };
   for (const path2 of paths) {
-    let isFolder;
+    let folderGiven;
     try {
-      isFolder = (await stat4(path2)).isDirectory();
+      folderGiven = (await stat4(path2)).isDirectory();
     } catch {
       unreadable.push(path2);
       continue;
     }
-    if (isFolder) {
-      const named = CATALOGUE_FOLDERS.has(basename8(path2));
-      await walk2(path2, named ? join51(path2, "..") : path2, path2, false);
+    if (folderGiven) {
+      const catalogue = CATALOGUE_FOLDERS.has(basename8(path2));
+      const root = catalogue ? join51(path2, "..") : path2;
+      await walk2(path2, {
+        relOf: (p) => under(root, p),
+        folder: path2,
+        inCatalogue: catalogue,
+        fixedNames: false
+      });
     } else {
       const rel = under(process.cwd(), path2);
+      if (isPersonal(rel.startsWith("..") ? basename8(path2) : rel)) {
+        await take(path2, { target: "memories" });
+        continue;
+      }
       const source = rel.startsWith("..") ? null : markdownImportSourceOf(rel);
       await take(
         path2,
@@ -80211,8 +80301,38 @@ async function findMarkdownFiles(paths) {
       );
     }
   }
+  if (harness !== void 0) {
+    for (const { dir, mount } of harness.folders) {
+      if (!await isFolder(dir)) continue;
+      await walk2(dir, {
+        relOf: (p) => `${mount}/${under(dir, p)}`,
+        folder: dir,
+        inCatalogue: true,
+        fixedNames: true
+      });
+    }
+    for (const { file, filename } of harness.instructions) {
+      let found = false;
+      try {
+        found = (await stat4(file)).isFile();
+      } catch {
+      }
+      if (!found) continue;
+      await take(file, { filename, target: "memories" });
+      break;
+    }
+  }
   return { sources, unreadable };
 }
+function parseHarness(value, writer) {
+  if (value === void 0) return void 0;
+  const harness = LAPTOP_HARNESSES.find((h) => h === value.toLowerCase());
+  if (harness !== void 0) return harness;
+  failCommand(
+    `Invalid --harness "${value}". Use claude-code, codex, or cursor.`,
+    writer
+  );
+}
 function parseTarget(value, writer) {
   if (value === void 0) return void 0;
   const target2 = TARGETS.find((t) => t === value.toLowerCase());
@@ -80222,15 +80342,17 @@ function parseTarget(value, writer) {
     writer
   );
 }
-async function handleSteeringImport(paths, opts, writer = stdoutWriter) {
-  if (paths.length === 0) {
+async function handleSteeringImport(paths, opts, writer = stdoutWriter, env = process.env, home = homedir12()) {
+  const harness = parseHarness(opts.harness, writer);
+  if (paths.length === 0 && harness === void 0) {
     failCommand(
-      "Nothing to import. Pass Markdown files or folders, such as `oxagen steering import docs`.",
+      "Nothing to import. Pass Markdown files or folders, such as `oxagen steering import docs`, or a harness, such as `oxagen steering import --harness claude-code`.",
       writer
     );
   }
   const target2 = parseTarget(opts.as, writer);
-  const walk2 = await findMarkdownFiles(paths);
+  const folders = harness === void 0 ? void 0 : harnessHome(harness, env, home);
+  const walk2 = await findMarkdownFiles(paths, folders);
   if (walk2.unreadable.length > 0) {
     writer.writeErr(
       `Skipped paths that do not exist or cannot be read:
@@ -80238,8 +80360,13 @@ async function handleSteeringImport(paths, opts, writer = stdoutWriter) {
     );
   }
   if (walk2.sources.length === 0) {
+    const where = [
+      ...paths,
+      ...folders?.folders.map((f) => f.dir) ?? [],
+      ...folders?.instructions.map((f) => f.file) ?? []
+    ];
     failCommand(
-      `Found no .md, .markdown, .mdx, or .mdc file in ${paths.join(", ")}. Pass a Markdown file, or a folder that holds one.`,
+      folders === void 0 ? `Found no .md, .markdown, .mdx, or .mdc file in ${paths.join(", ")}. Pass a Markdown file, or a folder that holds one.` : `Found no skill, command, subagent file, instruction file, or Markdown file in ${where.join(", ")}.`,
       writer
     );
   }
@@ -80250,11 +80377,12 @@ async function handleSteeringImport(paths, opts, writer = stdoutWriter) {
     writer
   );
 }
-var STEERING_IMPORT_CAPABILITIES, MARKDOWN_EXTENSIONS, CATALOGUE_FOLDERS, TARGETS;
+var STEERING_IMPORT_CAPABILITIES, MARKDOWN_EXTENSIONS, CATALOGUE_FOLDERS, TARGETS, LAPTOP_HARNESSES;
 var init_steering_import = __esm({
   "src/commands/steering-import.ts"() {
     init_steering_markdown_import_shared();
     init_harness_files();
+    init_skills();
     init_capture_writer();
     init_markdown_import();
     STEERING_IMPORT_CAPABILITIES = [
@@ -80277,6 +80405,11 @@ var init_steering_import = __esm({
       "policies",
       "memories"
     ];
+    LAPTOP_HARNESSES = [
+      "claude-code",
+      "codex",
+      "cursor"
+    ];
   }
 });
 
@@ -82939,7 +83072,7 @@ import {
   realpathSync as realpathSync8,
   writeFileSync as writeFileSync7
 } from "node:fs";
-import { homedir as homedir12, hostname as osHostname3 } from "node:os";
+import { homedir as homedir13, hostname as osHostname3 } from "node:os";
 import { join as join53, relative as relative7, resolve as resolve19, sep as sep8 } from "node:path";
 function git4(cwd, args) {
   return new Promise((done) => {
@@ -83035,7 +83168,7 @@ function machineId(configDir = getConfigDir()) {
 `, { encoding: "utf8", mode: 384 });
     }
   } catch {
-    secret = `fallback:${osHostname3()}:${homedir12()}`;
+    secret = `fallback:${osHostname3()}:${homedir13()}`;
   }
   return createHash17("sha256").update(secret).digest("hex");
 }
@@ -134527,10 +134660,13 @@ function buildProgram() {
     }
   );
   steeringCmd.command("import").argument(
-    "<paths...>",
+    "[paths...]",
     "Markdown files, or folders to search for .md, .markdown, .mdx, and .mdc files"
   ).description(
-    "Read Markdown files into steering records, Cedar policies, or memories. Previews unless --yes."
+    "Read Markdown files, or your own harness folders, into steering records, Cedar policies, or memories. Previews unless --yes."
+  ).option(
+    "--harness <name>",
+    "claude-code, codex, or cursor. Also read that harness's skills, commands, and subagent files on this machine as workspace records, and its user instruction file, such as ~/.claude/CLAUDE.md, as your memories. Honours CLAUDE_CONFIG_DIR and CODEX_HOME."
   ).option(
     "--as <target>",
     "records, policies, or memories for every file. Without it, each file takes the target its text implies, such as policies for a file with a cedar block."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxagen/cli",
-  "version": "2.1.4-705",
+  "version": "2.1.4-707",
   "description": "Oxagen governance CLI — spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {