@paradigma-inc/flywheel 0.1.115 → 0.1.134

package/src/public-command-metadata.mjs

@@ -14,6 +14,13 @@ export const COMPLETION_SHELL_CHOICES = [
   "nushell",
 ];
 
+const HELP_OPTION = {
+  name: "help",
+  type: "boolean",
+  usage: "-h --help",
+  description: "Show this help.",
+};
+
 const INCLUDE_BASH_COMPLETION_LIB_OPTION = {
   name: "include-bash-completion-lib",
   type: "boolean",
@@ -27,7 +34,10 @@ const COMPLETION_GENERATOR_USAGE = COMPLETION_SHELL_CHOICES.map((shell) => ({
   summary: `Generate a ${shell} shell completion script`,
   endpoints: [],
   required: [],
-  optional: shell === "bash" ? [INCLUDE_BASH_COMPLETION_LIB_OPTION] : [],
+  optional:
+    shell === "bash"
+      ? [HELP_OPTION, INCLUDE_BASH_COMPLETION_LIB_OPTION]
+      : [HELP_OPTION],
   examples: [
     {
       description: `Generate ${shell} completions`,
@@ -56,7 +66,7 @@ export const HELP_EXTRAS = [
   {
     group: "setup-admin",
     name: "setup",
-    summary: "Install Flywheel CLI + MCP + skills.",
+    summary: "Configure host skills or MCP; CLI mode also writes user TOML.",
   },
   {
     group: "setup-admin",
@@ -80,12 +90,14 @@ const COMPLETION_INSTALL_USAGE = {
     {
       name: "shell",
       type: "string",
+      usage: "shell",
       description: "Shell to install completions for",
       choices: COMPLETION_SHELL_CHOICES,
     },
   ],
   required: [],
   optional: [
+    HELP_OPTION,
     {
       name: "dir",
       type: "string",
@@ -140,12 +152,14 @@ const COMPLETION_UNINSTALL_USAGE = {
     {
       name: "shell",
       type: "string",
+      usage: "shell",
       description: "Shell to uninstall completions for",
       choices: COMPLETION_SHELL_CHOICES,
     },
   ],
   required: [],
   optional: [
+    HELP_OPTION,
     {
       name: "dir",
       type: "string",
@@ -191,7 +205,7 @@ export const USAGE_EXTRAS = [
     endpoints: [],
     args: [],
     required: [],
-    optional: [INCLUDE_BASH_COMPLETION_LIB_OPTION],
+    optional: [HELP_OPTION, INCLUDE_BASH_COMPLETION_LIB_OPTION],
     examples: [
       {
         description: "Generate bash completions",
@@ -216,10 +230,11 @@ export const USAGE_EXTRAS = [
   {
     group: "setup-admin",
     name: "setup",
-    summary: "Set up Flywheel for your AI coding host",
+    summary: "Configure host skills or MCP; CLI mode also writes user TOML.",
     endpoints: [],
     required: [],
     optional: [
+      HELP_OPTION,
       {
         name: "claude",
         type: "boolean",
@@ -277,6 +292,12 @@ export const USAGE_EXTRAS = [
         usage: "--api-key <KEY>",
         description: "Use API key authentication",
       },
+      {
+        name: "api-key-stdin",
+        type: "boolean",
+        description:
+          "Read one API key privately from stdin without browser authentication",
+      },
       {
         name: "oauth",
         type: "boolean",
@@ -323,7 +344,7 @@ export const USAGE_EXTRAS = [
       {
         description: "Install MCP wiring and bundled skills",
         invocation:
-          "npx --yes @paradigma-inc/flywheel setup --mode mcp --install-skill",
+          "npx --yes @paradigma-inc/flywheel setup --mode mcp --install-skill --codex",
       },
       {
         description: "Configure Codex MCP wiring without bundled skills",
@@ -345,6 +366,7 @@ export const USAGE_EXTRAS = [
     endpoints: [],
     required: [],
     optional: [
+      HELP_OPTION,
       {
         name: "check",
         type: "boolean",
@@ -385,6 +407,7 @@ export const USAGE_EXTRAS = [
     endpoints: [],
     required: [],
     optional: [
+      HELP_OPTION,
       {
         name: "claude",
         type: "boolean",

package/src/runtime/delegate.mjs

@@ -1,21 +1,4 @@
-import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
-
-// import.meta.dirname is only available on Node v20.11.0+. fileURLToPath +
-// path.dirname is portable across the full Node 20 range the package
-// declares (engines.node >= 20).
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const RUNTIME_ENTRY_PATH = path.join(
-  __dirname,
-  "vendor",
-  "flywheel-cli-dist",
-  "runtime-entry.js",
-);
-
 export async function runRuntimeCli(argv, dependencies = {}) {
-  const runtimeModule = await import(pathToFileURL(RUNTIME_ENTRY_PATH).href);
-  if (typeof runtimeModule.runCli !== "function") {
-    throw new Error("Runtime CLI entrypoint does not export runCli.");
-  }
-  return await runtimeModule.runCli(argv, dependencies);
+  const { runCli } = await import("./vendor/flywheel-cli-dist/runtime-entry.js");
+  return await runCli(argv, dependencies);
 }

package/src/runtime/required-runtime-commands.json

@@ -1,27 +1,19 @@
 [
   "auth:status",
   "auth:login",
-  "nodes:list",
-  "nodes:get",
-  "nodes:children",
-  "nodes:parents",
-  "nodes:commit-new",
+  "hosted:node:list",
+  "hosted:node:get",
+  "hosted:lineage:list",
   "nodes:stage:lease:acquire",
-  "nodes:commit",
-  "nodes:delete",
   "nodes:render:tree",
-  "artifacts:list",
-  "artifacts:get",
+  "hosted:artifact:list",
+  "hosted:artifact:get",
   "compute:status",
   "export:subgraph",
   "profile:list",
   "profile:show",
   "profile:set",
   "profile:unset",
-  "tags:create",
-  "tags:update",
-  "tags:delete",
-  "tags:assign",
   "nodes:sharing:get",
   "nodes:sharing:set",
   "nodes:sharing:set-bulk",
@@ -29,24 +21,12 @@
   "nodes:resolve-slug",
   "nodes:render:ancestry",
   "nodes:render:summary",
-  "nodes:add-parent",
-  "nodes:remove-parent",
-  "nodes:branch",
-  "nodes:merge",
-  "nodes:delete-bulk",
   "nodes:files",
   "nodes:stage:lease:heartbeat",
   "nodes:stage:lease:release",
   "campaign:snapshot",
   "remote-artifacts:resolve",
   "remote-artifacts:refresh",
-  "nodes:create",
-  "artifacts:upload:prepare",
-  "artifacts:upload:finalize",
-  "artifacts:upload",
-  "artifacts:delete",
-  "artifacts:delete-bulk",
-  "artifacts:note:set",
   "hooks:list",
   "hooks:create",
   "hooks:update",
@@ -83,6 +63,7 @@
   "admin:test-users:create",
   "admin:test-users:delete",
   "admin:test-users:login",
+  "admin:test-users:revoke-api-key",
   "admin:graphs:list",
   "admin:graphs:export",
   "admin:graphs:export:stream",
@@ -130,8 +111,79 @@
   "export:history",
   "compute:budgets",
   "machines:list",
-  "auth:keychain:set",
-  "auth:keychain:clear",
+  "auth:credentials:set",
+  "auth:credentials:clear",
   "env:list",
-  "env:switch"
+  "env:switch",
+  "repo:node:get",
+  "repo:tag:list",
+  "repo:lineage:list",
+  "repo:node-artifact:list",
+  "repo:edge-artifact:list",
+  "repo:artifact:get",
+  "repo:containment:get",
+  "repo:containment:list",
+  "repo:edge:list",
+  "repo:edge:get",
+  "repo:init",
+  "repo:clone",
+  "repo:restore",
+  "repo:status",
+  "repo:doctor",
+  "repo:commit",
+  "repo:log",
+  "repo:diff",
+  "repo:revert",
+  "repo:pull",
+  "repo:push",
+  "repo:purge",
+  "repo:backup",
+  "repo:gc",
+  "repo:conflicts:list",
+  "repo:conflicts:show",
+  "repo:conflicts:resolve",
+  "repo:rebase:continue",
+  "repo:rebase:abort",
+  "repo:node:create",
+  "repo:node:set",
+  "repo:node:tombstone",
+  "repo:node:restore",
+  "repo:node:branch",
+  "repo:node:merge",
+  "repo:tag:define",
+  "repo:tag:update",
+  "repo:tag:retire",
+  "repo:node-tag:assign",
+  "repo:node-tag:remove",
+  "repo:lineage:add",
+  "repo:lineage:remove",
+  "repo:containment:remove",
+  "repo:containment:assign",
+  "repo:edge:add",
+  "repo:edge:set-content",
+  "repo:edge:remove",
+  "repo:artifact:attach",
+  "repo:artifact:detach",
+  "repo:artifact:set-metadata",
+  "hosted:node:create",
+  "hosted:node:set",
+  "hosted:node:tombstone",
+  "hosted:node:restore",
+  "hosted:node:branch",
+  "hosted:node:merge",
+  "hosted:tag:define",
+  "hosted:tag:update",
+  "hosted:tag:retire",
+  "hosted:node-tag:assign",
+  "hosted:node-tag:remove",
+  "hosted:lineage:add",
+  "hosted:lineage:remove",
+  "hosted:containment:assign",
+  "hosted:containment:remove",
+  "hosted:edge:add",
+  "hosted:edge:set-content",
+  "hosted:edge:remove",
+  "hosted:artifact:attach",
+  "hosted:artifact:detach",
+  "hosted:artifact:set-metadata"
 ]

package/src/runtime/runtime-config.mjs

@@ -1,84 +1,63 @@
-import { readFile } from "node:fs/promises";
 import os from "node:os";
-import path from "node:path";
-import { writeSecureFile } from "../secure-write.mjs";
+import { loadFlywheelConfig, resolveFlywheelConfigPath, saveFlywheelConfig } from "./vendor/flywheel-cli-dist/config/index.js";
+import { isBuiltinProfileName } from "./vendor/flywheel-cli-dist/auth/profiles.js";
+import {
+  resolveCredentialFilePath,
+  setCredential,
+} from "./vendor/flywheel-cli-dist/auth/credentials.js";
 
 const RUNTIME_BASE_URL_SUFFIX = "/api";
 
-export function resolveRuntimeConfigPath({
-  env = process.env,
-  homeDir = os.homedir(),
-} = {}) {
-  const override = env.FLYWHEEL_CLI_CONFIG_PATH?.trim();
-  if (override) {
-    return override;
-  }
-  return path.join(homeDir, ".config", "flywheel-cli", "config.json");
+export function resolveRuntimeConfigPath({ env = process.env, homeDir = os.homedir(), cwd = process.cwd(), platform = process.platform } = {}) {
+  return resolveFlywheelConfigPath({ env, homeDir, cwd, platform });
 }
 
 export function normalizeRuntimeBaseUrl(origin) {
   const trimmed = String(origin || "").trim();
-  if (!trimmed) {
-    throw new Error("Runtime base URL origin cannot be empty.");
-  }
-
+  if (!trimmed) throw new Error("Runtime base URL origin cannot be empty.");
   let parsed;
   try {
     parsed = new URL(trimmed);
   } catch {
-    throw new Error(
-      `Runtime base URL must be a valid absolute URL: ${trimmed}`,
-    );
+    throw new Error(`Runtime base URL must be a valid absolute URL: ${trimmed}`);
   }
-
+  const endpoint = trimmed.split(/[?#]/u, 1)[0].replace(/\/+$/u, "");
   const cleanPath = parsed.pathname.replace(/\/+$/, "");
-  if (cleanPath === "" || cleanPath === RUNTIME_BASE_URL_SUFFIX) {
-    return `${parsed.origin}${RUNTIME_BASE_URL_SUFFIX}`;
-  }
-  return `${parsed.origin}${cleanPath}${RUNTIME_BASE_URL_SUFFIX}`;
-}
-
-/**
- * Read the existing runtime-config JSON, returning an empty object if
- * the file is missing or malformed. `setup --mode cli` is the recovery
- * path — throwing on a corrupted file would be a worse user experience
- * than overwriting it with a fresh valid write.
- */
-async function readExistingRuntimeConfig(configPath) {
-  try {
-    const raw = await readFile(configPath, "utf8");
-    const parsed = JSON.parse(raw);
-    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
-      ? parsed
-      : {};
-  } catch {
-    return {};
-  }
+  return cleanPath === RUNTIME_BASE_URL_SUFFIX ? endpoint : `${endpoint}${RUNTIME_BASE_URL_SUFFIX}`;
 }
 
-/**
- * Merge-write the runtime config.
- *
- * The writer owns only `baseUrl` and `apiKey` — every other top-level
- * key (`activeProfile`, `profileKeys`, user-authored notes) is merged
- * from the existing file so re-running `flywheel setup --mode cli`
- * after a user has configured profile-based auth does not silently
- * clobber that state. Mirrors the merge-write semantics of the CLI's
- * own `saveAuthConfig`.
- */
 export async function writeRuntimeConfig({
   origin,
   apiKey,
+  credentialProfile,
   configPath = resolveRuntimeConfigPath(),
+  credentialFile,
 }) {
   const trimmedKey = String(apiKey || "").trim();
-  if (trimmedKey.length === 0) {
-    throw new Error("Runtime config requires a non-empty API key.");
-  }
-
+  if (!trimmedKey) throw new Error("Runtime config requires a non-empty API key.");
   const baseUrl = normalizeRuntimeBaseUrl(origin);
-  const existing = await readExistingRuntimeConfig(configPath);
-  const merged = { ...existing, baseUrl, apiKey: trimmedKey };
-  await writeSecureFile(configPath, `${JSON.stringify(merged, null, 2)}\n`);
-  return { configPath, baseUrl };
+  const selectedCredentialFile = credentialFile ?? resolveCredentialFilePath();
+  const config = await loadFlywheelConfig({
+    env: { ...process.env, FLYWHEEL_CLI_CONFIG_PATH: configPath },
+    credentialFile: selectedCredentialFile,
+  });
+  const selectedProfile = credentialProfile ?? config.activeProfile ?? "default";
+  await setCredential(selectedProfile, baseUrl, trimmedKey, selectedCredentialFile);
+  config.activeProfile = selectedProfile;
+  if (!isBuiltinProfileName(selectedProfile)) {
+    config.profiles = {
+      ...config.profiles,
+      [selectedProfile]: { ...config.profiles?.[selectedProfile], baseUrl },
+    };
+  }
+  try {
+    await saveFlywheelConfig(config, configPath);
+  } catch {
+    throw new Error("The credential was saved and retained, but Flywheel configuration could not be saved. Repair the configuration path and reconcile the retained credential before retrying setup.");
+  }
+  return {
+    configPath,
+    baseUrl,
+    credentialProfile: selectedProfile,
+  };
 }