wip

foundry/packages/client/src/keys.ts

@@ -4,18 +4,14 @@ export function organizationKey(organizationId: string): ActorKey {
   return ["org", organizationId];
 }
 
-export function repositoryKey(organizationId: string, repoId: string): ActorKey {
-  return ["org", organizationId, "repository", repoId];
-}
-
 export function taskKey(organizationId: string, repoId: string, taskId: string): ActorKey {
-  return ["org", organizationId, "repository", repoId, "task", taskId];
+  return ["org", organizationId, "task", repoId, taskId];
 }
 
 export function taskSandboxKey(organizationId: string, sandboxId: string): ActorKey {
   return ["org", organizationId, "sandbox", sandboxId];
 }
 
-export function auditLogKey(organizationId: string, repoId: string): ActorKey {
-  return ["org", organizationId, "repository", repoId, "audit-log"];
+export function auditLogKey(organizationId: string): ActorKey {
+  return ["org", organizationId, "audit-log"];
 }

foundry/packages/client/src/mock/backend-client.ts

@@ -308,6 +308,7 @@ export function createMockBackendClient(defaultOrganizationId = "default"): Back
       task: task.title,
       sandboxProviderId: "local",
       status: toTaskStatus(archived ? "archived" : "running", archived),
+      pullRequest: null,
       activeSandboxId: task.id,
       sandboxes: [
         {
@@ -453,6 +454,7 @@ export function createMockBackendClient(defaultOrganizationId = "default"): Back
           branchName: task.branch,
           title: task.title,
           status: task.status === "archived" ? "archived" : "running",
+          pullRequest: null,
           updatedAt: task.updatedAtMs,
         }));
     },
@@ -633,11 +635,7 @@ export function createMockBackendClient(defaultOrganizationId = "default"): Back
       return { endpoint: "mock://terminal-unavailable" };
     },
 
-    async getSandboxWorkspaceModelGroups(
-      _organizationId: string,
-      _sandboxProviderId: SandboxProviderId,
-      _sandboxId: string,
-    ): Promise<WorkspaceModelGroup[]> {
+    async getSandboxWorkspaceModelGroups(_organizationId: string, _sandboxProviderId: SandboxProviderId, _sandboxId: string): Promise<WorkspaceModelGroup[]> {
       return DEFAULT_WORKSPACE_MODEL_GROUPS;
     },
 

foundry/packages/client/test/keys.test.ts

@@ -1,15 +1,9 @@
 import { describe, expect, it } from "vitest";
-import { auditLogKey, organizationKey, repositoryKey, taskKey, taskSandboxKey } from "../src/keys.js";
+import { auditLogKey, organizationKey, taskKey, taskSandboxKey } from "../src/keys.js";
 
 describe("actor keys", () => {
   it("prefixes every key with organization namespace", () => {
-    const keys = [
-      organizationKey("default"),
-      repositoryKey("default", "repo"),
-      taskKey("default", "repo", "task"),
-      taskSandboxKey("default", "sbx"),
-      auditLogKey("default", "repo"),
-    ];
+    const keys = [organizationKey("default"), taskKey("default", "repo", "task"), taskSandboxKey("default", "sbx"), auditLogKey("default")];
 
     for (const key of keys) {
       expect(key[0]).toBe("org");

foundry/packages/client/test/subscription-manager.test.ts

@@ -164,6 +164,9 @@ describe("RemoteSubscriptionManager", () => {
       },
     } satisfies OrganizationEvent);
 
+    // applyEvent chains onto an internal promise — flush the microtask queue
+    await flushAsyncWork();
+
     expect(manager.getSnapshot("organization", params)?.taskSummaries[0]?.title).toBe("Updated task");
     expect(listenerA).toHaveBeenCalled();
     expect(listenerB).toHaveBeenCalled();