@oxagen/cli 2.1.4-430 → 2.1.4-438

package/oxagen.mjs

@@ -22995,7 +22995,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname7, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-430";
+  if (true) return "2.1.4-438";
   try {
     const here = dirname7(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -51676,7 +51676,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-430",
+      version: "2.1.4-438",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -57966,7 +57966,7 @@ var init_steering_markdown_import_shared = __esm({
 });
 
 // ../../packages/oxagen/src/contracts/context.steering.shared.ts
-var recordKindSchema2, steeringPrKindSchema, proposalKindSchema, RECORD_KINDS2, STEERING_PR_KINDS, GOVERNANCE_LINEAGE, recordForceSchema2, constraintEffectSchema, publishedSharingScopeSchema, appendKindSchema, proposalStatusSchema, proposalStateSchema, repositoryProviderSchema, governanceModeSchema, GOVERNANCE_MODES2, checkNameSchema, CHECK_NAMES, steeringCheckNameSchema, STEERING_CHECK_NAMES, instant, checkResultSchema, RECORD_LINEAGE_ID, lineageIdSchema, proposedRecordSchema, proposalSupportSchema, proposalViewSchema, publishedRecordSchema;
+var recordKindSchema2, steeringPrKindSchema, proposalKindSchema, RECORD_KINDS2, STEERING_PR_KINDS, GOVERNANCE_LINEAGE, recordForceSchema2, constraintEffectSchema, publishedSharingScopeSchema, appendKindSchema, proposalStatusSchema, proposalStateSchema, repositoryProviderSchema, governanceModeSchema, GOVERNANCE_MODES2, checkNameSchema, CHECK_NAMES, steeringCheckNameSchema, STEERING_CHECK_NAMES, instant, checkResultSchema, checkFindingSchema, RECORD_LINEAGE_ID, lineageIdSchema, proposedRecordSchema, proposalSupportSchema, proposalViewSchema, publishedRecordSchema;
 var init_context_steering_shared = __esm({
   "../../packages/oxagen/src/contracts/context.steering.shared.ts"() {
     "use strict";
@@ -58058,6 +58058,15 @@ var init_context_steering_shared = __esm({
       startedAt: instant.nullable(),
       completedAt: instant.nullable()
     }).strict();
+    checkFindingSchema = external_exports.object({
+      rule: external_exports.enum(["managed-block"]),
+      /** The file the finding is in. */
+      path: external_exports.string(),
+      /** The line it starts on, when the check could name one. */
+      line: external_exports.number().int().positive().nullable(),
+      /** One sentence saying what the check found. */
+      message: external_exports.string()
+    }).strict();
     RECORD_LINEAGE_ID = new RegExp(
       `^(?!${GOVERNANCE_LINEAGE}$)${STEERING_RECORD_LINEAGE.source.replace(/^\^/, "")}`
     );
@@ -70791,15 +70800,38 @@ var init_lineage = __esm({
 });
 
 // ../../packages/steering-check/src/checks/owned.ts
-function writesFindings(env) {
+function lockServer(path2) {
+  return path2.split("/")[2];
+}
+function lockFinding(path2, line, verb, problems) {
+  const shown2 = problems.slice(0, 3).join(" ");
+  const more = problems.length > 3 ? ` ${problems.length - 3} more problems follow.` : "";
+  return find7({
+    rule: "oxagen-writes",
+    path: path2,
+    line,
+    field: null,
+    message: `This steering PR ${verb} ${path2}, and the lock it holds is not one Oxagen writes. ${shown2}${more}`,
+    expected: `${path2} as Studio's Review or a sync writes it.`,
+    fix: `Restore ${path2} from the production branch. Change the server's tools in Studio and open its Review, or sync the server, and Oxagen writes the lock.`
+  });
+}
+function writesFindings(env, base2) {
   const findings = [];
+  const readLock3 = env.servers?.lock;
   for (const path2 of [...env.changed, ...env.removed].sort()) {
-    const what = OXAGEN_WRITES[classifySteeringRepoPath(path2)];
+    const kind = classifySteeringRepoPath(path2);
+    const what = OXAGEN_WRITES[kind];
     if (what === void 0) continue;
-    const before = env.base?.get(path2);
+    const before = base2.get(path2);
     const after = env.head.get(path2);
     const line = after === void 0 ? null : before === void 0 ? 1 : firstDifferingLine(before, after);
     const verb = after === void 0 ? "removes" : before === void 0 ? "adds" : "changes";
+    if (kind === "server-lock" && after !== void 0 && readLock3 !== void 0) {
+      const outcome = readLock3(lockServer(path2), env.head, base2);
+      if (!outcome.ok) findings.push(lockFinding(path2, line, verb, outcome.problems));
+      continue;
+    }
     findings.push(
       find7({
         rule: "oxagen-writes",
@@ -70867,7 +70899,7 @@ var init_owned = __esm({
     MANAGED_FILES = [AGENTS_MD_PATH, CLAUDE_MD_PATH, README_PATH];
     BEGIN_MARKER = "<!-- oxagen:begin managed sha256:... -->";
     ownedCheck = (env) => {
-      const findings = env.base === null ? [] : writesFindings(env);
+      const findings = env.base === null ? [] : writesFindings(env, env.base);
       for (const path2 of MANAGED_FILES) {
         if (env.base !== null && !env.changed.has(path2) && !env.removed.has(path2)) continue;
         const finding = managedFinding(env, path2);
@@ -74513,6 +74545,9 @@ async function promoteWorkspaceMemories(input) {
 async function dismissWorkspaceMemories(input) {
   return apiPostOrThrow(ROUTES.dismiss, input);
 }
+async function dropMemoryPrRecord(input) {
+  return apiPostOrThrow(ROUTES.drop, input);
+}
 function truncate2(text4, max2) {
   const line = text4.trim().replace(/\s+/g, " ");
   return line.length <= max2 ? line : `${line.slice(0, max2 - 3)}...`;
@@ -74639,6 +74674,15 @@ function formatDismissResult(result2, restore) {
     );
   return lines.join("\n");
 }
+function formatDropResult(result2) {
+  const pr = result2.pull_request;
+  const short5 = result2.commit_sha.slice(0, 7);
+  return [
+    result2.already_dropped ? `${result2.path} was already dropped from memory PR #${pr.number} in commit ${short5}.` : `Dropped ${result2.path} from memory PR #${pr.number} in commit ${short5} on ${pr.branch}.`,
+    "When the PR merges, the record's statements are rejected and its memories wait again.",
+    pr.url
+  ].join("\n");
+}
 var ROUTES, WORKSPACE_MEMORY_STATES, STATE_LABELS, SKIP_REASONS2, SKIPPED_STATES;
 var init_workspace_memory_client = __esm({
   "src/lib/workspace-memory-client.ts"() {
@@ -74647,7 +74691,8 @@ var init_workspace_memory_client = __esm({
       list: "context/steering/memories/list",
       get: "context/steering/memories/get",
       promote: "context/steering/memories/promote",
-      dismiss: "context/steering/memories/dismiss"
+      dismiss: "context/steering/memories/dismiss",
+      drop: "context/steering/memory-prs/records/drop"
     };
     WORKSPACE_MEMORY_STATES = [
       "waiting",
@@ -74684,6 +74729,7 @@ __export(memory_exports, {
   MEMORY_COMMAND_CAPABILITIES: () => MEMORY_COMMAND_CAPABILITIES,
   MEMORY_IMPORT_CAPABILITIES: () => MEMORY_IMPORT_CAPABILITIES,
   handleMemoryDismiss: () => handleMemoryDismiss,
+  handleMemoryDrop: () => handleMemoryDrop,
   handleMemoryImport: () => handleMemoryImport,
   handleMemoryList: () => handleMemoryList,
   handleMemoryPromote: () => handleMemoryPromote,
@@ -74795,6 +74841,23 @@ async function handleMemoryDismiss(ids, opts, writer = stdoutWriter) {
     handleApiError(err2, writer);
   }
 }
+async function handleMemoryDrop(number2, path2, opts, writer = stdoutWriter) {
+  if (!/^\d+$/.test(number2.trim()) || Number(number2) < 1)
+    failCommand(`Invalid memory PR number "${number2}". Use the PR's number, such as 12.`, writer);
+  const pr = Number(number2.trim());
+  if (path2.trim() === "")
+    failCommand("Name the record file to drop, such as steering/memory/workspace/general/use-pnpm.md.", writer);
+  try {
+    const result2 = await dropMemoryPrRecord({ number: pr, path: path2.trim() });
+    if (opts.json) {
+      writer.write(JSON.stringify(result2, null, 2));
+      return;
+    }
+    writer.write(formatDropResult(result2));
+  } catch (err2) {
+    handleApiError(err2, writer);
+  }
+}
 async function handleMemoryImport(files2, opts, writer = stdoutWriter) {
   if (files2.length === 0) {
     failCommand(
@@ -74824,7 +74887,8 @@ var init_memory2 = __esm({
       "list_workspace_memories",
       "get_workspace_memory",
       "promote_memories",
-      "dismiss_memories"
+      "dismiss_memories",
+      "drop_memory_record"
     ];
     HARNESSES2 = ["claude-code", "codex", "cursor", "stella", "claude-desktop"];
     KINDS2 = [
@@ -112977,6 +113041,56 @@ function lockFindings2(name, text4, lock) {
   }
   return findings;
 }
+function versionProblem(name, key, entry2, before) {
+  const tool = `${name}__${key}`;
+  if (before === void 0) {
+    return entry2.version === 1 ? null : `${tool} is at version ${entry2.version}, and a tool new to the lock starts at version 1.`;
+  }
+  if (before.definition_hash === entry2.definition_hash) {
+    return entry2.version === before.version ? null : `${tool} is at version ${entry2.version}. Its definition_hash is the production lock's, so its version stays ${before.version}.`;
+  }
+  return entry2.version === before.version + 1 ? null : `${tool} is at version ${entry2.version}. Its definition_hash differs from the production lock's, so its version is ${before.version + 1}.`;
+}
+function lockOutcome(name, head2, base2) {
+  const path2 = toolsLockPath(name);
+  const text4 = head2.get(path2);
+  if (text4 === void 0) return { ok: false, problems: [`The steering PR holds no ${path2}.`] };
+  const read2 = parseLock(text4);
+  if (!read2.ok) {
+    const problems2 = read2.issues.map(
+      (issue) => closed(issue.field === null ? issue.message : `${issue.field}: ${issue.message}`)
+    );
+    return { ok: false, problems: problems2 };
+  }
+  const pinned = read2.value;
+  const problems = [];
+  const serverText = head2.get(serverTomlPath(name));
+  const server = serverText === void 0 ? void 0 : parseServerToml(serverText);
+  if (server?.ok === true && server.value.source.type !== pinned.source.type) {
+    problems.push(`The lock's source is ${pinned.source.type}, and server.toml's source is ${server.value.source.type}.`);
+  }
+  const toolsText = head2.get(toolsTomlPath(name));
+  const tools = toolsText === void 0 ? void 0 : parseToolsToml(toolsText);
+  if (tools?.ok === true) {
+    const imported = tools.value.tools ?? {};
+    for (const key of Object.keys(pinned.tools)) {
+      if (!Object.hasOwn(imported, key)) {
+        problems.push(`The lock holds ${name}__${key}, and tools.toml imports no tool keyed ${key}.`);
+      }
+    }
+  }
+  const baseText = base2.get(path2);
+  const previous = baseText === void 0 ? null : readLock2(baseText);
+  if (previous === null || previous.ok) {
+    const prior = previous === null ? {} : previous.lock.tools;
+    const entries2 = Object.entries(pinned.tools);
+    for (const [key, entry2] of entries2) {
+      const problem = versionProblem(name, key, entry2, Object.hasOwn(prior, key) ? prior[key] : void 0);
+      if (problem !== null) problems.push(problem);
+    }
+  }
+  return problems.length === 0 ? { ok: true } : { ok: false, problems };
+}
 function toolField(tool, field) {
   return field === void 0 ? `tools.${tool}` : `tools.${tool}.${field}`;
 }
@@ -113243,7 +113357,8 @@ var init_servers = __esm({
     CALLS_FILE = "tests/calls.jsonl";
     SERVER_READERS = {
       server: (text4) => outcomeOf2(parseServerToml(text4)),
-      tools: (text4) => outcomeOf2(parseToolsToml(text4))
+      tools: (text4) => outcomeOf2(parseToolsToml(text4)),
+      lock: (name, head2, base2) => lockOutcome(name, head2, base2)
     };
     DEFINITION_SOURCES = /* @__PURE__ */ new Set(["openapi", "graphql", "grpc"]);
     RESYNC = "Restore tools.lock.json from the production branch. If the production branch has this lock, sync the server in Studio so Oxagen writes it again.";
@@ -116150,6 +116265,12 @@ function buildProgram() {
       await handleMemoryDismiss2(ids, opts);
     }
   );
+  memory.command("drop <number> <path>").description(
+    "Drop one proposed record from an open memory PR. When the PR merges, the record's statements are rejected and its memories wait again"
+  ).option("--json", "Output JSON").action(async (number2, path2, opts) => {
+    const { handleMemoryDrop: handleMemoryDrop2 } = await Promise.resolve().then(() => (init_memory2(), memory_exports));
+    await handleMemoryDrop2(number2, path2, opts);
+  });
   memory.command("import <files...>").description(
     "Read Markdown files into steering records with a kind and a force for each statement. Previews unless --yes."
   ).option(

package/package.json

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