arcane-os 0.22.1 → 0.24.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.24.0
+
+- Read nonsecret mail settings from `arcane.config.json.mail` and provider keys
+  from `.arcane.env.json.mail`. Keep existing root keys, exact named profiles,
+  and TLS path settings working without migrating or rewriting either file.
+- Let explicit CLI/API options override configuration, replace origin lists,
+  and apply listener defaults after file settings. Share configured profile,
+  sender and provider deadlines with `mail send` without requiring TLS paths.
+- Preserve unrelated settings during credential updates and remove both selected
+  key representations on explicit deletion. Document configuration precedence,
+  origin rejection, startup, platform behavior and the purpose-gate review.
+
+## 0.23.0
+
+- Rename the mail configuration file to `.arcane.env.json`. Upgrade existing
+  deployments by renaming `.env.json` in the directory where the mail command
+  runs, preserving its contents. Mail commands now read only the selected new
+  name and report `storage: '.arcane.env.json'`.
+- Keep configuration independent of the SDK installation directory, including
+  an SDK nested beneath the site root. Preserve provider profiles, relative TLS
+  paths, other JSON settings and HTTPS/HTTP2 port 4433. Update help, references,
+  the purpose-gate report and generated-workspace Git ignores.
+
 ## 0.22.1
 
 - Change the mail gateway's default HTTPS/HTTP2 port from 8025 to 4433 in

package/README.md

@@ -19,14 +19,17 @@ version-locked SDK runtime, while an integrated Arcane checkout uses its live
 `arcane/` runtime. Both profiles preserve the same app URLs, theme, packaging,
 event, cancellation, and browser run contracts.
 
-This checkout defines the `0.22.1` SDK contract. Applications pin one exact npm
+This checkout defines the `0.24.0` SDK contract. Applications pin one exact npm
 version and lockfile; registry state is deliberately not baked into application
 artifacts.
 
-The [mail gateway](docs/reference/mail.md) serves HTTPS with HTTP/2 on port 4433,
-using certificate paths from `.env.json`, and defaults browser mail to
-`/v1/mail` on the current domain. Multiple applications can share
-one server with explicit allowed origins. Subscription verification is disabled
+The [mail gateway](docs/reference/mail.md) serves HTTPS with HTTP/2 on port 4433
+by default. Configure its host, port, origin list, certificate paths, and other
+mail settings in `arcane.config.json.mail`; keep provider keys in the ignored
+`.arcane.env.json.mail`. Both files belong in the command's working directory.
+Existing root credential, profile, and TLS settings remain supported. Browser
+mail defaults to `/v1/mail` on the current domain, and multiple applications can
+share one server with explicit allowed origins. Subscription verification is disabled
 until a `verifySubscription` callback is configured; that callback receives the
 application name and bearer subscription key before each provider attempt.
 See the [method and action gate report](docs/reviews/mail-server-purpose-review.md)

package/docs/reference/cli.md

@@ -32,7 +32,7 @@ and exits nonzero on failure. Machine output is defined by
 | `arcane update-check` | Performs one explicit, read-only npm dist-tag query for the installed SDK version. |
 | `arcane targets` | Lists target ids, declared status, formats, architectures, signing profiles, methods, and pairing reason. |
 | `arcane repo status\|pull\|push` | Runs one selected repository operation for the current app workspace. |
-| `arcane mail key set\|status\|delete` | Manages one server-only Resend API-key profile in `.env.json`. |
+| `arcane mail key set\|status\|delete` | Manages one server-only Resend API-key profile in `.arcane.env.json`. |
 | `arcane mail send` | Performs one explicit, idempotency-keyed Resend attempt from a complete JSON report on redirected stdin. |
 | `arcane mail serve` | Starts one Arcane-to-Resend gateway with a server-only provider profile, a selected listener, and optional CORS and recipient configuration. |
 
@@ -814,7 +814,7 @@ npm exec -- arcane repo status
 
 ### Resend credential profiles
 
-The mail commands read `.env.json` from the invocation directory on Windows,
+The mail commands read `.arcane.env.json` from the invocation directory on Windows,
 Linux, and macOS. The credential subcommands select one profile in that file:
 
 ```text
@@ -825,7 +825,7 @@ arcane mail key delete [profile]
 
 `key set` reads the Resend API key from a hidden terminal prompt. The
 `--secret-stdin` form is for deliberately redirected non-interactive input and
-rejects a TTY before reading. The key is written to `.env.json` and is never
+rejects a TTY before reading. The key is written to `.arcane.env.json` and is never
 accepted in argv or returned in status output. The optional profile defaults
 to `mail`, which selects top-level `RESEND_API_KEY`. Any other exact profile
 selects `MAIL_PROFILES[profile].RESEND_API_KEY`, with no default-key fallback.
@@ -838,10 +838,10 @@ The minimal file is:
 }
 ```
 
-Fill in the key before starting mail, and add `.env.json` to the project's
+Fill in the key before starting mail, and add `.arcane.env.json` to the project's
 `.gitignore`; the SDK repository already ignores it. Set and delete preserve
 the file's other settings and profiles. Status returns the selected profile,
-`provider:'resend'`, `storage:'.env.json'`, and `exists`. Delete returns
+`provider:'resend'`, `storage:'.arcane.env.json'`, and `exists`. Delete returns
 `exists:false` for both a removed and an already-absent credential.
 
 Programmatic `createToolchain().mail(...)` resolves the configuration directory
@@ -852,6 +852,12 @@ Existing Windows Credential Manager records remain untouched; the JSON reader
 does not migrate or fall back to them. Mail reads JSON directly and does not
 populate or depend on process environment variables for this key.
 
+The SDK's installation directory does not affect this location. With an SDK
+under `my-site/arcane-os-sdk/`, run the command from `my-site/` and keep
+`my-site/.arcane.env.json` alongside that directory. Existing deployments using
+SDK 0.22.1 or earlier must rename `.env.json` to `.arcane.env.json` while
+preserving its contents; the loader reads only the new name.
+
 Missing files or missing/empty selected keys stop `send` and `serve` with the
 configuration path and exact JSON setting to fill in. Invalid JSON and file
 access failures remain observable without printing credential content.
@@ -887,7 +893,7 @@ Resend owns their accepted shape. The adapter removes the application-only
 `type` field and applies `--from` when supplied; otherwise the report or provider
 template supplies the sender. Direct CLI sending has
 no configured fallback recipients. The Resend credential comes only from the
-selected `.env.json` profile; omitting `--profile` selects `mail`. Neither the
+selected `.arcane.env.json` profile; omitting `--profile` selects `mail`. Neither the
 key nor report content is accepted through argv or process environment variables.
 
 The caller owns the nonempty `--report-key`, which is forwarded unchanged.
@@ -912,7 +918,7 @@ loss after the attempt begins is ambiguous because Resend may have accepted it.
 arcane mail serve [--profile <profile>] [--from <verified-sender>] [--app <label>] [--origin <exact-origin>] [--allow-to <addresses>] [--host 0.0.0.0] [--port 4433] [--request-timeout <ms>]
 ```
 
-The selected `.env.json` profile supplies only the server-side Resend API key;
+The selected `.arcane.env.json` profile supplies only the server-side Resend API key;
 omitting `--profile` selects `mail`.
 
 Add the listener's certificate configuration at the top level of the same file:
@@ -926,10 +932,10 @@ Add the listener's certificate configuration at the top level of the same file:
 ```
 
 Supply an existing PEM certificate chain and its private key. Paths resolve
