@vellumai/assistant 0.4.53 → 0.4.54

package/src/util/pricing.ts

@@ -264,41 +264,3 @@ export function resolvePricing(
     createDirectUsage(inputTokens, outputTokens),
   );
 }
-
-/**
- * Resolve pricing with optional custom model overrides checked first.
- * Overrides are matched by provider (exact) and modelPattern (prefix match).
- * Falls back to the built-in catalog if no override matches.
- */
-export function resolvePricingWithOverrides(
-  provider: string,
-  model: string,
-  inputTokens: number,
-  outputTokens: number,
-  overrides?: ModelPricingOverride[],
-): PricingResult {
-  return resolvePricingForUsageWithOverrides(
-    provider,
-    model,
-    createDirectUsage(inputTokens, outputTokens),
-    overrides,
-  );
-}
-
-/**
- * Estimate cost in USD for the given token counts, provider, and model.
- * Returns 0 if the provider/model combination is not in the pricing table
- * (e.g. Ollama local models).
- */
-export function estimateCost(
-  inputTokens: number,
-  outputTokens: number,
-  model: string,
-  provider: string,
-): number {
-  const result = resolvePricing(provider, model, inputTokens, outputTokens);
-  if (result.pricingStatus === "priced" && result.estimatedCostUsd != null) {
-    return result.estimatedCostUsd;
-  }
-  return 0;
-}

package/src/watcher/constants.ts

@@ -1,11 +1,4 @@
 /** Default poll interval for watchers (60 seconds). */
 export const DEFAULT_POLL_INTERVAL_MS = 60_000;
-
-/** Base delay for exponential backoff on consecutive errors. */
-export const BACKOFF_BASE_MS = 30_000;
-
-/** Maximum backoff delay (1 hour). */
-export const MAX_BACKOFF_MS = 60 * 60 * 1000;
-
 /** Disable watcher after this many consecutive errors. */
 export const MAX_CONSECUTIVE_ERRORS = 5;

package/src/watcher/providers/linear.ts

