agent-relay-server 0.69.1 → 0.70.1

package/src/config-store.ts

@@ -3,6 +3,7 @@ import { cleanEnum, cleanString, cleanStringArray } from "./validation";
 import { DEFAULT_CONTEXT_THRESHOLD_CONFIG, validateContextThresholdConfig } from "./context-threshold-config";
 import { DEFAULT_SELF_RESUME_CONFIG, validateSelfResumeConfig } from "./self-resume-config";
 import { TEAM_TEMPLATE_NAMESPACE, validateTeamTemplate } from "./team-template-config";
+import { PROJECT_INSTRUCTION_POLICY_NAMES } from "./project-instructions";
 import { resolveProviderSelection, type ProviderEffort } from "agent-relay-sdk/provider-catalog";
 import { errMessage, isRecord, SPAWN_PROVIDERS, VALID_WORKSPACE_MODES } from "agent-relay-sdk"; import { effectiveProviderCatalogList } from "./provider-catalog-store";
 import type {
@@ -54,13 +55,14 @@ const OPS_ASSISTANT_BRIEF = [
   "Hold and apply session-local ops conventions the coordinator gives you. Report crisp outcomes only: command/gate, pass/fail, commit/version/host evidence, and the next blocker when one exists. Do not dump logs unless asked.",
   "Do not make strategy, design, scope, or release-timing calls. Escalate those decisions to your spawn-parent. Report operational results to your spawn-parent by default and keep their context clean.",
 ].join("\n");
-const BUILT_IN_AGENT_PROFILE_NAMES = new Set(["default-relay", "minimal", "isolated-research", "vanilla", "coordinator", "ops-assistant", "worker", "reviewer"]);
+const BUILT_IN_AGENT_PROFILE_NAMES = new Set(["default-relay", "minimal", "isolated-research", "vanilla", "lean-worker", "coordinator", "ops-assistant", "worker", "reviewer"]);
 
 const BUILT_IN_AGENT_PROFILES: AgentProfile[] = [
   agentProfileDefaults({ name: "default-relay", description: "Relay-aware spawned agent with bundled Relay context, skills, plugins, and status integration.", base: "host" }),
   agentProfileDefaults({ name: "minimal", description: "Repo-focused spawned agent with Relay affordances disabled and host/global extras avoided where supported.", base: "minimal" }),
   agentProfileDefaults({ name: "isolated-research", description: "Strict profile for autonomous research runs: repo context only, no Relay prompt surface, no global extras where supported.", base: "isolated" }),
   agentProfileDefaults({ name: "vanilla", description: "Zero host bleed (#552): isolated provider home with host plugins, skills, hooks, MCP, and the CLAUDE.md/AGENTS.md cascade (repo + global) all suppressed at launch. Relay provisions any surface explicitly per profile.", base: "vanilla" }),
+  agentProfileDefaults({ name: "lean-worker", description: "Lean worker profile (#570): vanilla host-dependency drop with only Relay context/MCP restored and Project knowledge injected from the spawn cwd.", base: "vanilla", relay: { context: true, skills: false, plugins: false, statusLine: false, mcp: true }, projectInstructions: { policy: "all" } }),
   agentProfileDefaults({ name: "coordinator", description: "Relay-aware coordination lead for spawning worker teams, maintaining shared state, and driving review and release.", base: "host", instructions: { append: [COORDINATION_CHARTER], repoInstructions: "allow", globalInstructions: "allow" }, maxSpawnedAgents: 8 }),
   agentProfileDefaults({ name: "ops-assistant", description: "Relay-aware ops lieutenant for a coordinator: runs tests, releases, smoke probes, gates, and host checks, then reports crisp outcomes back up.", provider: "codex", base: "host", instructions: { append: [OPS_ASSISTANT_BRIEF], repoInstructions: "allow", globalInstructions: "allow" }, permissions: { mode: "open", filesystem: "host" } }),
   agentProfileDefaults({ name: "worker", description: "Relay-aware focused implementer with open approval posture and no delegated spawn capability.", base: "host", permissions: { mode: "open", filesystem: "host" } }),
@@ -211,6 +213,15 @@ function cleanNumber(value: unknown, field: string, opts: { min: number; max: nu
   return value;
 }
 
+function cleanAgentProfileProjectInstructions(value: unknown): AgentProfile["projectInstructions"] {
+  if (value === undefined || value === null || value === false) return undefined;
+  if (value === true) return {};
+  if (!isRecord(value)) throw new ValidationError("projectInstructions must be a boolean or { policy } object");
+  const policy = value.policy;
+  if (policy === undefined || policy === null) return {};
+  return { policy: cleanEnum(policy, "projectInstructions.policy", PROJECT_INSTRUCTION_POLICY_NAMES) as NonNullable<AgentProfile["projectInstructions"]>["policy"] };
+}
+
 function agentProfileDefaults(input: Pick<AgentProfile, "name" | "base"> & Partial<AgentProfile>): AgentProfile {
   const isolated = input.base !== "host";
   // "vanilla" (#552) additionally suppresses the REPO instruction cascade
@@ -230,6 +241,7 @@ function agentProfileDefaults(input: Pick<AgentProfile, "name" | "base"> & Parti
       repoInstructions: input.instructions?.repoInstructions ?? (vanilla ? "ignore" : "allow"),
       globalInstructions: input.instructions?.globalInstructions ?? (isolated ? "ignore" : "allow"),
     },
+    ...(input.projectInstructions ? { projectInstructions: input.projectInstructions } : {}),
     relay: {
       context: input.relay?.context ?? !isolated,
       skills: input.relay?.skills ?? !isolated,
@@ -303,6 +315,7 @@ function validateAgentProfile(key: string, value: unknown): AgentProfile {
         ? defaults.instructions.globalInstructions
         : cleanEnum(instructions.globalInstructions, "instructions.globalInstructions", VALID_PROFILE_INSTRUCTION_POLICIES),
     },
+    projectInstructions: cleanAgentProfileProjectInstructions(value.projectInstructions),
     relay: {
       context: relay.context === undefined ? defaults.relay.context : cleanBoolean(relay.context, "relay.context"),
       skills: relay.skills === undefined ? defaults.relay.skills : cleanBoolean(relay.skills, "relay.skills"),

package/src/context-advisory.ts

@@ -1,4 +1,4 @@
-import { deriveContextThresholdFromWindowTokens, resolveProviderContextThreshold, type ProviderModelCatalogEntry, type ResolvedProviderContextThreshold } from "agent-relay-sdk/provider-catalog";
+import { deriveContextThresholdFromWindowTokens, findProviderCatalogModel, resolveProviderContextThreshold, type ProviderModelCatalogEntry, type ResolvedProviderContextThreshold } from "agent-relay-sdk/provider-catalog";
 import { isRecord, SPAWN_PROVIDERS } from "agent-relay-sdk";
 import { getConfig, getNotificationsConfig } from "./config-store";
 import { DEFAULT_CONTEXT_THRESHOLD_CONFIG, validateContextThresholdConfig } from "./context-threshold-config";
@@ -132,10 +132,11 @@ export function handleContextPressure(input: {
 }
 
 function effectiveContextThreshold(agent: AgentCard): EffectiveContextThreshold {
-  const model = findAgentCatalogModel(agent);
-  const windowTokens = model?.limits?.contextWindowTokens?.value
-    ?? finiteNumber(agent.providerCapabilities?.context?.windowTokens)
+  const observedWindowTokens = finiteNumber(agent.providerCapabilities?.context?.windowTokens)
     ?? finiteNumber(agent.context?.tokensMax);
+  const model = findAgentCatalogModel(agent, observedWindowTokens);
+  const windowTokens = model?.limits?.contextWindowTokens?.value
+    ?? observedWindowTokens;
   if (model?.contextThreshold) {
     return { ...resolveProviderContextThreshold(model), source: "model" };
   }
@@ -157,16 +158,14 @@ function explicitContextThresholdConfig(): EffectiveContextThreshold | undefined
   };
 }
 
-function findAgentCatalogModel(agent: AgentCard): ProviderModelCatalogEntry | undefined {
+function findAgentCatalogModel(agent: AgentCard, observedWindowTokens: number | undefined): ProviderModelCatalogEntry | undefined {
   const runtime = agent.providerCapabilities?.model;
   const provider = runtime?.provider;
   if (!provider || !(SPAWN_PROVIDERS as readonly string[]).includes(provider)) return undefined;
   const catalog = effectiveProviderCatalogList().find((entry) => entry.provider === provider);
   if (!catalog) return undefined;
   const ids = [runtime.alias, runtime.id, runtime.providerModel].filter((value): value is string => Boolean(value));
-  const lowerIds = new Set(ids.map((id) => id.toLowerCase()));
-  return catalog.models.find((model) => ids.includes(model.alias) || ids.includes(model.providerModel))
-    ?? catalog.models.find((model) => lowerIds.has(model.alias.toLowerCase()) || lowerIds.has(model.providerModel.toLowerCase()));
+  return findProviderCatalogModel(catalog, ids, { observedWindowTokens });
 }
 
 function clearContextAdvisory(context: ContextState): ContextState {

package/src/services/spawn-agent.ts

@@ -223,9 +223,10 @@ export async function spawnAgent(input: SpawnAgentInput, ctx: AuthContext): Prom
   // providers (project preamble → profile system → profile append → caller/fork context) and
   // carries the #559 scoped-knowledge seam. Spawns without profile/project material stay
   // byte-identical to the caller-provided systemPromptAppend.
+  const projectInstructions = input.projectInstructions ?? agentProfile?.projectInstructions;
   const systemPromptAppend = composeSpawnInstructions({
     ...(callerProject ? { callerProject } : {}),
-    ...(input.projectInstructions ? { projectInstructions: input.projectInstructions } : {}),
+    ...(projectInstructions ? { projectInstructions } : {}),
     ...(agentProfile ? { profile: agentProfile } : {}),
     ...(input.systemPromptAppend ? { callerSystemPromptAppend: input.systemPromptAppend } : {}),
   });