@vellumai/assistant 0.3.2 → 0.3.4

package/src/daemon/session-agent-loop.ts

@@ -31,10 +31,7 @@ import type { MessageQueue } from './session-queue-manager.js';
 import type { QueueDrainReason } from './session-queue-manager.js';
 import {
   applyRuntimeInjections,
-  stripActiveSurfaceContext,
-  stripWorkspaceTopLevelContext,
-  stripChannelCapabilityContext,
-  stripTemporalContext,
+  stripInjectedContext,
 } from './session-runtime-assembly.js';
 import { buildTemporalContext } from './date-context.js';
 import type { ActiveSurfaceContext, ChannelCapabilities } from './session-runtime-assembly.js';
@@ -58,6 +55,7 @@ import { repairHistory, deepRepairHistory } from './history-repair.js';
 import { stripMediaPayloadsForRetry, raceWithTimeout } from './session-media-retry.js';
 import { commitTurnChanges } from '../workspace/turn-commit.js';
 import { getWorkspaceGitService } from '../workspace/git-service.js';
+import { commitAppTurnChanges } from '../memory/app-git-service.js';
 import type { UsageActor } from '../usage/actors.js';
 import type { SkillProjectionCache } from './session-skill-tools.js';
 
@@ -739,16 +737,10 @@ export async function runAgentLoopImpl(
     }
 
     const restoredHistory = [...preRepairMessages, ...newMessages];
-    const recallStripped = stripMemoryRecallMessages(restoredHistory, recall.injectedText, recallInjectionStrategy);
-    ctx.messages = stripTemporalContext(
-      stripChannelCapabilityContext(
-        stripWorkspaceTopLevelContext(
-          stripActiveSurfaceContext(
-            stripDynamicProfileMessages(recallStripped, dynamicProfile.text),
-          ),
-        ),
-      ),
-    );
+    ctx.messages = stripInjectedContext(restoredHistory, {
+      stripRecall: (msgs) => stripMemoryRecallMessages(msgs, recall.injectedText, recallInjectionStrategy),
+      stripDynamicProfile: (msgs) => stripDynamicProfileMessages(msgs, dynamicProfile.text),
+    });
 
     emitUsage(ctx, exchangeInputTokens, exchangeOutputTokens, model, onEvent, 'main_agent', reqId);
 
@@ -859,6 +851,9 @@ export async function runAgentLoopImpl(
           'Turn-boundary commit timed out — continuing without waiting (commit still runs in background)',
         );
       }
+
+      // Commit app changes (fire-and-forget — apps repo is separate from workspace)
+      void commitAppTurnChanges(ctx.conversationId, ctx.turnCount);
     }
 
     ctx.profiler.emitSummary(ctx.traceEmitter, reqId);

package/src/daemon/session-process.ts

@@ -8,12 +8,13 @@
 
 import type { Message } from '../providers/types.js';
 import type { ServerMessage, UserMessageAttachment } from './ipc-protocol.js';
+import type { UsageStats } from './ipc-contract.js';
 import type { MessageQueue } from './session-queue-manager.js';
 import type { QueueDrainReason } from './session-queue-manager.js';
 import type { TraceEmitter } from './trace-emitter.js';
 import { createUserMessage, createAssistantMessage } from '../agent/message-types.js';
 import * as conversationStore from '../memory/conversation-store.js';
-import { resolveSlash } from './session-slash.js';
+import { resolveSlash, type SlashContext } from './session-slash.js';
 import { getConfig } from '../config/loader.js';
 import { getLogger } from '../util/logger.js';
 import { tryRouteCallMessage } from '../calls/call-bridge.js';
@@ -56,6 +57,8 @@ export interface ProcessSessionContext {
   readonly traceEmitter: TraceEmitter;
   currentActiveSurfaceId?: string;
   currentPage?: string;
+  /** Cumulative token usage stats for the session. */
+  readonly usageStats: UsageStats;
   /** Request-scoped skill IDs preactivated via slash resolution. */
   preactivatedSkillIds?: string[];
   persistUserMessage(content: string, attachments: UserMessageAttachment[], requestId?: string, metadata?: Record<string, unknown>): string;
@@ -67,6 +70,20 @@ export interface ProcessSessionContext {
   ): Promise<void>;
 }
 
