@vellumai/assistant 0.8.1 → 0.8.3

package/src/daemon/pkb-reminder-builder.test.ts

@@ -2,32 +2,24 @@ import { describe, expect, test } from "bun:test";
 
 import { buildPkbReminder } from "./pkb-reminder-builder.js";
 
-// Byte-for-byte fixture of the default (non-relaxed) PKB reminder. Asserted
-// verbatim so that any future edit to the BODY text is caught by tests.
-const BASE_REMINDER_DEFAULT =
+// Byte-for-byte fixture of the PKB reminder. Asserted verbatim so that any
+// future edit to the BODY text is caught by tests.
+const BASE_REMINDER =
   "<system_reminder>" +
-  "\n**CRITICAL:** Call `remember` this turn for anything concrete the user said — facts, preferences, plans, names, dates, decisions, corrections, felt moments. Default to remembering; skip only obvious noise. This should be your most frequently used tool." +
+  "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
   "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing." +
   "\n</system_reminder>";
 
-// Byte-for-byte fixture of the relaxed PKB reminder used when the
-// `memory-retrospective` feature flag is on.
-const BASE_REMINDER_RELAXED =
-  "<system_reminder>" +
-  "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments, things the user asks you to hold onto. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
-  "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing." +
-  "\n</system_reminder>";
-
-describe("buildPkbReminder — default body (relaxed=false)", () => {
+describe("buildPkbReminder", () => {
   test("empty hints returns exact base reminder byte-for-byte", () => {
-    expect(buildPkbReminder([], false)).toBe(BASE_REMINDER_DEFAULT);
+    expect(buildPkbReminder([])).toBe(BASE_REMINDER);
   });
 
   test("single hint renders one bullet with no duplicates or trailing blank line", () => {
-    const out = buildPkbReminder(["projects/alpha.md"], false);
+    const out = buildPkbReminder(["projects/alpha.md"]);
     const expected =
       "<system_reminder>" +
-      "\n**CRITICAL:** Call `remember` this turn for anything concrete the user said — facts, preferences, plans, names, dates, decisions, corrections, felt moments. Default to remembering; skip only obvious noise. This should be your most frequently used tool." +
+      "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
       "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing." +
       "\nBased on the current context, these files look especially relevant:" +
       "\n- projects/alpha.md" +
@@ -44,10 +36,10 @@ describe("buildPkbReminder — default body (relaxed=false)", () => {
 
   test("three hints render all three in order", () => {
     const hints = ["a.md", "sub/b.md", "c/d/e.md"];
-    const out = buildPkbReminder(hints, false);
+    const out = buildPkbReminder(hints);
     const expected =
       "<system_reminder>" +
-      "\n**CRITICAL:** Call `remember` this turn for anything concrete the user said — facts, preferences, plans, names, dates, decisions, corrections, felt moments. Default to remembering; skip only obvious noise. This should be your most frequently used tool." +
+      "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
       "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing." +
       "\nBased on the current context, these files look especially relevant:" +
       "\n- a.md" +
@@ -67,7 +59,7 @@ describe("buildPkbReminder — default body (relaxed=false)", () => {
 
   test("hints with special chars (< and &) are emitted verbatim (no escaping)", () => {
     const hints = ["weird<name>.md", "foo&bar.md"];
-    const out = buildPkbReminder(hints, false);
+    const out = buildPkbReminder(hints);
     expect(out).toContain("- weird<name>.md");
     expect(out).toContain("- foo&bar.md");
     // Ensure no HTML-style escaping happened.
@@ -75,38 +67,3 @@ describe("buildPkbReminder — default body (relaxed=false)", () => {
     expect(out).not.toContain("&amp;");
   });
 });
-
-describe("buildPkbReminder — relaxed body (relaxed=true)", () => {
-  test("empty hints returns the relaxed base reminder byte-for-byte", () => {
-    expect(buildPkbReminder([], true)).toBe(BASE_REMINDER_RELAXED);
-  });
-
-  test("relaxed BODY does NOT contain the default high-pressure phrasing", () => {
-    const out = buildPkbReminder([], true);
-    expect(out).not.toContain("**CRITICAL:**");
-    expect(out).not.toContain("most frequently used tool");
-    expect(out).not.toContain("Default to remembering");
-  });
-
-  test("relaxed BODY mentions the retrospective backstop framing", () => {
-    const out = buildPkbReminder([], true);
-    expect(out).toContain("Stay present");
-    expect(out).toContain("retrospective pass");
-  });
-
-  test("hints render below the relaxed body in the same shape as default", () => {
-    const out = buildPkbReminder(["projects/alpha.md"], true);
-    expect(out).toContain("- projects/alpha.md");
-    expect(out).toContain(
-      "Based on the current context, these files look especially relevant:",
-    );
-    // Should still close cleanly with no double newline before the tag.
-    expect(out.includes("\n\n</system_reminder>")).toBe(false);
-  });
-});
-
-describe("buildPkbReminder — relaxed vs default differ", () => {
-  test("the two BODY variants are NOT byte-identical", () => {
-    expect(buildPkbReminder([], false)).not.toBe(buildPkbReminder([], true));
-  });
-});

package/src/daemon/pkb-reminder-builder.ts

@@ -1,9 +1,5 @@
-const BODY_DEFAULT =
-  "\n**CRITICAL:** Call `remember` this turn for anything concrete the user said — facts, preferences, plans, names, dates, decisions, corrections, felt moments. Default to remembering; skip only obvious noise. This should be your most frequently used tool." +
-  "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing.";
-
-const BODY_RELAXED =
-  "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments, things the user asks you to hold onto. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
+const BODY =
+  "\nStay present in this conversation. Use `remember` when something feels worth pausing to mark — corrections (highest priority), plans, decisions, felt moments. You don't have to capture everything in the moment — a retrospective pass reviews this conversation in the background and saves what you didn't capture." +
   "\nIf you're unsure about something that may live in the workspace — past decisions, prior conversations, files — use `recall` before asking or guessing.";
 
 /**
@@ -15,23 +11,12 @@ const BODY_RELAXED =
  * hint. Hints are emitted verbatim — they are trusted internal paths, not
  * user input, so no escaping is performed.
  *
- * The `relaxed` flag selects between the default high-pressure body and the
- * relaxed "judgment framing" body used when the `memory-retrospective`
- * feature flag is on. With the flag on, the in-conversation remember pressure
- * eases because the retrospective is the backstop. Callers must pass
- * `relaxed` explicitly — no default — so the contract is visible at every
- * call site.
- *
  * Caller is responsible for capping the hints array at 3 entries.
  */
-export function buildPkbReminder(
-  hints: ReadonlyArray<string>,
-  relaxed: boolean,
-): string {
-  const body = relaxed ? BODY_RELAXED : BODY_DEFAULT;
+export function buildPkbReminder(hints: ReadonlyArray<string>): string {
   if (hints.length === 0) {
-    return `<system_reminder>${body}\n</system_reminder>`;
+    return `<system_reminder>${BODY}\n</system_reminder>`;
   }
   const bullets = hints.map((h) => `- ${h}`).join("\n");
-  return `<system_reminder>${body}\nBased on the current context, these files look especially relevant:\n${bullets}\n</system_reminder>`;
+  return `<system_reminder>${BODY}\nBased on the current context, these files look especially relevant:\n${bullets}\n</system_reminder>`;
 }

package/src/daemon/plugin-source-watcher.ts

@@ -0,0 +1,146 @@
+/**
+ * Filesystem watcher for the external plugins directory.
+ *
+ * Watches `<workspaceDir>/plugins/` recursively using fs.watch (FSEvents on
+ * macOS). When a plugin directory is created or modified, debounces per
+ * top-level directory name (= the plugin name) and dispatches to the
+ * watcher's internal change handler so the daemon can register or reload
+ * the plugin without a restart.
+ *
+ * Mirrors `app-source-watcher.ts` (same DebouncerMap shape, same start/stop
+ * lifecycle, same ensureStarted late-create hook), but exposes its lifecycle
+ * through a static singleton so tool side-effects can call
+ * `PluginSourceWatcher.getInstance().ensureStarted()` directly without an
+ * intermediate module-level injection.
+ */
+
+import { type FSWatcher, mkdirSync, watch } from "node:fs";
+
+import { DebouncerMap } from "../util/debounce.js";
+import { getLogger } from "../util/logger.js";
+import { getWorkspacePluginsDir } from "../util/platform.js";
+import { reregisterExternalPlugin } from "./external-plugins-bootstrap.js";
+
+const log = getLogger("plugin-source-watcher");
+
+const PLUGIN_SOURCE_DEBOUNCE_MS = 500;
+
+/**
+ * Extract the plugin's top-level directory name from a relative path within
+ * the plugins root. Returns null for a stray file directly in `plugins/`
+ * (not a plugin dir).
+ */
+function resolvePluginNameFromRelPath(relPath: string): string | null {
+  const slashIdx = relPath.indexOf("/");
+  if (slashIdx === -1) {
+    // Bare entry under plugins/ — fs.watch reports these when a new
+    // directory is first created. We treat the name as the plugin name and
+    // let the install path decide whether it's a real plugin.
+    return relPath.length > 0 ? relPath : null;
+  }
+  const dirName = relPath.slice(0, slashIdx);
+  return dirName.length > 0 ? dirName : null;
+}
+
+export class PluginSourceWatcher {
+  /**
+   * Process-wide singleton. Callers reach the watcher via
+   * {@link PluginSourceWatcher.getInstance} rather than instantiating
+   * directly so tool side-effects (`assistant plugins install`) can call
+   * `ensureStarted()` on the same watcher the daemon `start()`/`stop()`
+   * lifecycle owns, without threading an instance through a registered
+   * module-level callback.
+   */
+  private static singleton: PluginSourceWatcher | null = null;
+
+  static getInstance(): PluginSourceWatcher {
+    PluginSourceWatcher.singleton ??= new PluginSourceWatcher();
+    return PluginSourceWatcher.singleton;
+  }
+
+  /** Test-only — drops the singleton so the next `getInstance()` rebuilds. */
+  static resetForTests(): void {
+    PluginSourceWatcher.singleton?.stop();
+    PluginSourceWatcher.singleton = null;
+  }
+
+  private watcher: FSWatcher | null = null;
+  private started = false;
+  private debouncer = new DebouncerMap({
+    defaultDelayMs: PLUGIN_SOURCE_DEBOUNCE_MS,
+    maxEntries: 50,
+  });
+
+  start(): void {
+    this.started = true;
+    this.tryWatch();
+  }
+
+  /**
+   * Ensure the watcher is running. Idempotent — safe to call after a tool
+   * side-effect that may have just created the plugins directory.
+   * No-op if `start()` has not been called yet.
+   */
+  ensureStarted(): void {
+    if (!this.started || this.watcher) return;
+    this.tryWatch();
+  }
+
+  stop(): void {
+    this.started = false;
+    this.debouncer.cancelAll();
+    if (this.watcher) {
+      this.watcher.close();
+      this.watcher = null;
+    }
+  }
+
+  private onChange(pluginName: string): Promise<void> {
+    return reregisterExternalPlugin(pluginName);
+  }
+
+  private tryWatch(): void {
+    if (this.watcher) return;
+
+    let pluginsDir: string;
+    try {
+      pluginsDir = getWorkspacePluginsDir();
+    } catch {
+      log.warn(
+        "Could not resolve plugins directory; plugin source watching disabled",
+      );
+      return;
+    }
+
+    try {
+      mkdirSync(pluginsDir, { recursive: true });
+    } catch (err) {
+      log.warn(
+        { err, pluginsDir },
+        "Could not create plugins directory; source watching disabled",
+      );
+      return;
+    }
+
+    try {
+      this.watcher = watch(
+        pluginsDir,
+        { recursive: true },
+        (_eventType, filename) => {
+          if (!filename) return;
+          const pluginName = resolvePluginNameFromRelPath(filename);
+          if (!pluginName) return;
+          this.debouncer.schedule(`plugin:${pluginName}`, () => {
+            void this.onChange(pluginName);
+          });
+        },
+      );
+      log.info({ pluginsDir }, "Plugin source watcher started");
+    } catch (err) {
+      log.warn(
+        { err },
+        "Failed to watch plugins directory; source watching disabled",
+      );
+    }
+  }
+}

package/src/daemon/process-message.ts

@@ -30,9 +30,14 @@ import {
 import { updateMetaFile } from "../memory/conversation-disk-view.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
+import { publishConversationMessagesChanged } from "../runtime/sync/resource-sync-events.js";
+import { getSubagentManager } from "../subagent/index.js";
 import { getLogger } from "../util/logger.js";
 import type { Conversation } from "./conversation.js";
-import { buildSlackMetaForPersistence } from "./conversation-messaging.js";
+import {
+  buildSlackMetaForPersistence,
+  serializePersistedUserMessageContent,
+} from "./conversation-messaging.js";
 import { formatCompactResult } from "./conversation-process.js";
 import { resolveChannelCapabilities } from "./conversation-runtime-assembly.js";
 import {
@@ -314,7 +319,11 @@ export async function processMessage(
     const persisted = await addMessage(
       conversationId,
       "user",
-      JSON.stringify(cleanMsg.content),
+      serializePersistedUserMessageContent(
+        content,
+        attachments,
+        options?.displayContent,
+      ),
       userMetaWithSlack,
     );
     conversation.getMessages().push(llmMsg);
@@ -368,6 +377,7 @@ export async function processMessage(
       serverChannelMeta,
     );
     conversation.getMessages().push(assistantMsg);
+    publishConversationMessagesChanged(conversationId);
     return { messageId: persisted.id };
   }
 
@@ -399,7 +409,11 @@ export async function processMessage(
     const persisted = await addMessage(
       conversationId,
       "user",
-      JSON.stringify(cleanMsg.content),
+      serializePersistedUserMessageContent(
+        content,
+        attachments,
+        options?.displayContent,
+      ),
       compactUserMeta,
     );
     conversation.getMessages().push(cleanMsg);
@@ -421,6 +435,7 @@ export async function processMessage(
       compactChannelMeta,
     );
     conversation.getMessages().push(assistantMsg);
+    publishConversationMessagesChanged(conversationId);
     return { messageId: persisted.id };
   }
 
@@ -435,10 +450,13 @@ export async function processMessage(
     attachments,
     requestId,
     persistMetadata,
+    options?.displayContent,
   );
+  publishConversationMessagesChanged(conversationId);
 
   if (options?.isInteractive === true) {
     conversation.updateClient(broadcastMessage, false);
+    getSubagentManager().updateParentSender(conversationId, broadcastMessage);
   }
 
   try {
@@ -499,10 +517,13 @@ export async function processMessageInBackground(
     attachments,
     requestId,
     persistMetadata,
+    options?.displayContent,
   );
+  publishConversationMessagesChanged(conversationId);
 
   if (options?.isInteractive === true) {
     conversation.updateClient(broadcastMessage, false);
+    getSubagentManager().updateParentSender(conversationId, broadcastMessage);
   }
 
   conversation.setSlackRuntimeContextNotice(options?.slackRuntimeContextNotice);

package/src/daemon/server.ts

@@ -16,7 +16,9 @@ import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { getSigningKeyFingerprint } from "../runtime/auth/token-service.js";
 import {
   publishAvatarChanged,
+  publishConfigChanged,
   publishIdentityChanged,
+  publishSoundsConfigUpdated,
 } from "../runtime/sync/resource-sync-events.js";
 import { updatePublishedAppDeployment } from "../services/published-app-updater.js";
 import { getSubagentManager } from "../subagent/index.js";
@@ -43,6 +45,8 @@ import { refreshSurfacesForApp } from "./conversation-surfaces.js";
 import { parseIdentityFields } from "./handlers/identity.js";
 import type { ConversationCreateOptions } from "./handlers/shared.js";
 import { setGlobalSkillIpcSender } from "./meet-host-supervisor.js";
+import { PluginSourceWatcher } from "./plugin-source-watcher.js";
+import { refreshSkillCapabilityMemories } from "./skill-memory-refresh.js";
 
 const log = getLogger("server");
 
@@ -68,6 +72,7 @@ export class DaemonServer {
   // Composed subsystems
   private configWatcher = getConfigWatcher();
   private appSourceWatcher = new AppSourceWatcher();
+  private pluginSourceWatcher = PluginSourceWatcher.getInstance();
   private cliIpc = new AssistantIpcServer();
   private skillIpc = new SkillIpcServer();
 
@@ -193,11 +198,11 @@ export class DaemonServer {
   }
 
   private broadcastConfigChanged(): void {
-    broadcastMessage({ type: "config_changed" });
+    publishConfigChanged();
   }
 
   private broadcastSoundsConfigUpdated(): void {
-    broadcastMessage({ type: "sounds_config_updated" });
+    publishSoundsConfigUpdated();
   }
 
   private broadcastAvatarUpdated(): void {
@@ -279,12 +284,15 @@ export class DaemonServer {
       () => this.broadcastSoundsConfigUpdated(),
       () => this.broadcastAvatarUpdated(),
       () => this.broadcastConfigChanged(),
+      () => refreshSkillCapabilityMemories(getConfig()),
     );
 
     this.syncIdentityToPlatform();
 
     this.appSourceWatcher.start((appId) => this.handleAppSourceChange(appId));
 
+    this.pluginSourceWatcher.start();
+
     // Broadcast contacts_changed to all clients when any contact mutation occurs.
     this.unsubscribeContactChange = onContactChange(() => {
       broadcastMessage({ type: "contacts_changed" });
@@ -299,6 +307,7 @@ export class DaemonServer {
     this.evictor.stop();
     this.configWatcher.stop();
     this.appSourceWatcher.stop();
+    this.pluginSourceWatcher.stop();
     this.cliIpc.stop();
     this.skillIpc.stop();
     if (this.unsubscribeContactChange) {

package/src/daemon/skill-memory-refresh.ts

@@ -0,0 +1,33 @@
+import { getConfig } from "../config/loader.js";
+import type { AssistantConfig } from "../config/schema.js";
+import {
+  seedSkillGraphNodes,
+  seedUninstalledCatalogSkillMemories,
+} from "../memory/graph/capability-seed.js";
+import { getLogger } from "../util/logger.js";
+import {
+  maybeSeedMemoryV2CliCommands,
+  maybeSeedMemoryV2Skills,
+} from "./memory-v2-startup.js";
+
+const log = getLogger("skill-memory-refresh");
+
+export function refreshSkillCapabilityMemories(
+  config: AssistantConfig = getConfig(),
+): void {
+  seedSkillGraphNodes();
+  maybeSeedMemoryV2Skills(config);
+  maybeSeedMemoryV2CliCommands(config);
+  void seedUninstalledCatalogSkillMemories()
+    .then(() => {
+      // Re-run after the async catalog fetch populates the cache so stale
+      // installed-skill nodes can be pruned without deleting catalog-only nodes.
+      seedSkillGraphNodes();
+    })
+    .catch((err) =>
+      log.warn(
+        { err },
+        "Uninstalled catalog skill memory seeding failed — continuing",
+      ),
+    );
+}

package/src/daemon/wake-target-adapter.ts

@@ -135,6 +135,8 @@ function translateAgentEventToServerMessage(
     case "input_json_delta":
     case "usage":
     case "error":
+    case "provider_error":
+    case "agent_loop_exit":
       return null;
   }
 }