@vellumai/assistant 0.8.3 → 0.8.4

package/src/workspace/git-service.ts

@@ -1,5 +1,12 @@
 import { execFile, spawnSync } from "node:child_process";
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { join } from "node:path";
 import { promisify } from "node:util";
 
@@ -70,6 +77,41 @@ const WORKSPACE_GITIGNORE_RULES = [
   "session-token",
 ];
 
+const NULL_GIT_OID = "0000000000000000000000000000000000000000";
+
+const WORKSPACE_BRANCH_GUARD_HOOK = `#!/bin/sh
+set -eu
+
+state="\${1:-}"
+if [ "$state" != "prepared" ]; then
+  exit 0
+fi
+
+while read -r _old_oid new_oid refname; do
+  case "$refname" in
+    refs/heads/main)
+      ;;
+    refs/heads/*)
+      if [ "$new_oid" = "${NULL_GIT_OID}" ]; then
+        continue
+      fi
+
+      cat >&2 <<MSG
+Blocked: assistant workspace git branches are disabled.
+
+Use the workspace main branch for assistant state. Create task branches only in
+external product repositories or dedicated worktrees.
+
+Rejected ref update: $refname
+MSG
+      exit 1
+      ;;
+  esac
+done
+
+exit 0
+`;
+
 /** Properties added by Node's child_process errors. */
 interface ExecError extends Error {
   killed?: boolean;
@@ -426,7 +468,9 @@ export class WorkspaceGitService {
                 // These calls are OUTSIDE the rev-parse try/catch so that
                 // normalization errors are not misclassified as "no commits".
                 this.ensureGitignoreRulesLocked();
+                this.ensureBranchGuardHookLocked();
                 await this.ensureCommitIdentityLocked();
+                await this.ensureBranchGuardConfigLocked();
                 await this.ensureOnMainLocked();
                 this.initialized = true;
                 this.recordInitSuccess();
@@ -444,7 +488,9 @@ export class WorkspaceGitService {
           // in the corruption-recovery path we fall through here after
           // removing .git, so branch enforcement is still useful.
           this.ensureGitignoreRulesLocked();
+          this.ensureBranchGuardHookLocked();
           await this.ensureCommitIdentityLocked();
+          await this.ensureBranchGuardConfigLocked();
           await this.ensureOnMainLocked();
 
           // Create initial commit synchronously within the lock to prevent
@@ -452,9 +498,14 @@ export class WorkspaceGitService {
           // initial commit could run concurrently and consume edits meant
           // for the first user-requested commit.
           const status = await this.getStatusInternal();
-          const hasExistingFiles =
-            status.untracked.length > 1 || // More than just .gitignore
-            status.untracked.some((f) => f !== ".gitignore");
+          const autoCreatedInitFiles = new Set([
+            ".gitignore",
+            ".githooks/",
+            ".githooks/reference-transaction",
+          ]);
+          const hasExistingFiles = status.untracked.some(
+            (f) => !autoCreatedInitFiles.has(f),
+          );
 
           await this.execGit(["add", "-A"]);
 
@@ -766,6 +817,26 @@ export class WorkspaceGitService {
     await this.execGit(["config", "user.email", gitEmail]);
   }
 
+  /**
+   * Ensure workspace branch guard hook is present.
+   * Must be called with the mutex lock held.
+   */
+  private ensureBranchGuardHookLocked(): void {
+    const hooksDir = join(this.workspaceDir, ".githooks");
+    const hookPath = join(hooksDir, "reference-transaction");
+    mkdirSync(hooksDir, { recursive: true });
+    writeFileSync(hookPath, WORKSPACE_BRANCH_GUARD_HOOK, "utf-8");
+    chmodSync(hookPath, 0o755);
+  }
+
+  /**
+   * Ensure workspace git uses the branch guard hook path.
+   * Must be called with the mutex lock held.
+   */
+  private async ensureBranchGuardConfigLocked(): Promise<void> {
+    await this.execGit(["config", "core.hooksPath", ".githooks"]);
+  }
+
   /**
    * Ensure the workspace repo is on the `main` branch.
    * If on a different branch or in detached HEAD state, switches to main

package/src/workspace/migrations/088-deprecate-background-conversation-override.ts

@@ -0,0 +1,103 @@
+/**
+ * Workspace migration 088: Deprecate stale
+ * `prompts/system/08-background-conversation.md` overrides.
+ *
+ * PR #31210 moved the background-conversation guidance out of the bundled
+ * system prompt and into a per-turn user-message injector. As a side effect:
+ *
+ *   - Workspace overrides that gated on `{{#isBackgroundConversation}}` now
+ *     evaluate the gate as false (the key is no longer passed to the system
+ *     prompt context) and silently stop rendering in background turns.
+ *   - Plain-text overrides without a gate would now render unconditionally
+ *     in ALL conversations — the opposite of intended behavior.
+ *
+ * Either failure mode is silent. To prevent it, this migration renames any
+ * existing `prompts/system/08-background-conversation.md` to
+ * `08-background-conversation.md.deprecated` so the section-discovery walker
+ * (which only picks up `.md` files) stops loading it, while preserving the
+ * user's customized text on disk for manual review.
+ *
+ * Idempotent: re-runs after `08-background-conversation.md` has already been
+ * renamed are no-ops. If both files exist (a user re-created the override
+ * after a prior partial run), the bundled section is gone — drop the `.md`
+ * and keep the previously-preserved `.deprecated` copy.
+ */
+
+import { existsSync, renameSync, unlinkSync } from "node:fs";
+import { join } from "node:path";
+
+import { getLogger } from "../../util/logger.js";
+import type { WorkspaceMigration } from "./types.js";
+
+const log = getLogger(
+  "workspace-migration-088-deprecate-background-conversation-override",
+);
+
+const OVERRIDE_FILENAME = "08-background-conversation.md";
+const DEPRECATED_FILENAME = "08-background-conversation.md.deprecated";
+
+export const deprecateBackgroundConversationOverrideMigration: WorkspaceMigration =
+  {
+    id: "088-deprecate-background-conversation-override",
+    description:
+      "Rename stale prompts/system/08-background-conversation.md overrides to .deprecated so they stop rendering after the section moved to a per-turn injector",
+    retryFailedCheckpoint: true,
+
+    run(workspaceDir: string): void {
+      const promptDir = join(workspaceDir, "prompts", "system");
+      const overridePath = join(promptDir, OVERRIDE_FILENAME);
+      const deprecatedPath = join(promptDir, DEPRECATED_FILENAME);
+
+      if (!existsSync(overridePath)) return;
+
+      if (existsSync(deprecatedPath)) {
+        try {
+          unlinkSync(overridePath);
+          log.info(
+            { path: overridePath, preserved: deprecatedPath },
+            "Removed re-created background-conversation override; preserved copy already exists",
+          );
+        } catch (err) {
+          log.warn(
+            { err, path: overridePath },
+            "Failed to remove background-conversation override",
+          );
+          throw err;
+        }
+        return;
+      }
+
+      try {
+        renameSync(overridePath, deprecatedPath);
+        log.info(
+          { from: overridePath, to: deprecatedPath },
+          "Renamed stale background-conversation override to .deprecated",
+        );
+      } catch (err) {
+        log.warn(
+          { err, from: overridePath, to: deprecatedPath },
+          "Failed to rename background-conversation override",
+        );
+        throw err;
+      }
+    },
+
+    down(workspaceDir: string): void {
+      const promptDir = join(workspaceDir, "prompts", "system");
+      const overridePath = join(promptDir, OVERRIDE_FILENAME);
+      const deprecatedPath = join(promptDir, DEPRECATED_FILENAME);
+
+      if (!existsSync(deprecatedPath)) return;
+      if (existsSync(overridePath)) return;
+
+      try {
+        renameSync(deprecatedPath, overridePath);
+      } catch (err) {
+        log.warn(
+          { err, from: deprecatedPath, to: overridePath },
+          "Failed to restore background-conversation override",
+        );
+        throw err;
+      }
+    },
+  };

package/src/workspace/migrations/registry.ts

@@ -85,6 +85,7 @@ import { removeLegacySkillsIndexMigration } from "./084-remove-legacy-skills-ind
 import { memoryV2Bm25BReembedDisabledV2PagesMigration } from "./085-memory-v2-bm25-b-reembed-disabled-v2-pages.js";
 import { revertStaleGeminiMisRewritesMigration } from "./086-revert-stale-gemini-mis-rewrites.js";
 import { memoryRouterBalancedProfileMigration } from "./087-memory-router-balanced-profile.js";
+import { deprecateBackgroundConversationOverrideMigration } from "./088-deprecate-background-conversation-override.js";
 import { migrateToWorkspaceVolumeMigration } from "./migrate-to-workspace-volume.js";
 import type { WorkspaceMigration } from "./types.js";
 
@@ -181,4 +182,5 @@ export const WORKSPACE_MIGRATIONS: WorkspaceMigration[] = [
   memoryV2Bm25BReembedDisabledV2PagesMigration,
   revertStaleGeminiMisRewritesMigration,
   memoryRouterBalancedProfileMigration,
+  deprecateBackgroundConversationOverrideMigration,
 ];

package/src/config/bundled-skills/document/SKILL.md

@@ -1,54 +0,0 @@
----
-name: document
-description: Write, draft, or compose long-form text (blog posts, articles, essays, reports, guides)
-compatibility: "Designed for Vellum personal assistants"
-metadata:
-  emoji: "📄"
-  vellum:
-    display-name: "Document"
-    activation-hints:
-      - "User asks to write, draft, or collaborate on long-form content — use the document editor for a better editing experience"
-      - "When content will be iterated on, reviewed, or exported, prefer the document editor over inline markdown"
-      - "When a file attachment contains a draft or document the user wants to iterate on, open it in the editor"
----
-
-Create and edit long-form documents using the built-in rich text editor. Documents open in workspace mode with chat docked to the side.
-
-## Tools
-
-- **document_create** - Opens a new document editor with an optional title and initial Markdown content. Returns a `surface_id` for subsequent updates.
-- **document_update** - Updates content in an open document editor by `surface_id`. Supports `replace` (overwrite) and `append` (add to end) modes.
-- **document_read** - Reads the current content of a document by `surface_id` when it belongs to the current conversation, or when the current actor is the guardian/local user. Use to verify content before editing.
-- **document_list** - Lists documents. Without `query`, lists the current conversation's documents. With `query`, searches by title; guardian/local users can search across conversations, while other actors are scoped to the current conversation.
-- **document_delete** - Deletes a document by `surface_id`. Use to clean up unwanted documents.
-
-## Retrieving existing documents
-
-When the user asks to see, open, or pull up a document:
-
-1. Check the `<active_documents>` block in your context — it lists all documents in this conversation with their `surface_id` and title. If the document is there, call `document_read` with its `surface_id`. Done in one call.
-2. If the document is NOT in `<active_documents>`, call `document_list` with a `query` matching the document title. For guardian/local users, this searches across previous conversations and sessions.
-3. Once you have the `surface_id`, call `document_read` to retrieve the content.
-
-**Never** search the filesystem, conversation history, or archives to find a document. Always use `document_list` with a `query`.
-
-## Creating a new document
-
-1. **Create the document**: Call `document_create` with a title (inferred from the request). Call the tool immediately, not after conversational preamble.
-2. **Write content in Markdown**: Use proper structure (`#` for titles, `##` for sections), **bold**, _italic_, code blocks, tables, lists, blockquotes as appropriate.
-3. **CRITICAL - Stream content in chunks**: Call `document_update` MULTIPLE times, not just once. Break content into logical chunks (paragraphs, sections, or every 200-300 words). Call `document_update` with `mode: "append"` for EACH chunk separately. The user experiences real-time content appearing as you write.
-
-## Editing an existing document
-
-When the user requests changes to a document:
-
-1. Find the `surface_id` from the `<active_documents>` context block.
-2. Use `document_update` with the existing `surface_id` — do NOT call `document_create` again.
-3. Use `mode: "replace"` for full rewrites or `mode: "append"` for additions.
-
-## Usage Notes
-
-- The `mode` parameter on `document_update` defaults to `append`.
-- Documents are automatically saved and accessible via the Generated panel.
-- Users can manually edit documents at any time.
-- Write in clear, engaging prose. Use active voice, vary sentence structure, and break content into logical sections with descriptive headings.

package/src/config/bundled-skills/document/TOOLS.json

@@ -1,106 +0,0 @@
-{
-  "version": 1,
-  "tools": [
-    {
-      "name": "document_create",
-      "description": "Create a new long-form document with a rich text editor. Use this when the user asks to write a blog post, article, or any long-form content. The editor opens in workspace mode with chat docked to the side.",
-      "category": "document",
-      "risk": "low",
-      "input_schema": {
-        "type": "object",
-        "properties": {
-          "title": {
-            "type": "string",
-            "description": "Initial title for the document (optional, can be updated later)"
-          },
-          "initial_content": {
-            "type": "string",
-            "description": "Initial Markdown content to populate the editor (optional)"
-          }
-        }
-      },
-      "executor": "tools/document-create.ts",
-      "execution_target": "host"
-    },
-    {
-      "name": "document_update",
-      "description": "Update content in an open document editor. Use this to stream generated content or apply edits.",
-      "category": "document",
-      "risk": "low",
-      "input_schema": {
-        "type": "object",
-        "properties": {
-          "surface_id": {
-            "type": "string",
-            "description": "The ID of the document surface to update"
-          },
-          "content": {
-            "type": "string",
-            "description": "Markdown content to set or append"
-          },
-          "mode": {
-            "type": "string",
-            "enum": ["replace", "append"],
-            "description": "Whether to replace all content or append to the end. Defaults to append."
-          }
-        },
-        "required": ["surface_id", "content"]
-      },
-      "executor": "tools/document-update.ts",
-      "execution_target": "host"
-    },
-    {
-      "name": "document_read",
-      "description": "Read the current content of a document by its surface_id when it belongs to the current conversation, or when the current actor is the guardian/local user. Use this to verify document state before making edits.",
-      "category": "document",
-      "risk": "low",
-      "input_schema": {
-        "type": "object",
-        "properties": {
-          "surface_id": {
-            "type": "string",
-            "description": "The ID of the document to read"
-          }
-        },
-        "required": ["surface_id"]
-      },
-      "executor": "tools/document-read.ts",
-      "execution_target": "host"
-    },
-    {
-      "name": "document_list",
-      "description": "List documents. Without a query, lists documents in the current conversation. With a query, searches documents by title; guardian/local users can search across conversations, while other actors are scoped to the current conversation.",
-      "category": "document",
-      "risk": "low",
-      "input_schema": {
-        "type": "object",
-        "properties": {
-          "query": {
-            "type": "string",
-            "description": "Search documents by title. Omit to list only the current conversation's documents."
-          }
-        }
-      },
-      "executor": "tools/document-list.ts",
-      "execution_target": "host"
-    },
-    {
-      "name": "document_delete",
-      "description": "Delete a document by its surface_id.",
-      "category": "document",
-      "risk": "low",
-      "input_schema": {
-        "type": "object",
-        "properties": {
-          "surface_id": {
-            "type": "string",
-            "description": "The ID of the document to delete"
-          }
-        },
-        "required": ["surface_id"]
-      },
-      "executor": "tools/document-delete.ts",
-      "execution_target": "host"
-    }
-  ]
-}

package/src/daemon/seed-files.ts

@@ -1,18 +0,0 @@
-import { existsSync, mkdirSync } from "node:fs";
-
-import { getLogger } from "../util/logger.js";
-import { getInterfacesDir } from "../util/platform.js";
-
-const log = getLogger("seed-files");
-
-/**
- * Ensures interface directories exist so the runtime can serve files
- * immediately. Called during daemon startup.
- */
-export function seedInterfaceFiles(): void {
-  const tuiDir = getInterfacesDir();
-  if (!existsSync(tuiDir)) {
-    mkdirSync(tuiDir, { recursive: true });
-    log.info("Created interfaces directory");
-  }
-}

package/src/runtime/routes/interface-routes.ts

@@ -1,43 +0,0 @@
-/**
- * GET /v1/interfaces/:path*
- *
- * Serves interface definition files from the workspace's `interfaces/`
- * directory. Returns the raw file content as `text/plain`.
- */
-
-import { existsSync, readFileSync } from "node:fs";
-import { resolve } from "node:path";
-
-import { getInterfacesDir } from "../../util/platform.js";
-import { NotFoundError } from "./errors.js";
-import type { RouteDefinition } from "./types.js";
-
-export const ROUTES: RouteDefinition[] = [
-  {
-    operationId: "getInterface",
-    endpoint: "interfaces/:path*",
-    method: "GET",
-    policyKey: "interfaces",
-    summary: "Serve an interface definition file",
-    tags: ["interfaces"],
-    responseHeaders: { "Content-Type": "text/plain; charset=utf-8" },
-    handler: ({ pathParams }) => {
-      const interfacePath = pathParams?.path;
-      if (!interfacePath) {
-        throw new NotFoundError("Interface not found");
-      }
-
-      const interfacesDir = getInterfacesDir();
-      const fullPath = resolve(interfacesDir, interfacePath);
-      if (
-        (fullPath !== interfacesDir &&
-          !fullPath.startsWith(interfacesDir + "/")) ||
-        !existsSync(fullPath)
-      ) {
-        throw new NotFoundError("Interface not found");
-      }
-
-      return readFileSync(fullPath, "utf-8");
-    },
-  },
-];