fix(agents): match configured owner before configless rebind fallback

xialonglee · xialonglee · commit b6ec377d8e4a · 2026-07-21T02:48:21.000+08:00
Constrain the configless-gateway fallback in acquirePreparedModelRuntimeLease to only suppress the rebind error when the requesting runtime has no matching configured owner. Previously the predicate checked any configured owner in the process, so a mixed gateway (one configured agent + one configless runtime) would still throw and block configless Model Setup activation. - Extract findConfiguredOwnerCandidates and hasConfiguredOwnerMatching from rebindInputToCommittedConfiguredOwner so the fallback reuses the same identity/directory matching criteria. - Add regression test for a configless runtime activating standalone while another agent is configured. Fixes review feedback on #111841.
diff --git a/src/agents/prepared-model-runtime.lifecycle.test.ts b/src/agents/prepared-model-runtime.lifecycle.test.ts
@@ -325,6 +325,21 @@ describe("prepared model runtime snapshots", () => {
     lease.release();
   });
 
+  it("activates a standalone lease for a configless runtime while another agent is configured", async () => {
+    mocks.configuredAgentIds = ["other"];
+    const config = {};
+    await refreshPreparedModelRuntimeSnapshots(config, { gatewayLifecycle: true });
+    const input = {
+      config,
+      agentDir: "/tmp/unused-agent",
+      inheritedAuthDir: "/tmp/unused-agent",
+      workspaceDir: "/tmp/configless-mixed-workspace",
+    };
+    const lease = await acquireAgentRunPreparedModelRuntime(input);
+    expect(lease.snapshot.agentDir).toBe("/tmp/unused-agent");
+    lease.release();
+  });
+
   it("rebases a stale dynamic owner onto the committed configured generation", async () => {
     mocks.configuredAgentIds = ["default"];
     const initialConfig = {};
diff --git a/src/agents/prepared-model-runtime.owner.ts b/src/agents/prepared-model-runtime.owner.ts
@@ -82,33 +82,47 @@ export class PreparedModelRuntimeOwnerNotPublishedError extends Error {}
 
 export class PreparedModelRuntimePublicationSupersededError extends PreparedModelRuntimeOwnerNotPublishedError {}
 
-export function rebindInputToCommittedConfiguredOwner(
+function findConfiguredOwnerCandidates(
   owners: Map<string, PreparedModelRuntimeOwner>,
   rawInput: PreparedModelRuntimeInput,
-): PreparedModelRuntimeInput {
+): PreparedModelRuntimeOwner[] {
   const input = normalizePreparedModelRuntimeInput(rawInput);
-  const committed = [...owners.values()].filter(
-    (owner) =>
-      owner.provenance === "configured" && owner.snapshot && !owner.needsRefresh && !owner.pending,
-  );
+  const configured = [...owners.values()].filter((owner) => owner.provenance === "configured");
   const identityCandidates =
     input.agentId === undefined
       ? []
-      : committed.filter((owner) => owner.input.agentId === input.agentId);
+      : configured.filter((owner) => owner.input.agentId === input.agentId);
   const exactCandidates = identityCandidates.filter(
     (owner) => owner.input.agentDir === input.agentDir,
   );
-  const directoryCandidates = committed.filter((owner) => owner.input.agentDir === input.agentDir);
+  const directoryCandidates = configured.filter((owner) => owner.input.agentDir === input.agentDir);
   // Unbound inputs and reserved setup identities derive ownership from the configured directory.
   // Ordinary agent runs stay bound to their explicit identity, even when handed a stale directory.
   const canRebindByDirectory =
     input.agentId === undefined || isReservedSystemAgentId(input.agentId);
-  const candidates =
-    exactCandidates.length > 0
-      ? exactCandidates
-      : canRebindByDirectory && directoryCandidates.length > 0
-        ? directoryCandidates
-        : identityCandidates;
+  return exactCandidates.length > 0
+    ? exactCandidates
+    : canRebindByDirectory && directoryCandidates.length > 0
+      ? directoryCandidates
+      : identityCandidates;
+}
+
+/** Whether a configured owner matches the requesting runtime's identity/directory. */
+export function hasConfiguredOwnerMatching(
+  owners: Map<string, PreparedModelRuntimeOwner>,
+  rawInput: PreparedModelRuntimeInput,
+): boolean {
+  return findConfiguredOwnerCandidates(owners, rawInput).length > 0;
+}
+
+export function rebindInputToCommittedConfiguredOwner(
+  owners: Map<string, PreparedModelRuntimeOwner>,
+  rawInput: PreparedModelRuntimeInput,
+): PreparedModelRuntimeInput {
+  const input = normalizePreparedModelRuntimeInput(rawInput);
+  const candidates = findConfiguredOwnerCandidates(owners, rawInput).filter(
+    (owner) => owner.snapshot && !owner.needsRefresh && !owner.pending,
+  );
   if (candidates.length !== 1) {
     throw new PreparedModelRuntimeOwnerNotPublishedError(
       `prepared model runtime owner was not committed after replacement for ${input.agentDir}`,
diff --git a/src/agents/prepared-model-runtime.ts b/src/agents/prepared-model-runtime.ts
@@ -7,6 +7,7 @@ import {
   PreparedModelRuntimePublicationSupersededError,
   createPreparedModelRuntimeReplacement,
   effectiveEnvironmentFingerprint,
+  hasConfiguredOwnerMatching,
   hasSameLifecycleInput,
   listConfiguredOwnerInputs,
   normalizeOptionalDir,
@@ -289,15 +290,13 @@ async function acquirePreparedModelRuntimeLease(
         if (!(error instanceof PreparedModelRuntimeOwnerNotPublishedError)) {
           throw error;
         }
-        const hasAnyConfiguredOwner = [...owners.values()].some(
-          (candidate) => candidate.provenance === "configured",
-        );
-        if (hasAnyConfiguredOwner) {
+        if (hasConfiguredOwnerMatching(owners, input)) {
           throw error;
         }
-        // A configless gateway has no committed configured owner yet (e.g.
-        // first-run Model Setup activation). The raw input continues to a
-        // standalone lease publication below without a configured rebind.
+        // The requesting runtime has no committed configured owner to rebind to
+        // (e.g. first-run Model Setup on a configless gateway). The raw input
+        // continues to a standalone lease publication below without a configured
+        // rebind.
       }
     }
     try {