@@ -402,7 +402,7 @@ function getStateCache(watcherKey: string): Map<string, string> {
  * disabled. Prevents unbounded growth of `knownIssueStateIdsByWatcher` in
  * environments that create and delete watchers frequently (watcher churn).
  */
-export function clearLinearStateCache(watcherKey: string): void {
+function clearLinearStateCache(watcherKey: string): void {
   knownIssueStateIdsByWatcher.delete(watcherKey);
   lastSeenAssignedIdsByWatcher.delete(watcherKey);
 }

package/src/work-items/work-item-store.ts

@@ -147,7 +147,7 @@ export function deleteWorkItem(id: string): void {
 
 // ── Queue Removal ───────────────────────────────────────────────────
 
-export interface RemoveWorkItemResult {
+interface RemoveWorkItemResult {
   success: boolean;
   title: string;
   message: string;
@@ -177,7 +177,7 @@ export function removeWorkItemFromQueue(id: string): RemoveWorkItemResult {
 
 // ── Selectors / Helpers ─────────────────────────────────────────────
 
-export interface WorkItemSelector {
+interface WorkItemSelector {
   workItemId?: string;
   taskId?: string;
   title?: string;
@@ -356,9 +356,9 @@ export function resolveWorkItem(
 
 // ── Entity Identification ───────────────────────────────────────────
 
-export type EntityType = "task_template" | "work_item" | "unknown";
+type EntityType = "task_template" | "work_item" | "unknown";
 
-export interface EntityIdentification {
+interface EntityIdentification {
   type: EntityType;
   id: string;
   title?: string;

package/src/workspace/commit-message-provider.ts

@@ -33,7 +33,7 @@ export interface CommitMessageProvider {
 /**
  * Build a short summary of what changed from a list of file paths.
  */
-export function buildChangeSummary(files: string[]): string {
+function buildChangeSummary(files: string[]): string {
   if (files.length === 0) {
     return "workspace changes";
   }

package/src/workspace/git-service.ts

@@ -1,5 +1,11 @@
 import { execFile } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  readFileSync,
+  statSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
 import { join } from "node:path";
 import { promisify } from "node:util";
 
@@ -252,6 +258,33 @@ export class WorkspaceGitService {
     );
   }
 
+  /** Age threshold (ms) beyond which an index.lock is considered stale. */
+  private static readonly LOCK_STALE_THRESHOLD_MS = 30_000;
+
+  /**
+   * Remove `.git/index.lock` only if it is stale — older than
+   * {@link LOCK_STALE_THRESHOLD_MS}. A recently-created lock may belong to a
+   * concurrent git process outside our mutex (e.g. a user-initiated CLI
+   * command), so we leave it alone.
+   */
+  private cleanStaleLockFile(): void {
+    const lockPath = join(this.workspaceDir, ".git", "index.lock");
+    try {
+      const stat = statSync(lockPath);
+      const ageMs = Date.now() - stat.mtimeMs;
+      if (ageMs < WorkspaceGitService.LOCK_STALE_THRESHOLD_MS) {
+        log.debug(
+          `index.lock exists but is only ${Math.round(ageMs / 1000)}s old — leaving it`,
+        );
+        return;
+      }
+      unlinkSync(lockPath);
+      log.debug(`Removed stale index.lock (${Math.round(ageMs / 1000)}s old)`);
+    } catch {
+      // File doesn't exist or can't be stat'd/removed — move on.
+    }
+  }
+
   /**
    * Ensure the git repository is initialized.
    * Idempotent: safe to call multiple times.
@@ -298,6 +331,11 @@ export class WorkspaceGitService {
 
           const gitDir = join(this.workspaceDir, ".git");
 
+          // Clean up stale lock files before any git operations.
+          if (existsSync(gitDir)) {
+            this.cleanStaleLockFile();
+          }
+
           if (existsSync(gitDir)) {
             // Validate existing repo is not corrupted before marking as ready.
             // A corrupted .git directory (e.g. missing HEAD) would cause all
@@ -440,6 +478,8 @@ export class WorkspaceGitService {
     await this.ensureInitialized();
 
     await this.mutex.withLock(async () => {
+      this.cleanStaleLockFile();
+
       // Stage all changes
       await this.execGit(["add", "-A"]);
 
@@ -513,6 +553,8 @@ export class WorkspaceGitService {
 
     try {
       const result = await this.mutex.withLock(async () => {
+        this.cleanStaleLockFile();
+
         // Re-check breaker under lock: a queued call that started before the
         // breaker opened should not proceed with expensive git work now that
         // the breaker is open.
@@ -853,6 +895,7 @@ export class WorkspaceGitService {
   ): Promise<void> {
     await this.ensureInitialized();
     await this.mutex.withLock(async () => {
+      this.cleanStaleLockFile();
       await fn((args) => this.execGit(args));
     });
   }

package/src/workspace/provider-commit-message-generator.ts

@@ -141,7 +141,7 @@ export class ProviderCommitMessageGenerator {
     // Step 2: Resolve configured provider using fail-open semantics.
     // If nothing is resolvable, differentiate likely missing-key cases from
     // true registry/init failures.
-    const resolved = resolveConfiguredProvider();
+    const resolved = await resolveConfiguredProvider();
     if (!resolved) {
       const candidates = getProviderCandidates(config);
       const hasAnyKeylessCandidate = candidates.some((name) =>

package/src/__tests__/fixtures/proxy-fixtures.ts

@@ -1,147 +0,0 @@
-/**
- * Shared fixtures for credential proxy testing.
- *
- * Provides deterministic fake credential records and injection templates
- * used by the proxy layer test suite.
- */
-
-import type { CredentialMetadata } from "../../tools/credentials/metadata-store.js";
-
-// ---------------------------------------------------------------------------
-// Injection template types (defined here for upcoming proxy PRs)
-// ---------------------------------------------------------------------------
-
-/** How a credential value is injected into an outbound request. */
-export type InjectionMethod = "header" | "query" | "body";
-
-/** A template that describes where and how to inject a credential. */
-export interface InjectionTemplate {
-  /** Glob pattern for matching request hosts (e.g. "*.fal.ai"). */
-  hostPattern: string;
-  /** How the value is injected into the request. */
-  method: InjectionMethod;
-  /** Header name, query parameter, or body field path. */
-  fieldName: string;
-  /** Optional prefix prepended to the credential value (e.g. "Bearer "). */
-  valuePrefix?: string;
-}
-
-// ---------------------------------------------------------------------------
-// Deterministic timestamps
-// ---------------------------------------------------------------------------
-
-const CREATED_AT = 1700000000000;
-const UPDATED_AT = 1700000000000;
-
-// ---------------------------------------------------------------------------
-// Fake credential records
-// ---------------------------------------------------------------------------
-
-/** A fal.ai API key credential with header injection. */
-export const FAL_AI_CREDENTIAL: CredentialMetadata = {
-  credentialId: "cred-fal-001",
-  service: "fal-ai",
-  field: "api_key",
-  allowedTools: ["api_request", "image_generate"],
-  allowedDomains: ["fal.ai"],
-  usageDescription: "fal.ai image generation API key",
-  createdAt: CREATED_AT,
-  updatedAt: UPDATED_AT,
-};
-
-/** Injection template for the fal.ai credential. */
-export const FAL_AI_INJECTION: InjectionTemplate = {
-  hostPattern: "*.fal.ai",
-  method: "header",
-  fieldName: "Authorization",
-  valuePrefix: "Key ",
-};
-
-/** An OpenAI API key credential. */
-export const OPENAI_CREDENTIAL: CredentialMetadata = {
-  credentialId: "cred-openai-001",
-  service: "openai",
-  field: "api_key",
-  allowedTools: ["api_request"],
-  allowedDomains: ["api.openai.com"],
-  usageDescription: "OpenAI API key",
-  createdAt: CREATED_AT,
-  updatedAt: UPDATED_AT,
-};
-
-/** Injection template for the OpenAI credential. */
-export const OPENAI_INJECTION: InjectionTemplate = {
-  hostPattern: "api.openai.com",
-  method: "header",
-  fieldName: "Authorization",
-  valuePrefix: "Bearer ",
-};
-
-/** A credential with query-param injection (e.g. legacy APIs). */
-export const QUERY_PARAM_CREDENTIAL: CredentialMetadata = {
-  credentialId: "cred-legacy-001",
-  service: "legacy-maps",
-  field: "api_key",
-  allowedTools: ["api_request"],
-  allowedDomains: ["maps.example.com"],
-  usageDescription: "Legacy maps API with query-param auth",
-  createdAt: CREATED_AT,
-  updatedAt: UPDATED_AT,
-};
-
-/** Injection template for query-parameter auth. */
-export const QUERY_PARAM_INJECTION: InjectionTemplate = {
-  hostPattern: "maps.example.com",
-  method: "query",
-  fieldName: "key",
-};
-
-/** A credential with no allowed tools or domains (should be denied). */
-export const EMPTY_POLICY_CREDENTIAL: CredentialMetadata = {
-  credentialId: "cred-empty-001",
-  service: "no-policy",
-  field: "token",
-  allowedTools: [],
-  allowedDomains: [],
-  createdAt: CREATED_AT,
-  updatedAt: UPDATED_AT,
-};
-
-// ---------------------------------------------------------------------------
-// Credential + injection pairs for table-driven tests
-// ---------------------------------------------------------------------------
-
-export interface CredentialWithInjection {
-  label: string;
-  credential: CredentialMetadata;
-  injection: InjectionTemplate;
-}
-
-/** Pre-built pairs for table-driven proxy tests. */
-export const CREDENTIAL_INJECTION_PAIRS: CredentialWithInjection[] = [
-  {
-    label: "fal.ai header injection with Key prefix",
-    credential: FAL_AI_CREDENTIAL,
-    injection: FAL_AI_INJECTION,
-  },
-  {
-    label: "OpenAI header injection with Bearer prefix",
-    credential: OPENAI_CREDENTIAL,
-    injection: OPENAI_INJECTION,
-  },
-  {
-    label: "legacy maps query-param injection",
-    credential: QUERY_PARAM_CREDENTIAL,
-    injection: QUERY_PARAM_INJECTION,
-  },
-];
-
-// ---------------------------------------------------------------------------
-// Fake credential value (test-only)
-// ---------------------------------------------------------------------------
-
-// Assembled from fragments to avoid pre-commit secret scanners
-const FAKE_KEY_PARTS = ["sk-test-", "proxy-", "fixture-", "0000"];
-
-/** A deterministic fake credential value for proxy tests. Never a real secret. */
-export const FAKE_CREDENTIAL_VALUE = FAKE_KEY_PARTS.join("");

package/src/browser-extension-relay/client.ts

@@ -1,155 +0,0 @@
-/**
- * Higher-level API over ExtensionRelayServer.
- *
- * Provides convenience wrappers for common operations:
- *   - relayEval    — evaluate JS in a tab (drop-in for cdpEval)
- *   - relayCookies — fetch cookies for a domain
- *   - waitForExtension — poll until the extension connects
- */
-
-import type { CookieSpec } from "./protocol.js";
-import { extensionRelayServer } from "./server.js";
-
-const WAIT_POLL_INTERVAL_MS = 250;
-
-/**
- * Evaluate a JavaScript expression in a tab matching the given URL pattern.
- *
- * @param urlPattern   Glob or substring matched against open tab URLs.
- * @param script       JS source string to evaluate in the tab's MAIN world.
- * @param timeoutMs    Per-command timeout (default: server default).
- * @returns            The return value of the script, as returned by the extension.
- */
-export async function relayEval(
-  urlPattern: string,
-  script: string,
-  timeoutMs?: number,
-): Promise<unknown> {
-  // Find the tab first
-  const findResp = await extensionRelayServer.sendCommand(
-    { action: "find_tab", url: urlPattern },
-    timeoutMs,
-  );
-  if (!findResp.success) {
-    throw new Error(
-      `relayEval: find_tab failed — ${findResp.error ?? "unknown error"}`,
-    );
-  }
-  const tabId = findResp.tabId;
-  if (tabId === undefined) {
-    throw new Error(`relayEval: no tab found matching "${urlPattern}"`);
-  }
-
-  const evalResp = await extensionRelayServer.sendCommand(
-    { action: "evaluate", tabId, code: script },
-    timeoutMs,
-  );
-  if (!evalResp.success) {
-    throw new Error(
-      `relayEval: evaluate failed — ${evalResp.error ?? "unknown error"}`,
-    );
-  }
-  return evalResp.result;
-}
-
-/**
- * Retrieve cookies for a domain.
- *
- * @param domain  e.g. "amazon.com"
- * @returns       Array of cookie objects returned by the extension.
- */
-export async function relayCookies(domain: string): Promise<unknown[]> {
-  const resp = await extensionRelayServer.sendCommand({
-    action: "get_cookies",
-    domain,
-  });
-  if (!resp.success) {
-    throw new Error(`relayCookies: failed — ${resp.error ?? "unknown error"}`);
-  }
-  return Array.isArray(resp.result) ? resp.result : [];
-}
-
-/**
- * Set a cookie via the extension.
- */
-export async function relaySetCookie(cookie: CookieSpec): Promise<void> {
-  const resp = await extensionRelayServer.sendCommand({
-    action: "set_cookie",
-    cookie,
-  });
-  if (!resp.success) {
-    throw new Error(
-      `relaySetCookie: failed — ${resp.error ?? "unknown error"}`,
-    );
-  }
-}
-
-/**
- * Navigate a tab (or open a new one) to a URL.
- */
-export async function relayNavigate(
-  url: string,
-  tabId?: number,
-): Promise<number> {
-  const resp = await extensionRelayServer.sendCommand({
-    action: "navigate",
-    url,
-    tabId,
-  });
-  if (!resp.success) {
-    throw new Error(`relayNavigate: failed — ${resp.error ?? "unknown error"}`);
-  }
-  return resp.tabId!;
-}
-
-/**
- * Open a new tab and navigate to a URL.
- */
-export async function relayNewTab(url: string): Promise<number> {
-  const resp = await extensionRelayServer.sendCommand({
-    action: "new_tab",
-    url,
-  });
-  if (!resp.success) {
-    throw new Error(`relayNewTab: failed — ${resp.error ?? "unknown error"}`);
-  }
-  return resp.tabId!;
-}
-
-/**
- * Take a screenshot of the currently visible tab.
- *
- * @param tabId  Optional tab ID; if omitted, captures the active tab in the focused window.
- * @returns      Base64-encoded PNG data URL.
- */
-export async function relayScreenshot(tabId?: number): Promise<string> {
-  const resp = await extensionRelayServer.sendCommand({
-    action: "screenshot",
-    tabId,
-  });
-  if (!resp.success) {
-    throw new Error(
-      `relayScreenshot: failed — ${resp.error ?? "unknown error"}`,
-    );
-  }
-  return resp.result as string;
-}
-
-/**
- * Poll until the Chrome extension connects or the timeout expires.
- *
- * @param timeoutMs  Total wait time in ms (default: 10 000).
- * @throws           Error if the extension does not connect within the timeout.
- */
-export async function waitForExtension(timeoutMs = 10_000): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (extensionRelayServer.getStatus().connected) return;
-    await new Promise<void>((resolve) =>
-      setTimeout(resolve, WAIT_POLL_INTERVAL_MS),
-    );
-  }
-  throw new Error(
-    `waitForExtension: Chrome extension did not connect within ${timeoutMs}ms`,
-  );
-}

package/src/contacts/index.ts

@@ -1,18 +0,0 @@
-export {
-  findContactByAddress,
-  getContact,
-  listContacts,
-  mergeContacts,
-  searchContacts,
-  upsertContact,
-} from "./contact-store.js";
-export type {
-  ChannelPolicy,
-  ChannelStatus,
-  ChannelType,
-  Contact,
-  ContactChannel,
-  ContactRole,
-  ContactWithChannels,
-} from "./types.js";
-export { CHANNEL_TYPES } from "./types.js";