@kitsy/cnos-cli 1.1.2 → 1.3.0

package/dist/index.js

@@ -11,27 +11,66 @@ var COMMAND_OPTION_KEYS_WITH_VALUE = /* @__PURE__ */ new Set([
   "--format",
   "--framework",
   "--prefix",
+  "--scan",
   "--target",
   "--to",
   "--provider",
   "--passphrase",
   "--vault",
-  "--inherit"
+  "--inherit",
+  "--as",
+  "--set",
+  "--debounce"
+]);
+var COMMAND_FLAG_KEYS = /* @__PURE__ */ new Set([
+  "--flatten",
+  "--public",
+  "--local",
+  "--remote",
+  "--ref",
+  "--no-passphrase",
+  "--stdin",
+  "--reveal",
+  "--auth",
+  "--all",
+  "--store-keychain",
+  "--watch",
+  "--dry-run",
+  "--apply",
+  "--rewrite",
+  "--signal"
 ]);
-var COMMAND_FLAG_KEYS = /* @__PURE__ */ new Set(["--flatten", "--public", "--local", "--remote", "--ref"]);
 function normalizeCommand(argv) {
   const [command = "doctor", ...rest] = argv;
   const resource = rest[0];
   const remaining = rest.slice(1);
+  if ((command === "set" || command === "get") && (resource === "value" || resource === "secret")) {
+    return [resource, command, ...remaining];
+  }
   if ((command === "create" || command === "add") && resource === "profile") {
     return ["profile", "create", ...remaining];
   }
+  if ((command === "create" || command === "add") && resource === "vault") {
+    return ["vault", "create", ...remaining];
+  }
   if ((command === "delete" || command === "remove") && resource === "profile") {
     return ["profile", "delete", ...remaining];
   }
+  if ((command === "delete" || command === "remove") && resource === "vault") {
+    return ["vault", "remove", ...remaining];
+  }
+  if (command === "auth" && resource === "vault") {
+    return ["vault", "auth", ...remaining];
+  }
+  if (command === "logout" && resource === "vault") {
+    return ["vault", "logout", ...remaining];
+  }
   if (command === "list" && resource === "profile") {
     return ["profile", "list", ...remaining];
   }
+  if (command === "list" && resource === "vault") {
+    return ["vault", "list", ...remaining];
+  }
   if ((command === "create" || command === "add") && resource === "secret") {
     return ["secret", "set", ...remaining];
   }
@@ -186,45 +225,27 @@ function printJson(value) {
 }
 
 // src/services/writes.ts
-import { mkdir, readFile, rm, writeFile } from "fs/promises";
+import { mkdir, readFile, writeFile } from "fs/promises";
 import path from "path";
 import {
-  createSecretVault,
+  createSecretVaultProvider,
   parseYaml,
   resolveConfigDocumentPath,
-  resolveSecretPassphrase,
-  resolveSecretStoreRoot,
-  stringifyYaml,
-  writeLocalSecret
+  resolveVaultAuth,
+  stringifyYaml
 } from "@kitsy/cnos/internal";
 
 // src/services/runtime.ts
-import { createCnos } from "@kitsy/cnos";
+import { createCnos } from "@kitsy/cnos/configure";
 async function createRuntimeService(options = {}) {
-  const createOptions = {
-    ...options.root ? {
-      root: options.root
-    } : {},
-    ...options.workspace ? {
-      workspace: options.workspace
-    } : {},
-    ...options.profile ? {
-      profile: options.profile
-    } : {},
-    ...options.globalRoot ? {
-      globalRoot: options.globalRoot
-    } : {},
-    ...options.cliArgs && options.cliArgs.length > 0 ? {
-      cliArgs: options.cliArgs
-    } : {},
-    ...options.processEnv ? {
-      processEnv: options.processEnv
-    } : {
-      processEnv: process.env
-    }
-  };
   return createCnos({
-    ...createOptions
+    ...options.root ? { root: options.root } : {},
+    ...options.workspace ? { workspace: options.workspace } : {},
+    ...options.profile ? { profile: options.profile } : {},
+    ...options.globalRoot ? { globalRoot: options.globalRoot } : {},
+    ...options.cliArgs && options.cliArgs.length > 0 ? { cliArgs: options.cliArgs } : {},
+    ...options.secretResolution ? { secretResolution: options.secretResolution } : {},
+    processEnv: options.processEnv ?? process.env
   });
 }
 
@@ -303,7 +324,8 @@ async function defineValue(namespace, configPath, rawValue, options = {}) {
       filePath: secret.filePath,
       value: {
         provider: secret.provider,
-        ref: secret.ref
+        ref: secret.ref,
+        ...secret.vault ? { vault: secret.vault } : {}
       }
     };
   }
@@ -321,48 +343,34 @@ async function defineValue(namespace, configPath, rawValue, options = {}) {
     value: parsedValue
   };
 }
-async function createVault(vault, options = {}) {
-  const passphrase = options.passphrase ?? resolveSecretPassphrase(vault, options.processEnv ?? process.env);
-  if (!passphrase) {
-    throw new Error("Vault creation requires --passphrase or CNOS_SECRET_PASSPHRASE");
-  }
-  const normalizedVault = vault.trim() || "default";
-  const filePath = await createSecretVault(
-    resolveSecretStoreRoot(options.processEnv),
-    normalizedVault,
-    passphrase
-  );
-  return {
-    vault: normalizedVault,
-    filePath
-  };
-}
 async function setSecret(configPath, rawValue, options = {}) {
   const runtime = await createRuntimeService(options);
   const workspaceRoot = getSelectedWorkspaceRoot(options, runtime);
   const profile = options.profile ?? runtime.graph.profile;
   const filePath = resolveConfigDocumentPath(workspaceRoot, "secret", configPath, profile);
   const document = await readYamlDocument(filePath);
-  const mode = options.mode ?? "local";
   const vault = options.vault?.trim() || "default";
+  const vaultDefinition = runtime.manifest.vaults[vault];
+  if (!vaultDefinition) {
+    throw new Error(`Unknown vault "${vault}". Create it first with cnos vault create ${vault}.`);
+  }
+  const mode = options.mode ?? (vaultDefinition.provider === "local" ? "local" : vaultDefinition.provider === "github-secrets" ? "ref" : "remote");
   let reference;
-  let storePath;
   if (mode === "local") {
-    const passphrase = options.passphrase ?? resolveSecretPassphrase(vault, options.processEnv ?? process.env);
-    if (!passphrase) {
-      throw new Error(`Vault "${vault}" requires --passphrase or CNOS_SECRET_PASSPHRASE`);
-    }
-    const ref = configPath;
-    storePath = await writeLocalSecret(resolveSecretStoreRoot(options.processEnv), ref, rawValue, passphrase, vault);
+    const auth = await resolveVaultAuth(vault, vaultDefinition, options.processEnv ?? process.env);
+    const provider = createSecretVaultProvider(vault, vaultDefinition, options.processEnv ?? process.env);
+    await provider.authenticate(auth);
+    await provider.set(configPath, rawValue);
     reference = {
       provider: "local",
-      ref,
+      ref: configPath,
       vault
     };
   } else {
     reference = {
-      provider: options.provider ?? (mode === "ref" ? "ref" : "remote"),
-      ref: rawValue
+      provider: options.provider?.trim() || vaultDefinition.provider,
+      ref: rawValue || configPath.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase(),
+      vault
     };
   }
   setNestedValue(document, configPath.split("."), reference);
@@ -372,8 +380,7 @@ async function setSecret(configPath, rawValue, options = {}) {
     filePath,
     provider: reference.provider,
     ref: reference.ref,
-    ...reference.vault ? { vault: reference.vault } : {},
-    ...storePath ? { storePath } : {}
+    ...reference.vault ? { vault: reference.vault } : {}
   };
 }
 async function deleteSecret(configPath, options = {}) {
@@ -391,23 +398,19 @@ async function deleteSecret(configPath, options = {}) {
     };
   }
   await writeFile(filePath, stringifyYaml(document), "utf8");
