@ours.network/fleet 0.17.8 → 0.17.10

package/dist/spawn.js

@@ -5,6 +5,7 @@ import { parse, stringify } from 'yaml';
 import { agentDir, fleetDDir } from './paths.js';
 import { validateIsolationConfig } from './isolation/policy.js';
 import { loadConfig, resolveAuthProxy, resolveModelChain, resolveMonitorConfig, resolveOwnerChannelConfig, resolvePermissions, resolveRoleModel, resolveWorklogPolicy, validateMonitorConfig, } from './config.js';
+import { resolveRoleModelEnv } from './model-env.js';
 import { applyRole, up } from './ops.js';
 import { START_STAGGER_FILE } from './runner.js';
 import { buildProvenance, daemonIdentityProvisioner, ensureIdentity, provenanceOf, withCreationTransaction, writeProvenance, writeRoleFile, } from './creation.js';
@@ -191,7 +192,17 @@ export function spawnDryRun(o) {
     const harness = raw.harness ?? cfg.defaults.harness ?? 'claude-code';
     const defaultHarness = cfg.defaults.harness ?? 'claude-code';
     const inheritsModelDefaults = harness === defaultHarness && raw.model !== null;
-    const model = resolveRoleModel(raw.model, raw.harness, cfg.defaults);
+    const authProxy = resolveAuthProxy(cfg.defaults.auth_proxy, raw.auth_proxy);
+    // One resolution for the environment and the model it pins (src/model-env.ts).
+    const modelEnv = resolveRoleModelEnv({
+        harness,
+        model: resolveRoleModel(raw.model, raw.harness, cfg.defaults),
+        modelWasExplicit: raw.model !== undefined,
+        defaultsEnv: (cfg.defaults.env ?? {}),
+        roleEnv: raw.env,
+        ...(authProxy ? { authProxyBaseUrl: authProxy.base_url } : {}),
+    });
+    const model = modelEnv.model;
     const session = raw.session ?? cfg.defaults.session ?? 'tmux';
     const resolvedRole = {
         ...raw,
@@ -212,19 +223,13 @@ export function spawnDryRun(o) {
         monitor: resolveMonitorConfig(cfg.defaults.monitor, raw.monitor),
         owner_channel: resolveOwnerChannelConfig(cfg.defaults.owner_channel, raw.owner_channel, session),
         worklog: resolveWorklogPolicy(cfg.defaults.worklog, raw.worklog),
-        auth_proxy: resolveAuthProxy(cfg.defaults.auth_proxy, raw.auth_proxy),
-    };
-    resolvedRole.env = {
-        ...(cfg.defaults.env ?? {}),
-        ...(raw.env ?? {}),
-        ...(resolvedRole.auth_proxy
-            ? { ANTHROPIC_BASE_URL: resolvedRole.auth_proxy.base_url }
-            : {}),
+        auth_proxy: authProxy,
     };
+    resolvedRole.env = modelEnv.env;
     const adapter = getAdapter(resolvedRole.harness);
     if (resolvedRole.auth_proxy && resolvedRole.harness !== 'claude-code')
         throw new Error('auth_proxy is supported only by claude-code');
-    const optionProblems = adapter.validateOptions(resolvedRole.harness_options);
+    const optionProblems = adapter.validateOptions(resolvedRole.harness_options, resolvedRole);
     if (optionProblems.length)
         throw new Error(optionProblems.map(problem => `${problem.path}: ${problem.message}`).join('; '));
     return {
@@ -403,7 +408,18 @@ async function spawnTempInner(o, binPath, launch, tx, guarantee, onStage) {
     };
     const harness = o.harness ?? defaultHarness ?? 'claude-code';
     const inheritsModelDefaults = harness === (defaultHarness ?? 'claude-code') && o.model !== null;
-    const model = resolveRoleModel(o.model, o.harness, cfg.defaults);
+    const tempAuthProxy = resolveAuthProxy(cfg.defaults.auth_proxy, fromOpts.auth_proxy);
+    // An explicitly requested --model must reach the child, not just the banner
+    // (src/model-env.ts).
+    const modelEnv = resolveRoleModelEnv({
+        harness,
+        model: resolveRoleModel(o.model, o.harness, cfg.defaults),
+        modelWasExplicit: o.model !== undefined,
+        defaultsEnv: (cfg.defaults.env ?? {}),
+        roleEnv: fromOpts.env,
+        ...(tempAuthProxy ? { authProxyBaseUrl: tempAuthProxy.base_url } : {}),
+    });
+    const model = modelEnv.model;
     const session = o.session ?? cfg.defaults.session ?? 'tmux';
     const role = {
         ...fromOpts, // includes `isolation` when --isolation-file was given
@@ -422,14 +438,10 @@ async function spawnTempInner(o, binPath, launch, tx, guarantee, onStage) {
         monitor: resolveMonitorConfig(cfg.defaults.monitor, fromOpts.monitor),
         owner_channel: resolveOwnerChannelConfig(cfg.defaults.owner_channel, fromOpts.owner_channel, session),
         worklog: resolveWorklogPolicy(cfg.defaults.worklog, fromOpts.worklog),
-        auth_proxy: resolveAuthProxy(cfg.defaults.auth_proxy, fromOpts.auth_proxy),
+        auth_proxy: tempAuthProxy,
         sourceFile: '(temp)',
     };
-    role.env = {
-        ...(cfg.defaults.env ?? {}),
-        ...(fromOpts.env ?? {}),
-        ...(role.auth_proxy ? { ANTHROPIC_BASE_URL: role.auth_proxy.base_url } : {}),
-    };
+    role.env = modelEnv.env;
     if (role.auth_proxy && role.harness !== 'claude-code')
         throw new Error('auth_proxy is supported only by claude-code');
     onStage?.('writing_role');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/fleet",
-  "version": "0.17.8",
+  "version": "0.17.10",
   "description": "Harness-agnostic fleet of persistent, identity-bound AI agents. Declarative fleet.yaml, tmux or ACP sessions, supervision, and ours.network messaging.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",