fix(core): spreads of optional config sections stay optional

steipete · steipete · commit eb376605b337 · 2026-07-12T04:35:51.000+01:00
Fresh-setup and first-install paths (crestodian setup inference, hook
installs, agent config base, target agent models) legitimately lack the
section being rebuilt; spreading undefined is the shipped {} semantics.
Removes the remaining gratuitous assertion wraps found by tree audit.
diff --git a/src/commands/agents.config.ts b/src/commands/agents.config.ts
@@ -1,4 +1,3 @@
-import { expectDefined } from "@openclaw/normalization-core";
 // Agent config mutation and summary builders used by `openclaw agents` commands.
 import {
   normalizeOptionalString,
@@ -127,12 +126,10 @@ export function applyAgentConfig(
   const name = params.name?.trim();
   const list = listAgentEntries(cfg);
   const index = findAgentEntryIndex(list, agentId);
-  const base = index >= 0 ? list[index] : { id: agentId };
-  const mergedIdentity = params.identity
-    ? { ...expectDefined(base, "agents.config base").identity, ...params.identity }
-    : undefined;
+  const base = (index >= 0 ? list[index] : undefined) ?? { id: agentId };
+  const mergedIdentity = params.identity ? { ...base.identity, ...params.identity } : undefined;
   const nextEntry: AgentEntry = {
-    ...expectDefined(base, "agents.config base"),
+    ...base,
     ...(name ? { name } : {}),
     ...(params.workspace ? { workspace: params.workspace } : {}),
     ...(params.agentDir ? { agentDir: params.agentDir } : {}),
diff --git a/src/crestodian/setup-inference.ts b/src/crestodian/setup-inference.ts
@@ -706,7 +706,7 @@ function copySelectedModelMetadata(params: {
     params.target.agents = {
       ...params.target.agents,
       defaults: {
-        ...expectDefined(params.target.agents?.defaults, "agent defaults"),
+        ...params.target.agents?.defaults,
         models: {
           ...params.target.agents?.defaults?.models,
           [params.modelRef]: structuredClone(
@@ -739,7 +739,7 @@ function copySelectedModelMetadata(params: {
     return;
   }
   targetAgent.models = {
-    ...expectDefined(targetAgent.models, "agent models"),
+    ...targetAgent.models,
     [params.modelRef]: structuredClone(
       expectDefined(preparedAgent.models[params.modelRef], "models entry at params.model ref"),
     ),
@@ -798,7 +798,7 @@ function projectManualInferenceConfig(params: {
       throw new Error(`Prepared provider config missing for ${providerConfigKey}`);
     }
     config.models = {
-      ...expectDefined(config.models, "configured models"),
+      ...config.models,
       providers: {
         ...config.models?.providers,
         [providerConfigKey]: structuredClone(preparedProvider),
diff --git a/src/hooks/installs.ts b/src/hooks/installs.ts
@@ -23,7 +23,7 @@ export function recordHookInstall(cfg: OpenClawConfig, update: HookInstallUpdate
     hooks: {
       ...cfg.hooks,
       internal: {
-        ...expectDefined(cfg.hooks?.internal, "internal hook configuration"),
+        ...cfg.hooks?.internal,
         installs: {
           ...installs,
           [hookId]: expectDefined(installs[hookId], "installs entry at hook id"),
