@uniqbit/mate-core 0.15.5 → 0.16.0-canary.1

package/src/lib/orchestrator/working-repo-projection.ts

@@ -0,0 +1,366 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { FRAMEWORK_NAME } from "../../framework";
+import { readProjectionFile } from "../../runtime/projection";
+import { repoLocalDirPath } from "../../runtime/repo-local";
+import { companionGitSyncDeps } from "./companion-git-sync";
+import type { GlobalConfigStore } from "./global-config-store";
+import { projectionEntries } from "./projection-entries";
+import {
+  isExternalDocument,
+  recordedRuntimeDocuments,
+  removeRuntimeDocuments,
+} from "./projection-runtime-documents";
+import {
+  firstFailure,
+  type RenderedRuntimeDocument,
+  type ProjectionDescription,
+  type ProjectionEntry,
+  type ProjectionEntryOutcome,
+  type ProjectionEntryPresence,
+  type ProjectionInput,
+  type ProjectionRemovalInput,
+  type ProjectionRemovalResult,
+  type ProjectionResult,
+  type ProjectionScope,
+} from "./projection-types";
+import type { FrameworkConfig, LinkedRepository } from "./types";
+
+/**
+ * The owner of the Managed Projection: every path Mate places inside a Working
+ * Repository is written and removed from here, through the declarations in
+ * `projection-entries.ts`. This module holds no Agent Runtime format knowledge —
+ * that is what keeps a second runtime writing the same destination a new
+ * declaration rather than a branch in here.
+ */
+
+export type ProjectionWriteResult =
+  | { kind: "written"; projectionRoot: string; companionPath: string }
+  | { kind: "current"; projectionRoot: string; companionPath: string }
+  | { kind: "failed"; error: Error };
+
+function toError(error: unknown): Error {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+function outcome(
+  entry: ProjectionEntry,
+  state: ProjectionEntryOutcome["state"],
+  error?: Error,
+): ProjectionEntryOutcome {
+  return {
+    id: entry.id,
+    path: entry.path,
+    kind: entry.kind,
+    state,
+    ...(error ? { error } : {}),
+    ...(entry.degradable ? { degradable: true } : {}),
+  };
+}
+
+/**
+ * Writes the entries the scope declares, in catalogue order so the managed
+ * exclude block precedes anything it covers. Best-effort per entry: one failure
+ * neither aborts the rest nor throws, so a caller that must fail reads the
+ * reported outcomes instead.
+ */
+export async function project(
+  scope: ProjectionScope,
+  input: ProjectionInput,
+): Promise<ProjectionResult> {
+  const outcomes: ProjectionEntryOutcome[] = [];
+  for (const entry of projectionEntries()) {
+    if (!entry.scopes.includes(scope)) continue;
+    try {
+      // oxlint-disable-next-line no-await-in-loop -- catalogue order is the contract
+      outcomes.push(outcome(entry, await entry.write(input)));
+    } catch (error) {
+      outcomes.push(outcome(entry, "failed", toError(error)));
+    }
+  }
+  return { root: repoLocalDirPath(input.repoPath), scope, outcomes };
+}
+
+/**
+ * Removes every declared entry regardless of which scope wrote it, walking the
+ * catalogue in reverse. An entry covered by another entry's removal, or
+ * deliberately retained, is reported as such rather than being silently absent.
+ */
+export async function unproject(input: ProjectionRemovalInput): Promise<ProjectionRemovalResult> {
+  const outcomes: ProjectionEntryOutcome[] = [];
+  for (const entry of [...projectionEntries()].reverse()) {
+    const { removal } = entry;
+    if (removal.by === "entry") {
+      outcomes.push(outcome(entry, "covered"));
+      continue;
+    }
+    if (removal.by === "retained") {
+      outcomes.push(outcome(entry, "retained"));
+      continue;
+    }
+    try {
+      // oxlint-disable-next-line no-await-in-loop -- reverse catalogue order is the contract
+      outcomes.push(outcome(entry, await removal.remove(input)));
+    } catch (error) {
+      outcomes.push(outcome(entry, "failed", toError(error)));
+    }
+  }
+  return { root: repoLocalDirPath(input.repoPath), outcomes };
+}
+
+/** Removes entries that wrap owns but an unwrap must withdraw independently. */
+export async function removeWorkingRepositoryUnwrapEntries(
+  repoPath: string,
+): Promise<ProjectionEntryOutcome[]> {
+  const entries = projectionEntries().filter(
+    (entry) => entry.removeOnUnwrap && entry.removal.by === "self",
+  );
+  return Promise.all(
+    entries.map(async (entry) => {
+      const removal = entry.removal;
+      if (removal.by !== "self") return outcome(entry, "failed", new Error("invalid removal"));
+      try {
+        return outcome(entry, await removal.remove({ repoPath }));
+      } catch (error) {
+        return outcome(entry, "failed", toError(error));
+      }
+    }),
+  );
+}
+
+/** Reads and reports; writes nothing. Freshness is a verdict above this module. */
+export async function describe(repoPath: string): Promise<ProjectionDescription> {
+  const entries: ProjectionEntryPresence[] = [];
+  for (const entry of projectionEntries()) {
+    const present = entry.present
+      ? // oxlint-disable-next-line no-await-in-loop -- reported in catalogue order
+        await entry.present(repoPath)
+      : await fs
+          .access(path.join(path.resolve(repoPath), entry.path))
+          .then(() => true)
+          .catch(() => false);
+    entries.push({ id: entry.id, path: entry.path, kind: entry.kind, present });
+  }
+  return {
+    root: repoLocalDirPath(repoPath),
+    entries,
+    projection: readProjectionFile(repoPath),
+  };
+}
+
+/**
+ * Makes the Managed Projection durable at the Working Repository's Projection
+ * Root so an Unmanaged Session can resolve it from files. Reports its outcome
+ * rather than swallowing it: callers that asked for the write explicitly need
+ * to fail on it, while resolution paths stay best-effort through the wrapper
+ * below. Callers must have established that the companion is not a guess.
+ */
+export async function projectWorkingRepository(
+  companionPath: string,
+  repository: LinkedRepository,
+): Promise<ProjectionWriteResult> {
+  const resolvedCompanionPath = path.resolve(companionPath);
+  const result = await project("session", {
+    repoPath: repository.path,
+    companionPath: resolvedCompanionPath,
+    repository,
+  });
+
+  const failure = firstFailure(result.outcomes);
+  if (failure) return { kind: "failed", error: failure.error ?? new Error("projection failed") };
+
+  /** The projection pair is what "the projection" means to these callers. */
+  const pair = result.outcomes.find((candidate) => candidate.id === "projection-pair");
+  return {
+    kind: pair?.state === "written" ? "written" : "current",
+    projectionRoot: result.root,
+    companionPath: resolvedCompanionPath,
+  };
+}
+
+/**
+ * The rendered runtime documents, placed. Reported per document because the
+ * operator asked for these by name: a failure has to say which one failed while
+ * the projection already written stays where it is.
+ */
+export type RuntimeDocumentsResult =
+  | { kind: "written" | "current"; documents: string[] }
+  | { kind: "failed"; document: string; error: Error };
+
+/**
+ * Which of the given repo-relative paths Git already has in its index. Asked
+ * through the same runner the companion sync uses rather than a second spawn.
+ * Best-effort by construction: a directory that is no repository, a Git that is
+ * not installed, and a `ls-files` that fails for any other reason all answer
+ * "nothing tracked" — this feeds a warning, and a warning may not fail a wrap.
+ */
+async function trackedDocuments(repoPath: string, documentPaths: string[]): Promise<string[]> {
+  if (documentPaths.length === 0) return [];
+  try {
+    const result = await companionGitSyncDeps.runGit(
+      ["ls-files", "-z", "--", ...documentPaths],
+      path.resolve(repoPath),
+    );
+    if (result.status !== 0) return [];
+    return result.stdout.split("\0").filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * The managed exclude block only hides a file Git does not already track, so a
+ * repository that commits one of these documents keeps it in the index and the
+ * regions land in a tracked file. Those regions carry machine-absolute
+ * companion paths — keys naming directories under this user's home — so a
+ * routine `git add -A` pushes one machine's layout to everyone else. Warn and
+ * write anyway: refusing would silently drop the projection the repository was
+ * wrapped for.
+ *
+ * Asked here rather than while rendering because the render also runs on every
+ * launch; the wrap pass is the one that is a deliberate act, so this is the
+ * scope where saying it once is information rather than noise.
+ */
+async function warnAboutTrackedDocuments(
+  repository: LinkedRepository,
+  runtimeDocuments: readonly RenderedRuntimeDocument[],
+): Promise<void> {
+  const tracked = await trackedDocuments(
+    repository.path,
+    runtimeDocuments
+      .map((document) => document.path)
+      .filter((documentPath) => !isExternalDocument(documentPath)),
+  );
+  for (const documentPath of tracked) {
+    console.error(
+      `${FRAMEWORK_NAME}: warning: ${documentPath} is tracked by Git in ${repository.id}; ${FRAMEWORK_NAME} writes machine-absolute companion paths into it, so committing it would push this machine's paths to everyone else on the repository.`,
+    );
+    console.error(
+      `Untrack it with \`git rm --cached ${documentPath}\` if those paths should stay local.`,
+    );
+  }
+}
+
+export async function projectWorkingRuntimeDocuments(
+  companionPath: string,
+  repository: LinkedRepository,
+  config: FrameworkConfig,
+  runtimeDocuments: readonly RenderedRuntimeDocument[],
+  globalConfigStore?: GlobalConfigStore,
+): Promise<RuntimeDocumentsResult> {
+  await warnAboutTrackedDocuments(repository, runtimeDocuments);
+  const result = await project("wrap", {
+    repoPath: repository.path,
+    companionPath: path.resolve(companionPath),
+    repository,
+    config,
+    runtimeDocuments,
+    globalConfigStore,
+  });
+
+  const failure = firstFailure(result.outcomes);
+  if (failure) {
+    return {
+      kind: "failed",
+      document: failure.path,
+      error: failure.error ?? new Error("runtime document write failed"),
+    };
+  }
+
+  /** The destinations the caller handed over; the rest of the pass is scaffolding. */
+  const destinations = new Set(
+    runtimeDocuments.map((document) => document.path.split("/").join(path.sep)),
+  );
+  const outcomes = result.outcomes.filter((outcome) => destinations.has(outcome.path));
+  return {
+    kind: outcomes.some((outcome) => outcome.state === "written") ? "written" : "current",
+    documents: [...new Set(outcomes.map((outcome) => outcome.path))],
+  };
+}
+
+/**
+ * Whether `mate wrap` configured this Working Repository. Asked of the runtime
+ * document manifest rather than of the Projection Root, because the root is not
+ * evidence of a wrap: a launch and every Capability command write the
+ * projection pair too. The manifest is written only by a pass that placed a
+ * runtime document, and wrapping is the only pass that places one.
+ */
+export async function isWorkingRepositoryWrapped(repoPath: string): Promise<boolean> {
+  return (await recordedRuntimeDocuments(repoPath)).length > 0;
+}
+
+export type UnwrapResult =
+  | { kind: "unwrapped" | "absent"; documents: string[] }
+  | { kind: "failed"; document: string; error: Error };
+
+/**
+ * The inverse of {@link projectWorkingRuntimeDocuments}: runtime documents and
+ * projected Claude skill links are withdrawn while the Projection Root, the
+ * Repository Link and the companion link are left exactly as they were. That
+ * asymmetry with `mate working cleanup` is the point — cleanup removes Mate's
+ * whole local integration including the Repository Link, while unwrapping takes
+ * back only what wrapping added, leaving a linked repository that was never
+ * wrapped. That is what makes unwrapping the way back to a Managed Session
+ * rather than a teardown.
+ *
+ * Driven by the manifest, so it withdraws whatever the wrap that ran recorded,
+ * including a destination this release no longer renders.
+ */
+export async function unwrapWorkingRuntimeDocuments(repoPath: string): Promise<UnwrapResult> {
+  const documents = await recordedRuntimeDocuments(repoPath);
+  const removeWrapEntries = async (): Promise<ProjectionEntryOutcome[]> =>
+    removeWorkingRepositoryUnwrapEntries(repoPath);
+  if (documents.length === 0) {
+    const outcomes = await removeWrapEntries();
+    const failure = firstFailure(outcomes);
+    if (failure) {
+      return {
+        kind: "failed",
+        document: failure.path,
+        error: failure.error ?? new Error("wrap entry removal failed"),
+      };
+    }
+    return outcomes.some((entry) => entry.state === "removed")
+      ? { kind: "unwrapped", documents: [] }
+      : { kind: "absent", documents: [] };
+  }
+
+  /**
+   * One manifest read and one manifest write for the whole withdrawal. A
+   * per-document call could not be run concurrently — each rewrites the whole
+   * manifest, so the last write would restore the keys the others removed, and
+   * a surviving key reads back as still wrapped — leaving a launch refused after
+   * a successful unwrap.
+   */
+  const { removed, error } = await removeRuntimeDocuments(repoPath, documents);
+  /** Reported after the successful withdrawals are already durable. */
+  if (error) return { kind: "failed", document: error.document, error: error.error };
+  const outcomes = await removeWrapEntries();
+  const failure = firstFailure(outcomes);
+  if (failure) {
+    return {
+      kind: "failed",
+      document: failure.path,
+      error: failure.error ?? new Error("wrap entry removal failed"),
+    };
+  }
+  return { kind: "unwrapped", documents: removed };
+}
+
+/**
+ * Best-effort like `backfillCompanionRegistration`: a read-only Working
+ * Repository warns and the caller still proceeds.
+ */
+export async function projectWorkingRepositoryBestEffort(
+  companionPath: string,
+  repository: LinkedRepository,
+): Promise<ProjectionWriteResult> {
+  const result = await projectWorkingRepository(companionPath, repository);
+  if (result.kind === "failed") {
+    console.error(
+      `${FRAMEWORK_NAME}: warning: failed to write the projection for ${repository.id}: ${result.error.message}`,
+    );
+  }
+  return result;
+}

package/src/lib/orchestrator/workspace-inventory.ts

@@ -5,7 +5,7 @@ import { readCompanionRegistry } from "./companion-registry-reader";
 import { GlobalConfigStore } from "./global-config-store";
 import type { LinkedRepository } from "./types";
 
-/** Envelope version for `mate workspace list --json`; bump on any breaking shape change. */
+/** Envelope version for the aggregate inventory shape; bump on any breaking shape change. */
 export const WORKSPACE_INVENTORY_SCHEMA_VERSION = 1;
 
 export type CompanionInventoryHealth = "ready" | "missing" | "unreadable";

package/src/lib/package-paths.ts

@@ -3,9 +3,19 @@ import { createRequire } from "node:module";
 import path from "node:path";
 
 import { getActiveDistribution } from "../distribution";
+import { mateInstallPath } from "../runtime/install";
 
 const require = createRequire(import.meta.url);
 
+/**
+ * Root of the installed mate-core package. A stamp input for the durable
+ * projection: a mate installed at a different path resolves different wrapper
+ * and plugin assets.
+ */
+export function getMateInstallPath(): string {
+  return mateInstallPath();
+}
+
 /**
  * Resolved wrapper directory: a distribution asset root that ships
  * `wrappers/bin` wins over core's bundled default.
@@ -35,7 +45,7 @@ export function getClaudePluginRoot(): string {
 export const CLAUDE_PLUGIN_HOOK_SHIMS = [
   "validate-artifact-path.mjs",
   "session-banner.mjs",
-  "artifact-finish-nudge.mjs",
+  "session-guidance.mjs",
 ] as const;
 
 /**

package/src/lib/public-npm.ts

@@ -92,9 +92,10 @@ function withPublicNpmConfigSync<T>(
 export async function fetchPublicPackageVersion(
   packageName: string,
   registry = PUBLIC_NPM_REGISTRY,
+  distTag = "latest",
 ): Promise<string> {
   const { stdout } = await withPublicNpmConfig(packageName, registry, (env) =>
-    publicNpmDeps.execFile("npm", ["view", packageName, "version"], {
+    publicNpmDeps.execFile("npm", ["view", `${packageName}@${distTag}`, "version"], {
       timeout: 10_000,
       env,
     }),

package/src/lib/update-checker.ts

@@ -1,13 +1,13 @@
 import os from "node:os";
 import path from "node:path";
 
+import semver from "semver";
+
 import { getActiveDistribution, type DistributionUpdateConfig } from "../distribution";
 import { FRAMEWORK_NAME } from "../framework";
 import { fetchPublicPackageVersion, PUBLIC_NPM_REGISTRY } from "./public-npm";
 import { YamlFileStore } from "./orchestrator/yaml-file-store";
 
-const parse = (v: string): number[] => v.split(".").slice(0, 3).map(Number);
-
 interface UpdateState {
   lastChecked: string;
   latestVersion: string | null;
@@ -31,11 +31,12 @@ const updateStateFileSlug = (packageName: string): string =>
  */
 export class UpdateStateStore extends YamlFileStore<UpdateState> {
   constructor(packageName: string = getUpdateConfig().packageName) {
+    const channelSuffix = getUpdateChannel() === "canary" ? "-canary" : "";
     super(
       path.join(
         os.homedir(),
         `.${FRAMEWORK_NAME}`,
-        `update-state-${updateStateFileSlug(packageName)}.yaml`,
+        `update-state-${updateStateFileSlug(packageName)}${channelSuffix}.yaml`,
       ),
     );
   }
@@ -62,12 +63,15 @@ export function isCanaryVersion(version: string = getCurrentVersion()): boolean
   return version.includes("-canary");
 }
 
+export type UpdateChannel = "latest" | "canary";
+
+export function getUpdateChannel(version: string = getCurrentVersion()): UpdateChannel {
+  return isCanaryVersion(version) ? "canary" : "latest";
+}
+
 export function isNewer(latest: string, current: string): boolean {
-  const [la, lb, lc] = parse(latest);
-  const [ca, cb, cc] = parse(current);
-  if (la !== ca) return la > ca;
-  if (lb !== cb) return lb > cb;
-  return lc > cc;
+  if (!semver.valid(latest) || !semver.valid(current)) return false;
+  return semver.gt(latest, current);
 }
 
 export async function showUpdateBannerIfAvailable(store: UpdateStateStore): Promise<void> {
@@ -109,7 +113,9 @@ export async function enforceUpdateIfRequired(store: UpdateStateStore): Promise<
 
 export async function fetchLatestVersion(): Promise<string> {
   const { packageName, registry } = getUpdateConfig();
-  return fetchPublicPackageVersion(packageName, registry);
+  const latestVersion = await fetchPublicPackageVersion(packageName, registry, getUpdateChannel());
+  if (!semver.valid(latestVersion)) throw new Error("npm returned an invalid version");
+  return latestVersion;
 }
 
 export function scheduleBackgroundCheck(store: UpdateStateStore): Promise<void> {