@uniqbit/mate-core 0.16.0-canary.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqbit/mate-core",
-  "version": "0.16.0-canary.0",
+  "version": "0.16.0",
   "description": "Core framework and plugin APIs for Mate.",
   "license": "MIT",
   "files": [
@@ -50,7 +50,7 @@
     "@types/semver": "^7.7.1"
   },
   "engines": {
-    "node": "24.x"
+    "node": ">=24"
   },
   "packageManager": "bun@1.3.14"
 }

package/src/cli/commands/cap/tokensave.ts

@@ -6,7 +6,7 @@ import { ensureTokensaveInstalled } from "../../../tools/setup/capabilities/toke
 
 interface TokensaveCapDeps {
   resolveForLaunch?: typeof resolveForLaunch;
-  ensureInstalled?: (repoPath: string) => Promise<boolean>;
+  ensureInstalled?: (repoPath: string, options?: { upgrade?: boolean }) => Promise<boolean>;
   spawn?: typeof spawnSync;
 }
 
@@ -15,8 +15,8 @@ interface TokensaveCapDeps {
  * @description Forwards `[...args]` to the `tokensave` CLI, run from the
  * active working repository. Requires the `tokensave` capability to be enabled
  * in `.mate/config/framework.yaml` and a registered working repo for the
- * current `MATE_REPO_ID`. Ensures the `tokensave` binary is installed in that
- * repo (via {@link ensureTokensaveInstalled}) before forwarding.
+ * current `MATE_REPO_ID`. Ensures the `tokensave` binary is installed and
+ * upgraded in that repo (via {@link ensureTokensaveInstalled}) before forwarding.
  * @remarks The child process's exit code is propagated via `process.exitCode`.
  */
 export async function runTokensaveCapCommand(
@@ -49,7 +49,7 @@ export async function runTokensaveCapCommand(
     return;
   }
 
-  if (!(await ensureInstalled(repo.path))) {
+  if (!(await ensureInstalled(repo.path, { upgrade: true }))) {
     process.exitCode = 1;
     return;
   }

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> {

package/src/templates/mate-skills/agents/mate-interview-me/SKILL.md

@@ -69,6 +69,9 @@ Ask exactly one focused question that would most reduce uncertainty. Attach your
 best guess about the answer and the reasoning behind it:
 
 ```text
+CONFIDENCE: <0-100%> (<change since the previous answer>)
+RESOLVED: <what is now clear>
+REMAINING: <what is still uncertain>
 Q: <one focused question> GUESS: <your hypothesis for the answer and why>
 ```
 
@@ -76,6 +79,10 @@ Wait for the answer before asking the next question. Never batch questions or
 advance silently. The guess exposes assumptions and lets the user correct them
 quickly.
 
+After every answer, update the confidence, resolved points, and remaining
+uncertainty before asking the next question. Keep this progress state visible;
+do not report confidence only at the beginning or end.
+
 ### Step 3: Listen for "want versus should want"
 
 Watch for best-practice talk without specifics, deference to convention, phrases
@@ -138,6 +145,8 @@ Before stopping, check that:
 
 - An initial hypothesis and confidence number were stated.
 - Every confidence number below 70 percent included its reason.
+- Confidence, resolved points, and remaining uncertainty were shown before each
+  question.
 - Every question was asked one at a time with an attached guess.
 - The want-versus-should-want probe ran when the user gave a convention or
   sophistication-signaling answer.

package/src/templates/mate-skills/claude/mate-interview-me/SKILL.md

@@ -69,6 +69,9 @@ Ask exactly one focused question that would most reduce uncertainty. Attach your
 best guess about the answer and the reasoning behind it:
 
 ```text
+CONFIDENCE: <0-100%> (<change since the previous answer>)
+RESOLVED: <what is now clear>
+REMAINING: <what is still uncertain>
 Q: <one focused question> GUESS: <your hypothesis for the answer and why>
 ```
 
@@ -76,6 +79,10 @@ Wait for the answer before asking the next question. Never batch questions or
 advance silently. The guess exposes assumptions and lets the user correct them
 quickly.
 
+After every answer, update the confidence, resolved points, and remaining
+uncertainty before asking the next question. Keep this progress state visible;
+do not report confidence only at the beginning or end.
+
 ### Step 3: Listen for "want versus should want"
 
 Watch for best-practice talk without specifics, deference to convention, phrases
@@ -138,6 +145,8 @@ Before stopping, check that:
 
 - An initial hypothesis and confidence number were stated.
 - Every confidence number below 70 percent included its reason.
+- Confidence, resolved points, and remaining uncertainty were shown before each
+  question.
 - Every question was asked one at a time with an attached guess.
 - The want-versus-should-want probe ran when the user gave a convention or
   sophistication-signaling answer.

package/src/tools/setup/capabilities/tokensave.ts

@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import { constants as fsConstants } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 
@@ -14,6 +15,8 @@ export const TOKENSAVE_STORE_CONFIG_FILE = "config.json";
 export const TOKENSAVE_MIN_RUST_VERSION = "1.91.0";
 /** Single-graph posture Mate owns in the per-project store config; every other key is left as found. */
 const TOKENSAVE_OWNED_POSTURE = { auto_track: false, suppress_scope_warning: true } as const;
+const TOKENSAVE_BRANCH_META_FILE = "branch-meta.json";
+const TOKENSAVE_DISABLED_BRANCH_META_FILE = "branch-meta.json.mate-disabled";
 const TOKENSAVE_STORE_EXCLUDE_ENTRY = `${TOKENSAVE_STORE_DIR}/`;
 const TOKENSAVE_BREW_INSTALL_CMD = "brew install aovestdipaperino/tap/tokensave";
 const TOKENSAVE_CARGO_INSTALL_CMD = "cargo install --locked tokensave";
@@ -104,6 +107,21 @@ async function tokensaveInstalled(repoPath: string): Promise<boolean> {
   return result.ok;
 }
 
+/**
+ * Upgrades the installed binary without making setup depend on network
+ * availability. `--kill` keeps the non-interactive setup path from hanging on
+ * a running Tokensave MCP process.
+ */
+async function upgradeTokensave(repoPath: string): Promise<void> {
+  const result = tokensaveDeps.run(["upgrade", "--kill"], repoPath);
+  if (result.ok) return;
+
+  const detail = result.stderr.trim();
+  process.stderr.write(
+    `tokensave: automatic upgrade failed${detail ? `: ${detail}` : ""} - continuing with the installed version\n`,
+  );
+}
+
 // Global agent integration (MCP entry, session hooks, wildcard permission grant, and
 // tokensave's own config bookkeeping) is owned by tokensave's installer — Mate never
 // hand-edits ~/.tokensave/config.toml. Runs in setup mode only; the installer is
@@ -172,8 +190,12 @@ function getTokensaveInstallPlan(): { command: string; run: () => Promise<void>
   return undefined;
 }
 
-export async function ensureTokensaveInstalled(repoPath: string): Promise<boolean> {
+export async function ensureTokensaveInstalled(
+  repoPath: string,
+  options: { upgrade?: boolean } = {},
+): Promise<boolean> {
   if (await tokensaveInstalled(repoPath)) {
+    if (options.upgrade) await upgradeTokensave(repoPath);
     return true;
   }
 
@@ -233,11 +255,49 @@ export async function ensureTokensaveStoreExcluded(repoPath: string): Promise<vo
   await fs.writeFile(excludePath, lines.join("\n") + "\n", "utf8");
 }
 
+/**
+ * Deactivates Tokensave's multi-branch mode without deleting branch databases.
+ * The metadata is preserved in a Mate-owned backup so the migration is reversible.
+ */
+async function deactivateTokensaveBranchMetadata(repoPath: string): Promise<void> {
+  const storePath = path.join(repoPath, TOKENSAVE_STORE_DIR);
+  const branchMetaPath = path.join(storePath, TOKENSAVE_BRANCH_META_FILE);
+  const disabledBranchMetaPath = path.join(storePath, TOKENSAVE_DISABLED_BRANCH_META_FILE);
+
+  let branchMeta: string;
+  try {
+    branchMeta = await fs.readFile(branchMetaPath, "utf8");
+  } catch {
+    return;
+  }
+
+  let removeActiveMetadata = false;
+  try {
+    await fs.copyFile(branchMetaPath, disabledBranchMetaPath, fsConstants.COPYFILE_EXCL);
+    removeActiveMetadata = true;
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== "EEXIST") {
+      return;
+    }
+
+    try {
+      removeActiveMetadata = (await fs.readFile(disabledBranchMetaPath, "utf8")) === branchMeta;
+    } catch {
+      return;
+    }
+  }
+
+  if (removeActiveMetadata) {
+    await fs.unlink(branchMetaPath).catch(() => {});
+  }
+}
+
 /**
  * Reconciles Mate's single-graph branching posture into the working repo's
- * git-excluded `.tokensave/config.json`. Best-effort by design: the file is
- * created by `tokensave init`, so an absent, unreadable, or unparseable config
- * is left untouched rather than treated as an error.
+ * git-excluded `.tokensave/config.json` and deactivates existing branch
+ * metadata. Best-effort by design: the file is created by `tokensave init`,
+ * so an absent, unreadable, or unparseable config is left untouched rather
+ * than treated as an error. Existing branch databases are never removed.
  */
 export async function ensureTokensaveBranchingPosture(repoPath: string): Promise<void> {
   const configPath = path.join(repoPath, TOKENSAVE_STORE_DIR, TOKENSAVE_STORE_CONFIG_FILE);
@@ -266,6 +326,7 @@ export async function ensureTokensaveBranchingPosture(repoPath: string): Promise
   );
   const serialized = `${next}\n`;
   if (serialized === raw) {
+    await deactivateTokensaveBranchMetadata(repoPath);
     return;
   }
 
@@ -274,6 +335,8 @@ export async function ensureTokensaveBranchingPosture(repoPath: string): Promise
   } catch {
     /** Best-effort: the store config is not Mate's to guarantee. */
   }
+
+  await deactivateTokensaveBranchMetadata(repoPath);
 }
 
 async function teardownDriver(repoPath: string, providers: string[]) {
@@ -371,7 +434,11 @@ export function createTokensavePlugin(): CapabilityPlugin {
       if (ctx.activeProviders.filter((p) => TOKENSAVE_SUPPORTED_AGENTS.has(p)).length === 0) return;
 
       const targetPath = ctx.repoPath ?? ctx.companionPath;
-      if (!(await ensureTokensaveInstalled(targetPath))) {
+      if (
+        !(await ensureTokensaveInstalled(targetPath, {
+          upgrade: ctx.mode === "setup",
+        }))
+      ) {
         return;
       }
       await ensureTokensaveBranchingPosture(targetPath);