-  let removedStore;
   const secretRef = metadata?.secretRef;
   if (isSecretReference(secretRef) && secretRef.provider === "local") {
-    const storePath = path.join(
-      resolveSecretStoreRoot(options.processEnv),
-      "vaults",
-      secretRef.vault ?? "default",
-      "store",
-      ...secretRef.ref.split("/")
-    ).concat(".json");
-    await rm(storePath, { force: true });
-    removedStore = storePath;
+    const definition = runtime.manifest.vaults[secretRef.vault ?? "default"];
+    if (definition) {
+      const auth = await resolveVaultAuth(secretRef.vault ?? "default", definition, options.processEnv ?? process.env);
+      const provider = createSecretVaultProvider(secretRef.vault ?? "default", definition, options.processEnv ?? process.env);
+      await provider.authenticate(auth);
+      await provider.delete(secretRef.ref);
+    }
   }
   return {
     filePath,
-    deleted: true,
-    ...removedStore ? { removedStore } : {}
+    deleted: true
   };
 }
 async function deleteValue(namespace, configPath, options = {}) {
@@ -464,6 +467,17 @@ async function runDefine(namespace, configPath, rawValue, options = {}) {
   return `defined ${namespace}.${configPath} in ${result.filePath}`;
 }
 
+// src/commands/drift.ts
+import { compareSchemaToGraph, formatDriftReport } from "@kitsy/cnos/internal";
+async function runDrift(options = {}) {
+  const runtime = await createRuntimeService(options);
+  const report = compareSchemaToGraph(runtime);
+  if (options.json) {
+    return printJson(report);
+  }
+  return formatDriftReport(report);
+}
+
 // src/commands/diff.ts
 import { flattenObject } from "@kitsy/cnos/internal";
 function flattenRuntime(runtime) {
@@ -502,8 +516,15 @@ async function runDiff(leftProfile, rightProfile, options = {}) {
 }
 
 // src/services/doctor.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readdir, readFile as readFile2 } from "fs/promises";
 import path2 from "path";
+import {
+  detectLegacyVaultFormat,
+  isSecretReference as isSecretReference2,
+  parseYaml as parseYaml2,
+  readKeychain,
+  resolveSecretStoreRoot
+} from "@kitsy/cnos/internal";
 
 // src/services/validation.ts
 import { validateRuntime } from "@kitsy/cnos/internal";
@@ -548,6 +569,70 @@ async function checkGitignore(root) {
 function issueSummary(issues) {
   return issues.length === 0 ? "no issues" : issues.map((issue) => issue.message).join("; ");
 }
+async function collectYamlFiles(root) {
+  try {
+    const entries = await readdir(root, { withFileTypes: true });
+    const results = [];
+    for (const entry of entries) {
+      const target = path2.join(root, entry.name);
+      if (entry.isDirectory()) {
+        results.push(...await collectYamlFiles(target));
+        continue;
+      }
+      if (entry.isFile() && [".yml", ".yaml"].includes(path2.extname(entry.name).toLowerCase())) {
+        results.push(target);
+      }
+    }
+    return results;
+  } catch {
+    return [];
+  }
+}
+function hasPlaintextSecret(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+  }
+  if (isSecretReference2(value)) {
+    return false;
+  }
+  return Object.values(value).some((entry) => hasPlaintextSecret(entry));
+}
+async function checkSecretSecurity(options, runtime) {
+  const storeRoot = resolveSecretStoreRoot(options.processEnv);
+  const legacyPaths = await Promise.all(
+    Object.entries(runtime.manifest.vaults).filter(([, definition]) => definition.provider === "local").map(async ([vault]) => ({ vault, path: await detectLegacyVaultFormat(storeRoot, vault) }))
+  );
+  const legacyDetected = legacyPaths.filter((entry) => Boolean(entry.path));
+  const secretFiles = await Promise.all(
+    runtime.graph.workspace.workspaceRoots.filter((root) => root.scope === "local").map((root) => collectYamlFiles(path2.join(root.path, "secrets")))
+  );
+  const plaintextFiles = [];
+  for (const file of secretFiles.flat()) {
+    try {
+      const parsed = parseYaml2(await readFile2(file, "utf8"));
+      if (hasPlaintextSecret(parsed)) {
+        plaintextFiles.push(file);
+      }
+    } catch {
+      plaintextFiles.push(file);
+    }
+  }
+  const keychainWarnings = await Promise.all(
+    Object.entries(runtime.manifest.vaults).filter(([, definition]) => definition.provider === "local").flatMap(
+      ([vault, definition]) => (definition.auth?.passphrase?.from ?? []).filter((source) => source.startsWith("keychain:")).map(async (source) => ({ vault, source, value: await readKeychain(source.slice("keychain:".length)) }))
+    )
+  );
+  const warnings = [
+    ...legacyDetected.map((entry) => `legacy vault ${entry.vault}: ${entry.path}`),
+    ...plaintextFiles.map((file) => `plaintext secret file: ${file}`),
+    ...keychainWarnings.filter((entry) => !entry.value).map((entry) => `no keychain entry for vault ${entry.vault} (${entry.source})`)
+  ];
+  return {
+    name: "security",
+    ok: warnings.length === 0,
+    details: warnings.length === 0 ? "no legacy vaults, plaintext secret files, or missing keychain entries" : warnings.join("; ")
+  };
+}
 async function evaluateDoctor(options = {}) {
   const root = path2.resolve(options.root ?? process.cwd());
   const { runtime, summary } = await createValidationSummary(options);
@@ -579,6 +664,7 @@ async function evaluateDoctor(options = {}) {
       ok: !runtime.manifest.workspaces.global.enabled || Boolean(runtime.graph.workspace.globalRoot),
       details: runtime.manifest.workspaces.global.enabled ? runtime.graph.workspace.globalRoot ? `enabled at ${runtime.graph.workspace.globalRoot}` : "enabled but no global root resolved" : "disabled"
     },
+    await checkSecretSecurity(options, runtime),
     await checkGitignore(root)
   ];
 }
@@ -597,7 +683,7 @@ async function runDoctor(options = {}) {
 }
 
 // src/commands/dump.ts
-import { writeDump } from "@kitsy/cnos";
+import { writeDump } from "@kitsy/cnos/configure";
 async function runDump(options = {}) {
   const cliArgs = [...options.cliArgs ?? []];
   const flatten = consumeFlag(cliArgs, "--flatten");
@@ -619,12 +705,60 @@ async function runDump(options = {}) {
   return `dumped ${result.files.length} files to ${result.root}`;
 }
 
+// src/commands/codegen.ts
+import { watchSchema, writeCodegenOutput } from "@kitsy/cnos/internal";
+async function runCodegen(options = {}) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const out = consumeOption(cliArgs, "--out");
+  const watch2 = consumeFlag(cliArgs, "--watch");
+  if (cliArgs.length > 0) {
+    throw new Error(`Unknown codegen options: ${cliArgs.join(" ")}`);
+  }
+  if (watch2) {
+    const watcher = await watchSchema({
+      ...options.root ? {
+        root: options.root
+      } : {},
+      ...out ? {
+        out
+      } : {},
+      onError(error) {
+        const message = error instanceof Error ? error.message : String(error);
+        process.stderr.write(`${message}
+`);
+      }
+    });
+    const closeWatcher = () => {
+      watcher.close();
+    };
+    process.once("SIGINT", closeWatcher);
+    process.once("SIGTERM", closeWatcher);
+    return `watching schema changes -> ${out ?? ".cnos/types/cnos.d.ts"}`;
+  }
+  const result = await writeCodegenOutput({
+    ...options.root ? {
+      root: options.root
+    } : {},
+    ...out ? {
+      out
+    } : {}
+  });
+  const summary = result.hasSchema ? `generated types from ${result.schemaEntryCount} schema entr${result.schemaEntryCount === 1 ? "y" : "ies"}` : "generated empty types (no schema section found)";
+  return `${summary} -> ${result.typesPath} and ${result.runtimePath}`;
+}
+
 // src/commands/exportEnv.ts
+import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
+import path3 from "path";
+function formatEnvOutput(env) {
+  return Object.entries(env).sort(([left], [right]) => left.localeCompare(right)).map(([key, value]) => `${key}=${value}`).join("\n");
+}
 async function runExportEnv(options = {}) {
   const cliArgs = [...options.cliArgs ?? []];
   const isPublic = consumeFlag(cliArgs, "--public");
   const framework = consumeOption(cliArgs, "--framework");
   const prefix = consumeOption(cliArgs, "--prefix");
+  const to = consumeOption(cliArgs, "--to");
   const runtime = await createRuntimeService({
     ...options,
     cliArgs
@@ -632,16 +766,26 @@ async function runExportEnv(options = {}) {
   const env = isPublic ? runtime.toPublicEnv({
     ...framework ? { framework } : {},
     ...prefix ? { prefix } : {}
-  }) : Object.fromEntries(
-    Object.entries(runtime.manifest.envMapping.explicit).map(([envVar, logicalKey]) => [envVar, runtime.read(logicalKey)]).filter((entry) => entry[1] !== void 0).map(([envVar, value]) => [
-      envVar,
-      typeof value === "string" ? value : typeof value === "number" || typeof value === "boolean" || typeof value === "bigint" ? String(value) : JSON.stringify(value)
-    ])
-  );
+  }) : runtime.toEnv();
+  const output = formatEnvOutput(env);
+  if (to) {
+    const targetPath = path3.resolve(options.root ?? process.cwd(), to);
+    await mkdir2(path3.dirname(targetPath), { recursive: true });
+    await writeFile2(targetPath, output, "utf8");
+    if (options.json) {
+      return printJson({
+        to: targetPath,
+        count: Object.keys(env).length,
+        public: isPublic,
+        ...framework ? { framework } : {}
+      });
+    }
+    return `Wrote ${Object.keys(env).length} env vars to ${targetPath}`;
+  }
   if (options.json) {
     return printJson(env);
   }
-  return Object.entries(env).sort(([left], [right]) => left.localeCompare(right)).map(([key, value]) => `${key}=${value}`).join("\n");
+  return output;
 }
 
 // src/commands/export.ts
@@ -704,6 +848,23 @@ var COMMANDS = [
     ],
     examples: ["cnos onboard", "cnos onboard --workspace webapp", "cnos onboard --root ../my-app --workspace app --move"]
   },
+  {
+    id: "codegen",
+    summary: "Generate typed CNOS access wrappers from schema.",
+    usage: "cnos codegen [--out <path>] [--watch] [--root <path>]",
+    description: "Reads schema from .cnos/cnos.yml and generates typed CNOS declaration output plus a typed createCnos wrapper.",
+    options: [
+      {
+        flag: "--out <path>",
+        description: "Custom path for the generated type declaration file. runtime.ts is emitted beside it."
+      },
+      {
+        flag: "--watch",
+        description: "Watch the manifest schema and regenerate output when it changes."
+      }
+    ],
+    examples: ["cnos codegen", "cnos codegen --out src/cnos-config.d.ts", "cnos codegen --watch"]
+  },
   {
     id: "read",
     summary: "Read any fully-qualified CNOS key.",
@@ -796,17 +957,90 @@ var COMMANDS = [
         description: "Provider name for --remote or --ref secret writes."
       },
       {
-        flag: "--passphrase <value>",
-        description: "Passphrase used to encrypt local secret material when --local is selected."
+        flag: "--vault <name>",
+        description: "Use a manifest-defined vault. Provider behavior is inferred from the vault definition."
+      },
+      {
+        flag: "--reveal",
+        description: "Reveal the resolved secret value for get-style reads. Output is masked by default."
       }
     ],
     examples: [
       "cnos secret app.token",
-      "cnos secret set app.token super-secret --local --passphrase dev-pass",
-      "cnos add secret app.token APP_TOKEN --ref --provider env",
-      "cnos secret list --workspace agents"
+      "cnos vault create local-dev",
+      "cnos vault auth local-dev",
+      "cnos secret set app.token super-secret --vault local-dev",
+      "cnos vault create github-ci --provider github-secrets --no-passphrase",
+      "cnos secret set app.token APP_TOKEN --vault github-ci"
     ]
   },
