@vellumai/assistant 0.12.1-staging.1 → 0.12.1

package/src/__tests__/drain-requeue-on-contention.test.ts

@@ -78,6 +78,12 @@ function makeFakeConversation(options: {
     setTransportHints: () => {
       mutationCalls.push("setTransportHints");
     },
+    setTrustContext: () => {
+      mutationCalls.push("setTrustContext");
+    },
+    ensureActorScopedHistory: async () => {
+      mutationCalls.push("ensureActorScopedHistory");
+    },
     emitActivityState: () => {
       mutationCalls.push("emitActivityState");
     },

package/src/__tests__/evict-conversations-for-reload.test.ts

@@ -1,6 +1,6 @@
 /**
  * `evictConversationsForReload` drops in-memory conversations after a
- * config/prompt reload so the next turn rebuilds them against the new
+ * config/prompt/skills reload so the next turn rebuilds them against the new
  * config. Queued messages live only on the instance being disposed, so the
  * same "not idle while a queue is pending" rule the periodic evictor applies
  * has to hold here: `isProcessing()` reads false in the window between a turn

package/src/__tests__/host-bash-proxy.test.ts

@@ -669,31 +669,23 @@ describe("HostBashProxy", () => {
       expect(sentMessages).toHaveLength(0);
     });
 
-    test("selects the most recently active same-user client when several are connected", async () => {
+    test("rejects ambiguously when multiple same-user capable clients are connected and no targetClientId", async () => {
+      // Regression: previously fell through to untargeted broadcast, fanning
+      // a single targeted-style request out across every same-user machine.
       setup();
       setupMultipleClients(["client-1", "client-2", "client-3"]);
 
-      const resultPromise = proxy.request(
+      const result = await proxy.request(
         { command: "echo hello" },
         "session-1",
         undefined,
         "user-A",
       );
 
-      const sent = sentMessages[0] as Record<string, unknown>;
-      expect(sent.targetClientId).toBe("client-1");
-      const options = sentMessageOptions[0] as
-        | Record<string, unknown>
-        | undefined;
-      expect(options?.targetClientId).toBe("client-1");
-
-      proxy.resolveResult(sent.requestId as string, {
-        stdout: "hello\n",
-        stderr: "",
-        exitCode: 0,
-        timedOut: false,
-      });
-      expect((await resultPromise).isError).toBe(false);
+      expect(result.isError).toBe(true);
+      expect(result.content).toContain("target_client_id");
+      // No broadcast happened
+      expect(sentMessages).toHaveLength(0);
     });
 
     test("falls through to broadcast when zero capable clients (existing timeout path)", async () => {
@@ -840,19 +832,30 @@ describe("HostBashProxy", () => {
       expect(sentMessages).toHaveLength(0);
     });
 
-    test("rejects when the actor has no capable client", async () => {
+    test("untargeted local flow unchanged when no auto-resolve match", async () => {
       setup();
+      // No capable clients connected — untargeted path runs.
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { command: "echo hello" },
         "session-1",
         undefined,
         "user-A",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
+      expect(sentMessages).toHaveLength(1);
+      const sent = sentMessages[0] as Record<string, unknown>;
+      expect(sent.type).toBe("host_bash_request");
+      expect(sent.targetClientId).toBeUndefined();
+
+      const requestId = sent.requestId as string;
+      proxy.resolveResult(requestId, {
+        stdout: "hello\n",
+        stderr: "",
+        exitCode: 0,
+        timedOut: false,
+      });
+      await resultPromise;
     });
 
     test("auto-resolve to same-user client succeeds", async () => {
@@ -880,20 +883,36 @@ describe("HostBashProxy", () => {
       await resultPromise;
     });
 
-    test("rejects when only a different user has a capable client", async () => {
+    test("auto-resolve to different-user client falls through to untargeted", async () => {
       setup();
+      // Single capable client owned by user-B; caller is user-A.
       setupSingleClient("client-abc", "user-B");
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { command: "echo hello" },
         "session-1",
         undefined,
         "user-A",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
+      // Auto-resolve must NOT pick the cross-user client; the untargeted
+      // broadcast path runs instead.
+      expect(sentMessages).toHaveLength(1);
+      const sent = sentMessages[0] as Record<string, unknown>;
+      expect(sent.type).toBe("host_bash_request");
+      expect(sent.targetClientId).toBeUndefined();
+
+      const opts = sentMessageOptions[0] as Record<string, unknown> | undefined;
+      expect(opts?.targetClientId).toBeUndefined();
+
+      const requestId = sent.requestId as string;
+      proxy.resolveResult(requestId, {
+        stdout: "hello\n",
+        stderr: "",
+        exitCode: 0,
+        timedOut: false,
+      });
+      await resultPromise;
     });
   });
 });

package/src/__tests__/host-browser-proxy.test.ts

@@ -608,17 +608,22 @@ describe("HostBrowserProxy", () => {
         },
       ];
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { cdpMethod: "Page.navigate", cdpParams: { url: "https://a.test" } },
         "session-1",
         undefined,
         "user-1",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
+      // Auto-resolution filters out the cross-user candidate, so the
+      // proxy falls into the existing "no active extension connection"
+      // rejection — we never broadcast to a different actor's client.
+      await expect(resultPromise).rejects.toThrow(
+        "no active extension connection",
+      );
       expect(getPublishedMessages()).toHaveLength(0);
     });
+
     test("prefers the chrome-extension client over a more-recently-active macOS bridge", async () => {
       // Mock `listClientsByCapability` returns mockClients in array
       // order, which mirrors production's `lastActiveAt`-desc ordering.
@@ -715,6 +720,11 @@ describe("HostBrowserProxy", () => {
     });
 
     test("rejects when caller has actor but no host_browser-capable client is connected for that actor", async () => {
+      // Same-user filter returns empty even though listClientsByCapability
+      // would return a non-empty list (because that list is for a
+      // different actor). The unfiltered fallback path runs only when
+      // the caller has no actor — we don't silently broadcast to anyone
+      // when the caller IS authenticated to a specific actor.
       mockClients = [
         {
           clientId: "other-user-ext",
@@ -724,15 +734,16 @@ describe("HostBrowserProxy", () => {
         },
       ];
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { cdpMethod: "Page.navigate", cdpParams: { url: "https://a.test" } },
         "session-1",
         undefined,
         "user-1",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
+      await expect(resultPromise).rejects.toThrow(
+        "no active extension connection",
+      );
       expect(getPublishedMessages()).toHaveLength(0);
     });
   });

package/src/__tests__/host-file-proxy-targeted.test.ts

@@ -274,29 +274,6 @@ describe("HostFileProxy — targetClientId (Phase 2)", () => {
     });
   });
 
-  test("selects the most recently active same-user client when several are connected", async () => {
-    setup();
-    setupMultipleClients(["client-1", "client-2"]);
-
-    const resultPromise = proxy.request(
-      { operation: "read", path: "/tmp/file.txt" },
-      "session-1",
-      undefined,
-      undefined,
-      TEST_PRINCIPAL,
-    );
-
-    const sent = sentMessages[0] as Record<string, unknown>;
-    expect(sent.targetClientId).toBe("client-1");
-    const options = sentMessageOptions[0] as
-      | Record<string, unknown>
-      | undefined;
-    expect(options?.targetClientId).toBe("client-1");
-
-    proxy.resolve(sent.requestId as string, { content: "ok", isError: false });
-    expect((await resultPromise).isError).toBe(false);
-  });
-
   // ── targetClientId in cancel (abort signal) ──────────────────────────
 
   describe("targetClientId in cancel — abort signal", () => {

package/src/__tests__/host-file-proxy.test.ts

@@ -746,8 +746,9 @@ describe("HostFileProxy", () => {
       expect(sentMessages).toHaveLength(0);
     });
 
-    test("rejects when the actor has no capable client", async () => {
+    test("untargeted request with no auto-resolve match still broadcasts (legacy path unchanged)", async () => {
       setup();
+      // No matching same-user clients available.
       mockClients = [
         {
           clientId: "client-A",
@@ -756,18 +757,23 @@ describe("HostFileProxy", () => {
         },
       ];
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { operation: "read", path: "/tmp/test.txt" },
         "session-1",
         undefined,
         undefined,
-        "user-B",
+        "user-B", // No same-user match → no auto-resolve, broadcast untargeted.
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
+      expect(sentMessages).toHaveLength(1);
+      const sent = sentMessages[0] as Record<string, unknown>;
+      expect(sent.targetClientId).toBeUndefined();
+      const requestId = sent.requestId as string;
+
+      proxy.resolve(requestId, { content: "ok", isError: false });
+      await resultPromise;
     });
+
     test("auto-resolve picks the same-user client when there's exactly one", async () => {
       setup();
       mockClients = [
@@ -801,7 +807,7 @@ describe("HostFileProxy", () => {
       await resultPromise;
     });
 
-    test("rejects when only a different user has a capable client", async () => {
+    test("auto-resolve falls through when no client matches the source user", async () => {
       setup();
       mockClients = [
         {
@@ -811,7 +817,7 @@ describe("HostFileProxy", () => {
         },
       ];
 
-      const result = await proxy.request(
+      const resultPromise = proxy.request(
         { operation: "read", path: "/tmp/test.txt" },
         "session-1",
         undefined,
@@ -819,10 +825,16 @@ describe("HostFileProxy", () => {
         "user-C",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
+      // No same-user client → no auto-resolve, broadcast untargeted.
+      expect(sentMessages).toHaveLength(1);
+      const sent = sentMessages[0] as Record<string, unknown>;
+      expect(sent.targetClientId).toBeUndefined();
+      const requestId = sent.requestId as string;
+
+      proxy.resolve(requestId, { content: "ok", isError: false });
+      await resultPromise;
     });
+
     test("legacy embedded targetClientId in input still goes through the same-user gate", async () => {
       setup();
       mockClients = [

package/src/__tests__/host-transfer-proxy-targeted.test.ts

@@ -812,7 +812,7 @@ describe("HostTransferProxy — targetClientId", () => {
       await resultPromise;
     });
 
-    test("requestToHost: rejects when no client matches the source user", async () => {
+    test("requestToHost: auto-resolve falls through when no client matches the source user", async () => {
       setup();
       mockClientRegistry.set("client-A", {
         clientId: "client-A",
@@ -824,7 +824,7 @@ describe("HostTransferProxy — targetClientId", () => {
       const srcPath = `/tmp/htp-auto-no-match-${Date.now()}.txt`;
       await globalThis.Bun.write(srcPath, "data");
 
-      const result = await proxy.requestToHost(
+      const resultPromise = proxy.requestToHost(
         {
           sourcePath: srcPath,
           destPath: "/host/dest.txt",
@@ -835,9 +835,13 @@ describe("HostTransferProxy — targetClientId", () => {
         "user-C",
       );
 
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
+      await waitForMessages(sentMessages, 1);
+      const sent = sentMessages[0] as Record<string, unknown>;
+      expect(sent.targetClientId).toBeUndefined();
+
+      const requestId = sent.requestId as string;
+      proxy.resolveTransferResult(requestId, { isError: false });
+      await resultPromise;
     });
 
     test("requestToSandbox: targeted request from a different user is rejected", async () => {
@@ -893,31 +897,6 @@ describe("HostTransferProxy — targetClientId", () => {
       await resultPromise;
     });
 
-    test("requestToSandbox: rejects when no client matches the source user", async () => {
-      setup();
-      const a: MockClient = {
-        clientId: "client-A",
-        capabilities: ["host_file"],
-        actorPrincipalId: "user-A",
-      };
-      mockCapableClients = [a];
-      mockClientRegistry.set("client-A", a);
-
-      const result = await proxy.requestToSandbox(
-        {
-          sourcePath: "/host/source.txt",
-          destPath: "/sandbox/dest.txt",
-          conversationId: "conv-same-9-no-match",
-        },
-        undefined,
-        "user-C",
-      );
-
-      expect(result).toMatchObject({ isError: true });
-      expect(result.content).toContain("belongs to this user");
-      expect(sentMessages).toHaveLength(0);
-    });
-
     test("requestToSandbox: auto-resolve picks the same-user client when there's exactly one", async () => {
       setup();
       const a: MockClient = {

package/src/__tests__/llm-catalog-parity.test.ts

@@ -6,7 +6,6 @@ import {
   getCatalogProviderForModel,
   isModelInCatalog,
   PROVIDER_CATALOG,
-  supportsForcedToolChoiceWithThinking,
 } from "../providers/model-catalog.js";
 import { PLATFORM_PROVIDER_META } from "../providers/platform-proxy/constants.js";
 import { resolvePricing, resolvePricingForUsage } from "../util/pricing.js";
@@ -552,30 +551,6 @@ describe("LLM catalog parity: daemon vs client", () => {
     expect(getCatalogProviderForModel("unknown/model")).toBeUndefined();
   });
 
-  test("forced tool choice with thinking is scoped to OpenRouter Kimi K2.6", () => {
-    expect(
-      supportsForcedToolChoiceWithThinking("openrouter", "moonshotai/kimi-k2.6"),
-    ).toBe(false);
-    expect(
-      supportsForcedToolChoiceWithThinking(
-        "openrouter",
-        "moonshotai/kimi-k2.6-20260420",
-      ),
-    ).toBe(false);
-    expect(
-      supportsForcedToolChoiceWithThinking(
-        "vercel-ai-gateway",
-        "moonshotai/kimi-k2.6",
-      ),
-    ).toBe(true);
-    expect(
-      supportsForcedToolChoiceWithThinking("openrouter", "unknown/model"),
-    ).toBe(true);
-    expect(
-      supportsForcedToolChoiceWithThinking("unknown-provider", "unknown/model"),
-    ).toBe(true);
-  });
-
   test("Gemini 2.5 Pro catalog context matches provider limits", () => {
     const gemini = PROVIDER_CATALOG.find((entry) => entry.id === "gemini");
     expect(

package/src/__tests__/mcp-auth-routes.test.ts

@@ -24,12 +24,15 @@ mock.module("../mcp/mcp-auth-state.js", () => ({
   getMcpAuthState: mockGetMcpAuthState,
 }));
 
-import { setWorkspaceMcp } from "./helpers/set-workspace-mcp.js";
-
-// Seed the MCP server the routes look up via workspace mcp.json.
-setWorkspaceMcp({
-  "my-server": {
-    transport: { type: "sse", url: "https://mcp.example.com" },
+import { setConfig } from "./helpers/set-config.js";
+
+// Seed the MCP server the routes look up via `loadRawConfig()` into the
+// workspace config for real.
+setConfig("mcp", {
+  servers: {
+    "my-server": {
+      transport: { type: "sse", url: "https://mcp.example.com" },
+    },
   },
 });