-relative to `.env.json`, or may be absolute. They are shared across provider
+relative to `.arcane.env.json`, or may be absolute. They are shared across provider
 profiles. Missing TLS settings name the fields to fill in before a listener
 opens; the TLS owner reports PEM file errors. Keep private-key material outside
-tracked source. The SDK repository already ignores `.arcane/` and `.env.json`.
+tracked source. The SDK repository already ignores `.arcane/` and `.arcane.env.json`.
 
 The selected `node-http-server` module negotiates HTTP/2 with HTTP/1.1 fallback
 on the same HTTPS port, default `4433`, with no plain-HTTP listener. Callers use

package/docs/reference/mail.md

@@ -13,7 +13,7 @@ gateway and is never included in browser or WebAssembly state.
 | `MailTransport.mjs` | Browser, WebView, or compatible Fetch host | Sends one already-persisted request to the configured Arcane gateway with the stable report key as its idempotency key. |
 | `arcane mail send` | Node on the local machine | Reads one complete provider-neutral report from redirected stdin and performs one explicit Resend attempt with a caller-owned idempotency key. |
 | `arcane mail serve` | Node on the configured host | Owns caller verification, protects the provider credential, applies explicitly configured recipient and origin settings, and makes one server-side Resend request. |
-| `arcane mail key ...` | Node on Windows, Linux, or macOS | Stores, inspects, or deletes a Resend API key in the selected `.env.json`. |
+| `arcane mail key ...` | Node on Windows, Linux, or macOS | Stores, inspects, or deletes a Resend API key in the selected `.arcane.env.json`. |
 
 The browser never receives the Resend API key. The gateway never writes that
 key to source, argv, logs, events, fixtures, browser storage, or its public
@@ -56,7 +56,7 @@ browser import while preserving one shared CLI/toolchain implementation.
 Arcane Mail deliberately separates two credentials:
 
 - The **Resend API key** is provider authority. The Node process reads it from
-  `.env.json`. `arcane mail key set [profile]` can store it there through hidden
+  `.arcane.env.json`. `arcane mail key set [profile]` can store it there through hidden
   input; `mail send` and `mail serve` read the selected profile inside that process.
 - The **subscription key** is the application user's subscription credential.
   When present, the browser sends it as `Authorization: Bearer <subscriptionKey>`,
@@ -272,31 +272,78 @@ committed acceptance result.
 
 ## Operate the CLI and gateway
 
-Create `.env.json` in the directory from which the mail command runs, then fill
-in the provider key and the HTTPS certificate paths:
+Keep app-supplied SDK settings under named capability members, starting with
+`mail`. Put the nonsecret mail settings in `arcane.config.json` in the directory
+from which the command runs:
 
 ```json
 {
-  "RESEND_API_KEY": "",
-  "MAIL_TLS_CERT_PATH": "",
-  "MAIL_TLS_KEY_PATH": ""
+  "mail": {
+    "host": "0.0.0.0",
+    "port": 4433,
+    "origins": [
+      "https://dragons.example",
+      "https://www.dragons.example"
+    ],
+    "profile": "mail",
+    "certPath": "certificates/fullchain.pem",
+    "keyPath": "certificates/private-key.pem"
+  }
 }
 ```
 
-The SDK repository ignores `.env.json`. Keep the same entry in a consuming
-project's `.gitignore`. This is a JSON configuration file; the mail commands
-read it directly without copying its contents into `process.env`.
+Put the Resend provider key in the separate `.arcane.env.json`:
 
