@uniqbit/mate-core 0.15.4-canary.7 → 0.15.4-canary.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqbit/mate-core",
-  "version": "0.15.4-canary.7",
+  "version": "0.15.4-canary.8",
   "description": "Core framework and plugin APIs for Mate.",
   "license": "MIT",
   "files": [

package/src/cli/commands/install.ts

@@ -56,10 +56,14 @@ export async function runInstallCommand(argv: string[], cwd = process.cwd()): Pr
     process.exitCode = 1;
     return false;
   }
-  // Companion-declared plugins install first and hydrate into the registry
-  // before the plan is built, so one run goes install → load → plan and their
-  // own install requirements are part of the plan.
-  if (context.kind === "companion" && context.companionPath && context.config.plugins?.length) {
+  // Root-declared plugins (companion or hub) install first and hydrate into
+  // the registry before the plan is built, so one run goes install → load →
+  // plan and their own install requirements are part of the plan.
+  if (
+    (context.kind === "companion" || context.kind === "hub") &&
+    context.companionPath &&
+    context.config.plugins?.length
+  ) {
     reportPluginInstallResults(
       await installDeclaredPlugins(context.companionPath, context.config.plugins),
     );

package/src/cli/commands/plugin/install.ts

@@ -37,7 +37,7 @@ export interface PluginInstallCommandDeps {
 
 /**
  * @command mate plugin install <package>[@version]
- * @description Declares `<package>` in the companion's `framework.yaml`
+ * @description Declares `<package>` in the companion's (or hub's) `framework.yaml`
  * `plugins:` list (adding it, or updating its version if already declared)
  * and installs it immediately into the shared workspace, the same way
  * `mate install` would on its next run.
@@ -62,9 +62,9 @@ export async function runPluginInstallCommand(
     process.exitCode = 1;
     return false;
   }
-  if (context.kind !== "companion" || !context.companionPath) {
+  if ((context.kind !== "companion" && context.kind !== "hub") || !context.companionPath) {
     process.stderr.write(
-      `${FRAMEWORK_NAME}: \`plugin install\` requires a companion context; run it from inside a linked working repository.\n`,
+      `${FRAMEWORK_NAME}: \`plugin install\` requires a companion or hub context; run it from inside a linked working repository or a hub root.\n`,
     );
     process.exitCode = 1;
     return false;

package/src/cli/main.ts

@@ -30,6 +30,8 @@ export interface GateNeeds {
   updateGuard?: boolean;
   /** Block the command when the current directory resolves to a hub root. */
   notHubRoot?: boolean;
+  /** Block the command when the current directory resolves to a companion root. */
+  notCompanionRoot?: boolean;
   /** Require an unambiguous companion (selection wizard on ambiguity) before dispatch. */
   companion?: boolean;
   /** Require a complete installation (install preflight) before dispatch. */
@@ -91,12 +93,22 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       await showUpdateBannerIfAvailable(updateStore);
     }
 
-    if (needs.notHubRoot && (await deps.resolveRootContext()).kind === "hub") {
-      console.error(
-        `${FRAMEWORK_NAME}: this directory resolves to a companion hub root; companion commands are not available here. Use \`${FRAMEWORK_NAME} hub ...\` to manage the hub.`,
-      );
-      process.exitCode = 1;
-      return false;
+    if (needs.notHubRoot || needs.notCompanionRoot) {
+      const kind = (await deps.resolveRootContext()).kind;
+      if (needs.notHubRoot && kind === "hub") {
+        console.error(
+          `${FRAMEWORK_NAME}: this directory resolves to a companion hub root; companion commands are not available here. Use \`${FRAMEWORK_NAME} hub ...\` to manage the hub.`,
+        );
+        process.exitCode = 1;
+        return false;
+      }
+      if (needs.notCompanionRoot && kind === "companion") {
+        console.error(
+          `${FRAMEWORK_NAME}: this directory resolves to a companion root; hub commands are not available here. Run them from a hub root.`,
+        );
+        process.exitCode = 1;
+        return false;
+      }
     }
 
     if (needs.companion && !(await deps.ensureUnambiguousCompanion())) {
@@ -126,9 +138,10 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       return;
     case "plugin":
       // Declares into framework.yaml and installs on the spot, so it needs
-      // the same gating as `install` — an unambiguous companion, but must
-      // stay runnable when installation is otherwise incomplete.
-      if (!(await gate({ updateGuard: true }))) return;
+      // the same gating as `install` — an unambiguous companion (hubs pass
+      // trivially), but must stay runnable when installation is otherwise
+      // incomplete.
+      if (!(await gate({ companion: true }))) return;
       await runPluginCommand(subcommand, rest);
       return;
     case "artifact":
@@ -144,9 +157,10 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
           if (!(await gate({ notHubRoot: true }))) return;
           break;
         // Hub commands establish and operate on a local hub root directly;
-        // they must not require a linked working repository or installation.
+        // they must not require a linked working repository or installation —
+        // but companions are never hubs.
         case "hub":
-          if (!(await gate({ updateGuard: true }))) return;
+          if (!(await gate({ updateGuard: true, notCompanionRoot: true }))) return;
           break;
         // open/tui consume a companion context.
         case "open":
@@ -160,7 +174,8 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       await runCompanionCommand(subcommand, rest);
       return;
     case "hub":
-      if (!(await gate({ updateGuard: true }))) return;
+      // Hubs are never companions: hub commands are blocked in companion roots.
+      if (!(await gate({ updateGuard: true, notCompanionRoot: true }))) return;
       await runHubCommand(subcommand ? [subcommand, ...rest] : []);
       return;
     case "claude":