+  {
+    id: "vault",
+    summary: "Manage manifest-defined secret vaults.",
+    usage: "cnos vault [create <name> | list | remove <name>] [options] [global-options]",
+    description: "Creates, lists, and removes vault definitions in .cnos/cnos.yml. Local vaults use encrypted material under ~/.cnos/secrets, while github-secrets vaults resolve from process.env in CI.",
+    options: [
+      {
+        flag: "--provider <local|github-secrets>",
+        description: "Vault provider. Defaults to local."
+      },
+      {
+        flag: "--no-passphrase",
+        description: "Allowed for passwordless providers such as github-secrets."
+      }
+    ],
+    examples: [
+      "cnos vault create local-dev",
+      "cnos vault auth local-dev",
+      "cnos vault create github-ci --provider github-secrets --no-passphrase",
+      "cnos vault list",
+      "cnos vault remove local-dev"
+    ]
+  },
+  {
+    id: "vault create",
+    summary: "Create a manifest-defined vault.",
+    usage: "cnos vault create <name> [--provider <local|github-secrets>] [--no-passphrase] [global-options]",
+    description: "Creates a vault definition in .cnos/cnos.yml and, for local vaults, initializes the encrypted store under ~/.cnos/secrets.",
+    examples: [
+      "cnos vault create local-dev",
+      "cnos vault create github-ci --provider github-secrets --no-passphrase"
+    ]
+  },
+  {
+    id: "vault auth",
+    summary: "Authenticate a vault for the current shell session.",
+    usage: "cnos vault auth <name> [--store-keychain] [global-options]",
+    description: "Authenticates a local vault using env, keychain, or prompt-based auth and stores a derived session key for later CNOS commands in the same shell.",
+    examples: ["cnos vault auth local-dev", "cnos vault auth local-dev --store-keychain"]
+  },
+  {
+    id: "vault logout",
+    summary: "Clear vault auth state for the current shell session.",
+    usage: "cnos vault logout <name> [global-options]",
+    description: "Removes active vault session auth for the selected vault or all vaults when used with --all.",
+    options: [
+      {
+        flag: "--all",
+        description: "Clear all active vault auth sessions for the current shell context."
+      }
+    ],
+    examples: ["cnos vault logout local-dev", "cnos vault logout --all"]
+  },
+  {
+    id: "vault list",
+    summary: "List manifest-defined vaults.",
+    usage: "cnos vault list [global-options]",
+    description: "Lists vault definitions together with provider and passphrase policy.",
+    examples: ["cnos vault list"]
+  },
+  {
+    id: "vault remove",
+    summary: "Remove a vault definition.",
+    usage: "cnos vault remove <name> [global-options]",
+    description: "Removes the vault from .cnos/cnos.yml and deletes local vault store metadata when present.",
+    examples: ["cnos vault remove local-dev"]
+  },
   {
     id: "define",
     summary: "Write a value or secret into the selected workspace.",
@@ -850,7 +1084,7 @@ var COMMANDS = [
   {
     id: "list",
     summary: "List resolved config entries.",
-    usage: "cnos list [value|secret|meta|env|public|all] [--prefix <path>] [global-options]",
+    usage: "cnos list [value|secret|meta|env|public|all] [--prefix <path>] [--framework <name>] [global-options]",
     description: "Lists stored config or derived projections across one namespace or the full effective graph, with optional prefix filtering.",
     options: [
       {
@@ -860,9 +1094,13 @@ var COMMANDS = [
       {
         flag: "--prefix <path>",
         description: "Filter list output to entries whose logical keys begin with this prefix."
+      },
+      {
+        flag: "--framework <name>",
+        description: "When listing public output, apply framework-specific prefixes such as vite or next."
       }
     ],
-    examples: ["cnos list", "cnos list value --prefix app.", "cnos list env", "cnos list --namespace secret"]
+    examples: ["cnos list", "cnos list value --prefix app.", "cnos list env", "cnos list public --framework vite"]
   },
   {
     id: "profile",
@@ -909,29 +1147,52 @@ var COMMANDS = [
     description: "Deletes .cnos/profiles/<name>.yml.",
     examples: ["cnos profile delete stage"]
   },
+  {
+    id: "promote",
+    summary: "Promote shareable config into public or env projection surfaces.",
+    usage: "cnos promote <key...> --to <public|env> [--as <ENV_VAR>] [global-options]",
+    description: "Adds keys to public.promote or envMapping.explicit in .cnos/cnos.yml. Sensitive or non-shareable namespaces are rejected.",
+    options: [
+      {
+        flag: "--to <public|env>",
+        description: "Choose whether the keys are promoted to the public surface or env export surface."
+      },
+      {
+        flag: "--as <ENV_VAR>",
+        description: "Required for --to env. Sets the exported env var name for the promoted key."
+      }
+    ],
+    examples: [
+      "cnos promote value.flag.auth.upi_enabled --to public",
+      "cnos promote value.server.port --to env --as PORT"
+    ]
+  },
   {
     id: "secret set",
     summary: "Write a secret securely.",
-    usage: "cnos secret set <path> <value> [--local|--remote|--ref] [--vault <name>] [--provider <name>] [--passphrase <value>] [global-options]",
-    description: "Writes a secret reference into the repo and, when --local is used, stores encrypted secret material outside the repo under ~/.cnos/secrets/vaults/<vault>.",
+    usage: "cnos secret set <path> <value> [--local|--remote|--ref] [--vault <name>] [--provider <name>] [global-options]",
+    description: "Writes a secret reference into the repo. When a local vault is selected, CNOS stores encrypted secret material outside the repo under ~/.cnos/secrets/vaults/<vault>; when a github-secrets vault is selected, CNOS writes a CI env-backed ref.",
     examples: [
-      "cnos secret create vault db --passphrase dev-pass",
-      "cnos secret set app.token super-secret --local --vault db --passphrase dev-pass"
+      "cnos vault create db",
+      "cnos vault auth db",
+      "cnos secret set app.token super-secret --vault db",
+      "cnos vault create github-ci --provider github-secrets --no-passphrase",
+      "cnos secret set app.token APP_TOKEN --vault github-ci"
     ]
   },
   {
     id: "secret create vault",
     summary: "Create a local secret vault.",
-    usage: "cnos secret create vault <name> --passphrase <value> [global-options]",
-    description: "Creates a named local secret vault under ~/.cnos/secrets/vaults.",
-    examples: ["cnos secret create vault db --passphrase dev-pass"]
+    usage: "cnos secret create vault <name> [global-options]",
+    description: "Alias for cnos vault create <name>.",
+    examples: ["cnos secret create vault db"]
   },
   {
     id: "secret list",
     summary: "List resolved secrets.",
-    usage: "cnos secret list [global-options]",
-    description: "Lists resolved secret keys for the selected workspace and profile.",
-    examples: ["cnos secret list --workspace api"]
+    usage: "cnos secret list [--vault <name>] [--provider <name>] [global-options]",
+    description: "Lists stored secret entries for the selected workspace and profile, optionally filtered by vault or provider.",
+    examples: ["cnos secret list --workspace api", "cnos secret list --vault github-ci"]
   },
   {
     id: "secret delete",
@@ -982,7 +1243,7 @@ var COMMANDS = [
   {
     id: "export env",
     summary: "Render environment variables for the selected workspace.",
-    usage: "cnos export env [--public] [--framework <name>] [--prefix <prefix>] [global-options]",
+    usage: "cnos export env [--public] [--framework <name>] [--prefix <prefix>] [--to <path>] [global-options]",
     description: "Exports the effective environment as KEY=VALUE lines, or only promoted public values when --public is set.",
     options: [
       {
@@ -996,9 +1257,17 @@ var COMMANDS = [
       {
         flag: "--prefix <prefix>",
         description: "Override the generated public env prefix."
+      },
+      {
+        flag: "--to <path>",
+        description: "Write the rendered KEY=VALUE output to a file instead of stdout."
       }
     ],
-    examples: ["cnos export env", "cnos export env --public --framework vite --workspace api"]
+    examples: [
+      "cnos export env",
+      "cnos export env --to .env.local",
+      "cnos export env --public --framework vite --to .env.local --workspace api"
+    ]
   },
   {
     id: "dump",
@@ -1020,9 +1289,32 @@ var COMMANDS = [
   {
     id: "run",
     summary: "Run a child process with CNOS env injected.",
-    usage: "cnos run [global-options] -- <command...>",
-    description: "Resolves the active workspace and profile, injects runtime env variables, and executes the command after --.",
-    examples: ["cnos run -- node server.js", "cnos run --workspace api -- pnpm dev"]
+    usage: "cnos run [--public] [--framework <name>] [--set <logical-key=value>] [global-options] -- <command...>",
+    description: "Resolves the active workspace and profile, injects runtime env variables, bootstraps __CNOS_GRAPH__ for singleton runtime reads, and executes the command after --.",
+    options: [
+      {
+        flag: "--set <logical-key=value>",
+        description: "Apply inline logical-key overrides for this run without touching repo config files."
+      },
+      {
+        flag: "--public",
+        description: "Inject only promoted public env variables into the child process."
+      },
+      {
+        flag: "--framework <name>",
+        description: "When used with --public, apply framework-specific prefixes such as vite or next."
+      },
+      {
+        flag: "--prefix <prefix>",
+        description: "Override the generated public env prefix for --public runs."
+      }
+    ],
+    examples: [
+      "cnos run -- node server.js",
+      "cnos run --profile stage -- node server.js",
+      "cnos run --set value.server.port=9999 -- node server.js",
+      "cnos run --public --framework vite -- pnpm build"
+    ]
   },
   {
     id: "diff",
@@ -1050,6 +1342,60 @@ var COMMANDS = [
     description: "Checks manifest/workspace setup, gitignore coverage, and related diagnostics for the selected workspace.",
     examples: ["cnos doctor", "cnos doctor --workspace api --json"]
   },
+  {
+    id: "drift",
+    summary: "Compare resolved config against schema and report drift.",
+    usage: "cnos drift [--workspace <id>] [--profile <name>] [--json]",
+    description: "Reports missing required keys, undeclared keys, type mismatches, and defaults applied for the selected workspace/profile.",
+    examples: ["cnos drift", "cnos drift --workspace api --profile stage", "cnos drift --json"]
+  },
+  {
+    id: "watch",
+    summary: "Watch CNOS inputs and either restart a process or emit changed keys.",
+    usage: "cnos watch [--signal] [--debounce <ms>] [global-options] -- <command...>",
+    description: "Watches the active manifest, workspace roots, env files, and config documents. In restart mode it respawns the child command after changes; in signal mode it prints changed keys as JSON.",
+    options: [
+      {
+        flag: "--signal",
+        description: "Emit changed keys as JSON instead of restarting a child process."
+      },
+      {
+        flag: "--debounce <ms>",
+        description: "Debounce change handling before re-resolving the graph. Defaults to 300ms."
+      }
+    ],
+    examples: ["cnos watch -- node server.js", "cnos watch --signal", "cnos watch --debounce 100 -- node server.js"]
+  },
+  {
+    id: "migrate",
+    summary: "Scan env usage and propose CNOS manifest mappings.",
+    usage: "cnos migrate [--scan <path>] [--dry-run] [--apply] [--rewrite] [global-options]",
+    description: "Scans JS/TS source for process.env and import.meta.env usage, proposes logical CNOS mappings, updates envMapping/public promote entries, and can rewrite supported source files with backups.",
+    options: [
+      {
+        flag: "--scan <path>",
+        description: "Directory to scan. Defaults to ./src relative to the repo root."
+      },
+      {
+        flag: "--dry-run",
+        description: "Preview the proposed mappings without changing the manifest."
+      },
+      {
+        flag: "--apply",
+        description: "Write proposed env mappings and public promotions into .cnos/cnos.yml."
+      },
+      {
+        flag: "--rewrite",
+        description: "With --apply, rewrite supported process.env usages in source files and create .bak backups."
+      }
+    ],
+    examples: [
+      "cnos migrate",
+      "cnos migrate --scan src --dry-run",
+      "cnos migrate --scan apps/api/src --apply",
+      "cnos migrate --apply --rewrite"
+    ]
+  },
   {
     id: "help",
     summary: "Show human-readable CLI help.",
@@ -1095,17 +1441,25 @@ var INTEGRATIONS = [
     id: "vite",
     packageName: "@kitsy/cnos-vite",
     entrypoint: "@kitsy/cnos-vite",
-    summary: "Inject CNOS public env into Vite define replacements and import.meta.env.",
+    summary: "Inject CNOS public env into Vite and embed browser-readable CNOS public data.",
     usage: 'import { createCnosVitePlugin } from "@kitsy/cnos-vite"',
-    examples: ["cnos export env --public --framework vite", "vite.config.ts -> plugins: [createCnosVitePlugin()]"]
+    examples: [
+      "cnos export env --public --framework vite",
+      "vite.config.ts -> plugins: [createCnosVitePlugin()]",
+      'browser code -> import cnos from "@kitsy/cnos/browser"'
+    ]
   },
   {
     id: "next",
     packageName: "@kitsy/cnos-next",
     entrypoint: "@kitsy/cnos-next",
-    summary: "Merge CNOS public env into next.config.* using the NEXT_PUBLIC_ convention.",
+    summary: "Merge CNOS public env into Next and embed browser-readable CNOS public data.",
     usage: 'import { withCnosNext } from "@kitsy/cnos-next"',
-    examples: ["cnos export env --public --framework next", "next.config.mjs -> export default withCnosNext({})"]
+    examples: [
+      "cnos export env --public --framework next",
+      "next.config.mjs -> export default withCnosNext({})",
+      'browser code -> import cnos from "@kitsy/cnos/browser"'
+    ]
   }
 ];
 var HELP_DOCUMENT = {
@@ -1232,11 +1586,11 @@ function runHelpAi(topic, cliArgs = []) {
 }
 
 // src/commands/init.ts
-import path4 from "path";
+import path5 from "path";
 
 // src/services/scaffold.ts
-import { mkdir as mkdir2, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import path3 from "path";
+import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
+import path4 from "path";
 function scaffoldManifest(projectName, workspace) {
   const lines = [
     "version: 1",
@@ -1270,12 +1624,12 @@ async function ensureFile(filePath, content) {
     await readFile3(filePath, "utf8");
     return false;
   } catch {
-    await writeFile2(filePath, content, "utf8");
+    await writeFile3(filePath, content, "utf8");
     return true;
   }
 }
 async function ensureGitignore(root) {
-  const gitignorePath = path3.join(root, ".gitignore");
+  const gitignorePath = path4.join(root, ".gitignore");
   const requiredEntries = [
     ".cnos/env/.env",
     ".cnos/env/.env.*",
@@ -1298,18 +1652,18 @@ async function ensureGitignore(root) {
   }
   const prefix = current.trim().length > 0 ? `${current.trimEnd()}
 ` : "";
-  await writeFile2(gitignorePath, `${prefix}${missingEntries.join("\n")}
+  await writeFile3(gitignorePath, `${prefix}${missingEntries.join("\n")}
 `, "utf8");
   return true;
 }
 async function scaffoldWorkspace(root, workspace) {
-  const cnosRoot = path3.join(root, ".cnos");
-  const workspaceRoot = workspace ? path3.join(cnosRoot, "workspaces", workspace) : cnosRoot;
+  const cnosRoot = path4.join(root, ".cnos");
+  const workspaceRoot = workspace ? path4.join(cnosRoot, "workspaces", workspace) : cnosRoot;
   const createdPaths = [];
-  await mkdir2(path3.join(workspaceRoot, "profiles"), { recursive: true });
-  await mkdir2(path3.join(workspaceRoot, "values"), { recursive: true });
-  await mkdir2(path3.join(workspaceRoot, "secrets"), { recursive: true });
-  await mkdir2(path3.join(workspaceRoot, "env"), { recursive: true });
+  await mkdir3(path4.join(workspaceRoot, "profiles"), { recursive: true });
+  await mkdir3(path4.join(workspaceRoot, "values"), { recursive: true });
+  await mkdir3(path4.join(workspaceRoot, "secrets"), { recursive: true });
+  await mkdir3(path4.join(workspaceRoot, "env"), { recursive: true });
   const relativePaths = workspace ? [
     ["workspaces", workspace, "profiles", ".gitkeep"],
     ["workspaces", workspace, "values", ".gitkeep"],
@@ -1322,15 +1676,15 @@ async function scaffoldWorkspace(root, workspace) {
     ["env", ".gitkeep"]
   ];
   for (const relativePath of relativePaths) {
-    const filePath = path3.join(cnosRoot, ...relativePath);
+    const filePath = path4.join(cnosRoot, ...relativePath);
     if (await ensureFile(filePath, "")) {
-      createdPaths.push(path3.relative(root, filePath).replace(/\\/g, "/"));
+      createdPaths.push(path4.relative(root, filePath).replace(/\\/g, "/"));
     }
   }
-  if (await ensureFile(path3.join(cnosRoot, "cnos.yml"), scaffoldManifest(path3.basename(root), workspace))) {
+  if (await ensureFile(path4.join(cnosRoot, "cnos.yml"), scaffoldManifest(path4.basename(root), workspace))) {
     createdPaths.push(".cnos/cnos.yml");
   }
-  if (workspace && await ensureFile(path3.join(root, ".cnos-workspace.yml"), `workspace: ${workspace}
+  if (workspace && await ensureFile(path4.join(root, ".cnos-workspace.yml"), `workspace: ${workspace}
 globalRoot: ~/.cnos
 `)) {
     createdPaths.push(".cnos-workspace.yml");
@@ -1347,7 +1701,7 @@ globalRoot: ~/.cnos
 
 // src/commands/init.ts
 async function runInit(options = {}) {
-  const root = path4.resolve(options.root ?? process.cwd());
+  const root = path5.resolve(options.root ?? process.cwd());
   const result = await scaffoldWorkspace(root, options.workspace);
   if (options.json) {
     return printJson(result);
@@ -1358,6 +1712,12 @@ async function runInit(options = {}) {
   return `initialized CNOS project at ${root}`;
 }
 
+// src/format/maskSecret.ts
+var MASKED_SECRET_VALUE = "****";
+function maskSecretValue(value) {
+  return value === void 0 ? "" : MASKED_SECRET_VALUE;
+}
+
 // src/format/printInspect.ts
 function printInspect(record) {
   const lines = [
@@ -1382,12 +1742,22 @@ function printInspect(record) {
 
 // src/commands/inspect.ts
 async function runInspect(key, options = {}) {
+  const reveal = options.cliArgs?.includes("--reveal") ?? false;
   const runtime = await createRuntimeService(options);
   const inspectResult = runtime.inspect(key);
+  const value = key.startsWith("secret.") && !reveal ? maskSecretValue(inspectResult.value) : inspectResult.value;
+  const printable = {
+    ...inspectResult,
+    value,
+    overridden: inspectResult.overridden.map((entry) => ({
+      ...entry,
+      value: key.startsWith("secret.") && !reveal ? maskSecretValue(entry.value) : entry.value
+    }))
+  };
   if (options.json) {
-    return printJson(inspectResult);
+    return printJson(printable);
   }
-  return printInspect(inspectResult);
+  return printInspect(printable);
 }
 
 // src/format/printValue.ts
@@ -1406,34 +1776,52 @@ function printValue(value, json = false) {
 
 // src/services/listing.ts
 import { flattenObject as flattenObject2 } from "@kitsy/cnos/internal";
+function matchesSecretFilter(candidate, filter) {
+  const secretRef = candidate.metadata?.secretRef;
+  if (filter.vault && secretRef?.vault !== filter.vault) {
+    return false;
+  }
+  if (filter.provider && secretRef?.provider !== filter.provider) {
+    return false;
+  }
+  return true;
+}
 function matchesPrefix(key, prefix) {
   if (!prefix) {
     return true;
   }
   return key.startsWith(prefix) || key.split(".").slice(1).join(".").startsWith(prefix);
 }
-function toStoredEntry(namespace, entry) {
+function toStoredEntry(namespace, entry, filter = {}) {
   const sourceId = namespace === "value" ? "filesystem-values" : "filesystem-secrets";
   const candidates = [entry.winner, ...entry.overridden].filter((candidate) => candidate.sourceId === sourceId);
   if (candidates.length === 0) {
     return void 0;
   }
+  const selectedCandidate = namespace === "secret" ? candidates.find((candidate) => matchesSecretFilter(candidate, filter)) : candidates[0];
+  if (!selectedCandidate) {
+    return void 0;
+  }
   return {
     key: entry.key,
-    value: candidates[0]?.value
+    value: selectedCandidate.value
   };
 }
 function listStoredNamespace(namespace, options) {
   return createRuntimeService(options).then(
-    (runtime) => Array.from(runtime.graph.entries.values()).filter((entry) => entry.namespace === namespace).map((entry) => toStoredEntry(namespace, entry)).filter((entry) => Boolean(entry)).filter((entry) => matchesPrefix(entry.key, options.prefix)).sort((left, right) => left.key.localeCompare(right.key))
+    (runtime) => Array.from(runtime.graph.entries.values()).filter((entry) => entry.namespace === namespace).map((entry) => toStoredEntry(namespace, entry, options)).filter((entry) => Boolean(entry)).filter((entry) => matchesPrefix(entry.key, options.prefix)).sort((left, right) => left.key.localeCompare(right.key))
   );
 }
 function listProjectedNamespace(namespace, options) {
   return createRuntimeService(options).then((runtime) => {
-    const projected = namespace === "meta" ? flattenObject2(runtime.toNamespace("meta")) : namespace === "env" ? runtime.manifest.envMapping.explicit : runtime.toPublicEnv();
-    const entries = namespace === "env" ? Object.entries(projected).map(([envVar, logicalKey]) => ({
+    const projected = namespace === "meta" ? flattenObject2(runtime.toNamespace("meta")) : namespace === "env" ? runtime.toEnv() : runtime.toPublicEnv({
+      ...options.framework ? {
+        framework: options.framework
+      } : {}
+    });
+    const entries = namespace === "env" ? Object.entries(projected).map(([envVar, value]) => ({
       key: envVar,
-      value: runtime.read(logicalKey)
+      value
     })) : Object.entries(projected).map(([key, value]) => ({
       key: namespace === "meta" ? `meta.${key}` : key,
       value
@@ -1482,10 +1870,12 @@ async function runList(args = [], options = {}) {
   const cliArgs = [...options.cliArgs ?? []];
   const namespace = normalizeNamespace(args[0] ?? consumeOption(cliArgs, "--namespace"));
   const prefix = consumeOption(cliArgs, "--prefix");
+  const framework = consumeOption(cliArgs, "--framework");
   const entries = await listConfigEntries(namespace, {
     ...options,
     cliArgs,
-    ...prefix ? { prefix } : {}
+    ...prefix ? { prefix } : {},
+    ...framework ? { framework } : {}
   });
   if (options.json) {
     return printJson(entries);
@@ -1496,35 +1886,115 @@ async function runList(args = [], options = {}) {
   return entries.map((entry) => `${entry.key}=${printValue(entry.value)}`).join("\n");
 }
 
+// src/commands/migrate.ts
+import path6 from "path";
+import {
+  applyManifestMappings,
+  loadManifest,
+  proposeMapping,
+  rewriteSourceFiles,
+  scanEnvUsage
+} from "@kitsy/cnos/internal";
+async function runMigrate(options = {}) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const scan = consumeOption(cliArgs, "--scan");
+  const apply = consumeFlag(cliArgs, "--apply");
+  const dryRun = consumeFlag(cliArgs, "--dry-run") || !apply;
+  const rewrite = consumeFlag(cliArgs, "--rewrite");
+  if (cliArgs.length > 0) {
+    throw new Error(`Unknown migrate options: ${cliArgs.join(" ")}`);
+  }
+  const manifest = await loadManifest(options.root ? { root: options.root } : {});
+  const scanRoot = path6.resolve(manifest.repoRoot, scan ?? "src");
+  const usages = await scanEnvUsage(scanRoot);
+  const uniqueProposals = new Map(usages.map((usage) => [usage.envVar, proposeMapping(usage.envVar)]));
+  const proposals = Array.from(uniqueProposals.values()).sort((left, right) => left.envVar.localeCompare(right.envVar));
+  let manifestResult;
+  let rewriteResult;
+  if (apply) {
+    manifestResult = await applyManifestMappings(proposals, options.root);
+    if (rewrite) {
+      rewriteResult = await rewriteSourceFiles(usages.filter((usage) => usage.kind === "process-env"), uniqueProposals);
+    }
+  }
+  if (options.json) {
+    return printJson({
+      scanRoot,
+      dryRun,
+      apply,
+      rewrite,
+      usages,
+      proposals,
+      ...manifestResult ? { manifest: manifestResult } : {},
+      ...rewriteResult ? { rewriteResult } : {}
+    });
+  }
+  const lines = [
+    `Scanned ${usages.length} env usage${usages.length === 1 ? "" : "s"} in ${scanRoot}`,
+    "",
+    "Proposed mappings:",
+    ...proposals.map(
+      (proposal) => `  ${proposal.envVar} -> ${proposal.logicalKey}${proposal.public ? " (promote to public)" : ""}`
+    )
+  ];
+  if (proposals.length === 0) {
+    lines.push("  none");
+  }
+  if (dryRun) {
+    lines.push("", "Dry run only. Re-run with --apply to update the manifest.");
+  }
+  if (manifestResult) {
+    lines.push(
+      "",
+      `Updated ${manifestResult.manifestPath} with ${manifestResult.appliedMappings} env mapping${manifestResult.appliedMappings === 1 ? "" : "s"} and ${manifestResult.appliedPromotions} public promotion${manifestResult.appliedPromotions === 1 ? "" : "s"}.`
+    );
+  }
+  if (rewrite) {
+    if (!apply) {
+      lines.push("", "Source rewrite requested but skipped because --apply was not set.");
+    } else if (rewriteResult) {
+      lines.push(
+        "",
+        `Rewrote ${rewriteResult.rewrittenFiles.length} file${rewriteResult.rewrittenFiles.length === 1 ? "" : "s"} and created ${rewriteResult.backupFiles.length} backup${rewriteResult.backupFiles.length === 1 ? "" : "s"}.`
+      );
+      if (rewriteResult.skippedUsages.length > 0) {
+        lines.push("Skipped usages:");
+        lines.push(...rewriteResult.skippedUsages.map((entry) => `  ${entry}`));
+      }
+    }
+  }
+  return lines.join("\n");
+}
+
 // src/commands/onboard.ts
-import { copyFile, readdir, rm as rm2 } from "fs/promises";
-import path5 from "path";
+import { copyFile, readdir as readdir2, rm } from "fs/promises";
+import path7 from "path";
 var ROOT_ENV_FILE_PATTERN = /^\.env(?:\.[A-Za-z0-9_-]+)*(?:\.example)?$/;
 async function listRootEnvFiles(root) {
-  const entries = await readdir(root, { withFileTypes: true });
+  const entries = await readdir2(root, { withFileTypes: true });
   return entries.filter((entry) => entry.isFile() && ROOT_ENV_FILE_PATTERN.test(entry.name)).map((entry) => entry.name).sort((left, right) => left.localeCompare(right));
 }
 async function runOnboard(options = {}) {
-  const root = path5.resolve(options.root ?? process.cwd());
-  const workspace = options.workspace ?? path5.basename(root);
+  const root = path7.resolve(options.root ?? process.cwd());
+  const workspace = options.workspace ?? path7.basename(root);
   const cliArgs = [...options.cliArgs ?? []];
   const move = consumeFlag(cliArgs, "--move");
   if (cliArgs.length > 0) {
     throw new Error(`Unsupported onboard arguments: ${cliArgs.join(" ")}`);
   }
   const scaffold = await scaffoldWorkspace(root, workspace);
-  const envRoot = path5.join(root, ".cnos", "workspaces", workspace, "env");
+  const envRoot = path7.join(root, ".cnos", "workspaces", workspace, "env");
   const rootFiles = await listRootEnvFiles(root);
   const imported = [];
   const skipped = [];
   for (const fileName of rootFiles) {
-    const sourcePath = path5.join(root, fileName);
-    const targetPath = path5.join(envRoot, fileName);
+    const sourcePath = path7.join(root, fileName);
+    const targetPath = path7.join(envRoot, fileName);
     try {
       await copyFile(sourcePath, targetPath);
-      imported.push(path5.relative(root, targetPath).replace(/\\/g, "/"));
+      imported.push(path7.relative(root, targetPath).replace(/\\/g, "/"));
       if (move) {
-        await rm2(sourcePath);
+        await rm(sourcePath);
       }
     } catch {
       skipped.push(fileName);
@@ -1547,17 +2017,17 @@ async function runOnboard(options = {}) {
 }
 
 // src/commands/profile.ts
-import path8 from "path";
+import path10 from "path";
 
 // src/services/context.ts
-import { readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
-import path6 from "path";
-import { parseYaml as parseYaml2, stringifyYaml as stringifyYaml2 } from "@kitsy/cnos/internal";
+import { readFile as readFile4, writeFile as writeFile4 } from "fs/promises";
+import path8 from "path";
+import { parseYaml as parseYaml3, stringifyYaml as stringifyYaml2 } from "@kitsy/cnos/internal";
 async function loadCliContext(root = process.cwd()) {
-  const filePath = path6.join(path6.resolve(root), ".cnos-workspace.yml");
+  const filePath = path8.join(path8.resolve(root), ".cnos-workspace.yml");
   try {
     const source = await readFile4(filePath, "utf8");
-    const parsed = parseYaml2(source);
+    const parsed = parseYaml3(source);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return {};
     }
@@ -1567,8 +2037,8 @@ async function loadCliContext(root = process.cwd()) {
   }
 }
 async function saveCliContext(options = {}) {
-  const root = path6.resolve(options.root ?? process.cwd());
-  const filePath = path6.join(root, ".cnos-workspace.yml");
+  const root = path8.resolve(options.root ?? process.cwd());
+  const filePath = path8.join(root, ".cnos-workspace.yml");
   const current = await loadCliContext(root);
   const next = {
     ...current.workspace ? { workspace: current.workspace } : {},
@@ -1578,7 +2048,7 @@ async function saveCliContext(options = {}) {
     ...options.profile ? { profile: options.profile } : {},
     ...options.globalRoot ? { globalRoot: options.globalRoot } : {}
   };
-  await writeFile3(filePath, stringifyYaml2(next), "utf8");
+  await writeFile4(filePath, stringifyYaml2(next), "utf8");
   return {
     filePath,
     context: next
@@ -1586,19 +2056,19 @@ async function saveCliContext(options = {}) {
 }
 
 // src/services/profiles.ts
-import { mkdir as mkdir3, readdir as readdir2, readFile as readFile5, rm as rm3, writeFile as writeFile4 } from "fs/promises";
-import path7 from "path";
-import { parseYaml as parseYaml3, stringifyYaml as stringifyYaml3 } from "@kitsy/cnos/internal";
+import { mkdir as mkdir4, readdir as readdir3, readFile as readFile5, rm as rm2, writeFile as writeFile5 } from "fs/promises";
+import path9 from "path";
+import { parseYaml as parseYaml4, stringifyYaml as stringifyYaml3 } from "@kitsy/cnos/internal";
 async function createProfileDefinition(root = process.cwd(), profile, inherit) {
-  const filePath = path7.join(path7.resolve(root), ".cnos", "profiles", `${profile}.yml`);
-  await mkdir3(path7.dirname(filePath), { recursive: true });
+  const filePath = path9.join(path9.resolve(root), ".cnos", "profiles", `${profile}.yml`);
+  await mkdir4(path9.dirname(filePath), { recursive: true });
   const document = inherit && inherit !== "base" ? {
     name: profile,
     extends: [inherit]
   } : {
     name: profile
   };
-  await writeFile4(filePath, stringifyYaml3(document), "utf8");
+  await writeFile5(filePath, stringifyYaml3(document), "utf8");
   return {
     filePath,
     profile,
@@ -1606,9 +2076,9 @@ async function createProfileDefinition(root = process.cwd(), profile, inherit) {
   };
 }
 async function listProfiles(root = process.cwd()) {
-  const profilesRoot = path7.join(path7.resolve(root), ".cnos", "profiles");
+  const profilesRoot = path9.join(path9.resolve(root), ".cnos", "profiles");
   try {
-    const entries = await readdir2(profilesRoot, { withFileTypes: true });
+    const entries = await readdir3(profilesRoot, { withFileTypes: true });
     const discovered = /* @__PURE__ */ new Set(["base"]);
     for (const entry of entries) {
       if (entry.isFile() && entry.name.endsWith(".yml")) {
@@ -1621,9 +2091,9 @@ async function listProfiles(root = process.cwd()) {
   }
 }
 async function deleteProfileDefinition(root = process.cwd(), profile) {
-  const filePath = path7.join(path7.resolve(root), ".cnos", "profiles", `${profile}.yml`);
+  const filePath = path9.join(path9.resolve(root), ".cnos", "profiles", `${profile}.yml`);
   try {
-    await rm3(filePath);
+    await rm2(filePath);
     return {
       filePath,
       deleted: true
@@ -1641,9 +2111,9 @@ async function readProfileDefinition(root = process.cwd(), profile = "base") {
       name: "base"
     };
   }
-  const filePath = path7.join(path7.resolve(root), ".cnos", "profiles", `${profile}.yml`);
+  const filePath = path9.join(path9.resolve(root), ".cnos", "profiles", `${profile}.yml`);
   try {
-    return parseYaml3(await readFile5(filePath, "utf8")) ?? void 0;
+    return parseYaml4(await readFile5(filePath, "utf8")) ?? void 0;
   } catch {
     return void 0;
   }
@@ -1665,7 +2135,7 @@ function normalizeProfileAction(args) {
 }
 async function runProfile(args, options = {}) {
   const { action, tail } = normalizeProfileAction(args);
-  const root = path8.resolve(options.root ?? process.cwd());
+  const root = path10.resolve(options.root ?? process.cwd());
   const cliArgs = [...options.cliArgs ?? []];
   if (action === "create") {
     const profile = tail[0] ?? "stage";
@@ -1708,6 +2178,73 @@ async function runProfile(args, options = {}) {
   return profiles.join("\n");
 }
 
+// src/commands/promote.ts
+import { writeFile as writeFile6 } from "fs/promises";
+import {
+  ensureProjectionAllowed,
+  loadManifest as loadManifest2,
+  stringifyYaml as stringifyYaml4
+} from "@kitsy/cnos/internal";
+function normalizeTarget(value) {
+  if (value === "public" || value === "env") {
+    return value;
+  }
+  throw new Error("promote requires --to public|env");
+}
+function sortRecord(record) {
+  return Object.fromEntries(Object.entries(record).sort(([left], [right]) => left.localeCompare(right)));
+}
+async function runPromote(args = [], options = {}) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const target = normalizeTarget(consumeOption(cliArgs, "--to"));
+  const alias = consumeOption(cliArgs, "--as");
+  const keys = args.filter(Boolean);
+  if (keys.length === 0) {
+    throw new Error("promote requires at least one logical key");
+  }
+  if (target === "env") {
+    if (keys.length !== 1) {
+      throw new Error("promote --to env requires exactly one logical key");
+    }
+    if (!alias) {
+      throw new Error("promote --to env requires --as <ENV_VAR>");
+    }
+  }
+  const loadedManifest = await loadManifest2(options.root ? { root: options.root } : {});
+  for (const key of keys) {
+    ensureProjectionAllowed(loadedManifest.manifest, key, target);
+  }
+  const rawManifest = {
+    ...loadedManifest.rawManifest
+  };
+  if (target === "public") {
+    rawManifest.public = {
+      ...rawManifest.public ?? {},
+      promote: Array.from(/* @__PURE__ */ new Set([...rawManifest.public?.promote ?? [], ...keys])).sort(
+        (left, right) => left.localeCompare(right)
+      )
+    };
+  } else {
+    rawManifest.envMapping = {
+      ...rawManifest.envMapping ?? {},
+      explicit: sortRecord({
+        ...rawManifest.envMapping?.explicit ?? {},
+        [alias]: keys[0]
+      })
+    };
+  }
+  await writeFile6(loadedManifest.manifestPath, stringifyYaml4(rawManifest), "utf8");
+  if (options.json) {
+    return printJson({
+      target,
+      keys,
+      ...target === "env" ? { envVar: alias } : {},
+      manifestPath: loadedManifest.manifestPath
+    });
+  }
+  return target === "public" ? `promoted ${keys.join(", ")} to public in ${loadedManifest.manifestPath}` : `promoted ${keys[0]} to env as ${alias} in ${loadedManifest.manifestPath}`;
+}
+
 // src/commands/read.ts
 async function runRead(key, options = {}) {
   const runtime = await createRuntimeService(options);
@@ -1715,22 +2252,82 @@ async function runRead(key, options = {}) {
   if (value === void 0) {
     throw new Error(`Missing CNOS config key: ${key}`);
   }
+  const isSecret = key.startsWith("secret.");
+  const valueForOutput = isSecret ? maskSecretValue(value) : value;
   if (options.json) {
-    return printJson({ key, value });
+    return printJson({ key, value: valueForOutput });
   }
-  return printValue(value);
+  return printValue(valueForOutput);
 }
 
 // src/commands/run.ts
 import { spawn } from "child_process";
+import {
+  CNOS_GRAPH_ENV_VAR,
+  CNOS_SECRET_PAYLOAD_ENV_VAR,
+  CNOS_SESSION_KEY_ENV_VAR,
+  serializeSecretPayload,
+  serializeRuntimeGraph
+} from "@kitsy/cnos/internal";
+function consumeOptions(args, flag) {
+  const values = [];
+  for (let index = 0; index < args.length; ) {
+    const token = args[index];
+    if (token === flag) {
+      const value = args[index + 1];
+      if (!value) {
+        throw new Error(`Missing value for ${flag}`);
+      }
+      values.push(value);
+      args.splice(index, 2);
+      continue;
+    }
+    if (token?.startsWith(`${flag}=`)) {
+      values.push(token.slice(flag.length + 1));
+      args.splice(index, 1);
+      continue;
+    }
+    index += 1;
+  }
+  return values;
+}
+function normalizeSetOverrides(values) {
+  return values.map((value) => {
+    if (!value.includes("=")) {
+      throw new Error("--set requires <logical-key>=<value>");
+    }
+    return value.startsWith("--") ? value : `--${value}`;
+  });
+}
 async function runCommand(command, options = {}) {
   if (command.length === 0) {
     throw new Error("run requires a command after --");
   }
-  const runtime = await createRuntimeService(options);
+  const cliArgs = [...options.cliArgs ?? []];
+  const isPublic = consumeFlag(cliArgs, "--public");
+  const isAuthenticated = consumeFlag(cliArgs, "--auth");
+  const framework = consumeOption(cliArgs, "--framework");
+  const prefix = consumeOption(cliArgs, "--prefix");
+  const setOverrides = normalizeSetOverrides(consumeOptions(cliArgs, "--set"));
+  const runtime = await createRuntimeService({
+    ...options,
+    cliArgs: [...cliArgs, ...setOverrides]
+  });
+  const authenticatedSecrets = isAuthenticated ? Object.fromEntries(
+    Array.from(runtime.graph.entries.values()).filter((entry) => entry.namespace === "secret").map((entry) => [entry.key, runtime.read(entry.key)])
+  ) : void 0;
+  const secretPayload = authenticatedSecrets ? serializeSecretPayload(authenticatedSecrets) : void 0;
   const env = {
     ...process.env,
-    ...runtime.toEnv()
+    ...isPublic ? runtime.toPublicEnv({
+      ...framework ? { framework } : {},
+      ...prefix ? { prefix } : {}
+    }) : runtime.toEnv(),
+    [CNOS_GRAPH_ENV_VAR]: serializeRuntimeGraph(runtime.graph),
+    ...secretPayload ? {
+      [CNOS_SECRET_PAYLOAD_ENV_VAR]: secretPayload.payload,
+      [CNOS_SESSION_KEY_ENV_VAR]: secretPayload.sessionKey
+    } : {}
   };
   return new Promise((resolve, reject) => {
     const executable = command[0];
@@ -1765,12 +2362,254 @@ async function runCommand(command, options = {}) {
   });
 }
 
-// src/commands/secret.ts
-function isSecretRef(value) {
-  return Boolean(
-    value && typeof value === "object" && !Array.isArray(value) && typeof value.provider === "string" && typeof value.ref === "string"
-  );
+// src/services/vaults.ts
+import { rm as rm3, writeFile as writeFile7 } from "fs/promises";
+import path11 from "path";
+import {
+  clearAllVaultSessionKeys,
+  clearVaultSessionKey,
+  createSecretVault,
+  deriveVaultKey,
+  loadManifest as loadManifest3,
+  listSecretVaults,
+  readVaultMetadata,
+  resolveSecretStoreRoot as resolveSecretStoreRoot2,
+  resolveVaultAuth as resolveVaultAuth2,
+  resolveVaultDefinition,
+  stringifyYaml as stringifyYaml5,
+  writeKeychain,
+  writeVaultSessionKey
+} from "@kitsy/cnos/internal";
+function sortVaults(vaults) {
+  return Object.fromEntries(Object.entries(vaults).sort(([left], [right]) => left.localeCompare(right)));
+}
+function defaultLocalAuthSources(vault) {
+  const token = vault.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase();
+  return [`env:CNOS_SECRET_PASSPHRASE_${token}`, "env:CNOS_SECRET_PASSPHRASE", `keychain:cnos/${vault}`, "prompt"];
+}
+async function createVaultDefinition(name, options = {}) {
+  const vault = name.trim() || "default";
+  const provider = options.provider?.trim() || "local";
+  if (provider === "local" && (options.noPassphrase ?? false)) {
+    throw new Error("Local vaults cannot be passwordless.");
+  }
+  const loadedManifest = await loadManifest3(options.root ? { root: options.root } : {});
+  const rawManifest = {
+    ...loadedManifest.rawManifest,
+    vaults: {
+      ...loadedManifest.rawManifest.vaults ?? {},
+      [vault]: provider === "local" ? {
+        provider: "local",
+        auth: {
+          passphrase: {
+            from: defaultLocalAuthSources(vault)
+          }
+        }
+      } : {
+        provider,
+        auth: {
+          method: "environment"
+        }
+      }
+    }
+  };
+  await writeFile7(loadedManifest.manifestPath, stringifyYaml5(rawManifest), "utf8");
+  const definition = resolveVaultDefinition({ [vault]: rawManifest.vaults[vault] }, vault);
+  return {
+    ...definition,
+    authMethod: definition.auth?.method ?? (provider === "local" ? "passphrase" : "environment"),
+    localStore: provider === "local",
+    manifestPath: loadedManifest.manifestPath
+  };
+}
+async function listVaultDefinitions(options = {}) {
+  const loadedManifest = await loadManifest3(options.root ? { root: options.root } : {});
+  const localStoreVaults = await listSecretVaults(resolveSecretStoreRoot2(options.processEnv));
+  return Object.keys(loadedManifest.manifest.vaults).sort((left, right) => left.localeCompare(right)).map((name) => {
+    const definition = resolveVaultDefinition(loadedManifest.manifest.vaults, name);
+    return {
+      ...definition,
+      authMethod: definition.auth?.method ?? (definition.provider === "local" ? "passphrase" : "environment"),
+      localStore: localStoreVaults.includes(name)
+    };
+  });
+}
+async function removeVaultDefinition(name, options = {}) {
+  const vault = name.trim() || "default";
+  const loadedManifest = await loadManifest3(options.root ? { root: options.root } : {});
+  if (!loadedManifest.rawManifest.vaults?.[vault]) {
+    return {
+      name: vault,
+      deleted: false,
+      manifestPath: loadedManifest.manifestPath
+    };
+  }
+  const nextVaults = { ...loadedManifest.rawManifest.vaults ?? {} };
+  delete nextVaults[vault];
+  const rawManifest = {
+    ...loadedManifest.rawManifest,
+    ...Object.keys(nextVaults).length > 0 ? { vaults: sortVaults(nextVaults) } : {}
+  };
+  if (Object.keys(nextVaults).length === 0) {
+    delete rawManifest.vaults;
+  }
+  await writeFile7(loadedManifest.manifestPath, stringifyYaml5(rawManifest), "utf8");
+  const vaultRoot = path11.join(resolveSecretStoreRoot2(options.processEnv), "vaults", vault);
+  let removedStore;
+  try {
+    await rm3(vaultRoot, { recursive: true, force: true });
+    removedStore = vaultRoot;
+  } catch {
+    removedStore = void 0;
+  }
+  await clearVaultSessionKey(vault, options.processEnv);
+  return {
+    name: vault,
+    deleted: true,
+    manifestPath: loadedManifest.manifestPath,
+    ...removedStore ? { removedStore } : {}
+  };
+}
+async function listLocalStoreVaults(options = {}) {
+  return listSecretVaults(resolveSecretStoreRoot2(options.processEnv));
+}
+async function authenticateVault(name, options = {}) {
+  const vault = name.trim() || "default";
+  const loadedManifest = await loadManifest3(options.root ? { root: options.root } : {});
+  const definition = loadedManifest.manifest.vaults[vault];
+  if (!definition) {
+    throw new Error(`Unknown vault "${vault}"`);
+  }
+  const auth = await resolveVaultAuth2(vault, definition, options.processEnv ?? process.env);
+  const storeRoot = resolveSecretStoreRoot2(options.processEnv);
+  if (definition.provider === "local") {
+    if (!auth.passphrase) {
+      throw new Error(`Vault "${vault}" requires passphrase-based authentication.`);
+    }
+    const existing = await readVaultMetadata(storeRoot, vault);
+    if (!existing) {
+      await createSecretVault(storeRoot, vault, auth.passphrase);
+    }
+    const metadata = await readVaultMetadata(storeRoot, vault);
+    if (!metadata) {
+      throw new Error(`Failed to initialize vault "${vault}"`);
+    }
+    const derivedKey = deriveVaultKey(auth.passphrase, Buffer.from(metadata.salt, "base64"), metadata.iterations);
+    const sessionPath2 = await writeVaultSessionKey(vault, derivedKey, options.processEnv);
+    if (options.storeKeychain) {
+      await writeKeychain(`cnos/${vault}`, derivedKey.toString("hex"));
+    }
+    return {
+      name: vault,
+      method: auth.method,
+      storedInKeychain: options.storeKeychain ?? false,
+      sessionPath: sessionPath2
+    };
+  }
+  const sessionPath = await writeVaultSessionKey(vault, Buffer.from(vault, "utf8"), options.processEnv);
+  return {
+    name: vault,
+    method: auth.method,
+    storedInKeychain: false,
+    sessionPath
+  };
+}
+async function logoutVault(name, options = {}) {
+  if (options.all) {
+    await clearAllVaultSessionKeys(options.processEnv);
+    return { scope: "all" };
+  }
+  const vault = name?.trim() || "default";
+  await clearVaultSessionKey(vault, options.processEnv);
+  return { scope: vault };
+}
+
+// src/commands/vault.ts
+function normalizeVaultAction(args) {
+  const [action = "list", ...tail] = args;
+  if (["create", "add", "list", "delete", "remove", "auth", "logout"].includes(action)) {
+    return {
+      action: action === "add" || action === "create" ? "create" : action === "delete" || action === "remove" ? "remove" : action === "auth" ? "auth" : action === "logout" ? "logout" : "list",
+      tail
+    };
+  }
+  return {
+    action: "list",
+    tail: args
+  };
+}
+async function runVault(args = [], options = {}) {
+  const { action, tail } = normalizeVaultAction(args);
+  const cliArgs = [...options.cliArgs ?? []];
+  if (consumeOption(cliArgs, "--passphrase")) {
+    throw new Error("The --passphrase option is not supported in CNOS 1.4. Use env, keychain, or prompt-based auth.");
+  }
+  if (action === "create") {
+    const name = tail[0] ?? "default";
+    const provider = consumeOption(cliArgs, "--provider") ?? "local";
+    const noPassphrase = consumeFlag(cliArgs, "--no-passphrase");
+    const result = await createVaultDefinition(name, {
+      ...options,
+      cliArgs,
+      provider,
+      ...noPassphrase ? { noPassphrase: true } : {}
+    });
+    if (options.json) {
+      return printJson(result);
+    }
+    return `created vault "${result.name}" with provider "${result.provider}" in ${result.manifestPath}`;
+  }
+  if (action === "auth") {
+    const result = await authenticateVault(tail[0] ?? "default", {
+      ...options,
+      cliArgs,
+      storeKeychain: consumeFlag(cliArgs, "--store-keychain")
+    });
+    if (options.json) {
+      return printJson(result);
+    }
+    return `authenticated vault "${result.name}" via ${result.method}`;
+  }
+  if (action === "logout") {
+    const result = await logoutVault(tail[0], {
+      ...options,
+      cliArgs,
+      all: consumeFlag(cliArgs, "--all")
+    });
+    if (options.json) {
+      return printJson(result);
+    }
+    return result.scope === "all" ? "logged out all vault sessions" : `logged out vault "${result.scope}"`;
+  }
+  if (action === "remove") {
+    const name = tail[0] ?? "default";
+    const result = await removeVaultDefinition(name, options);
+    if (options.json) {
+      return printJson(result);
+    }
+    return result.deleted ? `removed vault "${result.name}"` : `vault "${result.name}" was not found`;
+  }
+  const [manifestVaults, localStoreVaults] = await Promise.all([
+    listVaultDefinitions(options),
+    listLocalStoreVaults(options)
+  ]);
+  if (options.json) {
+    return printJson(
+      manifestVaults.map((vault) => ({
+        ...vault,
+        localStore: localStoreVaults.includes(vault.name)
+      }))
+    );
+  }
+  if (manifestVaults.length === 0) {
+    return "";
+  }
+  return manifestVaults.map(
+    (vault) => `${vault.name} provider=${vault.provider} auth=${vault.authMethod}${localStoreVaults.includes(vault.name) ? " local-store=true" : ""}`
+  ).join("\n");
 }
+
+// src/commands/secret.ts
 function normalizeSecretCommand(args) {
   const [actionOrPath, next, ...tail] = args;
   if (!actionOrPath) {
@@ -1796,64 +2635,78 @@ function normalizeSecretCommand(args) {
     tail: args
   };
 }
+async function readStdinValue() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+  }
+  return Buffer.concat(chunks).toString("utf8").trimEnd();
+}
 async function runSecret(argsOrPath, options = {}) {
   const args = Array.isArray(argsOrPath) ? argsOrPath : [argsOrPath];
   const { action, tail } = normalizeSecretCommand(args);
   const cliArgs = [...options.cliArgs ?? []];
+  if (consumeOption(cliArgs, "--passphrase")) {
+    throw new Error("The --passphrase option is not supported in CNOS 1.4. Use env, keychain, or prompt-based auth.");
+  }
   if (action === "create-vault") {
-    const vault = tail[0] ?? "default";
-    const passphrase = consumeOption(cliArgs, "--passphrase");
-    const result = await createVault(vault, {
-      ...options,
-      cliArgs,
-      ...passphrase ? { passphrase } : {}
-    });
-    if (options.json) {
-      return printJson(result);
-    }
-    return `created secret vault "${result.vault}" in ${result.filePath}`;
+    return runVault(["create", tail[0] ?? "default"], options);
   }
   if (action === "list") {
+    const runtime2 = await createRuntimeService(options);
     const prefix = consumeOption(cliArgs, "--prefix");
-    const entries = await listConfigEntries("secret", {
-      ...options,
-      cliArgs,
-      ...prefix ? { prefix } : {}
-    });
+    const vault = consumeOption(cliArgs, "--vault");
+    const provider = consumeOption(cliArgs, "--provider");
+    const entries = Array.from(runtime2.graph.entries.values()).filter((entry2) => entry2.namespace === "secret").filter((entry2) => !prefix || entry2.key.startsWith(`secret.${prefix}`) || entry2.key.startsWith(prefix)).filter((entry2) => {
+      const secretRef2 = entry2.winner.metadata?.secretRef;
+      if (vault && secretRef2?.vault !== vault) {
+        return false;
+      }
+      if (provider && secretRef2?.provider !== provider) {
+        return false;
+      }
+      return true;
+    }).map((entry2) => {
+      const secretRef2 = entry2.winner.metadata?.secretRef;
+      return {
+        key: entry2.key,
+        vault: secretRef2?.vault ?? "default",
+        provider: secretRef2?.provider ?? "local"
+      };
+    }).sort((left, right) => left.key.localeCompare(right.key));
     if (options.json) {
       return printJson(entries);
     }
-    return entries.map((entry) => `${entry.key}=${printValue(entry.value)}`).join("\n");
+    return entries.map((entry2) => `${entry2.key} (vault: ${entry2.vault}, provider: ${entry2.provider})`).join("\n");
   }
   if (action === "set") {
-    const secretPath = tail[0];
-    const rawValue = tail[1] ?? "";
+    const secretPath2 = tail[0];
     const local = consumeFlag(cliArgs, "--local");
     const remote = consumeFlag(cliArgs, "--remote");
     const ref = consumeFlag(cliArgs, "--ref");
+    const stdin = consumeFlag(cliArgs, "--stdin");
     const target = consumeOption(cliArgs, "--target") ?? "local";
     const provider = consumeOption(cliArgs, "--provider");
-    const passphrase = consumeOption(cliArgs, "--passphrase");
     const vault = consumeOption(cliArgs, "--vault") ?? "default";
-    const mode = local ? "local" : remote ? "remote" : ref ? "ref" : "local";
-    const result = await setSecret(secretPath ?? "app.token", rawValue, {
+    const mode = local ? "local" : remote ? "remote" : ref ? "ref" : void 0;
+    const rawValue = stdin ? await readStdinValue() : tail[1] ?? "";
+    const result = await setSecret(secretPath2 ?? "app.token", rawValue, {
       ...options,
       cliArgs,
       target,
-      mode,
       vault,
-      ...provider ? { provider } : {},
-      ...passphrase ? { passphrase } : {}
+      ...mode ? { mode } : {},
+      ...provider ? { provider } : {}
     });
     if (options.json) {
       return printJson(result);
     }
-    return result.provider === "local" ? `set secret.${secretPath} in vault "${result.vault ?? "default"}" with ref "${result.ref}" and repo pointer ${result.filePath}` : `set secret.${secretPath} via ${result.provider} in ${result.filePath}`;
+    return result.provider === "local" ? `set secret.${secretPath2} in vault "${result.vault ?? "default"}" with ref "${result.ref}" and repo pointer ${result.filePath}` : `set secret.${secretPath2} via ${result.provider} in ${result.filePath}`;
   }
   if (action === "delete") {
-    const secretPath = tail[0];
+    const secretPath2 = tail[0];
     const target = consumeOption(cliArgs, "--target") ?? "local";
-    const result = await deleteSecret(secretPath ?? "app.token", {
+    const result = await deleteSecret(secretPath2 ?? "app.token", {
       ...options,
       cliArgs,
       target
@@ -1861,32 +2714,36 @@ async function runSecret(argsOrPath, options = {}) {
     if (options.json) {
       return printJson(result);
     }
-    return result.deleted ? `deleted secret.${secretPath} from ${result.filePath}` : `no secret.${secretPath} found in ${result.filePath}`;
+    return result.deleted ? `deleted secret.${secretPath2} from ${result.filePath}` : `no secret.${secretPath2} found in ${result.filePath}`;
   }
   const runtime = await createRuntimeService(options);
-  const value = runtime.secret(tail[0] ?? "app.token");
+  const secretPath = tail[0] ?? "app.token";
+  const expectedVault = consumeOption(cliArgs, "--vault");
+  const reveal = consumeFlag(cliArgs, "--reveal");
+  const entry = runtime.graph.entries.get(`secret.${secretPath}`);
+  const secretRef = entry?.winner.metadata?.secretRef;
+  const value = runtime.secret(secretPath);
   if (value === void 0) {
-    throw new Error(`Missing CNOS secret path: ${tail[0] ?? "app.token"}`);
+    throw new Error(`Missing CNOS secret path: ${secretPath}`);
   }
-  if (isSecretRef(value)) {
-    const vault = value.vault ?? "default";
-    throw new Error(
-      `Secret ${tail[0] ?? "app.token"} is stored in vault "${vault}" as ref "${value.ref}". Provide the correct vault passphrase to resolve it.`
-    );
+  if (expectedVault && secretRef?.vault && secretRef.vault !== expectedVault) {
+    throw new Error(`Secret ${secretPath} belongs to vault "${secretRef.vault}", not "${expectedVault}"`);
   }
+  const valueForOutput = reveal ? value : maskSecretValue(value);
   if (options.json) {
     return printJson({
-      key: `secret.${tail[0] ?? "app.token"}`,
-      value
+      key: `secret.${secretPath}`,
+      value: valueForOutput,
+      vault: secretRef?.vault ?? "default"
     });
   }
-  return printValue(value);
+  return printValue(valueForOutput);
 }
 
 // src/commands/use.ts
-import path9 from "path";
+import path12 from "path";
 async function runUse(args = [], options = {}) {
-  const root = path9.resolve(options.root ?? process.cwd());
+  const root = path12.resolve(options.root ?? process.cwd());
   const action = args[0] ?? "show";
   const hasUpdates = Boolean(options.workspace || options.profile || options.globalRoot);
   if (action === "show" || !hasUpdates) {
@@ -1923,7 +2780,7 @@ async function runValidate(options = {}) {
 // package.json
 var package_default = {
   name: "@kitsy/cnos-cli",
-  version: "1.1.2",
+  version: "1.3.0",
   description: "CLI entry point and developer tooling for CNOS.",
   type: "module",
   main: "./dist/index.js",
@@ -2060,6 +2917,180 @@ async function runValue(argsOrPath, options = {}) {
   return printValue(value);
 }
 
+// src/commands/watch.ts
+import { watch } from "fs";
+import { spawn as spawn2 } from "child_process";
+import {
+  CNOS_GRAPH_ENV_VAR as CNOS_GRAPH_ENV_VAR2,
+  CNOS_SECRET_PAYLOAD_ENV_VAR as CNOS_SECRET_PAYLOAD_ENV_VAR2,
+  CNOS_SESSION_KEY_ENV_VAR as CNOS_SESSION_KEY_ENV_VAR2,
+  diffGraphs,
+  serializeRuntimeGraph as serializeRuntimeGraph2,
+  serializeSecretPayload as serializeSecretPayload2,
+  watchFiles
+} from "@kitsy/cnos/internal";
+async function buildRunEnvironment(options) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const isPublic = consumeFlag(cliArgs, "--public");
+  const isAuthenticated = consumeFlag(cliArgs, "--auth");
+  const framework = consumeOption(cliArgs, "--framework");
+  const prefix = consumeOption(cliArgs, "--prefix");
+  const runtime = await createRuntimeService({
+    ...options,
+    cliArgs
+  });
+  const authenticatedSecrets = isAuthenticated ? Object.fromEntries(
+    Array.from(runtime.graph.entries.values()).filter((entry) => entry.namespace === "secret").map((entry) => [entry.key, runtime.read(entry.key)])
+  ) : void 0;
+  const secretPayload = authenticatedSecrets ? serializeSecretPayload2(authenticatedSecrets) : void 0;
+  return {
+    runtime,
+    env: {
+      ...process.env,
+      ...isPublic ? runtime.toPublicEnv({
+        ...framework ? { framework } : {},
+        ...prefix ? { prefix } : {}
+      }) : runtime.toEnv(),
+      [CNOS_GRAPH_ENV_VAR2]: serializeRuntimeGraph2(runtime.graph),
+      ...secretPayload ? {
+        [CNOS_SECRET_PAYLOAD_ENV_VAR2]: secretPayload.payload,
+        [CNOS_SESSION_KEY_ENV_VAR2]: secretPayload.sessionKey
+      } : {}
+    }
+  };
+}
+function spawnWatchedChild(command, cwd, env) {
+  const executable = command[0];
+  if (!executable) {
+    throw new Error("watch requires a command after -- unless --signal is used");
+  }
+  return spawn2(executable, command.slice(1), {
+    cwd,
+    env,
+    stdio: "inherit",
+    shell: false
+  });
+}
+async function startWatchLoop(options) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const isSignal = consumeFlag(cliArgs, "--signal");
+  const debounceMs = Number(consumeOption(cliArgs, "--debounce") ?? "300");
+  const command = options.command ?? [];
+  const root = options.root ?? process.cwd();
+  let current = await buildRunEnvironment({
+    ...options,
+    cliArgs
+  });
+  let child = !isSignal ? spawnWatchedChild(command, root, current.env) : void 0;
+  const watcherMap = /* @__PURE__ */ new Map();
+  let timer;
+  let closed = false;
+  const attachWatcher = (targetPath, recursive = false) => {
+    if (watcherMap.has(targetPath)) {
+      return;
+    }
+    try {
+      const watcher = watch(
+        targetPath,
+        recursive ? {
+          recursive: true
+        } : void 0,
+        () => {
+          if (timer) {
+            clearTimeout(timer);
+          }
+          timer = setTimeout(() => {
+            void handleChange();
+          }, debounceMs);
+        }
+      );
+      watcherMap.set(targetPath, watcher);
+    } catch {
+      if (recursive) {
+        attachWatcher(targetPath, false);
+      }
+    }
+  };
+  const refreshWatchers = async () => {
+    const nextTargets = await watchFiles(current.runtime, options.root);
+    attachWatcher(nextTargets.manifestPath, false);
+    for (const workspaceRoot of nextTargets.roots) {
+      attachWatcher(workspaceRoot, true);
+    }
+    for (const filePath of nextTargets.files) {
+      attachWatcher(filePath, false);
+    }
+  };
+  const handleChange = async () => {
+    if (closed) {
+      return;
+    }
+    const next = await buildRunEnvironment({
+      ...options,
+      cliArgs
+    });
+    const changedKeys = diffGraphs(current.runtime.graph, next.runtime.graph);
+    current = next;
+    await refreshWatchers();
+    if (changedKeys.length === 0) {
+      return;
+    }
+    if (isSignal) {
+      await options.onSignal?.({ changedKeys });
+      process.stdout.write(`${printJson({ changedKeys })}
+`);
+      return;
+    }
+    if (child && !child.killed) {
+      await new Promise((resolve) => {
+        child?.once("close", () => resolve());
+        child?.kill();
+      });
+    }
+    child = spawnWatchedChild(command, root, current.env);
+    await options.onRestart?.({ changedKeys });
+  };
+  await refreshWatchers();
+  return {
+    async close() {
+      closed = true;
+      if (timer) {
+        clearTimeout(timer);
+      }
+      for (const watcher of watcherMap.values()) {
+        watcher.close();
+      }
+      watcherMap.clear();
+      if (child && !child.killed) {
+        await new Promise((resolve) => {
+          child?.once("close", () => resolve());
+          child?.kill();
+        });
+      }
+    }
+  };
+}
+async function runWatch(command, options = {}) {
+  const cliArgs = [...options.cliArgs ?? []];
+  const isSignal = consumeFlag(cliArgs, "--signal");
+  const debounce = consumeOption(cliArgs, "--debounce");
+  const handle = await startWatchLoop({
+    ...options,
+    cliArgs: [
+      ...cliArgs,
+      ...isSignal ? ["--signal"] : [],
+      ...debounce ? ["--debounce", debounce] : []
+    ],
+    command
+  });
+  const closeWatcher = () => {
+    void handle.close();
+  };
+  process.once("SIGINT", closeWatcher);
+  process.once("SIGTERM", closeWatcher);
+  return isSignal ? "watching config changes in signal mode" : "watching config changes in restart mode";
+}
+
 // src/index.ts
 function resolveHelpTopic(command, args) {
   if (command === "help" || command === "help-ai") {
@@ -2068,6 +3099,9 @@ function resolveHelpTopic(command, args) {
   if (command === "export" && args[0] === "env") {
     return normalizeHelpTopic([command, args[0]]);
   }
+  if (command === "vault" && args[0] && ["create", "add", "list", "delete", "remove"].includes(args[0])) {
+    return normalizeHelpTopic([command, args[0] === "delete" ? "remove" : args[0] === "add" ? "create" : args[0]]);
+  }
   if (command === "secret" && args[0] && ["set", "create", "add", "list", "delete", "remove"].includes(args[0])) {
     if ((args[0] === "create" || args[0] === "add") && args[1] === "vault") {
       return normalizeHelpTopic(["secret", "create", "vault"]);
@@ -2137,6 +3171,14 @@ async function main(argv) {
       return;
     case "onboard":
       process.stdout.write(`${await runOnboard(runtimeOptions)}
+`);
+      return;
+    case "migrate":
+      process.stdout.write(`${await runMigrate(runtimeOptions)}
+`);
+      return;
+    case "codegen":
+      process.stdout.write(`${await runCodegen(runtimeOptions)}
 `);
       return;
     case "read":
@@ -2149,6 +3191,10 @@ async function main(argv) {
       return;
     case "secret":
       process.stdout.write(`${await runSecret(args.length > 0 ? args : ["app.token"], runtimeOptions)}
+`);
+      return;
+    case "vault":
+      process.stdout.write(`${await runVault(args, runtimeOptions)}
 `);
       return;
     case "use":
@@ -2157,6 +3203,10 @@ async function main(argv) {
       return;
     case "profile":
       process.stdout.write(`${await runProfile(args, runtimeOptions)}
+`);
+      return;
+    case "promote":
+      process.stdout.write(`${await runPromote(args, runtimeOptions)}
 `);
       return;
     case "list":
@@ -2193,8 +3243,16 @@ async function main(argv) {
       process.exitCode = result.exitCode;
       return;
     }
+    case "watch":
+      process.stdout.write(`${await runWatch(passthrough.length > 0 ? passthrough : args, runtimeOptions)}
+`);
+      return;
     case "diff":
       process.stdout.write(`${await runDiff(args[0] ?? "local", args[1] ?? "stage", runtimeOptions)}
+`);
+      return;
+    case "drift":
+      process.stdout.write(`${await runDrift(runtimeOptions)}
 `);
       return;
     case "doctor":