-The default profile is `mail`, which selects top-level `RESEND_API_KEY`.
-The explicit `--profile mail` form selects the same setting. Other profile names
-select exact entries under `MAIL_PROFILES`:
+```json
+{
+  "mail": {
+    "apiKey": ""
+  }
+}
+```
+
+The SDK repository ignores `.arcane.env.json`. Keep the same entry in a consuming
+project's `.gitignore`. `arcane.config.json` contains settings suitable for source
+control; its certificate fields contain file paths, never PEM contents or provider
+keys. Both files are read directly as JSON without copying values into
+`process.env`. Other top-level capability members remain untouched. The portable
+browser `arcane-os/mail` import does not read these Node-side files.
+
+The supported `arcane.config.json.mail` fields are:
+
+| Field | Type | Purpose and default |
+| --- | --- | --- |
+| `host` | string | Listener bind address; defaults to `0.0.0.0`. |
+| `port` | integer | Listener port; defaults to `4433`. Explicit `0` selects an available port. |
+| `origins` | string array | Exact allowed browser origins. An absent or empty list uses the current request authority as described below. |
+| `profile` | string | Resend credential profile for send/serve; defaults to `mail`. |
+| `from` | string | Optional shared sender override. Omit it to retain each report's sender or provider template default. |
+| `appId` | string | Optional server event label; does not restrict incoming application names. |
+| `recipientAllowlist` | string array | Optional allowed recipients; absent or empty means unrestricted recipients. |
+| `errorRecipients` | string array | Error-report fallback recipients; defaults to the effective recipient allowlist. An explicit empty array supplies no fallback. |
+| `bodyTimeoutMs` | integer or null | Optional request-body deadline in milliseconds; absent or null adds no deadline. |
+| `providerTimeoutMs` | integer or null | Optional provider deadline in milliseconds; absent or null adds no deadline. |
+| `retryableDelayMs` | positive integer | Retry guidance in a retryable result; defaults to `1000`. It does not schedule a retry. |
+| `certPath` | string | PEM certificate-chain file path, required for gateway HTTPS. |
+| `keyPath` | string | PEM private-key file path, required for gateway HTTPS. |
+
+Resend is the supported provider; no provider selector is needed. Keep callbacks,
+injected providers, `fetchImpl`, `onEvent`, `requestIdFactory`,
+`verifySubscription`, and `AbortSignal` values in programmatic options. They are
+runtime inputs, not JSON settings. Reports and their idempotency keys remain
+inputs to each send operation.
+
+The default credential profile `mail` selects `.arcane.env.json.mail.apiKey`.
+Other profile names select exact entries in `.arcane.env.json.mail.profiles`:
 
 ```json
 {
-  "RESEND_API_KEY": "",
-  "MAIL_PROFILES": {
-    "another-provider-account": {
-      "RESEND_API_KEY": ""
+  "mail": {
+    "apiKey": "",
+    "profiles": {
+      "another-provider-account": {
+        "apiKey": ""
+      }
     }
   }
 }
@@ -304,13 +351,67 @@ select exact entries under `MAIL_PROFILES`:
 
 An absent named profile does not fall back to the default key. The profile
 selects Resend provider credentials; it is separate from the incoming
-application name and subscriber key.
+application name and subscriber key. Existing top-level `RESEND_API_KEY` and
+`MAIL_PROFILES[profile].RESEND_API_KEY` remain supported. A nested selected
+`apiKey` takes precedence when the property exists, including null or an empty
+string, which means the selected key is absent. Only an absent nested key
+property permits fallback to the corresponding legacy key.
 
-Programmatic operations resolve `.env.json` from `options.cwd`, then
+Programmatic operations resolve both files from `options.cwd`, then
 `options.workspaceRoot`, then `process.cwd()`, choosing the first supplied
 directory. The CLI uses its invocation directory. There is no upward directory
 search or dependency on a Windows installation directory or temporary-directory
-environment variable.
+environment variable. Missing files are optional configuration sources; send and
+serve still report their missing required values before attempting delivery or
+binding. Malformed or unreadable files produce an error.
+
+Configuration precedence is explicit:
+
+1. A CLI/API option overrides its file setting when its value is not `undefined`.
+   An explicit null retains the option's existing meaning; it does not select
+   the file value again.
+2. `arcane.config.json.mail` supplies nonsecret settings absent from those options.
+3. Legacy `.arcane.env.json` root `MAIL_TLS_CERT_PATH` and `MAIL_TLS_KEY_PATH`
+   supply certificate paths absent from the selected options and config member.
+4. Remaining settings use the defaults above.
+
+The existing programmatic aliases `origin`, `allowTo`, `errorTo`, and
+`requestTimeout` take precedence over their corresponding canonical options
+`origins`, `recipientAllowlist`, `errorRecipients`, and `providerTimeoutMs` when
+both are supplied. The CLI continues to expose `--origin`, `--allow-to`, and
+`--request-timeout`. `origin` accepts a string or an array; the recipient aliases
+accept address arrays or comma-separated strings. Lists replace the lower-priority
+list completely. The configuration reader does not concatenate or deduplicate
+lists, rewrite case, or automatically add local addresses.
+
+Use the JSON `origins` array for multiple origins. Repeating the current
+`--origin` option keeps only its last value; there is no `--origins` CLI option.
+The CLI leaves omitted host, port, and send/serve profile options unset until
+configuration resolves, so its defaults do not mask file settings.
+
+Keep the configuration in the deployment directory even when the SDK is nested
+below it:
+
+```text
+my-site/
+├── arcane.config.json
+├── .arcane.env.json
+└── arcane-os-sdk/
+    └── bin/arcane.mjs
+```
+
+Run from `my-site`, for example:
+
+```sh
+node ./arcane-os-sdk/bin/arcane.mjs mail serve
+```
+
+The SDK directory does not choose the configuration location. When upgrading
+from SDK 0.22.1 or earlier, rename the existing `.env.json` to
+`.arcane.env.json` in the invocation directory, preserving its contents.
+The secret loader reads only `.arcane.env.json`; it does not read the old filename.
+Existing root key, profile, and TLS fields can remain in that file. Adopting the
+capability members does not perform an automatic rewrite or migration.
 
 The existing key commands manage the same file:
 
@@ -322,9 +423,15 @@ arcane mail key delete
 
 `key set` prompts with hidden input. `--secret-stdin` is the explicit
 non-interactive alternative and rejects a TTY. Each command accepts an optional
-profile argument, defaulting to `mail`. Set and delete preserve other JSON
-settings and profiles; status reports existence without returning the key.
-Results identify `storage: '.env.json'`. An already-absent deletion succeeds
+profile argument, defaulting to `mail` independently of `arcane.config.json.mail.profile`.
+Set and delete preserve other JSON settings and profiles; status reports
+existence without returning the key. A new credential is written to the nested
+mail member. An existing legacy credential is updated at its existing location
+unless the selected nested key property exists, in which case set updates that
+nested property. Delete removes both representations of only the selected key,
+so an older key cannot reappear through fallback. Other settings and profile
+containers remain intact.
+Results identify `storage: '.arcane.env.json'`. An already-absent deletion succeeds
 with `exists: false`.
 
 Existing Windows Credential Manager records remain untouched. The JSON path
@@ -358,19 +465,28 @@ cancellation after the provider attempt begins is returned as an ambiguous
 nonzero outcome because the provider may already have accepted the request.
 Cancellation before the attempt exits 130 without sending.
 For both CLI mail operations, `--request-timeout` accepts 1 through 2147483647
-milliseconds, the Node timer range. When omitted, the SDK adds no provider
-deadline.
+milliseconds, the Node timer range. The same range applies to configured body
+and provider deadlines. When no provider timeout is selected in options or
+configuration, the SDK adds no provider deadline.
+
+`mail send` consumes the selected profile, sender, provider timeout, and retry
+guidance from the same configuration. It does not require gateway TLS paths.
+Send and serve read each required JSON file once, concurrently when both are
+needed, before consuming their settings. An injected `readCredential` remains
+the credential owner and reads once. With that injection, send reads only
+`arcane.config.json`; serve also reads `.arcane.env.json` for legacy TLS paths
+without interpreting its unused file credential.
 
 Start the gateway:
 
 ```text
-npm exec -- arcane mail serve --profile mail --host 0.0.0.0 --port 4433
+npm exec -- arcane mail serve
 ```
 
-The default listener is `0.0.0.0:4433`; `--host` and `--port` select its bind
-address and port. The server can serve callers from multiple domains on the
-same machine. Route the page's `/v1/mail` to this listener, or configure an
-explicit shared endpoint in the caller.
+The default listener is `0.0.0.0:4433`; `mail.host` and `mail.port` select its
+configured bind address and port, and explicit `--host` / `--port` override them.
+The server can serve callers from multiple domains on the same machine.
+Configure the caller's endpoint to reach that listener.
 
 `mail serve` uses HTTPS with HTTP/2 on that selected port. The published
 `node-http-server` PEM API owns TLS and negotiates HTTP/2 or HTTP/1.1 on the
@@ -378,25 +494,29 @@ same listener. It creates no additional plain-HTTP listener. The returned URL
 uses `https://`; `0.0.0.0` is the bind address, so callers use the deployed
 domain, for example `https://mail.example.com:4433/v1/mail`.
 
-Set `MAIL_TLS_CERT_PATH` to the PEM certificate chain and `MAIL_TLS_KEY_PATH`
-to its PEM private-key file. These top-level settings belong to the listener
-and apply regardless of the selected provider profile. Relative paths resolve
-from the directory containing `.env.json`; absolute paths are also accepted.
+Set `arcane.config.json.mail.certPath` to the PEM certificate chain and
+`mail.keyPath` to its PEM private-key file. These settings belong to the listener
+and apply regardless of the selected provider profile. The legacy root
+`MAIL_TLS_CERT_PATH` and `MAIL_TLS_KEY_PATH` fields in `.arcane.env.json` remain
+fallbacks. Relative certificate paths resolve from the selected configuration
+directory, including explicit programmatic path options; absolute paths are also accepted.
 The certificate must cover the hostname callers use. One certificate may
 cover multiple names; the gateway does not require one certificate per calling
 application. Keep private-key files outside tracked source, such as in the
 already-ignored `.arcane/` directory or an existing host certificate directory.
 
-Startup reads the JSON configuration once, reports missing TLS settings before
+Startup reads each JSON file once, reports missing TLS settings before
 binding, and lets the TLS owner report unreadable or unusable PEM files. It
 does not generate certificates, modify system trust, or add a renewal watcher.
+No JSON configuration file is reread for an incoming HTTP request.
 Restart the gateway after the configured certificate files are renewed.
 The same Node file and TLS APIs are used on Windows, Linux, and macOS; Android
 requires a compatible Node host and accessible configuration and certificate
 paths. These platform contracts are separate from actual platform execution.
 
 The public `createToolchain().mail({action: 'serve', ...options})` operation
-uses the same JSON certificate pair. Internally, `startResendMailServer` accepts
+uses the same settings with explicit options taking precedence. Internally,
+`startResendMailServer` accepts
 `certPath` and `keyPath` and retains its existing HTTP behavior when neither
 is supplied. That internal function is not an npm package export.
 
@@ -408,18 +528,25 @@ The existing listener remains running; this launch does not retry or select
 another port.
 
 `--app` is an optional server event label and does not restrict incoming
