feat(credentials): move the store to .credentials.yaml and layer $DSH_HOME/.env
$DSH_HOME/.env carried two incompatible jobs. As credentials-local's writable secret store it could not be hoisted into process.env — hoisting makes every stored key read as a read-only launch override and blocks rotation from the TUI and the web page. But its name and dotenv format promise an environment file, so a DEEPSEEK_BASE_URL sitting beside a working DEEPSEEK_API_KEY in the same file was silently ignored: only the credential provider read the document, and it addresses credential references alone. Split the two jobs into two files. .credentials.yaml is the provider-managed store: a strict YAML mapping of CredentialRef to non-empty string, no version field, no wrapper level. Because it holds credentials and nothing else, a non-mapping root, a non-identifier key, a non-string value, an empty string, a duplicate key, and malformed YAML are all rejections rather than skipped entries — loud at boot and at a write, warn-and-keep-last-good on a live reload. The dotenv physical-line editor gives way to a patch of the parsed document, so comments and untouched entries keep their formatting and any string value round-trips, multi-line included. Writer lock, read-modify-write, atomic 0600 write under a 0700 directory, watcher, self-write suppression, and quiescent disposal are unchanged. $DSH_HOME/.env becomes the user's ordinary environment layer. app-boot's new loadLayeredEnv loads the invoking directory's .env then the Harness home's, giving user < project < inherited; the home resolves from the inherited environment first, so a project .env cannot redirect it. Credential precedence is unchanged: the live environment still wins read-only over the file, and shadowed writes still reject. Whether a provider-managed store should instead win over the environment is a separate decision. No migration: a key already in $DSH_HOME/.env keeps resolving through the new environment layer, as a read-only env source that shadows the stored one.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Shared boot glue for the app bins (`dsh`, `dsh-cli-demo`, `dsh-acp-demo`): load the gitignored
|
||||
* `.env`, install the fail-loud Loader guards, resolve the config path (snapshot-aware), load the
|
||||
* `.env` files, install the fail-loud Loader guards, resolve the config path (snapshot-aware), load the
|
||||
* optional personal overlay patches from the Harness home (`~/.dsh`), expose its path resolver to
|
||||
* config expressions, and drive the Cordis Loader against a leaf `cordis.yml` until the tree settles.
|
||||
* @module @deepseek-ai/dsh-app-boot
|
||||
@@ -65,6 +65,36 @@ export function loadEnv(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Load the dsh product CLI's user environment: the invoking directory's `.env`
|
||||
* over the Harness home's `.env`, both under the inherited process
|
||||
* environment. `process.loadEnvFile` never replaces a name that is already
|
||||
* set, so loading the project file first and the user file second is what
|
||||
* makes the layering `user < project < inherited`; the app-boot tests pin all
|
||||
* three layers because that ordering is the whole contract.
|
||||
*
|
||||
* The Harness home is resolved from the inherited environment *before* either
|
||||
* file loads, so a project `.env` can never redirect which user document is
|
||||
* read. Only the product CLI layers these files: an SDK or example bin loads
|
||||
* its own directory through {@link loadEnv} and must not inherit a developer's
|
||||
* `$DSH_HOME`.
|
||||
*
|
||||
* These are ordinary environment values with ordinary environment reach. A
|
||||
* secret the Harness should own and isolate belongs in the credentials
|
||||
* document, which is never materialized here.
|
||||
* @param binName - the diagnostic prefix on the warn lines.
|
||||
* @param cwd - the invoking directory whose `.env` is the project layer.
|
||||
* @param warn - sink for the one-line misconfiguration diagnostics.
|
||||
*/
|
||||
export function loadLayeredEnv(
|
||||
binName: string, cwd: string = process.cwd(),
|
||||
warn: (line: string) => void = line => void process.stderr.write(line),
|
||||
): void {
|
||||
const home = resolveDshHome()
|
||||
loadEnv(binName, cwd, warn)
|
||||
loadEnv(binName, home, warn)
|
||||
}
|
||||
|
||||
/** File inside the Harness home holding the personal loader overlay patches. */
|
||||
export const PERSONAL_CONFIG_FILENAME = 'config.yaml'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user