+/** Build a SlashContext from the current session state and config. */
+function buildSlashContext(session: ProcessSessionContext): SlashContext {
+  const config = getConfig();
+  return {
+    messageCount: session.messages.length,
+    inputTokens: session.usageStats.inputTokens,
+    outputTokens: session.usageStats.outputTokens,
+    maxInputTokens: config.contextWindow.maxInputTokens,
+    model: config.model,
+    provider: config.provider,
+    estimatedCost: session.usageStats.estimatedCost,
+  };
+}
+
 // ── drainQueue ───────────────────────────────────────────────────────
 
 /**
@@ -96,7 +113,7 @@ export function drainQueue(session: ProcessSessionContext, reason: QueueDrainRea
   });
 
   // Resolve slash commands for queued messages
-  const slashResult = resolveSlash(next.content);
+  const slashResult = resolveSlash(next.content, buildSlashContext(session));
 
   // Unknown slash — persist the exchange and continue draining.
   // Persist each message before pushing to session.messages so that a
@@ -242,7 +259,7 @@ export async function processMessage(
   session.currentPage = currentPage;
 
   // Resolve slash commands before persistence
-  const slashResult = resolveSlash(content);
+  const slashResult = resolveSlash(content, buildSlashContext(session));
 
   // Unknown slash command — persist the exchange (user + assistant) so the
   // messageId is real.  Persist each message before pushing to session.messages

package/src/daemon/session-runtime-assembly.ts

@@ -264,16 +264,24 @@ export function injectChannelCapabilityContext(message: Message, caps: ChannelCa
   };
 }
 
+// ---------------------------------------------------------------------------
+// Prefix-based stripping primitive
+// ---------------------------------------------------------------------------
+
 /**
- * Strip `<channel_capabilities>` blocks injected by
- * `injectChannelCapabilityContext`.
+ * Remove text blocks from user messages whose text starts with any of the
+ * given prefixes.  If stripping removes all content blocks from a message,
+ * the message itself is dropped.
+ *
+ * This is the shared primitive behind the individual strip* functions and
+ * the `stripInjectedContext` pipeline.
  */