-application names. `--from` is an optional shared sender override; omit it to
-preserve each report's sender or its provider template's default.
-`--origin` selects an exact allowed caller origin; the
-programmatic `origin` option also accepts an array for multiple origins. With
-no origins configured, the gateway accepts an Origin matching its request
+application names. `--from` and `mail.from` are optional shared sender overrides;
+omit both to preserve each report's sender or its provider template's default.
+`mail.origins` supplies an array of exact allowed caller origins. An explicit
+`--origin` replaces that array; the programmatic `origin` alias also accepts an
+array. With no origins configured, the gateway accepts an Origin matching its request
 authority (`:authority` for HTTP/2, `Host` for HTTP/1.1) using HTTP or HTTPS.
-Requests without Origin continue normally.
+An Origin outside the configured list or current-authority default receives
+`403 mail_origin_not_allowed`. Origin strings are compared exactly: include the
+scheme and any nondefault port, with no path or trailing slash. There are no
+wildcards, subdomain expansion, normalization, or loopback exceptions.
+Requests without an `Origin` header continue normally. This is a declared-origin
+CORS list, not a client-IP or connecting-machine allowlist; ordinary
+server-to-server requests commonly omit Origin.
 Cross-origin preflight permits `Content-Type`, `Idempotency-Key`, `X-Mail-App`,
-and `Authorization`. This is origin configuration, not a loopback policy.
+and `Authorization`.
 
-`--allow-to` explicitly limits recipients when supplied. With it omitted, the
-gateway imposes no recipient allowlist. When configured, the list applies to
+`mail.recipientAllowlist` or explicit `--allow-to` limits recipients when
+configured. An absent or empty effective list imposes no recipient allowlist.
+When configured, the list applies to
 every recipient in the resolved `to`, `cc`, and `bcc` fields, whether supplied
 as a string or an array. Sender, recipient, subject, and body
 values are not trimmed, lowercased, or filtered by an SDK email grammar at

package/docs/reviews/mail-server-purpose-review.md

