@stigmer/server 3.22.1-dev.20260922095755 → 3.23.0

package/src/domain/agentinstance/controller.ts

@@ -52,6 +52,10 @@ import {
   newAuthorizeResolvedTargetStep,
 } from "../../pipeline/steps/authorize-resolved-target.js";
 import { newGuardReservedLabelsStep } from "../../pipeline/steps/guard-reserved-labels.js";
+import {
+  newAuthorizeVisibilityTransitionStep,
+  newGuardPublicVisibilityStep,
+} from "../../pipeline/steps/visibility-gates.js";
 import {
   newBuildNewStateStep,
   setAuditFieldsForUpdate,
@@ -81,10 +85,7 @@ import {
   TARGET_RESOURCE_KEY,
   newLoadTargetStep,
 } from "../../pipeline/steps/load-target.js";
-import {
-  newNormalizeReferencesStep,
-  newValidateReferencesStep,
-} from "../../pipeline/steps/references.js";
+import { newNormalizeReferencesStep } from "../../pipeline/steps/references.js";
 import {
   newCleanupIamPoliciesStep,
   newCreateAuthorizationTuplesStep,
@@ -195,9 +196,9 @@ async function createInstance(
     )
     .addStep(newCheckDuplicateStep(deps.store))
     .addStep(newBuildNewStateStep())
+    .addStep(newGuardPublicVisibilityStep(deps.authorizer))
     .addStep(newGuardReservedLabelsStep(deps.authorizer))
     .addStep(newNormalizeReferencesStep())
-    .addStep(newValidateReferencesStep(deps.store))
     .addStep(newPersistStep(deps.store))
     .addStep(
       newCreateAuthorizationTuplesStep(
@@ -242,7 +243,6 @@ async function update(
     .addStep(newBuildUpdateStateStep())
     .addStep(newGuardReservedLabelsStep(deps.authorizer))
     .addStep(newNormalizeReferencesStep())
-    .addStep(newValidateReferencesStep(deps.store))
     .addStep(newPersistStep(deps.store))
     .addStep(
       newIndexSearchStep(deps.store, agentInstanceSearchExtractor, deps.logger),
@@ -383,6 +383,12 @@ async function updateVisibility(
     )
     .addStep(newRejectDefaultInstanceVisibilityUpdateStep(deps.store))
     .addStep(newValidateVisibilityUpdateStep())
+    .addStep(
+      newAuthorizeVisibilityTransitionStep(
+        UPDATE_VISIBILITY_INSTANCE_KEY,
+        deps.authorizer,
+      ),
+    )
     .addStep(newSetInstanceVisibilityStep())
     .addStep(newPersistInstanceForVisibilityUpdateStep(deps.store))
     .addStep(

package/src/domain/agentshare/__tests__/agentshare.test.ts

@@ -33,10 +33,8 @@ import { AgentCommandController } from "@stigmer/protos/ai/stigmer/agentic/agent
 import type { Agent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/api_pb";
 import { AgentShareCommandController } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/command_pb";
 import { AgentShareQueryController } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/query_pb";
-import { AgentShareSchema } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/api_pb";
 import type { AgentShare } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/api_pb";
 import { AgentShareAudience } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/spec_pb";
-import { EnvironmentSchema } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/api_pb";
 import { SkillSchema } from "@stigmer/protos/ai/stigmer/agentic/skill/v1/api_pb";
 import { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
 import { ApiResourceReferenceSchema } from "@stigmer/protos/ai/stigmer/commons/apiresource/io_pb";
@@ -49,15 +47,11 @@ import { createLogger } from "../../../boot/logger.js";
 import type { Store } from "../../../store/interface.js";
 import {
   ORG_REQUIRED_FOR_LOOKUP_MESSAGE,
-  sameOrgInvariantMessage,
+  crossOrgAudienceMessage,
 } from "../constants.js";
 import { findShareByOrgAndSlug, sharingLinkTokenAllowed } from "../steps.js";
 
-const silentLogger = createLogger({
-  level: "error",
-  pretty: false,
-  write: () => {},
-});
+const silentLogger = createLogger({ level: "error", pretty: false, write: () => {} });
 
 const API_VERSION = "agentic.stigmer.ai/v1";
 
@@ -74,10 +68,7 @@ let dir: string;
 beforeAll(async () => {
   dir = mkdtempSync(path.join(tmpdir(), "agentshare-domain-test-"));
   vi.stubEnv("STIGMER_ENCRYPTION_KEY", Buffer.alloc(32, 7).toString("base64"));
-  vi.stubEnv(
-    "STIGMER_RUNNER_TOKEN_KEY",
-    Buffer.alloc(32, 8).toString("base64"),
-  );
+  vi.stubEnv("STIGMER_RUNNER_TOKEN_KEY", Buffer.alloc(32, 8).toString("base64"));
   server = await composeServer({
     config: loadConfig({
       STIGMER_MODEL_REGISTRY_REFRESH: "off",
@@ -127,6 +118,13 @@ async function createTestAgent(name: string, org: string): Promise<Agent> {
 }
 
 /** Flips the agent marketplace-public through the real pipeline (D1). */
+async function makeAgentPublic(agent: Agent): Promise<void> {
+  await agents.updateVisibility({
+    resourceId: agent.metadata!.id,
+    visibility: ApiResourceVisibility.visibility_public,
+  });
+}
+
 /**
  * Writes a skill fixture directly to the store — the established
  * cross-domain fixture pattern (the skill domain is not ported yet, and
@@ -144,12 +142,7 @@ async function saveSkill(
     kind: "Skill",
     metadata: { id, name: slug, slug, org, visibility },
   });
-  await server.store.saveResource(
-    ApiResourceKind.skill,
-    id,
-    SkillSchema,
-    skill,
-  );
+  await server.store.saveResource(ApiResourceKind.skill, id, SkillSchema, skill);
 }
 
 /** Minimal canonical share: no slug, no name — both default from the agent. */
@@ -185,10 +178,7 @@ describe("agentshare create", () => {
   const ORG = "create-test-org";
 
   it("canonical share defaults slug and name from the agent; ash_ id; ref normalized", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Canonical Default Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Canonical Default Agent"), ORG);
     const share = await shares.create(shareFor(agent, true));
 
     expect(share.metadata?.slug).toBe(agent.metadata!.slug);
@@ -212,20 +202,13 @@ describe("agentshare create", () => {
     expect(err.rawMessage).toBe("Agent not found: no-such-agent");
   });
 
-  it("an agent_ref naming another organization is FAILED_PRECONDITION with the same-organization copy, before any lookup", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Cross Org Ghost Agent"),
-      ORG,
-    );
+  it("cross-org ref to a nonexistent agent is NOT_FOUND — no cross-org fallback", async () => {
+    const agent = await createTestAgent(uniqueName("Cross Org Ghost Agent"), ORG);
     const share = shareFor(agent, true);
-    share.spec.agentRef = {
-      ...share.spec.agentRef,
-      org: "some-other-org",
-    } as never;
+    share.spec.agentRef = { ...share.spec.agentRef, org: "some-other-org" } as never;
 
     const err = await grpcError(() => shares.create(share));
-    expect(err.code).toBe(Code.FailedPrecondition);
-    expect(err.rawMessage).toBe(sameOrgInvariantMessage("some-other-org"));
+    expect(err.code).toBe(Code.NotFound);
   });
 
   it("stamps the agent-id pin on the created share", async () => {
@@ -253,10 +236,7 @@ describe("agentshare create", () => {
   });
 
   it("second canonical share for the same agent is ALREADY_EXISTS", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Duplicate Share Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Duplicate Share Agent"), ORG);
     await shares.create(shareFor(agent, true));
 
     const err = await grpcError(() => shares.create(shareFor(agent, true)));
@@ -268,8 +248,7 @@ describe("agentshare create", () => {
     await shares.create(shareFor(agent, true));
 
     const named = shareFor(agent, true);
-    (named.metadata as Record<string, string>).name =
-      uniqueName("Docs Site Channel");
+    (named.metadata as Record<string, string>).name = uniqueName("Docs Site Channel");
     const second = await shares.create(named);
     expect(second.metadata?.slug).not.toBe(agent.metadata!.slug);
   });
@@ -285,10 +264,7 @@ describe("launch-gate config", () => {
   const ORG = "launchgate-test-org";
 
   it("allowed_origins and messages persist and round-trip", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Launch Gate Config Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Launch Gate Config Agent"), ORG);
     const created = await shares.create({
       ...shareFor(agent, true),
       spec: {
@@ -313,10 +289,7 @@ describe("launch-gate config", () => {
   });
 
   it("malformed origins are INVALID_ARGUMENT", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Origin Validation Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Origin Validation Agent"), ORG);
     for (const origin of [
       "docs.example.com", // missing scheme
       "https://example.com/path", // path not allowed
@@ -335,10 +308,7 @@ describe("launch-gate config", () => {
   });
 
   it("overlong custom message is INVALID_ARGUMENT", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Message Length Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Message Length Agent"), ORG);
     const err = await grpcError(() =>
       shares.create({
         ...shareFor(agent, true),
@@ -352,27 +322,7 @@ describe("launch-gate config", () => {
   });
 
   it("environment_refs on an org-audience share is INVALID_ARGUMENT; public persists", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Env Refs Audience Agent"),
-      ORG,
-    );
-    // The environment must exist when the share is written (the reference rule).
-    await server.store.saveResource(
-      ApiResourceKind.environment,
-      "env_shared_credentials",
-      EnvironmentSchema,
-      create(EnvironmentSchema, {
-        apiVersion: "agentic.stigmer.ai/v1",
-        kind: "Environment",
-        metadata: {
-          id: "env_shared_credentials",
-          name: "shared-credentials",
-          slug: "shared-credentials",
-          org: ORG,
-          visibility: ApiResourceVisibility.visibility_org,
-        },
-      }),
-    );
+    const agent = await createTestAgent(uniqueName("Env Refs Audience Agent"), ORG);
     const envRef = {
       kind: ApiResourceKind.environment,
       org: ORG,
@@ -428,14 +378,8 @@ describe("agentshare update", () => {
   });
 
   it("agent_ref is immutable — FAILED_PRECONDITION with the pinned copy", async () => {
-    const agentA = await createTestAgent(
-      uniqueName("Immutable Ref Agent A"),
-      ORG,
-    );
-    const agentB = await createTestAgent(
-      uniqueName("Immutable Ref Agent B"),
-      ORG,
-    );
+    const agentA = await createTestAgent(uniqueName("Immutable Ref Agent A"), ORG);
+    const agentB = await createTestAgent(uniqueName("Immutable Ref Agent B"), ORG);
     const created = await shares.create(shareFor(agentA, true));
 
     created.spec!.agentRef = create(ApiResourceReferenceSchema, {
@@ -453,83 +397,146 @@ describe("agentshare update", () => {
 // Cross-org contract (Go TestAgentShareController_CrossOrg, decision 013).
 // ---------------------------------------------------------------------------
 
-describe("the same-organization invariant", () => {
+describe("cross-org shares (decision 013)", () => {
   const PROVIDER = "provider-org";
   const CONSUMER = "consumer-org";
 
-  function shareInAnotherOrg(agent: Agent, enabled: boolean) {
+  function crossOrgShare(agent: Agent, enabled: boolean) {
     const share = shareFor(agent, enabled);
     share.metadata.org = CONSUMER;
-    share.spec.agentRef = {
-      ...share.spec.agentRef,
-      org: agent.metadata!.org,
-    } as never;
+    share.spec.agentRef = { ...share.spec.agentRef, org: agent.metadata!.org } as never;
     return share;
   }
 
-  it("another organization's agent cannot be shared — the same sentence whether the agent exists or not, at any level", async () => {
-    const existing = await createTestAgent(
-      uniqueName("Provider Agent"),
-      PROVIDER,
-    );
-    const err = await grpcError(() =>
-      shares.create(shareInAnotherOrg(existing, true)),
-    );
-    expect(err.code).toBe(Code.FailedPrecondition);
-    expect(err.rawMessage).toBe(sameOrgInvariantMessage(PROVIDER));
-
-    const ghost = shareFor(existing, true);
-    ghost.metadata.org = CONSUMER;
-    ghost.spec.agentRef = {
-      ...ghost.spec.agentRef,
-      org: PROVIDER,
-      slug: "no-such-agent",
-    } as never;
+  it("public agent is shareable cross-org: pin stamped, slug defaulted, profile resolves", async () => {
+    const agent = await createTestAgent(uniqueName("Public Provider Agent"), PROVIDER);
+    await makeAgentPublic(agent);
+
+    const created = await shares.create(crossOrgShare(agent, true));
+    expect(created.metadata?.org).toBe(CONSUMER);
+    expect(created.spec?.agentRef?.org).toBe(PROVIDER);
+    expect(created.metadata?.slug).toBe(agent.metadata!.slug);
+    expect(created.status?.agentId).toBe(agent.metadata!.id);
+
+    const profile = await query.getSharedProfile({
+      org: CONSUMER,
+      slug: created.metadata!.slug,
+    });
+    expect(profile.org).toBe(CONSUMER);
+    expect(profile.name).toBe(agent.metadata!.name);
+  });
+
+  it("non-public agent is NOT_FOUND, indistinguishable from absence", async () => {
+    const agent = await createTestAgent(uniqueName("Private Provider Agent"), PROVIDER);
+
+    const err = await grpcError(() => shares.create(crossOrgShare(agent, true)));
+    expect(err.code).toBe(Code.NotFound);
+
+    // The refusal must match a genuinely missing agent — no existence
+    // probe for private slugs (the T09 indistinguishability contract).
+    const ghost = crossOrgShare(agent, true);
+    ghost.spec.agentRef = { ...ghost.spec.agentRef, org: "empty-provider-org" } as never;
     const ghostErr = await grpcError(() => shares.create(ghost));
-    expect(ghostErr.code).toBe(Code.FailedPrecondition);
-    expect(ghostErr.rawMessage).toBe(sameOrgInvariantMessage(PROVIDER));
+    expect(err.rawMessage).toBe(ghostErr.rawMessage);
   });
 
-  it("a stored share whose agent is in another organization fails the profile closed, like a dangling reference", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Legacy Provider Agent"),
+  it("org audience is refused cross-org, on create and on update", async () => {
+    const agent = await createTestAgent(uniqueName("Audience Rule Agent"), PROVIDER);
+    await makeAgentPublic(agent);
+
+    const orgAudience = crossOrgShare(agent, true);
+    (orgAudience.spec as Record<string, unknown>).audience = AgentShareAudience.org;
+    const createErr = await grpcError(() => shares.create(orgAudience));
+    expect(createErr.code).toBe(Code.FailedPrecondition);
+    expect(createErr.rawMessage).toBe(crossOrgAudienceMessage(PROVIDER));
+
+    const created = await shares.create(crossOrgShare(agent, true));
+    created.spec!.audience = AgentShareAudience.org;
+    const updateErr = await grpcError(() => shares.update(created));
+    expect(updateErr.code).toBe(Code.FailedPrecondition);
+    expect(updateErr.rawMessage).toBe(crossOrgAudienceMessage(PROVIDER));
+  });
+
+  it("non-public dependencies block creation, naming every blocker sorted", async () => {
+    await saveSkill(
+      "skl_private_dep",
       PROVIDER,
+      "private-skill",
+      ApiResourceVisibility.visibility_private,
     );
-    // A row from before the invariant, written straight to the store.
-    const legacy = create(AgentShareSchema, {
+    await saveSkill(
+      "skl_public_dep",
+      PROVIDER,
+      "public-skill",
+      ApiResourceVisibility.visibility_public,
+    );
+
+    const agent = await agents.create({
       apiVersion: API_VERSION,
-      kind: "AgentShare",
-      metadata: {
-        id: "ash_legacy_cross_org",
-        name: "legacy-cross-org",
-        slug: "legacy-cross-org",
-        org: CONSUMER,
-      },
+      kind: "Agent",
+      metadata: { name: uniqueName("Tooling Agent"), org: PROVIDER },
       spec: {
-        agentRef: {
-          kind: ApiResourceKind.agent,
-          org: PROVIDER,
-          slug: agent.metadata!.slug,
-        },
-        enabled: true,
-        audience: AgentShareAudience.public,
+        instructions: "You are a tool-using cross-org test agent.",
+        skillRefs: [
+          { kind: ApiResourceKind.skill, slug: "private-skill" },
+          { kind: ApiResourceKind.skill, slug: "public-skill" },
+        ],
       },
-      status: { agentId: agent.metadata!.id },
     });
-    await server.store.saveResource(
-      ApiResourceKind.agent_share,
-      legacy.metadata!.id,
-      AgentShareSchema,
-      legacy,
-    );
+    await makeAgentPublic(agent);
 
-    const err = await grpcError(() =>
-      query.getSharedProfile({ org: CONSUMER, slug: "legacy-cross-org" }),
-    );
+    const err = await grpcError(() => shares.create(crossOrgShare(agent, true)));
+    expect(err.code).toBe(Code.FailedPrecondition);
+    expect(err.rawMessage).toContain("provider-org/private-skill");
+    expect(err.rawMessage).not.toContain("public-skill");
+
+    // Same-org sharing of the same agent stays unaffected — the sweep is
+    // a cross-org rule only.
+    await shares.create(shareFor(agent, true));
+  });
+
+  it("visibility flip fails the profile closed", async () => {
+    const agent = await createTestAgent(uniqueName("Revocable Agent"), PROVIDER);
+    await makeAgentPublic(agent);
+    const created = await shares.create(crossOrgShare(agent, true));
+
+    const ref = { org: CONSUMER, slug: created.metadata!.slug };
+    await query.getSharedProfile(ref);
+
+    await agents.updateVisibility({
+      resourceId: agent.metadata!.id,
+      visibility: ApiResourceVisibility.visibility_private,
+    });
+
+    const err = await grpcError(() => query.getSharedProfile(ref));
     expect(err.code).toBe(Code.NotFound);
-    // The row itself is still readable by id — nothing is deleted.
-    const row = await query.get({ value: legacy.metadata!.id });
-    expect(row.status?.agentId).toBe(agent.metadata!.id);
+  });
+
+  it("agent delete leaves the cross-org share failing closed; recreate never rebinds", async () => {
+    const name = uniqueName("Ephemeral Provider Agent");
+    const agent = await createTestAgent(name, PROVIDER);
+    await makeAgentPublic(agent);
+    const created = await shares.create(crossOrgShare(agent, true));
+    const ref = { org: CONSUMER, slug: created.metadata!.slug };
+
+    await agents.delete({ value: agent.metadata!.id });
+
+    // The consumer org's share survives the provider's delete (cross-org
+    // shares are NOT cascaded — not the provider's resource to destroy)
+    // but fails closed.
+    const survived = await query.get({ value: created.metadata!.id });
+    expect(survived.status?.agentId).toBe(agent.metadata!.id);
+    const danglingErr = await grpcError(() => query.getSharedProfile(ref));
+    expect(danglingErr.code).toBe(Code.NotFound);
+
+    // A DIFFERENT public agent later claims the same org/slug: the pin
+    // must keep the old share dark.
+    const recreated = await createTestAgent(name, PROVIDER);
+    await makeAgentPublic(recreated);
+    expect(recreated.metadata!.slug).toBe(agent.metadata!.slug);
+
+    const rebindErr = await grpcError(() => query.getSharedProfile(ref));
+    expect(rebindErr.code).toBe(Code.NotFound);
   });
 });
 
@@ -541,18 +548,13 @@ describe("getSharedProfile (anonymous lane)", () => {
   const ORG = "profile-test-org";
 
   it("uniform NotFound across no-share / disabled / deleted; enabled resolves trimmed", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Shared Profile Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Shared Profile Agent"), ORG);
     const ref = { org: ORG, slug: agent.metadata!.slug };
 
     // No share yet.
     const noShareErr = await grpcError(() => query.getSharedProfile(ref));
     expect(noShareErr.code).toBe(Code.NotFound);
-    expect(noShareErr.rawMessage).toBe(
-      `Agent not found: ${agent.metadata!.slug}`,
-    );
+    expect(noShareErr.rawMessage).toBe(`Agent not found: ${agent.metadata!.slug}`);
 
     // Enabled share resolves to the trimmed profile — display fields from
     // the AGENT, URL identity from the SHARE, never the full Agent.
@@ -607,10 +609,7 @@ describe("audience and the member resolution lane", () => {
   const ORG = "audience-test-org";
 
   it("audience persists and round-trips", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Audience Round Trip Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Audience Round Trip Agent"), ORG);
     const created = await shares.create({
       ...shareFor(agent, true),
       spec: { ...shareFor(agent, true).spec, audience: AgentShareAudience.org },
@@ -622,15 +621,10 @@ describe("audience and the member resolution lane", () => {
   });
 
   it("member path resolves shares in either audience (OSS: membership always holds)", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Member Resolution Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Member Resolution Agent"), ORG);
     const ref = { org: ORG, slug: agent.metadata!.slug };
 
-    const noShareErr = await grpcError(() =>
-      query.getSharedProfileForMember(ref),
-    );
+    const noShareErr = await grpcError(() => query.getSharedProfileForMember(ref));
     expect(noShareErr.code).toBe(Code.NotFound);
 
     await shares.create({
@@ -643,10 +637,7 @@ describe("audience and the member resolution lane", () => {
   });
 
   it("the ANONYMOUS path collapses an org-audience share to the uniform NotFound (C2 close-out — the proto's audience contract)", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Org Audience Anon Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Org Audience Anon Agent"), ORG);
     await shares.create({
       ...shareFor(agent, true),
       spec: { ...shareFor(agent, true).spec, audience: AgentShareAudience.org },
@@ -715,9 +706,7 @@ describe("rotateShareLink", () => {
 
     // Capture the no-share NOT_FOUND before creating — the locked-link
     // refusal must be byte-identical to it.
-    const noShareErr = await grpcError(() =>
-      query.getSharedProfile(request("")),
-    );
+    const noShareErr = await grpcError(() => query.getSharedProfile(request("")));
 
     const share = await shares.create(shareFor(agent, true));
 
@@ -725,31 +714,23 @@ describe("rotateShareLink", () => {
     await query.getSharedProfile(request("stray-token"));
 
     // Rotation locks the link: 27 url-safe chars, status-resident.
-    const rotated = await shares.rotateShareLink({
-      resourceId: share.metadata!.id,
-    });
+    const rotated = await shares.rotateShareLink({ resourceId: share.metadata!.id });
     const firstToken = rotated.status?.shareLinkToken ?? "";
     expect(firstToken).toHaveLength(27);
     expect(firstToken).toMatch(/^[A-Za-z0-9_-]+$/);
 
-    const lockedErr = await grpcError(() =>
-      query.getSharedProfile(request("")),
-    );
+    const lockedErr = await grpcError(() => query.getSharedProfile(request("")));
     expect(lockedErr.code).toBe(Code.NotFound);
     expect(lockedErr.rawMessage).toBe(noShareErr.rawMessage);
 
     await query.getSharedProfile(request(firstToken));
 
     // Re-rotation kills the previous token.
-    const reRotated = await shares.rotateShareLink({
-      resourceId: share.metadata!.id,
-    });
+    const reRotated = await shares.rotateShareLink({ resourceId: share.metadata!.id });
     const secondToken = reRotated.status?.shareLinkToken ?? "";
     expect(secondToken).not.toBe(firstToken);
 
-    const deadErr = await grpcError(() =>
-      query.getSharedProfile(request(firstToken)),
-    );
+    const deadErr = await grpcError(() => query.getSharedProfile(request(firstToken)));
     expect(deadErr.code).toBe(Code.NotFound);
     await query.getSharedProfile(request(secondToken));
 
@@ -776,10 +757,7 @@ describe("rotateShareLink", () => {
   });
 
   it("member path stays open for org-audience shares even when a token exists", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Org Audience Rotate Agent"),
-      ORG,
-    );
+    const agent = await createTestAgent(uniqueName("Org Audience Rotate Agent"), ORG);
     const created = await shares.create({
       ...shareFor(agent, true),
       spec: { ...shareFor(agent, true).spec, audience: AgentShareAudience.org },
@@ -800,15 +778,11 @@ describe("rotateShareLink", () => {
 
 describe("getByAgent", () => {
   it("finds the canonical share and a renamed share", async () => {
-    const agent = await createTestAgent(
-      uniqueName("Get By Agent Agent"),
-      "gba-org",
-    );
+    const agent = await createTestAgent(uniqueName("Get By Agent Agent"), "gba-org");
     const canonical = await shares.create(shareFor(agent, true));
 
     const renamed = shareFor(agent, true);
-    (renamed.metadata as Record<string, string>).name =
-      uniqueName("Renamed Channel");
+    (renamed.metadata as Record<string, string>).name = uniqueName("Renamed Channel");
     const second = await shares.create(renamed);
 
     const list = await query.getByAgent({ agentId: agent.metadata!.id });
@@ -828,21 +802,25 @@ describe("getByAgent", () => {
       uniqueName("Org Scoped List Agent"),
       "gba-provider-org",
     );
+    await makeAgentPublic(agent);
     await shares.create(shareFor(agent, true));
-    const named = shareFor(agent, true);
-    named.metadata = { ...named.metadata, name: "second link" } as never;
-    await shares.create(named);
+
+    const crossOrg = shareFor(agent, true);
+    crossOrg.metadata.org = "gba-consumer-org";
+    crossOrg.spec.agentRef = {
+      ...crossOrg.spec.agentRef,
+      org: agent.metadata!.org,
+    } as never;
+    await shares.create(crossOrg);
 
     const cases: Array<{ org: string; want: number; wantOrg: string }> = [
       { org: "", want: 2, wantOrg: "" },
-      { org: "gba-provider-org", want: 2, wantOrg: "gba-provider-org" },
+      { org: "gba-provider-org", want: 1, wantOrg: "gba-provider-org" },
+      { org: "gba-consumer-org", want: 1, wantOrg: "gba-consumer-org" },
       { org: "gba-bystander-org", want: 0, wantOrg: "" },
     ];
     for (const tt of cases) {
-      const list = await query.getByAgent({
-        agentId: agent.metadata!.id,
-        org: tt.org,
-      });
+      const list = await query.getByAgent({ agentId: agent.metadata!.id, org: tt.org });
       expect(list.totalCount, `org ${tt.org}`).toBe(tt.want);
       for (const item of list.items) {
         if (tt.wantOrg !== "") {
@@ -870,9 +848,7 @@ describe("apply semantics", () => {
     expect(created.metadata?.id).not.toBe("");
 
     const again = shareFor(agent, true);
-    (again.spec as Record<string, unknown>).allowedOrigins = [
-      "https://docs.example.com",
-    ];
+    (again.spec as Record<string, unknown>).allowedOrigins = ["https://docs.example.com"];
     const updated = await shares.apply(again);
     expect(updated.metadata?.id).toBe(created.metadata!.id);
     expect(updated.spec?.allowedOrigins).toHaveLength(1);