-export function stripChannelCapabilityContext(messages: Message[]): Message[] {
+export function stripUserTextBlocksByPrefix(messages: Message[], prefixes: string[]): Message[] {
   return messages.map((message) => {
     if (message.role !== 'user') return message;
     const nextContent = message.content.filter((block) => {
       if (block.type !== 'text') return true;
-      return !block.text.startsWith('<channel_capabilities>');
+      return !prefixes.some((p) => block.text.startsWith(p));
     });
     if (nextContent.length === message.content.length) return message;
     if (nextContent.length === 0) return null;
@@ -281,6 +289,15 @@ export function stripChannelCapabilityContext(messages: Message[]): Message[] {
   }).filter((message): message is NonNullable<typeof message> => message !== null);
 }
 
+// ---------------------------------------------------------------------------
+// Individual strip functions (thin wrappers around the primitive)
+// ---------------------------------------------------------------------------
+
+/** Strip `<channel_capabilities>` blocks injected by `injectChannelCapabilityContext`. */
+export function stripChannelCapabilityContext(messages: Message[]): Message[] {
+  return stripUserTextBlocksByPrefix(messages, ['<channel_capabilities>']);
+}
+
 /**
  * Prepend workspace top-level directory context to a user message.
  */
@@ -294,22 +311,9 @@ export function injectWorkspaceTopLevelContext(message: Message, contextText: st
   };
 }
 
-/**
- * Strip `<workspace_top_level>` blocks injected by
- * `injectWorkspaceTopLevelContext`.  Called after the agent run to prevent
- * workspace context from persisting in session history.
- */
+/** Strip `<workspace_top_level>` blocks injected by `injectWorkspaceTopLevelContext`. */
 export function stripWorkspaceTopLevelContext(messages: Message[]): Message[] {
-  return messages.map((message) => {
-    if (message.role !== 'user') return message;
-    const nextContent = message.content.filter((block) => {
-      if (block.type !== 'text') return true;
-      return !block.text.startsWith('<workspace_top_level>');
-    });
-    if (nextContent.length === message.content.length) return message;
-    if (nextContent.length === 0) return null;
-    return { ...message, content: nextContent };
-  }).filter((message): message is NonNullable<typeof message> => message !== null);
+  return stripUserTextBlocksByPrefix(messages, ['<workspace_top_level>']);
 }
 
 /**
@@ -328,8 +332,6 @@ export function injectTemporalContext(message: Message, temporalContext: string)
 
 /**
  * Strip `<temporal_context>` blocks injected by `injectTemporalContext`.
- * Called after the agent run to prevent temporal context from persisting
- * in session history.
  *
  * Uses a specific prefix (`<temporal_context>\nToday:`) so that
  * user-authored text that happens to start with `<temporal_context>`
@@ -338,35 +340,49 @@ export function injectTemporalContext(message: Message, temporalContext: string)
 const TEMPORAL_INJECTED_PREFIX = '<temporal_context>\nToday:';
 
 export function stripTemporalContext(messages: Message[]): Message[] {
-  return messages.map((message) => {
-    if (message.role !== 'user') return message;
-    const nextContent = message.content.filter((block) => {
-      if (block.type !== 'text') return true;
-      return !block.text.startsWith(TEMPORAL_INJECTED_PREFIX);
-    });
-    if (nextContent.length === message.content.length) return message;
-    if (nextContent.length === 0) return null;
-    return { ...message, content: nextContent };
-  }).filter((message): message is NonNullable<typeof message> => message !== null);
+  return stripUserTextBlocksByPrefix(messages, [TEMPORAL_INJECTED_PREFIX]);
 }
 
 /**
  * Strip `<active_workspace>` (and legacy `<active_dynamic_page>`) blocks
- * injected by `injectActiveSurfaceContext`.  Called after the agent run to
- * prevent the (potentially 100 KB) surface HTML from persisting in session
- * history.
+ * injected by `injectActiveSurfaceContext`.
  */
 export function stripActiveSurfaceContext(messages: Message[]): Message[] {
-  return messages.map((message) => {
-    if (message.role !== 'user') return message;
-    const nextContent = message.content.filter((block) => {
-      if (block.type !== 'text') return true;
-      return !block.text.startsWith('<active_workspace>') && !block.text.startsWith('<active_dynamic_page>');
-    });
-    if (nextContent.length === message.content.length) return message;
-    if (nextContent.length === 0) return null;
-    return { ...message, content: nextContent };
-  }).filter((message): message is NonNullable<typeof message> => message !== null);
+  return stripUserTextBlocksByPrefix(messages, ['<active_workspace>', '<active_dynamic_page>']);
+}
+
+// ---------------------------------------------------------------------------
+// Declarative strip pipeline
+// ---------------------------------------------------------------------------
+
+/** Prefixes stripped by the pipeline (order doesn't matter — single pass). */
+const RUNTIME_INJECTION_PREFIXES = [
+  '<channel_capabilities>',
+  '<workspace_top_level>',
+  TEMPORAL_INJECTED_PREFIX,
+  '<active_workspace>',
+  '<active_dynamic_page>',
+];
+
+/**
+ * Strip all runtime-injected context from message history in a single pass.
+ *
+ * Composes:
+ * 1. `stripMemoryRecallMessages` (caller-supplied, handles its own logic)
+ * 2. `stripDynamicProfileMessages` (caller-supplied, handles its own logic)
+ * 3. Prefix-based stripping for channel capabilities, workspace top-level,
+ *    temporal context, and active surface context (single pass).
+ */
+export function stripInjectedContext(
+  messages: Message[],
+  options: {
+    stripRecall: (msgs: Message[]) => Message[];
+    stripDynamicProfile: (msgs: Message[]) => Message[];
+  },
+): Message[] {
+  const afterRecall = options.stripRecall(messages);
+  const afterProfile = options.stripDynamicProfile(afterRecall);
+  return stripUserTextBlocksByPrefix(afterProfile, RUNTIME_INJECTION_PREFIXES);
 }
 
 /**

package/src/daemon/session-slash.ts

@@ -15,6 +15,18 @@ export type SlashResolution =
   | { kind: 'rewritten'; content: string; skillId: string }
   | { kind: 'unknown'; message: string };
 
+// ── /status command ──────────────────────────────────────────────────
+
+export interface SlashContext {
+  messageCount: number;
+  inputTokens: number;
+  outputTokens: number;
+  maxInputTokens: number;
+  model: string;
+  provider: string;
+  estimatedCost: number;
+}
+
 // ── /model command ───────────────────────────────────────────────────
 
 const AVAILABLE_MODELS = [
@@ -242,11 +254,31 @@ function resolveModelCommand(content: string): SlashResolution | null {
   };
 }
 
+function resolveStatusCommand(context: SlashContext): SlashResolution {
+  const { inputTokens, maxInputTokens, model, provider, messageCount, outputTokens, estimatedCost } = context;
+  const pct = maxInputTokens > 0 ? Math.min(Math.round((inputTokens / maxInputTokens) * 100), 100) : 0;
+  const filled = Math.round(pct / 5);
+  const bar = '█'.repeat(filled) + '░'.repeat(20 - filled);
+  const fmt = (n: number) => n.toLocaleString('en-US');
+  const displayName = MODEL_DISPLAY_NAMES[model] ?? model;
+
+  const lines = [
+    'Session Status\n',
+    `Context:  ${bar}  ${pct}%  (${fmt(inputTokens)} / ${fmt(maxInputTokens)} tokens)`,
+    `Model:    ${displayName} (${provider})`,
+    `Messages: ${fmt(messageCount)}`,
+    `Tokens:   ${fmt(inputTokens)} in / ${fmt(outputTokens)} out`,
+    `Cost:     $${estimatedCost.toFixed(2)} (estimated)`,
+  ];
+
+  return { kind: 'unknown', message: lines.join('\n') };
+}
+
 /**
  * Resolve slash commands against the current skill catalog.
  * Returns `unknown` with a deterministic message, or the (possibly rewritten) content.
  */
-export function resolveSlash(content: string): SlashResolution {
+export function resolveSlash(content: string, context?: SlashContext): SlashResolution {
   // Check provider shortcuts first (/gpt4, /opus, etc.)
   const providerResult = resolveProviderModelCommand(content);
   if (providerResult) return providerResult;
@@ -255,11 +287,27 @@ export function resolveSlash(content: string): SlashResolution {
   const modelResult = resolveModelCommand(content);
   if (modelResult) return modelResult;
 
+  // Handle /status command
+  if (content.trim() === '/status') {
+    if (!context) {
+      return { kind: 'unknown', message: 'Status information is not available in this context.' };
+    }
+    return resolveStatusCommand(context);
+  }
+
   // Handle /commands command
   if (content.trim() === '/commands') {
+    const lines = [
+      '/commands — List all available commands',
+      '/model — Show or switch the current model',
+      '/models — List all available models',
+    ];
+    if (context) {
+      lines.push('/status — Show session status and context usage');
+    }
     return {
       kind: 'unknown',
-      message: '/commands — List all available commands\n/model — Show or switch the current model\n/models — List all available models',
+      message: lines.join('\n'),
     };
   }
 

package/src/daemon/session-surfaces.ts

@@ -429,6 +429,12 @@ export function refreshSurfacesForApp(ctx: SurfaceSessionContext, appId: string,
     };
     stored.data = updatedData;
 
+    // Keep the persisted snapshot in sync so updates survive session restart.
+    const idx = ctx.currentTurnSurfaces.findIndex(s => s.surfaceId === surfaceId);
+    if (idx !== -1) {
+      ctx.currentTurnSurfaces[idx].data = updatedData;
+    }
+
     // Push the update to the client
     ctx.sendToClient({
       type: 'ui_surface_update',
@@ -603,6 +609,13 @@ export async function surfaceProxyResolver(
       surfaceId,
       data: mergedData,
     });
+
+    // Keep the persisted snapshot in sync so updates survive session restart.
+    const idx = ctx.currentTurnSurfaces.findIndex(s => s.surfaceId === surfaceId);
+    if (idx !== -1) {
+      ctx.currentTurnSurfaces[idx].data = mergedData;
+    }
+
     return { content: 'Surface updated', isError: false };
   }
 
@@ -662,7 +675,10 @@ export async function surfaceProxyResolver(
     const seededHomeBase = findSeededHomeBaseApp();
     const defaultPreview = seededHomeBase && seededHomeBase.id === app.id
       ? getPrebuiltHomeBasePreview()
-      : undefined;
+      // Generate a minimal fallback preview from app metadata so that the
+      // surface is always rendered as a clickable preview card (not an
+      // un-clickable fallback chip) after session restart.
+      : { title: app.name, subtitle: app.description };
 
     const surfaceData: DynamicPageSurfaceData = {
       html: app.htmlDefinition,

package/src/daemon/session.ts

@@ -308,8 +308,15 @@ export class Session {
     decision: UserDecision,
     selectedPattern?: string,
     selectedScope?: string,
+    decisionContext?: string,
   ): void {
-    this.prompter.resolveConfirmation(requestId, decision, selectedPattern, selectedScope);
+    this.prompter.resolveConfirmation(
+      requestId,
+      decision,
+      selectedPattern,
+      selectedScope,
+      decisionContext,
+    );
   }
 
   handleSecretResponse(requestId: string, value?: string, delivery?: 'store' | 'transient_send'): void {

package/src/inbound/public-ingress-urls.ts

@@ -73,11 +73,20 @@ export function getPublicBaseUrl(config: IngressConfig): string {
 }
 
 /**
- * Build the Twilio voice webhook URL for a given call session.
+ * Build the Twilio voice webhook URL.
+ *
+ * When `callSessionId` is provided (outbound calls), it is included as a
+ * query parameter so the gateway can correlate the webhook to an existing
+ * session. When omitted (phone-number-level webhook configuration for
+ * inbound calls), the URL is returned without the query parameter — the
+ * gateway will create a new session for inbound calls.
  */
-export function getTwilioVoiceWebhookUrl(config: IngressConfig, callSessionId: string): string {
+export function getTwilioVoiceWebhookUrl(config: IngressConfig, callSessionId?: string): string {
   const base = getPublicBaseUrl(config);
-  return `${base}/webhooks/twilio/voice?callSessionId=${callSessionId}`;
+  if (callSessionId) {
+    return `${base}/webhooks/twilio/voice?callSessionId=${callSessionId}`;
+  }
+  return `${base}/webhooks/twilio/voice`;
 }
 
 /**
@@ -114,6 +123,14 @@ export function getOAuthCallbackUrl(config: IngressConfig): string {
   return `${base}/webhooks/oauth/callback`;
 }
 
+/**
+ * Build the Twilio SMS webhook URL.
+ */
+export function getTwilioSmsWebhookUrl(config: IngressConfig): string {
+  const base = getPublicBaseUrl(config);
+  return `${base}/webhooks/twilio/sms`;
+}
+
 /**
  * Build the Telegram webhook URL.
  */

package/src/index.ts

@@ -2,8 +2,6 @@
 
 import { Command } from 'commander';
 import { createRequire } from 'node:module';
-import { dirname, join } from 'node:path';
-import { spawn } from 'node:child_process';
 
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json') as { version: string };
@@ -58,24 +56,4 @@ registerCompletionsCommand(program);
 registerTwitterCommand(program);
 registerMapCommand(program);
 
-const knownCommands = new Set(program.commands.map(cmd => cmd.name()));
-const firstArg = process.argv[2];
-
-if (firstArg && !firstArg.startsWith('-') && !knownCommands.has(firstArg)) {
-  try {
-    const cliPkgPath = require.resolve('@vellumai/cli/package.json');
-    const cliEntry = join(dirname(cliPkgPath), 'src', 'index.ts');
-    const child = spawn('bun', ['run', cliEntry, ...process.argv.slice(2)], {
-      stdio: 'inherit',
-    });
-    child.on('exit', (code) => {
-      process.exit(code ?? 1);
-    });
-  } catch {
-    console.error(`Unknown command: ${firstArg}`);
-    console.error('Install the full stack with: bun install -g vellum');
-    process.exit(1);
-  }
-} else {
-  program.parse();
-}
+program.parse();

package/src/memory/app-git-service.ts

@@ -141,6 +141,30 @@ export async function commitAppChange(message: string): Promise<void> {
   }
 }
 
+/**
+ * Commit app changes at turn boundaries.
+ *
+ * Called once per agent turn (after all tool calls complete). Only creates
+ * a commit if there are actual changes in the apps directory, so multiple
+ * mutations within a single turn are batched into one version.
+ *
+ * Fire-and-forget safe: errors are logged but never thrown.
+ */
+export async function commitAppTurnChanges(sessionId: string, turnNumber: number): Promise<void> {
+  try {
+    const appsDir = getAppsDir();
+    ensureAppGitignoreRules(appsDir);
+
+    const gitService = getWorkspaceGitService(appsDir);
+    await gitService.commitIfDirty(() => ({
+      message: `Turn ${turnNumber}: app changes`,
+      metadata: { sessionId, turnNumber },
+    }));
+  } catch (err) {
+    log.error({ err, sessionId, turnNumber }, 'Failed to commit app turn changes');
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Query methods
 // ---------------------------------------------------------------------------

package/src/memory/app-store.ts

@@ -29,7 +29,6 @@ import {
   isPrebuiltHomeBaseApp,
   validatePrebuiltHomeBaseHtml,
 } from '../home-base/prebuilt-home-base-updater.js';
-import { commitAppChange } from './app-git-service.js';
 
 export interface AppDefinition {
   id: string;
@@ -211,8 +210,6 @@ export function createApp(params: {
     app.pages = params.pages;
   }
 
-  void commitAppChange(`Create app: ${params.name}`);
-
   return app;
 }
 
@@ -375,27 +372,14 @@ export function updateApp(
     updated.pages = loadedPages;
   }
 
-  const changedFields = Object.keys(updates).filter(k => updates[k as keyof typeof updates] !== undefined);
-  void commitAppChange(`Update app: ${updated.name}\n\nChanged: ${changedFields.join(', ')}`);
-
   return updated;
 }
 
 export function deleteApp(id: string): void {
   validateId(id);
   const dir = getAppsDir();
-
-  // Read app name before deleting for the commit message
-  let appName = id;
   const filePath = join(dir, `${id}.json`);
   if (existsSync(filePath)) {
-    try {
-      const raw = readFileSync(filePath, 'utf-8');
-      const app = JSON.parse(raw);
-      if (app.name) appName = app.name;
-    } catch {
-      // fall back to id
-    }
     unlinkSync(filePath);
   }
   const previewPath = join(dir, `${id}.preview`);
@@ -404,8 +388,6 @@ export function deleteApp(id: string): void {
   }
   const appDir = join(dir, id);
   rmSync(appDir, { recursive: true, force: true });
-
-  void commitAppChange(`Delete app: ${appName}`);
 }
 
 export function createAppRecord(appId: string, data: Record<string, unknown>): AppRecord {
@@ -545,8 +527,6 @@ export function writeAppFile(appId: string, path: string, content: string): void
   const dir = join(resolved, '..');
   mkdirSync(dir, { recursive: true });
   writeFileSync(resolved, content, 'utf-8');
-
-  void commitAppChange(`Write ${path} in app ${appId}`);
 }
 
 /**
@@ -569,7 +549,6 @@ export function editAppFile(
   const result = applyEdit(content, oldString, newString, replaceAll ?? false);
   if (result.ok) {
     writeFileSync(resolved, result.updatedContent, 'utf-8');
-    void commitAppChange(`Edit ${path} in app ${appId}`);
   }
   return result;
 }