@@ -1,10 +1,10 @@
-[Roshi's Codex PRIME] The gateway review and its portable credential follow-up apply the same three purpose gates. The gateway removals preserve complete delivery outcomes, configured CORS and recipient policy, and the optional subscription verifier. Mail credentials now belong in the user-selected `.env.json`, with one portable Node implementation for Windows, Linux, and macOS and a compatible Node host as the Android adaptation boundary. The original gateway inventory below uses baseline `f055e05`; the credential follow-up reviews the Windows storage implementation present at SDK `0.18.0`. Commit, package, publication, and actual platform execution outcomes belong to the delivery record rather than to this source-review report.
+[Roshi's Codex PRIME] The gateway review and its portable credential follow-up apply the same three purpose gates. The gateway removals preserve complete delivery outcomes, configured CORS and recipient policy, and the optional subscription verifier. Mail credentials now belong in the user-selected `.arcane.env.json`, with one portable Node implementation for Windows, Linux, and macOS and a compatible Node host as the Android adaptation boundary. The original gateway inventory below uses baseline `f055e05`; the credential follow-up reviews the Windows storage implementation present at SDK `0.18.0`. Commit, package, publication, and actual platform execution outcomes belong to the delivery record rather than to this source-review report.
 
 | Decision | Behavior | Why it matters | Source status at this review |
 | --- | --- | --- | --- |
 | Remove | Loopback-only admission, manual header reconstruction, address/origin normalization, local payload grammar, manual content-length scan, dead queue knobs | These restrict supported use, rewrite supplied values, or repeat work already owned elsewhere. | Removed from the inspected source; naming-only changes carry no runtime claim. |
 | Remove and replace | Local app-key hashes and X-Mail-Key authentication | The selected application plus bearer subscription contract needs an actual verifier, not a local shared-key comparison. | Removed. Optional `verifySubscription` implements the local integration contract; the remote endpoint adapter remains future work. Initial setup without that callback performs no caller authentication. |
-| Remove and replace | Windows-only credential process, native interop, helper timers, environment prerequisites, encoding and input/output limits | They prevent the required portable startup and perform work absent from the selected JSON storage path. | Replaced by direct `.env.json` access. Existing Windows credential records remain untouched. Default and named credential operations remain useful and are preserved. |
+| Remove and replace | Windows-only credential process, native interop, helper timers, environment prerequisites, encoding and input/output limits | They prevent the required portable startup and perform work absent from the selected JSON storage path. | Replaced by direct `.arcane.env.json` access. Existing Windows credential records remain untouched. Default and named credential operations remain useful and are preserved. |
 | Simplify | Exact CORS policy, one configuration resolution, one provider request construction/serialization, optional observation | Preserve the intended result while eliminating repeated parsing, copies, policy structures, and absent-observer work. | Present in inspected source. Explicit nonempty origin lists remain authoritative; otherwise the nominal-domain default applies. |
 | Keep | Configured subscription authentication, explicit recipient policy/fallback, stable idempotency, real cancellation/deadlines, complete provider outcomes, concurrent requests and owned shutdown | These have concrete callers and determine whether mail is sent, retried, reported honestly, or stopped correctly. | Retained. Only a verifier result of `true` permits authenticated delivery; failures and cancellation prevent the provider attempt. |
 
@@ -35,7 +35,7 @@ The latest user-selected boundaries govern this review:
 - Explicit recipient allowlists and error-recipient fallback remain. A configured nonempty allowlist covers resolved `to`, `cc`, and `bcc` recipients; allowing additional provider fields must not bypass the selected recipient policy. With no allowlist, the policy performs no recipient scan. Per-address trimming, lowercasing, and local email grammar do not remain.
 - Caller-selected deadlines, the cancellation adapter, complete provider outcomes, retry classification, stable idempotency, and independently constructed snapshots for emitted observations remain. Shared mutable provider snapshots have not been selected.
 - Remove manual response content-length scanning, duplicate configuration/CORS construction, unobserved event payload creation, unused `allowZero`, and unused CLI queue options.
-- All SDK mail operations require a functional Windows, Linux, and macOS path, with Android adaptation at the host boundary. Read provider configuration directly from an ignored `.env.json`; an operating-system limitation notice does not satisfy the portable requirement. Default profile `mail` uses `RESEND_API_KEY`; other exact names use `MAIL_PROFILES[profile].RESEND_API_KEY`. Missing configuration must identify the file and setting to fill in. Existing Windows records remain untouched, without an automatic read or migration.
+- All SDK mail operations require a functional Windows, Linux, and macOS path, with Android adaptation at the host boundary. Read provider configuration directly from an ignored `.arcane.env.json`; an operating-system limitation notice does not satisfy the portable requirement. Default profile `mail` uses `RESEND_API_KEY`; other exact names use `MAIL_PROFILES[profile].RESEND_API_KEY`. Missing configuration must identify the file and setting to fill in. Existing Windows records remain untouched, without an automatic read or migration.
 
 Source inspection during this report's handoff shows local app/email/sender/API-key format validators and loopback admission removed; origin values retained in one Set; complete provider JSON values or raw response text preserved; template-shaped provider requests no longer required to supply local text/HTML fields; and configuration passed once into `createConfiguredMailHandler`. Observer objects, pending Sets, callback closures, event payload reconstruction, and drain waits are absent when `onEvent` is omitted. An already-cancelled direct send stops before provider payload construction or serialization. Response writing no longer calculates content length. The fixed `/v1/mail` route accepts its query-bearing form, matching the portable endpoint parser. These are source observations, not executed behavior.
 
@@ -311,7 +311,7 @@ The coupled CLI/browser actions below are necessary to avoid leaving contradicto
 
 | Coupled path/action | Gates and decision | Required result and evidence boundary |
 | --- | --- | --- |
-| `src/mail.mjs` `serveMail` old hidden app-key input and local auth options | Y/Y/Y — Reconciled with the optional verifier contract. | Obsolete shared-app-key prompt/options are removed. Current `serveMailGateway` forwards `options.verifySubscription` to the server and keeps provider credential operations and the provider API key separate. The portable follow-up resolves that provider credential from `.env.json`. |
+| `src/mail.mjs` `serveMail` old hidden app-key input and local auth options | Y/Y/Y — Reconciled with the optional verifier contract. | Obsolete shared-app-key prompt/options are removed. Current `serveMailGateway` forwards `options.verifySubscription` to the server and keeps provider credential operations and the provider API key separate. The portable follow-up resolves that provider credential from `.arcane.env.json`. |
 | `src/mail.mjs` `recipientList` and origin list preparation | Y/Y/Y — Remove redundant rewriting, preserve configured policy values. | Gateway and CLI must not disagree about preserved recipients/origins. An exact allowlist is still an intentional policy. |
 | `src/mail.mjs` `withoutMailCredentials` | N/N/Y for recursive payload-key redaction — Remove. | It recursively traversed/copied complete results and deleted any content property named `apiKey` or `appKey`, including ordinary user payload fields. Keep actual transport credentials outside constructed public results at their owning boundary; do not rewrite the report based on property names. Source inspection shows this traversal removed. |
 | `src/mail.mjs` `completeSendFailure` | Y/Y/Y — Remove helper after preserving the complete result directly. | Failure output still contains the provider result, or a narrow wrapper for a non-object injected result. No recursive copying/redaction pass remains. |
@@ -378,7 +378,7 @@ Existing native credential records are neither read nor changed.
 | `setMailCredential`, `readMailCredential`, `getMailCredentialStatus`, `deleteMailCredential` | Y/Y/Y | Preserve all four operations and replace their implementation. Explicit set/delete update only the selected credential field while preserving other settings and profiles; read returns the selected key or null; status reports existence. File access uses portable Node APIs. |
 | `mailCredentialOptions`, `readMailProviderKey` | Y/Y/Y | Keep shared command configuration and consolidate the real send/serve duplicate key-read error path. Remove Windows runner, helper directory, and helper timeout forwarding. Missing configuration names the exact JSON setting and file before opening a listener or attempting delivery. |
 | CLI required profile flag and omitted invocation directory | Y/Y/Y | Make the profile optional with default `mail`, retaining explicit profiles. Forward the invocation directory through every mail operation, so the CLI reads the operator's selected file. Preserve hidden/stdin key entry and existing send/serve lifecycle. |
-| Repository and workspace-template `.gitignore` entry | Y/Y/N | Keep `.env.json` out of source control in this checkout and newly generated workspaces. The populated local file is outside the committed and published change. |
+| Repository and workspace-template `.gitignore` entry | Y/Y/N | Keep `.arcane.env.json` out of source control in this checkout and newly generated workspaces. The populated local file is outside the committed and published change. |
 
 The credential path performs one file read per selected operation and one write
 only for an explicit set or a deletion that finds a credential. Startup reads
@@ -402,7 +402,7 @@ subscription callback, sender selection, recipient configuration and cancellatio
 
 | Method or action | Gates | Decision, callers, and concrete purpose |
 | --- | --- | --- |
-| `readMailServerSettings` | Y/Y/N | Read the same `.env.json` once for server startup, select the existing provider profile and resolve the two shared PEM path settings relative to that file. This avoids a second configuration read and platform-specific credential or certificate processes. |
+| `readMailServerSettings` | Y/Y/N | Read the same `.arcane.env.json` once for server startup, select the existing provider profile and resolve the two shared PEM path settings relative to that file. This avoids a second configuration read and platform-specific credential or certificate processes. |
 | `readMailProviderKey` and `serveMailGateway` | Y/Y/N | Preserve the existing credential-injection interface and missing-provider error while consuming the already-read startup key. Require the selected TLS pair before binding; forward only the paths to the listener. Direct provider sending and key CRUD remain unchanged. |
 | `MAIL_TLS_CERT_PATH` and `MAIL_TLS_KEY_PATH` | Y/Y/N | Clear top-level names identify certificate and private-key file paths for one listener, independently of any provider profile or calling application. Missing settings and unusable JSON values name the field without printing its content. |
 | `startResendMailServer` TLS options | Y/Y/N | Add `certPath` and `keyPath` through the module's published PEM API. HTTPS-only mode creates one listener with HTTP/2 and HTTP/1.1 negotiation on the selected port. This internal source integration retains its existing HTTP behavior when neither path is supplied; it is not an npm package export. The public toolchain mail operation requires the JSON pair. |
@@ -436,3 +436,74 @@ defaults adds no runtime work or helper. TLS negotiation, the returned endpoint
 and the occupied-port message already use the selected port. Existing test
 source was updated for the omitted-port path; explicit-port cases were retained.
 No local tests, checks or server launch were performed for this increment.
+
+## Deployment configuration filename follow-up
+
+The user selected `.arcane.env.json` in the command's invocation directory,
+independently of a nested SDK directory. `mailCredentialLocation` remains the
+single filename owner for key operations, direct sending and server startup;
+`mailCredentialStatus` reports the same new name. The directory precedence and
+relative certificate-path resolution remain unchanged.
+
+The filename change passes Y/Y/N: its name identifies Arcane configuration,
+deployment ownership makes the location useful, and removing that configuration
+would lose the provider and TLS settings. Additional filename fallbacks, upward
+searches and automatic migrations fail N/N/Y and are omitted. This rename adds
+no read, timer, helper or per-request work. Existing deployments rename their
+file with its contents intact when adopting SDK 0.23.0. Repository and generated
+workspace ignores include the new name and retain the old entry for existing
+private files. Only the intended filename and status contract change; mail
+payloads, profiles, other settings and lifecycle remain unchanged.
+
+Existing credential and CLI test fixtures now use the selected name. Source
+and diff were reviewed; local tests, checks and server execution were not run.
+
+## Capability configuration and secret separation follow-up
+
+The selected outcome is one app-authored mail configuration in
+`arcane.config.json.mail`, with Resend credentials in ignored
+`.arcane.env.json.mail`. The SDK owns reading and applying these settings through
+the existing CLI/toolchain mail operation. Domains, senders, certificates, and
+provider accounts remain deployment-owned data. This increment begins the
+named-capability configuration convention with mail; it does not migrate other
+capabilities or consumer files.
+
+The source audit found no existing `arcane.config.json` reader to reuse. The
+workspace loader owns `arcane-packager.json`, descriptors, and application
+layout. Requiring that loader to start a mail listener would add unrelated work.
+The existing mail JSON reader is the reusable boundary for the two selected
+files. Their explicit precedence and credential compatibility rules are in the
+[mail reference](../reference/mail.md#operate-the-cli-and-gateway).
+
+| Method or action | Gates | Decision, callers, and concrete purpose |
+| --- | --- | --- |
+| `readMailConfiguration` | Y/Y/N | Keep the cohesive configuration at the SDK owner. Send/serve read each required file once, in parallel when both are needed. A send with an injected credential reader skips the unused secrets file; incoming HTTP requests use the resolved configuration without file reads. Other capability settings stay untouched. |
+| CLI's early default host, port, and send/serve profile values | Y/Y/Y | Remove premature default assignment. The same defaults remain after file configuration resolves, while explicit CLI values retain priority. Assigning defaults before reading JSON would conceal the deployment's chosen settings. |
+| `origins` string array and list replacement | Y/Y/N | Keep one exact list for multiple caller domains. Explicit options replace the file list, including empty arrays. Existing `origin`, `allowTo`, `errorTo`, and `requestTimeout` aliases remain compatible and win over their canonical programmatic names when both are supplied. No normalization or list-merging helper is needed. |
+| Root provider-key, named-profile, and TLS compatibility | Y/Y/N | Preserve live deployments using `RESEND_API_KEY`, `MAIL_PROFILES`, `MAIL_TLS_CERT_PATH`, and `MAIL_TLS_KEY_PATH`. Nested selected key presence takes priority even when null or empty. Named profiles never select a different account's default key. |
+| Key set/status/delete operations | Y/Y/N | Preserve credential management and secret-free status. New keys use the nested member; existing legacy keys are updated in place unless a nested key exists. Delete removes both selected representations to prevent an old credential reappearing, preserving other keys, settings, and profile containers. Key commands still default to `mail` independently of the serving profile. |
+| Send configuration | Y/Y/N | Use the same profile, sender, provider-timeout, and retry-guidance settings for direct sending. A send needs provider authority and its report, so listener certificates remain a serve-only prerequisite. Reports and idempotency keys remain per-operation inputs. |
+| Explicit runtime dependencies and callbacks | Y/Y/N | Preserve `readCredential`, provider injection, observation, cancellation, and subscription callbacks as programmatic inputs. A function or signal is not JSON configuration. The portable browser mail import retains its existing dependency boundary. |
+| Shared sender omission | Y/Y/N | Preserve per-report `from` and provider-template sender selection when no shared override is configured. One listener can therefore serve independent application sender identities. |
+| Origin rejection behavior and explanation | Y/Y/N | Document the existing `403 mail_origin_not_allowed`, exact current-authority default, acceptance without Origin, and absence of IP filtering or loopback exceptions. This clarifies the retained behavior without adding admission policy. |
+| New provider selector, per-field helper hierarchy, consumer parser, CLI-generation layer, automatic migration, watcher, and request-time config reads | N/N/Y | Add none. Resend is the sole implemented provider, the selected settings fit one owner, and existing CLI/API options express overrides. These additions would increase work without changing the requested outcome. |
+
+The operation graph is at most two asynchronous JSON reads and one selected
+credential per send/serve invocation, followed by its existing provider attempt
+or listener lifecycle. A send with an injected credential reader reads only
+`arcane.config.json` and calls that reader once. Key operations retain one
+credential-file read and a write only when
+the requested set/delete needs one. Certificate contents are still loaded by
+the published HTTP server module. No dependency, process, polling loop, cache,
+or application/host fan-out is introduced. These are source-level work counts,
+not measured performance claims.
+
+The compatibility audit traces the CLI into `executeMailCommand`, the public
+`createToolchain().mail(...)` / `executeOperation('mail', ...)` entry points,
+credential CRUD, direct send, and serve. The complete report and provider-result
+paths are preserved. Configuration paths use the same portable Node filesystem
+contract on Windows, Linux, and macOS, with a compatible Node host as the Android
+adaptation. Local tests, checks, server launches, live mail sends, and platform
+execution were not performed by this documentation author. Selected package
+verification and publication outcomes belong to the release owner's delivery
+record.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcane-os",
-  "version": "0.22.1",
+  "version": "0.24.0",
   "description": "Arcane OS JavaScript SDK, project-local CLI, browser runtime, and repository-portable application packager.",
   "type": "module",
   "main": "./src/index.mjs",

package/src/cli/main.mjs

@@ -86,7 +86,7 @@ Usage:
   ${CLI_NAME} mail key delete [profile]
   ${CLI_NAME} mail send [--profile <profile>] [--from <address>] --report-key <id> --report-stdin [--request-timeout <ms>]
   ${CLI_NAME} mail serve [--profile <profile>] [--from <address>] [--app <label>] [--origin <origin>] [--allow-to <addresses>] [--host 0.0.0.0] [--port 4433] [--request-timeout <ms>]
-    HTTPS/HTTP2; .env.json supplies RESEND_API_KEY, MAIL_TLS_CERT_PATH, and MAIL_TLS_KEY_PATH.
+    HTTPS/HTTP2; arcane.config.json.mail supplies settings; .arcane.env.json supplies keys.
 
 Development:
   --public                      Bind dev to all IPv4 interfaces (0.0.0.0) and print network URLs.
@@ -692,13 +692,13 @@ function operationOptions(command,parsed,cwd){
             return {
                 action:'serve',
                 cwd,
-                profile:values.profile??'mail',
+                profile:values.profile,
                 from:values.from,
                 appId:values.app,
                 origin:values.origin,
                 allowTo:values['allow-to'],
-                host:values.host??'0.0.0.0',
-                port:readPort(values.port,4433),
+                host:values.host,
+                port:readPort(values.port),
                 requestTimeout:readMailRequestTimeout(values['request-timeout']),
             };
         }
@@ -721,7 +721,7 @@ function operationOptions(command,parsed,cwd){
             return {
                 action:'send',
                 cwd,
-                profile:values.profile??'mail',
+                profile:values.profile,
                 from:values.from,
                 reportKey:values['report-key'],
                 reportStdin:true,

package/src/mail-credentials.mjs

@@ -11,7 +11,7 @@ export function mailCredentialLocation(options={}){
         throw new ArcaneError(ERROR_CODES.usage,'Mail credential profile must be a nonempty string.');
     }
     return {
-        filePath:path.resolve(options.cwd??options.workspaceRoot??process.cwd(),'.env.json'),
+        filePath:path.resolve(options.cwd??options.workspaceRoot??process.cwd(),'.arcane.env.json'),
         profile,
         setting:profile==='mail'?'RESEND_API_KEY':`MAIL_PROFILES[${JSON.stringify(profile)}].RESEND_API_KEY`
     };
@@ -41,45 +41,70 @@ async function readMailSettings(filePath,signal){
     return settings;
 }
 
-function mailProfileSettings(settings,location){
+function mailProfileSettings(settings,location,nested=false){
+    const source=nested?settings.mail:settings;
+    if(source===undefined)return undefined;
+    if(!source||!is.object(source)||is.array(source)){
+        throw new ArcaneError(ERROR_CODES.usage,`mail in ${location.filePath} must be an object.`);
+    }
     if(location.profile==='mail'){
-        return settings;
+        return source;
     }
-    if(settings.MAIL_PROFILES===undefined){
+    const profiles=nested?source.profiles:source.MAIL_PROFILES;
+    const label=nested?'mail.profiles':'MAIL_PROFILES';
+    if(profiles===undefined){
         return undefined;
     }
-    if(!settings.MAIL_PROFILES||!is.object(settings.MAIL_PROFILES)||is.array(settings.MAIL_PROFILES)){
-        throw new ArcaneError(ERROR_CODES.usage,`MAIL_PROFILES in ${location.filePath} must be an object.`);
+    if(!profiles||!is.object(profiles)||is.array(profiles)){
+        throw new ArcaneError(ERROR_CODES.usage,`${label} in ${location.filePath} must be an object.`);
     }
-    if(!Object.hasOwn(settings.MAIL_PROFILES,location.profile)){
+    if(!Object.hasOwn(profiles,location.profile)){
         return undefined;
     }
-    const profileSettings=settings.MAIL_PROFILES[location.profile];
+    const profileSettings=profiles[location.profile];
     if(!profileSettings||!is.object(profileSettings)||is.array(profileSettings)){
         throw new ArcaneError(
             ERROR_CODES.usage,
-            `MAIL_PROFILES[${JSON.stringify(location.profile)}] in ${location.filePath} must be an object.`
+            `${label}[${JSON.stringify(location.profile)}] in ${location.filePath} must be an object.`
         );
     }
     return profileSettings;
 }
 
+function mailCredentialEntry(settings, location) {
+    const nestedSettings = mailProfileSettings(settings, location, true);
+    const nestedEntry = {
+        profileSettings: nestedSettings,
+        key: 'apiKey',
+        setting: location.profile === 'mail'
+            ? 'mail.apiKey'
+            : `mail.profiles[${JSON.stringify(location.profile)}].apiKey`
+    };
+    if (nestedSettings && Object.hasOwn(nestedSettings, 'apiKey')) return nestedEntry;
+    const legacySettings = mailProfileSettings(settings, location);
+    if (legacySettings && Object.hasOwn(legacySettings, 'RESEND_API_KEY')) {
+        return {profileSettings: legacySettings, key: 'RESEND_API_KEY', setting: location.setting};
+    }
+    return nestedEntry;
+}
+
 function configuredMailKey(settings,location){
-    const apiKey=mailProfileSettings(settings,location)?.RESEND_API_KEY;
+    const entry=mailCredentialEntry(settings,location);
+    const apiKey=entry.profileSettings?.[entry.key];
     if(apiKey===undefined||apiKey===null||apiKey===''){
         return null;
     }
     if(!is.string(apiKey)){
         throw new ArcaneError(
             ERROR_CODES.usage,
-            `${location.setting} in ${location.filePath} must be a string.`
+            `${entry.setting} in ${location.filePath} must be a string.`
         );
     }
     return apiKey;
 }
 
 function mailCredentialStatus(profile,exists){
-    return {profile,provider:'resend',storage:'.env.json',exists};
+    return {profile,provider:'resend',storage:'.arcane.env.json',exists};
 }
 
 export async function setMailCredential(options={}){
@@ -88,16 +113,22 @@ export async function setMailCredential(options={}){
         throw new ArcaneError(ERROR_CODES.usage,'The Resend API key must be a nonempty string.');
     }
     const settings=await readMailSettings(location.filePath,options.signal);
-    const profileSettings=mailProfileSettings(settings,location);
-    const updatedProfile={...profileSettings,RESEND_API_KEY:options.secret};
-    const updatedSettings=location.profile==='mail'
-        ?updatedProfile
-        :{
-            ...settings,
-            MAIL_PROFILES:{...settings.MAIL_PROFILES,[location.profile]:updatedProfile}
-        };
+    const entry=mailCredentialEntry(settings,location);
+    if(entry.profileSettings){
+        entry.profileSettings[entry.key]=options.secret;
+    }else{
+        settings.mail??={};
+        if(location.profile==='mail'){
+            settings.mail.apiKey=options.secret;
+        }else{
+            settings.mail.profiles={
+                ...settings.mail.profiles,
+                [location.profile]:{apiKey:options.secret}
+            };
+        }
+    }
     throwIfAborted(options.signal);
-    await writeFile(location.filePath,`${JSON.stringify(updatedSettings,null,2)}\n`,{
+    await writeFile(location.filePath,`${JSON.stringify(settings,null,2)}\n`,{
         encoding:'utf8',
         mode:0o600,
         signal:options.signal
@@ -111,30 +142,58 @@ export async function readMailCredential(options={}){
     return configuredMailKey(settings,location);
 }
 
-export async function readMailServerSettings(options = {}) {
-    const location = mailCredentialLocation(options);
-    const settings = await readMailSettings(location.filePath, options.signal);
-    const serverSettings = (options.readCredential ?? null) === null
-        ? {apiKey: configuredMailKey(settings, location)}
-        : {};
+export async function readMailConfiguration(options = {}) {
+    const directory = path.resolve(options.cwd ?? options.workspaceRoot ?? process.cwd());
+    const configPath = path.join(directory, 'arcane.config.json');
+    const envPath = path.join(directory, '.arcane.env.json');
+    const readCredentialFromFile = (options.readCredential ?? null) === null;
+    const [config, secrets] = await Promise.all(
+        [
+            readMailSettings(configPath, options.signal),
+            options.action !== 'send' || readCredentialFromFile
+                ? readMailSettings(envPath, options.signal)
+                : {}
+        ]
+    );
+    const mailSettings = config.mail === undefined ? {} : config.mail;
+    if (!mailSettings || !is.object(mailSettings) || is.array(mailSettings)) {
+        throw new ArcaneError(ERROR_CODES.usage, `mail in ${configPath} must be an object.`);
+    }
+    const location = mailCredentialLocation(
+        {...options, profile: options.profile !== undefined ? options.profile : mailSettings.profile}
+    );
+    const configuration = {profile: location.profile};
+    for (const name of [
+        'host', 'port', 'origins', 'from', 'appId', 'recipientAllowlist',
+        'errorRecipients', 'bodyTimeoutMs', 'providerTimeoutMs', 'retryableDelayMs'
+    ]) {
+        if (mailSettings[name] !== undefined) configuration[name] = mailSettings[name];
+    }
+    if (readCredentialFromFile) {
+        configuration.apiKey = configuredMailKey(secrets, location);
+    }
+    // Sending a report does not consume listener certificate configuration.
+    if (options.action === 'send') return configuration;
     const tlsSettings = {
         MAIL_TLS_CERT_PATH: 'certPath',
         MAIL_TLS_KEY_PATH: 'keyPath'
     };
     for (const [setting, option] of Object.entries(tlsSettings)) {
-        const value = settings[setting];
+        const value = options[option] !== undefined
+            ? options[option]
+            : mailSettings[option] !== undefined ? mailSettings[option] : secrets[setting];
         if (value === undefined || value === null || value === '') {
             continue;
         }
         if (!is.string(value)) {
             throw new ArcaneError(
                 ERROR_CODES.usage,
-                `${setting} in ${location.filePath} must be a PEM file path string.`
+                `mail.${option} (${setting}) must be a PEM file path string.`
             );
         }
-        serverSettings[option] = path.resolve(path.dirname(location.filePath), value);
+        configuration[option] = path.resolve(directory, value);
     }
-    return serverSettings;
+    return configuration;
 }
 
 export async function getMailCredentialStatus(options={}){
@@ -146,17 +205,18 @@ export async function getMailCredentialStatus(options={}){
 export async function deleteMailCredential(options={}){
     const location=mailCredentialLocation(options);
     const settings=await readMailSettings(location.filePath,options.signal);
-    const profileSettings=mailProfileSettings(settings,location);
-    if(profileSettings&&Object.hasOwn(profileSettings,'RESEND_API_KEY')){
-        const {RESEND_API_KEY,...remainingSettings}=profileSettings;
-        const updatedSettings=location.profile==='mail'
-            ?remainingSettings
-            :{
-                ...settings,
-                MAIL_PROFILES:{...settings.MAIL_PROFILES,[location.profile]:remainingSettings}
-            };
+    let changed=false;
+    for(const nested of [true,false]){
+        const profileSettings=mailProfileSettings(settings,location,nested);
+        const key=nested?'apiKey':'RESEND_API_KEY';
+        if(profileSettings&&Object.hasOwn(profileSettings,key)){
+            delete profileSettings[key];
+            changed=true;
+        }
+    }
+    if(changed){
         throwIfAborted(options.signal);
-        await writeFile(location.filePath,`${JSON.stringify(updatedSettings,null,2)}\n`,{
+        await writeFile(location.filePath,`${JSON.stringify(settings,null,2)}\n`,{
             encoding:'utf8',
             signal:options.signal
         });

package/src/mail.mjs

@@ -5,7 +5,7 @@ import {
     getMailCredentialStatus,
     mailCredentialLocation,
     readMailCredential,
-    readMailServerSettings,
+    readMailConfiguration,
     setMailCredential
 } from './mail-credentials.mjs';
 import {sendResendMail,startResendMailServer} from './mail-server.mjs';
@@ -62,6 +62,12 @@ function mailCredentialOptions(options){
     };
 }
 
+function configuredMailOption(options, settings, name, alias = name) {
+    if (options[alias] !== undefined) return options[alias];
+    if (options[name] !== undefined) return options[name];
+    return settings[name];
+}
+
 async function setMailCredentialFromInput(options){
     const readSecret=resolveMailCommandDependency(options,'readSecret',null);
     const store=resolveMailCommandDependency(options,'setCredential',setMailCredential);
@@ -94,20 +100,23 @@ async function sendMailFromReport(options){
     throwIfAborted(options.signal);
     const report=await readReport();
     throwIfAborted(options.signal);
-    let apiKey=await readMailProviderKey(options);
+    const readConfiguration=resolveMailCommandDependency(options,'readServerSettings',readMailConfiguration);
+    const mailSettings=await readConfiguration(options);
+    throwIfAborted(options.signal);
+    let apiKey=await readMailProviderKey(options,mailSettings);
     try{
         throwIfAborted(options.signal);
         const result=await send({
             apiKey,
             appId:'arcane-cli',
             fetchImpl:options.fetchImpl,
-            from:options.from,
+            from:configuredMailOption(options,mailSettings,'from'),
             onEvent:options.onEvent,
-            providerTimeoutMs:options.requestTimeout,
+            providerTimeoutMs:configuredMailOption(options,mailSettings,'providerTimeoutMs','requestTimeout'),
             report,
             reportKey:options.reportKey,
             requestIdFactory:options.requestIdFactory,
-            retryableDelayMs:options.retryableDelayMs,
+            retryableDelayMs:configuredMailOption(options,mailSettings,'retryableDelayMs'),
             signal:options.signal
         });
         if(result?.classification==='accepted'&&result.status==='accepted'){
@@ -126,16 +135,21 @@ async function sendMailFromReport(options){
     }
 }
 
-async function readMailProviderKey(options, serverSettings){
-    const credentialOptions=mailCredentialOptions(options);
-    const apiKey = serverSettings !== undefined && (options.readCredential ?? null) === null
-        ? serverSettings.apiKey
+async function readMailProviderKey(options, mailSettings){
+    const credentialOptions=mailCredentialOptions(
+        {...options,profile:options.profile??mailSettings?.profile}
+    );
+    const apiKey = mailSettings !== undefined && (options.readCredential ?? null) === null
+        ? mailSettings.apiKey
         : await resolveMailCommandDependency(options, 'readCredential', readMailCredential)(credentialOptions);
     if(apiKey===null){
         const location=mailCredentialLocation(credentialOptions);
+        const nestedSetting = location.profile === 'mail'
+            ? 'mail.apiKey'
+            : `mail.profiles[${JSON.stringify(location.profile)}].apiKey`;
         throw new ArcaneError(
             ERROR_CODES.prerequisiteMissing,
-            `Missing ${location.setting} in ${location.filePath}.`
+            `Missing ${location.setting} or ${nestedSetting} in ${location.filePath}.`
         );
     }
     if(!is.string(apiKey)||!apiKey){
@@ -149,11 +163,9 @@ async function readMailProviderKey(options, serverSettings){
 
 async function serveMailGateway(options){
     const startServer=resolveMailCommandDependency(options,'startServer',startResendMailServer);
-    const readServerSettings = resolveMailCommandDependency(options, 'readServerSettings', readMailServerSettings);
+    const readServerSettings = resolveMailCommandDependency(options, 'readServerSettings', readMailConfiguration);
     throwIfAborted(options.signal);
-    const serverSettings = await readServerSettings(
-        {...mailCredentialOptions(options), readCredential: options.readCredential}
-    );
+    const serverSettings = await readServerSettings(options);
     throwIfAborted(options.signal);
     let apiKey=await readMailProviderKey(options, serverSettings);
     try{
@@ -165,32 +177,36 @@ async function serveMailGateway(options){
             const location = mailCredentialLocation(options);
             throw new ArcaneError(
                 ERROR_CODES.prerequisiteMissing,
-                `Missing ${missingSettings.join(', ')} in ${location.filePath}. Mail HTTPS requires a certificate and private key.`
+                `Missing ${missingSettings.join(', ')} in ${location.filePath}, or the corresponding mail.certPath/mail.keyPath in arcane.config.json. Mail HTTPS requires a certificate and private key.`
             );
         }
-        const recipientAllowlist=mailRecipientOptions(options.allowTo,'allowTo');
-        const errorRecipients=options.errorTo===undefined
+        const recipientAllowlist=mailRecipientOptions(
+            configuredMailOption(options,serverSettings,'recipientAllowlist','allowTo'),'recipientAllowlist'
+        );
+        const errorTo=configuredMailOption(options,serverSettings,'errorRecipients','errorTo');
+        const errorRecipients=errorTo===undefined
             ? recipientAllowlist
-            : mailRecipientOptions(options.errorTo,'errorTo');
+            : mailRecipientOptions(errorTo,'errorRecipients');
+        const origins=configuredMailOption(options,serverSettings,'origins','origin');
         return await startServer({
             apiKey,
-            appId:options.appId,
-            allowedOrigins:options.origin===undefined
+            appId:configuredMailOption(options,serverSettings,'appId'),
+            allowedOrigins:origins===undefined
                 ?[]
-                :is.array(options.origin)?[...options.origin]:[options.origin],
-            bodyTimeoutMs:options.bodyTimeoutMs,
+                :is.array(origins)?[...origins]:[origins],
+            bodyTimeoutMs:configuredMailOption(options,serverSettings,'bodyTimeoutMs'),
             certPath:serverSettings.certPath,
             errorRecipients,
             fetchImpl:options.fetchImpl,
-            from:options.from,
-            host:options.host??'0.0.0.0',
+            from:configuredMailOption(options,serverSettings,'from'),
+            host:configuredMailOption(options,serverSettings,'host')??'0.0.0.0',
             keyPath:serverSettings.keyPath,
             onEvent:options.onEvent,
-            port:options.port,
-            providerTimeoutMs:options.requestTimeout,
+            port:configuredMailOption(options,serverSettings,'port'),
+            providerTimeoutMs:configuredMailOption(options,serverSettings,'providerTimeoutMs','requestTimeout'),
             recipientAllowlist,
             requestIdFactory:options.requestIdFactory,
-            retryableDelayMs:options.retryableDelayMs,
+            retryableDelayMs:configuredMailOption(options,serverSettings,'retryableDelayMs'),
             signal:options.signal,
             verifySubscription:options.verifySubscription
         });

package/src/templates/workspace-template.mjs

@@ -133,6 +133,7 @@ appropriate.
         'build/',
         '.arcane/',
         '.env.json',
+        '.arcane.env.json',
         '*.log',
         ''
     ].join('\n'));