@vellumai/assistant 0.8.12 → 0.9.0-staging.2

package/src/__tests__/pending-interactions-resolved-event.test.ts

@@ -102,6 +102,28 @@ describe("pendingInteractions.resolve emits interaction_resolved", () => {
     expect(publishedMessages).toHaveLength(0);
   });
 
+  test("no event is emitted for a conversation-less interaction", () => {
+    /**
+     * Conversation-less interactions (e.g. the CLI `credentials prompt`
+     * command) resolve through their own resolver rather than a conversation.
+     * The `interaction_resolved` envelope requires a conversationId, so the
+     * tracker skips the broadcast instead of emitting an invalid event.
+     */
+    // GIVEN a registered interaction with no owning conversation
+    pendingInteractions.register("req-detached", { kind: "secret" });
+
+    // WHEN it is resolved
+    const returned = pendingInteractions.resolve("req-detached", "answered");
+
+    // THEN the entry is still returned to its caller
+    expect(returned).toBeDefined();
+
+    // AND no interaction_resolved envelope is published
+    expect(
+      publishedMessages.filter((m) => m.type === "interaction_resolved"),
+    ).toHaveLength(0);
+  });
+
   test("a single resolve emits exactly one event", () => {
     pendingInteractions.register("req-once", {
       conversationId: "conv-e",
@@ -186,4 +208,44 @@ describe("removeByConversation emits interaction_resolved per entry", () => {
         .state,
     ).toBe("cancelled");
   });
+
+  test("settles a swept secret prompt's resolver with a cancelled result", () => {
+    /**
+     * A secret prompt blocks its caller (the CLI `credentials prompt` command
+     * or the in-conversation SecretPrompter) on `rpcResolve`. Unlike questions
+     * (abort-signal teardown) and confirmations (denyAllPendingConfirmations),
+     * nothing else settles a secret when it is superseded, so removing the
+     * entry alone would hang the caller until its IPC client times out.
+     */
+    // GIVEN a pending secret whose caller is blocked on rpcResolve
+    const resolved: unknown[] = [];
+    pendingInteractions.register("secret-sweep", {
+      conversationId: "conv-sweep",
+      kind: "secret",
+      rpcResolve: (value) => resolved.push(value),
+    });
+
+    // WHEN a new user message supersedes the conversation's interactions
+    pendingInteractions.removeByConversation("conv-sweep");
+
+    // THEN the secret resolver is settled once with a cancelled result
+    expect(resolved).toEqual([{ value: null, delivery: "store" }]);
+  });
+
+  test("does not invoke a swept confirmation's resolver with a secret result", () => {
+    // GIVEN a pending confirmation carrying an rpcResolve callback
+    const resolved: unknown[] = [];
+    pendingInteractions.register("conf-sweep", {
+      conversationId: "conv-conf",
+      kind: "confirmation",
+      rpcResolve: (value) => resolved.push(value),
+    });
+
+    // WHEN the conversation is superseded
+    pendingInteractions.removeByConversation("conv-conf");
+
+    // THEN the confirmation resolver is left untouched — only secret prompts
+    // are settled with a SecretPromptResult-shaped value here.
+    expect(resolved).toHaveLength(0);
+  });
 });

package/src/__tests__/post-turn-tool-result-truncation.test.ts

@@ -49,8 +49,10 @@ describe("postTurnTruncateToolResults", () => {
     const shortContent = "a".repeat(THRESHOLD_CHARS);
     const messages = makeMessages([makeToolResult(shortContent)]);
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(0);
     expect(result).toBe(messages); // same reference — no copy
@@ -62,12 +64,17 @@ describe("postTurnTruncateToolResults", () => {
     const toolUseId = "tool_use_abc";
     const messages = makeMessages([makeToolResult(longContent, toolUseId)]);
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(1);
 
-    const block = result[0].content[0] as { type: "tool_result"; content: string };
+    const block = result[0].content[0] as {
+      type: "tool_result";
+      content: string;
+    };
     expect(block.content).toContain(TRUNCATION_MARKER);
     expect(block.content.length).toBeLessThan(longContent.length);
 
@@ -83,8 +90,10 @@ describe("postTurnTruncateToolResults", () => {
       makeToolResult(longContent, "tool_err", true),
     ]);
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(0);
     expect(result).toBe(messages);
@@ -100,8 +109,10 @@ describe("postTurnTruncateToolResults", () => {
       makeToolResult(alreadyTruncated, "tool_idempotent"),
     ]);
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(0);
     expect(result).toBe(messages);
@@ -117,8 +128,10 @@ describe("postTurnTruncateToolResults", () => {
       makeToolResult(long2, "tool_long2"),
     ]);
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(2);
 
@@ -174,8 +187,10 @@ describe("postTurnTruncateToolResults", () => {
       { role: "user", content: [makeToolResult(skillBody, toolUseId)] },
     ];
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(0);
     expect(result).toBe(messages); // same reference — no copy
@@ -209,8 +224,10 @@ describe("postTurnTruncateToolResults", () => {
       { role: "user", content: [makeToolResult(longContent, toolUseId)] },
     ];
 
-    const { messages: result, truncatedCount } =
-      postTurnTruncateToolResults(messages, { conversationDir: convDir });
+    const { messages: result, truncatedCount } = postTurnTruncateToolResults(
+      messages,
+      { conversationDir: convDir },
+    );
 
     expect(truncatedCount).toBe(1);
     const block = result[1].content[0] as {
@@ -262,7 +279,38 @@ describe("derefToolResultReReads", () => {
       derefToolResultReReads(messages);
 
     expect(dereferencedCount).toBe(1);
-    const block = result[1].content[0] as { type: "tool_result"; content: string };
+    const block = result[1].content[0] as {
+      type: "tool_result";
+      content: string;
+    };
+    expect(block.content).toBe(REREAD_STUB);
+  });
+
+  test("host_file_read of .tool-results/ path: tool_result content replaced with REREAD_STUB", () => {
+    const toolUseId = "tu_host_reread";
+    const messages: Message[] = [
+      {
+        role: "assistant",
+        content: [
+          makeToolUse(toolUseId, "host_file_read", {
+            path: `/home/user/.local/share/vellum/conversations/abc/${TOOL_RESULT_DIR}/abc123.txt`,
+          }),
+        ],
+      },
+      {
+        role: "user",
+        content: [makeToolResult("full host file contents here", toolUseId)],
+      },
+    ];
+
+    const { messages: result, dereferencedCount } =
+      derefToolResultReReads(messages);
+
+    expect(dereferencedCount).toBe(1);
+    const block = result[1].content[0] as {
+      type: "tool_result";
+      content: string;
+    };
     expect(block.content).toBe(REREAD_STUB);
   });
 
@@ -289,7 +337,10 @@ describe("derefToolResultReReads", () => {
 
     expect(dereferencedCount).toBe(0);
     expect(result).toBe(messages); // same reference — no copy
-    const block = result[1].content[0] as { type: "tool_result"; content: string };
+    const block = result[1].content[0] as {
+      type: "tool_result";
+      content: string;
+    };
     expect(block.content).toBe(originalContent);
   });
 
@@ -316,7 +367,10 @@ describe("derefToolResultReReads", () => {
 
     expect(dereferencedCount).toBe(0);
     expect(result).toBe(messages);
-    const block = result[1].content[0] as { type: "tool_result"; content: string };
+    const block = result[1].content[0] as {
+      type: "tool_result";
+      content: string;
+    };
     expect(block.content).toBe(outputMentioningDir);
   });