@fabricorg/cli 0.9.0 → 0.9.1

package/dist/fabric.js

@@ -7,7 +7,7 @@ import { Command as Command25 } from "commander";
 // package.json
 var package_default = {
   name: "@fabricorg/cli",
-  version: "0.9.0",
+  version: "0.9.1",
   description: "CLI for the Fabric AI platform",
   keywords: [
     "fabric",
@@ -1171,6 +1171,20 @@ var ContextsResource = class {
       throw asConflictError(error);
     }
   }
+  /**
+   * Which of up to 500 paths hold no synced file in the project, for example
+   * after a Living Memory reset. Writes nothing.
+   *
+   * Requires a key with `projects:write`, and the key's creator must still
+   * hold permission to read context sources on that project.
+   */
+  findMissingSyncedFiles(projectId, sourcePaths, options = {}) {
+    const query2 = options.org ? `?org=${encodeURIComponent(options.org)}` : "";
+    return this.http.post(
+      `/projects/${encodeURIComponent(projectId)}/contexts/synced-files/missing${query2}`,
+      { sourcePaths }
+    );
+  }
   /**
    * Reset the project's Living Memory: delete EVERY file synced into its
    * Context at once, with their search-index entries queued for removal.
@@ -6753,6 +6767,9 @@ function asCliFailure(error) {
 }
 
 // src/lib/missing-scope.ts
+function signInCanGrant(scope) {
+  return REQUESTED_SCOPES.some((requested) => requested === scope);
+}
 function readProperty(error, name) {
   return typeof error === "object" && error !== null && name in error ? Reflect.get(error, name) : void 0;
 }
@@ -6776,7 +6793,10 @@ function missingScopeOf(error) {
 // src/lib/context-sync/failure.ts
 function missingScopeSentence(scope) {
   const named = scope ?? "projects:write";
-  return `This API key is missing the ${named} scope. Create an API key with the ${named} scope and run again, or sign in with: ${fabricCommand("auth login")}`;
+  if (signInCanGrant(named)) {
+    return `This credential is missing the ${named} scope. Create an API key with the ${named} scope and run again, or sign in with: ${fabricCommand("auth login")}`;
+  }
+  return `This credential is missing the ${named} scope, which a browser sign-in does not carry. Create an API key with the ${named} scope and sign in with it: ${fabricCommand("auth login")} --key <api-key>`;
 }
 function contextCliFailure(error) {
   if (error instanceof CliFailure) {
@@ -7462,6 +7482,32 @@ function lockProblem(value) {
   return null;
 }
 
+// src/lib/context-sync/missing-on-server.ts
+var PATHS_PER_REQUEST = 500;
+var NOTHING_MISSING = {
+  paths: [],
+  incomplete: false
+};
+async function findMissingOnServer(input) {
+  const confirmed = input.unchanged.filter(
+    (sourcePath) => input.lock?.files[sourcePath]?.state !== "duplicate"
+  );
+  const paths = [];
+  try {
+    for (let i = 0; i < confirmed.length; i += PATHS_PER_REQUEST) {
+      const answer = await input.client.contexts.findMissingSyncedFiles(
+        input.projectId,
+        confirmed.slice(i, i + PATHS_PER_REQUEST),
+        { org: input.org }
+      );
+      paths.push(...answer.missing);
+    }
+  } catch {
+    return { paths, incomplete: true };
+  }
+  return { paths, incomplete: false };
+}
+
 // src/lib/context-sync/classify.ts
 import { createHash as createHash3 } from "crypto";
 import path4 from "path";
@@ -8481,12 +8527,12 @@ function managedSkips(results) {
     detail: r.message
   }));
 }
-function countOutcomes(plan, results) {
+function countOutcomes(plan, results, missingOnServer) {
   const count = (status2) => results.filter((r) => r.status === status2).length;
   return {
     created: count("created"),
     updated: count("updated"),
-    unchanged: count("unchanged") + plan.unchangedLocal.length,
+    unchanged: count("unchanged") + plan.unchangedLocal.length - missingOnServer.length,
     duplicate: count("duplicate"),
     moved: count("moved"),
     moveUnsupported: count("move-unsupported"),
@@ -8609,6 +8655,7 @@ function group(lines2, label, items) {
 }
 function formatPushReport(input) {
   const { plan, results } = input;
+  const missing = input.missingOnServer ?? NOTHING_MISSING;
   const prune2 = Boolean(input.prune);
   const of = (status2) => results.filter(
     (r) => r.status === status2 && !isMoveFallback(r)
@@ -8693,7 +8740,18 @@ function formatPushReport(input) {
     "skipped",
     [...plan.skipped, ...managedSkips(results)].map(skippedLine)
   );
-  const unchanged = countOutcomes(plan, results).unchanged;
+  group(lines2, "missing on the server", missing.paths);
+  if (missing.paths.length > 0) {
+    lines2.push(
+      `These files are in this folder's lock but no longer on the server, so nothing was sent for them: a Living Memory reset or a delete removed them. To send them again, run: ${fabricCommand(`context push --init <dir> --project ${input.projectId}`)}`
+    );
+  }
+  if (missing.incomplete) {
+    lines2.push(
+      "Could not check whether the server still holds the files listed as unchanged, so some may be missing. Run this push again to check."
+    );
+  }
+  const unchanged = countOutcomes(plan, results, missing.paths).unchanged;
   if (unchanged > 0) {
     lines2.push(`unchanged (${unchanged})`);
   }
@@ -8764,7 +8822,13 @@ function contextPushJson(input) {
       skipped: input.plan.skipped
     },
     results: input.results,
-    counts: countOutcomes(input.plan, input.results)
+    missingOnServer: input.missingOnServer.paths,
+    missingCheckIncomplete: input.missingOnServer.incomplete,
+    counts: countOutcomes(
+      input.plan,
+      input.results,
+      input.missingOnServer.paths
+    )
   };
 }
 
@@ -9636,6 +9700,13 @@ async function runPush(dir, opts, format) {
   if (next !== null) {
     await writeContextLock(root, next);
   }
+  const missingOnServer = pushed.stoppedBy === null ? await findMissingOnServer({
+    client,
+    projectId: opts.project,
+    org: opts.org,
+    lock,
+    unchanged: plan.unchangedLocal
+  }) : NOTHING_MISSING;
   if (format === "json") {
     printOutput(
       jsonOutcome({
@@ -9643,7 +9714,8 @@ async function runPush(dir, opts, format) {
         opts,
         plan,
         results: pushed.results,
-        lockWritten: next !== null
+        lockWritten: next !== null,
+        missingOnServer
       }),
       { format: "json" }
     );
@@ -9655,7 +9727,8 @@ async function runPush(dir, opts, format) {
         plan,
         results: pushed.results,
         prune: Boolean(opts.prune),
-        pruneTargets: pushed.pruneTargets
+        pruneTargets: pushed.pruneTargets,
+        missingOnServer
       })
     );
   }
@@ -9678,7 +9751,8 @@ function jsonOutcome(input) {
     force: Boolean(input.opts.force),
     prune: Boolean(input.opts.prune),
     plan: input.plan,
-    results: input.results
+    results: input.results,
+    missingOnServer: input.missingOnServer ?? NOTHING_MISSING
   });
 }
 function pruneSummary(results, targets) {
@@ -11623,7 +11697,7 @@ var LINES = {
   "lock-of-other-project": () => "This folder was synced from a different project, so nothing was changed. Use another --dest, or delete .fabric/instructions.lock to start over.",
   "sign-in-expired": ({ origin, project }) => `Your sign-in to ${origin} has expired. Run: ${loginCommand(origin, project)}`,
   forbidden: () => "You do not have access to this project's coding instructions. Ask a project maintainer for access.",
-  "missing-scope": ({ scope, origin }) => `This credential is missing ${scope === null ? "a permission this needs" : `the ${scope} permission`}. Create a key that carries it, or run: ${loginCommand(origin)}`,
+  "missing-scope": ({ scope, origin }) => scope !== null && !signInCanGrant(scope) ? `This credential is missing the ${scope} permission, which a browser sign-in does not carry. Create a key that carries it and sign in with it: ${loginCommand(origin)} --key <api-key>` : `This credential is missing ${scope === null ? "a permission this needs" : `the ${scope} permission`}. Create a key that carries it, or run: ${loginCommand(origin)}`,
   "proposal-limit-proposer": () => "You already have five active coding-instructions proposals on this project. Wait for one to be reviewed, or withdraw one. Nothing was sent.",
   "proposal-limit-project": () => "This project already has as many active coding-instructions proposals as it allows. Wait for some to be reviewed. Nothing was sent.",
   "note-rejected": () => "The note was refused: it is too long or holds text that is not allowed. Change --message and push again; nothing was sent.",
@@ -19468,6 +19542,13 @@ var REBASE_STATE_PATH = `${LOCK_DIRECTORY}/rebase.json`;
 var REBASE_STATE_VERSION = 1;
 var VERSION_FILES_CHUNK = 200;
 var DEFAULT_MODE2 = 33188;
+var BaseVersionRemovedError = class extends Error {
+  constructor(version) {
+    super(`Version ${version} is no longer kept.`);
+    this.version = version;
+    this.name = "BaseVersionRemovedError";
+  }
+};
 function sha256Of2(bytes) {
   return createHash14("sha256").update(bytes).digest("hex");
 }
@@ -19494,7 +19575,14 @@ async function readBaseRecord(input) {
       input.lock.snapshotId,
       chunk,
       { org: input.org }
-    );
+    ).catch((error) => {
+      if (error.status === 404) {
+        throw new BaseVersionRemovedError(
+          input.lock.snapshotVersion
+        );
+      }
+      throw error;
+    });
     if (response.snapshotId !== input.lock.snapshotId) {
       throw new Error(
         "The server answered for a different version than the one this checkout last synced. Nothing was sent."
@@ -24978,7 +25066,12 @@ async function runCheck(opts, format) {
       published
     ));
   }
-  const drift = opts.verify && lock !== null ? await findLedgerDrift({ root, lock }) : [];
+  const ledgerDrift = opts.verify && lock !== null ? await findLedgerDrift({ root, lock }) : [];
+  const isOverridden = overrideMatcher(
+    ledgerDrift.length === 0 ? NO_OVERRIDES : await readLocalOverrides(root)
+  );
+  const drift = ledgerDrift.filter((entry) => !isOverridden(entry.path));
+  const overriddenDrift = ledgerDrift.filter((entry) => isOverridden(entry.path)).map((entry) => entry.path);
   if (format === "json") {
     printOutput(
       {
@@ -24988,6 +25081,7 @@ async function runCheck(opts, format) {
         localDigest: lock?.digest ?? null,
         verified: Boolean(opts.verify),
         drifted: drift.map(describeLedgerDrift),
+        localOverrides: overriddenDrift,
         // Spec §6.4: the edits an earlier sync saw and kept.
         keptEdited: drift.filter((entry) => entry.reason === "edited" && entry.kept).map((entry) => entry.path),
         ...published,
@@ -25009,7 +25103,7 @@ async function runCheck(opts, format) {
     );
   }
   if (opts.verify) {
-    reportDrift(opts, drift);
+    reportDrift(opts, drift, overriddenDrift);
   }
   if (checkout?.line) {
     line(checkout.line);
@@ -25071,11 +25165,15 @@ function describeRepositorySource(source, repository) {
   }
   return repository ? `${base} (${repository.path})` : base;
 }
-function reportDrift(opts, drift) {
+function reportDrift(opts, drift, overridden) {
   if (drift.length === 0) {
-    line("Every file in this folder matches the lock.");
+    line(
+      overridden.length === 0 ? "Every file in this folder matches the lock." : "Every file in this folder matches the lock, apart from your local overrides:"
+    );
+    listPaths("local override", overridden);
     return;
   }
+  listPaths("local override", overridden);
   line(`${drift.length} local file(s) no longer match the lock:`);
   listPaths("drifted", drift.map(describeLedgerDrift));
   const edits = drift.filter((entry) => entry.reason === "edited").length;
@@ -25889,6 +25987,12 @@ async function rebaseOntoPublished(input) {
         7
       );
     }
+    if (error instanceof BaseVersionRemovedError) {
+      throw new CliFailure(
+        `Version ${error.version}, which this folder last synced, is no longer kept, so your edits cannot be merged automatically. Nothing was sent. Run \`${fabricCommand("instructions sync")}\`, which keeps your edits. A push then sends each edited file whole, so first check that those files still hold what was published since, then run \`${fabricCommand("instructions push")}\`.`,
+        7
+      );
+    }
     throw error;
   }
 }
@@ -25988,6 +26092,12 @@ function reportPush(outcome) {
     return;
   }
   line(pushVerdict(outcome));
+  if (outcome.rebasedFromVersion !== null) {
+    line(
+      `Your lock was not changed: it still names version ${outcome.rebasedFromVersion}. \`${fabricCommand("instructions sync")}\` moves it to the published version and keeps your merged edits.`
+    );
+    return;
+  }
   line(
     outcome.publish ? `Your lock was not changed: it still names version ${outcome.baseVersion}, which is what \`${fabricCommand("instructions sync")}\` compares against.` : `Your lock was not changed: it still names the published version, which is what \`${fabricCommand("instructions sync")}\` compares against.`
   );