yzcode-cli 1.0.1 → 1.0.3

package/memdir/teamMemPaths.ts

@@ -0,0 +1,292 @@
+import { lstat, realpath } from 'fs/promises'
+import { dirname, join, resolve, sep } from 'path'
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
+import { getErrnoCode } from '../utils/errors.js'
+import { getAutoMemPath, isAutoMemoryEnabled } from './paths.js'
+
+/**
+ * Error thrown when a path validation detects a traversal or injection attempt.
+ */
+export class PathTraversalError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'PathTraversalError'
+  }
+}
+
+/**
+ * Sanitize a file path key by rejecting dangerous patterns.
+ * Checks for null bytes, URL-encoded traversals, and other injection vectors.
+ * Returns the sanitized string or throws PathTraversalError.
+ */
+function sanitizePathKey(key: string): string {
+  // Null bytes can truncate paths in C-based syscalls
+  if (key.includes('\0')) {
+    throw new PathTraversalError(`Null byte in path key: "${key}"`)
+  }
+  // URL-encoded traversals (e.g. %2e%2e%2f = ../)
+  let decoded: string
+  try {
+    decoded = decodeURIComponent(key)
+  } catch {
+    // Malformed percent-encoding (e.g. %ZZ, lone %) — not valid URL-encoding,
+    // so no URL-encoded traversal is possible
+    decoded = key
+  }
+  if (decoded !== key && (decoded.includes('..') || decoded.includes('/'))) {
+    throw new PathTraversalError(`URL-encoded traversal in path key: "${key}"`)
+  }
+  // Unicode normalization attacks: fullwidth ．．／ (U+FF0E U+FF0F) normalize
+  // to ASCII ../ under NFKC. While path.resolve/fs.writeFile treat these as
+  // literal bytes (not separators), downstream layers or filesystems may
+  // normalize — reject for defense-in-depth (PSR M22187 vector 4).
+  const normalized = key.normalize('NFKC')
+  if (
+    normalized !== key &&
+    (normalized.includes('..') ||
+      normalized.includes('/') ||
+      normalized.includes('\\') ||
+      normalized.includes('\0'))
+  ) {
+    throw new PathTraversalError(
+      `Unicode-normalized traversal in path key: "${key}"`,
+    )
+  }
+  // Reject backslashes (Windows path separator used as traversal vector)
+  if (key.includes('\\')) {
+    throw new PathTraversalError(`Backslash in path key: "${key}"`)
+  }
+  // Reject absolute paths
+  if (key.startsWith('/')) {
+    throw new PathTraversalError(`Absolute path key: "${key}"`)
+  }
+  return key
+}
+
+/**
+ * Whether team memory features are enabled.
+ * Team memory is a subdirectory of auto memory, so it requires auto memory
+ * to be enabled. This keeps all team-memory consumers (prompt, content
+ * injection, sync watcher, file detection) consistent when auto memory is
+ * disabled via env var or settings.
+ */
+export function isTeamMemoryEnabled(): boolean {
+  if (!isAutoMemoryEnabled()) {
+    return false
+  }
+  return getFeatureValue_CACHED_MAY_BE_STALE('tengu_herring_clock', false)
+}
+
+/**
+ * Returns the team memory path: <memoryBase>/projects/<sanitized-project-root>/memory/team/
+ * Lives as a subdirectory of the auto-memory directory, scoped per-project.
+ */
+export function getTeamMemPath(): string {
+  return (join(getAutoMemPath(), 'team') + sep).normalize('NFC')
+}
+
+/**
+ * Returns the team memory entrypoint: <memoryBase>/projects/<sanitized-project-root>/memory/team/MEMORY.md
+ * Lives as a subdirectory of the auto-memory directory, scoped per-project.
+ */
+export function getTeamMemEntrypoint(): string {
+  return join(getAutoMemPath(), 'team', 'MEMORY.md')
+}
+
+/**
+ * Resolve symlinks for the deepest existing ancestor of a path.
+ * The target file may not exist yet (we may be about to create it), so we
+ * walk up the directory tree until realpath() succeeds, then rejoin the
+ * non-existing tail onto the resolved ancestor.
+ *
+ * SECURITY (PSR M22186): path.resolve() does NOT resolve symlinks. An attacker
+ * who can place a symlink inside teamDir pointing outside (e.g. to
+ * ~/.ssh/authorized_keys) would pass a resolve()-based containment check.
+ * Using realpath() on the deepest existing ancestor ensures we compare the
+ * actual filesystem location, not the symbolic path.
+ *
+ */
+async function realpathDeepestExisting(absolutePath: string): Promise<string> {
+  const tail: string[] = []
+  let current = absolutePath
+  // Walk up until realpath succeeds. ENOENT means this segment doesn't exist
+  // yet; pop it onto the tail and try the parent. ENOTDIR means a non-directory
+  // component sits in the middle of the path; pop and retry so we can realpath
+  // the ancestor to detect symlink escapes.
+  // Loop terminates when we reach the filesystem root (dirname('/') === '/').
+  for (
+    let parent = dirname(current);
+    current !== parent;
+    parent = dirname(current)
+  ) {
+    try {
+      const realCurrent = await realpath(current)
+      // Rejoin the non-existing tail in reverse order (deepest popped first)
+      return tail.length === 0
+        ? realCurrent
+        : join(realCurrent, ...tail.reverse())
+    } catch (e: unknown) {
+      const code = getErrnoCode(e)
+      if (code === 'ENOENT') {
+        // Could be truly non-existent (safe to walk up) OR a dangling symlink
+        // whose target doesn't exist. Dangling symlinks are an attack vector:
+        // writeFile would follow the link and create the target outside teamDir.
+        // lstat distinguishes: it succeeds for dangling symlinks (the link entry
+        // itself exists), fails with ENOENT for truly non-existent paths.
+        try {
+          const st = await lstat(current)
+          if (st.isSymbolicLink()) {
+            throw new PathTraversalError(
+              `Dangling symlink detected (target does not exist): "${current}"`,
+            )
+          }
+          // lstat succeeded but isn't a symlink — ENOENT from realpath was
+          // caused by a dangling symlink in an ancestor. Walk up to find it.
+        } catch (lstatErr: unknown) {
+          if (lstatErr instanceof PathTraversalError) {
+            throw lstatErr
+          }
+          // lstat also failed (truly non-existent or inaccessible) — safe to walk up.
+        }
+      } else if (code === 'ELOOP') {
+        // Symlink loop — corrupted or malicious filesystem state.
+        throw new PathTraversalError(
+          `Symlink loop detected in path: "${current}"`,
+        )
+      } else if (code !== 'ENOTDIR' && code !== 'ENAMETOOLONG') {
+        // EACCES, EIO, etc. — cannot verify containment. Fail closed by wrapping
+        // as PathTraversalError so the caller can skip this entry gracefully
+        // instead of aborting the entire batch.
+        throw new PathTraversalError(
+          `Cannot verify path containment (${code}): "${current}"`,
+        )
+      }
+      tail.push(current.slice(parent.length + sep.length))
+      current = parent
+    }
+  }
+  // Reached filesystem root without finding an existing ancestor (rare —
+  // root normally exists). Fall back to the input; containment check will reject.
+  return absolutePath
+}
+
+/**
+ * Check whether a real (symlink-resolved) path is within the real team
+ * memory directory. Both sides are realpath'd so the comparison is between
+ * canonical filesystem locations.
+ *
+ * If teamDir does not exist, returns true (skips the check). This is safe:
+ * a symlink escape requires a pre-existing symlink inside teamDir, which
+ * requires teamDir to exist. If there's no directory, there's no symlink,
+ * and the first-pass string-level containment check is sufficient.
+ */
+async function isRealPathWithinTeamDir(
+  realCandidate: string,
+): Promise<boolean> {
+  let realTeamDir: string
+  try {
+    // getTeamMemPath() includes a trailing separator; strip it because
+    // realpath() rejects trailing separators on some platforms.
+    realTeamDir = await realpath(getTeamMemPath().replace(/[/\\]+$/, ''))
+  } catch (e: unknown) {
+    const code = getErrnoCode(e)
+    if (code === 'ENOENT' || code === 'ENOTDIR') {
+      // Team dir doesn't exist — symlink escape impossible, skip check.
+      return true
+    }
+    // Unexpected error (EACCES, EIO) — fail closed.
+    return false
+  }
+  if (realCandidate === realTeamDir) {
+    return true
+  }
+  // Prefix-attack protection: require separator after the prefix so that
+  // "/foo/team-evil" doesn't match "/foo/team".
+  return realCandidate.startsWith(realTeamDir + sep)
+}
+
+/**
+ * Check if a resolved absolute path is within the team memory directory.
+ * Uses path.resolve() to convert relative paths and eliminate traversal segments.
+ * Does NOT resolve symlinks — for write validation use validateTeamMemWritePath()
+ * or validateTeamMemKey() which include symlink resolution.
+ */
+export function isTeamMemPath(filePath: string): boolean {
+  // SECURITY: resolve() converts to absolute and eliminates .. segments,
+  // preventing path traversal attacks (e.g. "team/../../etc/passwd")
+  const resolvedPath = resolve(filePath)
+  const teamDir = getTeamMemPath()
+  return resolvedPath.startsWith(teamDir)
+}
+
+/**
+ * Validate that an absolute file path is safe for writing to the team memory directory.
+ * Returns the resolved absolute path if valid.
+ * Throws PathTraversalError if the path contains injection vectors, escapes the
+ * directory via .. segments, or escapes via a symlink (PSR M22186).
+ */
+export async function validateTeamMemWritePath(
+  filePath: string,
+): Promise<string> {
+  if (filePath.includes('\0')) {
+    throw new PathTraversalError(`Null byte in path: "${filePath}"`)
+  }
+  // First pass: normalize .. segments and check string-level containment.
+  // This is a fast rejection for obvious traversal attempts before we touch
+  // the filesystem.
+  const resolvedPath = resolve(filePath)
+  const teamDir = getTeamMemPath()
+  // Prefix attack protection: teamDir already ends with sep (from getTeamMemPath),
+  // so "team-evil/" won't match "team/"
+  if (!resolvedPath.startsWith(teamDir)) {
+    throw new PathTraversalError(
+      `Path escapes team memory directory: "${filePath}"`,
+    )
+  }
+  // Second pass: resolve symlinks on the deepest existing ancestor and verify
+  // the real path is still within the real team dir. This catches symlink-based
+  // escapes that path.resolve() alone cannot detect.
+  const realPath = await realpathDeepestExisting(resolvedPath)
+  if (!(await isRealPathWithinTeamDir(realPath))) {
+    throw new PathTraversalError(
+      `Path escapes team memory directory via symlink: "${filePath}"`,
+    )
+  }
+  return resolvedPath
+}
+
+/**
+ * Validate a relative path key from the server against the team memory directory.
+ * Sanitizes the key, joins with the team dir, resolves symlinks on the deepest
+ * existing ancestor, and verifies containment against the real team dir.
+ * Returns the resolved absolute path.
+ * Throws PathTraversalError if the key is malicious (PSR M22186).
+ */
+export async function validateTeamMemKey(relativeKey: string): Promise<string> {
+  sanitizePathKey(relativeKey)
+  const teamDir = getTeamMemPath()
+  const fullPath = join(teamDir, relativeKey)
+  // First pass: normalize .. segments and check string-level containment.
+  const resolvedPath = resolve(fullPath)
+  if (!resolvedPath.startsWith(teamDir)) {
+    throw new PathTraversalError(
+      `Key escapes team memory directory: "${relativeKey}"`,
+    )
+  }
+  // Second pass: resolve symlinks and verify real containment.
+  const realPath = await realpathDeepestExisting(resolvedPath)
+  if (!(await isRealPathWithinTeamDir(realPath))) {
+    throw new PathTraversalError(
+      `Key escapes team memory directory via symlink: "${relativeKey}"`,
+    )
+  }
+  return resolvedPath
+}
+
+/**
+ * Check if a file path is within the team memory directory
+ * and team memory is enabled.
+ */
+export function isTeamMemFile(filePath: string): boolean {
+  return isTeamMemoryEnabled() && isTeamMemPath(filePath)
+}

package/memdir/teamMemPrompts.ts

@@ -0,0 +1,100 @@
+import {
+  buildSearchingPastContextSection,
+  DIRS_EXIST_GUIDANCE,
+  ENTRYPOINT_NAME,
+  MAX_ENTRYPOINT_LINES,
+} from './memdir.js'
+import {
+  MEMORY_DRIFT_CAVEAT,
+  MEMORY_FRONTMATTER_EXAMPLE,
+  TRUSTING_RECALL_SECTION,
+  TYPES_SECTION_COMBINED,
+  WHAT_NOT_TO_SAVE_SECTION,
+} from './memoryTypes.js'
+import { getAutoMemPath } from './paths.js'
+import { getTeamMemPath } from './teamMemPaths.js'
+
+/**
+ * Build the combined prompt when both auto memory and team memory are enabled.
+ * Closed four-type taxonomy (user / feedback / project / reference) with
+ * per-type <scope> guidance embedded in XML-style <type> blocks.
+ */
+export function buildCombinedMemoryPrompt(
+  extraGuidelines?: string[],
+  skipIndex = false,
+): string {
+  const autoDir = getAutoMemPath()
+  const teamDir = getTeamMemPath()
+
+  const howToSave = skipIndex
+    ? [
+        '## How to save memories',
+        '',
+        "Write each memory to its own file in the chosen directory (private or team, per the type's scope guidance) using this frontmatter format:",
+        '',
+        ...MEMORY_FRONTMATTER_EXAMPLE,
+        '',
+        '- Keep the name, description, and type fields in memory files up-to-date with the content',
+        '- Organize memory semantically by topic, not chronologically',
+        '- Update or remove memories that turn out to be wrong or outdated',
+        '- Do not write duplicate memories. First check if there is an existing memory you can update before writing a new one.',
+      ]
+    : [
+        '## How to save memories',
+        '',
+        'Saving a memory is a two-step process:',
+        '',
+        "**Step 1** — write the memory to its own file in the chosen directory (private or team, per the type's scope guidance) using this frontmatter format:",
+        '',
+        ...MEMORY_FRONTMATTER_EXAMPLE,
+        '',
+        `**Step 2** — add a pointer to that file in the same directory's \`${ENTRYPOINT_NAME}\`. Each directory (private and team) has its own \`${ENTRYPOINT_NAME}\` index — each entry should be one line, under ~150 characters: \`- [Title](file.md) — one-line hook\`. They have no frontmatter. Never write memory content directly into a \`${ENTRYPOINT_NAME}\`.`,
+        '',
+        `- Both \`${ENTRYPOINT_NAME}\` indexes are loaded into your conversation context — lines after ${MAX_ENTRYPOINT_LINES} will be truncated, so keep them concise`,
+        '- Keep the name, description, and type fields in memory files up-to-date with the content',
+        '- Organize memory semantically by topic, not chronologically',
+        '- Update or remove memories that turn out to be wrong or outdated',
+        '- Do not write duplicate memories. First check if there is an existing memory you can update before writing a new one.',
+      ]
+
+  const lines = [
+    '# Memory',
+    '',
+    `You have a persistent, file-based memory system with two directories: a private directory at \`${autoDir}\` and a shared team directory at \`${teamDir}\`. ${DIRS_EXIST_GUIDANCE}`,
+    '',
+    "You should build up this memory system over time so that future conversations can have a complete picture of who the user is, how they'd like to collaborate with you, what behaviors to avoid or repeat, and the context behind the work the user gives you.",
+    '',
+    'If the user explicitly asks you to remember something, save it immediately as whichever type fits best. If they ask you to forget something, find and remove the relevant entry.',
+    '',
+    '## Memory scope',
+    '',
+    'There are two scope levels:',
+    '',
+    `- private: memories that are private between you and the current user. They persist across conversations with only this specific user and are stored at the root \`${autoDir}\`.`,
+    `- team: memories that are shared with and contributed by all of the users who work within this project directory. Team memories are synced at the beginning of every session and they are stored at \`${teamDir}\`.`,
+    '',
+    ...TYPES_SECTION_COMBINED,
+    ...WHAT_NOT_TO_SAVE_SECTION,
+    '- You MUST avoid saving sensitive data within shared team memories. For example, never save API keys or user credentials.',
+    '',
+    ...howToSave,
+    '',
+    '## When to access memories',
+    '- When memories (personal or team) seem relevant, or the user references prior work with them or others in their organization.',
+    '- You MUST access memory when the user explicitly asks you to check, recall, or remember.',
+    '- If the user says to *ignore* or *not use* memory: proceed as if MEMORY.md were empty. Do not apply remembered facts, cite, compare against, or mention memory content.',
+    MEMORY_DRIFT_CAVEAT,
+    '',
+    ...TRUSTING_RECALL_SECTION,
+    '',
+    '## Memory and other forms of persistence',
+    'Memory is one of several persistence mechanisms available to you as you assist the user in a given conversation. The distinction is often that memory can be recalled in future conversations and should not be used for persisting information that is only useful within the scope of the current conversation.',
+    '- When to use or update a plan instead of memory: If you are about to start a non-trivial implementation task and would like to reach alignment with the user on your approach you should use a Plan rather than saving this information to memory. Similarly, if you already have a plan within the conversation and you have changed your approach persist that change by updating the plan rather than saving a memory.',
+    '- When to use or update tasks instead of memory: When you need to break your work in current conversation into discrete steps or keep track of your progress use tasks instead of saving to memory. Tasks are great for persisting information about the work that needs to be done in the current conversation, but memory should be reserved for information that will be useful in future conversations.',
+    ...(extraGuidelines ?? []),
+    '',
+    ...buildSearchingPastContextSection(autoDir),
+  ]
+
+  return lines.join('\n')
+}

package/migrations/migrateAutoUpdatesToSettings.ts

@@ -0,0 +1,61 @@
+import { logEvent } from 'src/services/analytics/index.js'
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
+import { logError } from '../utils/log.js'
+import {
+  getSettingsForSource,
+  updateSettingsForSource,
+} from '../utils/settings/settings.js'
+/**
+ * Migration: Move user-set autoUpdates preference to settings.json env var
+ * Only migrates if user explicitly disabled auto-updates (not for protection)
+ * This preserves user intent while allowing native installations to auto-update
+ */
+export function migrateAutoUpdatesToSettings(): void {
+  const globalConfig = getGlobalConfig()
+
+  // Only migrate if autoUpdates was explicitly set to false by user preference
+  // (not automatically for native protection)
+  if (
+    globalConfig.autoUpdates !== false ||
+    globalConfig.autoUpdatesProtectedForNative === true
+  ) {
+    return
+  }
+
+  try {
+    const userSettings = getSettingsForSource('userSettings') || {}
+
+    // Always set DISABLE_AUTOUPDATER to preserve user intent
+    // We need to overwrite even if it exists, to ensure the migration is complete
+    updateSettingsForSource('userSettings', {
+      ...userSettings,
+      env: {
+        ...userSettings.env,
+        DISABLE_AUTOUPDATER: '1',
+      },
+    })
+
+    logEvent('tengu_migrate_autoupdates_to_settings', {
+      was_user_preference: true,
+      already_had_env_var: !!userSettings.env?.DISABLE_AUTOUPDATER,
+    })
+
+    // explicitly set, so this takes effect immediately
+    process.env.DISABLE_AUTOUPDATER = '1'
+
+    // Remove autoUpdates from global config after successful migration
+    saveGlobalConfig(current => {
+      const {
+        autoUpdates: _,
+        autoUpdatesProtectedForNative: __,
+        ...updatedConfig
+      } = current
+      return updatedConfig
+    })
+  } catch (error) {
+    logError(new Error(`Failed to migrate auto-updates: ${error}`))
+    logEvent('tengu_migrate_autoupdates_error', {
+      has_error: true,
+    })
+  }
+}

package/migrations/migrateBypassPermissionsAcceptedToSettings.ts

@@ -0,0 +1,40 @@
+import { logEvent } from 'src/services/analytics/index.js'
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
+import { logError } from '../utils/log.js'
+import {
+  hasSkipDangerousModePermissionPrompt,
+  updateSettingsForSource,
+} from '../utils/settings/settings.js'
+
+/**
+ * Migration: Move bypassPermissionsModeAccepted from global config to settings.json
+ * as skipDangerousModePermissionPrompt. This is a better home since settings.json
+ * is the user-configurable settings file.
+ */
+export function migrateBypassPermissionsAcceptedToSettings(): void {
+  const globalConfig = getGlobalConfig()
+
+  if (!globalConfig.bypassPermissionsModeAccepted) {
+    return
+  }
+
+  try {
+    if (!hasSkipDangerousModePermissionPrompt()) {
+      updateSettingsForSource('userSettings', {
+        skipDangerousModePermissionPrompt: true,
+      })
+    }
+
+    logEvent('tengu_migrate_bypass_permissions_accepted', {})
+
+    saveGlobalConfig(current => {
+      if (!('bypassPermissionsModeAccepted' in current)) return current
+      const { bypassPermissionsModeAccepted: _, ...updatedConfig } = current
+      return updatedConfig
+    })
+  } catch (error) {
+    logError(
+      new Error(`Failed to migrate bypass permissions accepted: ${error}`),
+    )
+  }
+}

package/migrations/migrateEnableAllProjectMcpServersToSettings.ts

@@ -0,0 +1,118 @@
+import { logEvent } from 'src/services/analytics/index.js'
+import {
+  getCurrentProjectConfig,
+  saveCurrentProjectConfig,
+} from '../utils/config.js'
+import { logError } from '../utils/log.js'
+import {
+  getSettingsForSource,
+  updateSettingsForSource,
+} from '../utils/settings/settings.js'
+
+/**
+ * Migration: Move MCP server approval fields from project config to local settings
+ * This migrates both enableAllProjectMcpServers and enabledMcpjsonServers to the
+ * settings system for better management and consistency.
+ */
+export function migrateEnableAllProjectMcpServersToSettings(): void {
+  const projectConfig = getCurrentProjectConfig()
+
+  // Check if any field exists in project config
+  const hasEnableAll = projectConfig.enableAllProjectMcpServers !== undefined
+  const hasEnabledServers =
+    projectConfig.enabledMcpjsonServers &&
+    projectConfig.enabledMcpjsonServers.length > 0
+  const hasDisabledServers =
+    projectConfig.disabledMcpjsonServers &&
+    projectConfig.disabledMcpjsonServers.length > 0
+
+  if (!hasEnableAll && !hasEnabledServers && !hasDisabledServers) {
+    return
+  }
+
+  try {
+    const existingSettings = getSettingsForSource('localSettings') || {}
+    const updates: Partial<{
+      enableAllProjectMcpServers: boolean
+      enabledMcpjsonServers: string[]
+      disabledMcpjsonServers: string[]
+    }> = {}
+    const fieldsToRemove: Array<
+      | 'enableAllProjectMcpServers'
+      | 'enabledMcpjsonServers'
+      | 'disabledMcpjsonServers'
+    > = []
+
+    // Migrate enableAllProjectMcpServers if it exists and hasn't been migrated
+    if (
+      hasEnableAll &&
+      existingSettings.enableAllProjectMcpServers === undefined
+    ) {
+      updates.enableAllProjectMcpServers =
+        projectConfig.enableAllProjectMcpServers
+      fieldsToRemove.push('enableAllProjectMcpServers')
+    } else if (hasEnableAll) {
+      // Already migrated, just mark for removal
+      fieldsToRemove.push('enableAllProjectMcpServers')
+    }
+
+    // Migrate enabledMcpjsonServers if it exists
+    if (hasEnabledServers && projectConfig.enabledMcpjsonServers) {
+      const existingEnabledServers =
+        existingSettings.enabledMcpjsonServers || []
+      // Merge the servers (avoiding duplicates)
+      updates.enabledMcpjsonServers = [
+        ...new Set([
+          ...existingEnabledServers,
+          ...projectConfig.enabledMcpjsonServers,
+        ]),
+      ]
+      fieldsToRemove.push('enabledMcpjsonServers')
+    }
+
+    // Migrate disabledMcpjsonServers if it exists
+    if (hasDisabledServers && projectConfig.disabledMcpjsonServers) {
+      const existingDisabledServers =
+        existingSettings.disabledMcpjsonServers || []
+      // Merge the servers (avoiding duplicates)
+      updates.disabledMcpjsonServers = [
+        ...new Set([
+          ...existingDisabledServers,
+          ...projectConfig.disabledMcpjsonServers,
+        ]),
+      ]
+      fieldsToRemove.push('disabledMcpjsonServers')
+    }
+
+    // Update settings if there are any updates
+    if (Object.keys(updates).length > 0) {
+      updateSettingsForSource('localSettings', updates)
+    }
+
+    // Remove migrated fields from project config
+    if (
+      fieldsToRemove.includes('enableAllProjectMcpServers') ||
+      fieldsToRemove.includes('enabledMcpjsonServers') ||
+      fieldsToRemove.includes('disabledMcpjsonServers')
+    ) {
+      saveCurrentProjectConfig(current => {
+        const {
+          enableAllProjectMcpServers: _enableAll,
+          enabledMcpjsonServers: _enabledServers,
+          disabledMcpjsonServers: _disabledServers,
+          ...configWithoutFields
+        } = current
+        return configWithoutFields
+      })
+    }
+
+    // Log the migration event
+    logEvent('tengu_migrate_mcp_approval_fields_success', {
+      migratedCount: fieldsToRemove.length,
+    })
+  } catch (e: unknown) {
+    // Log migration failure but don't throw to avoid breaking startup
+    logError(e)
+    logEvent('tengu_migrate_mcp_approval_fields_error', {})
+  }
+}

package/migrations/migrateFennecToOpus.ts

@@ -0,0 +1,45 @@
+import {
+  getSettingsForSource,
+  updateSettingsForSource,
+} from '../utils/settings/settings.js'
+
+/**
+ * Migrate users on removed fennec model aliases to their new Opus 4.6 aliases.
+ * - fennec-latest → opus
+ * - fennec-latest[1m] → opus[1m]
+ * - fennec-fast-latest → opus[1m] + fast mode
+ * - opus-4-5-fast → opus + fast mode
+ *
+ * Only touches userSettings. Reading and writing the same source keeps this
+ * idempotent without a completion flag. Fennec aliases in project/local/policy
+ * settings are left alone — we can't rewrite those, and reading merged
+ * settings here would cause infinite re-runs + silent global promotion.
+ */
+export function migrateFennecToOpus(): void {
+  if (process.env.USER_TYPE !== 'ant') {
+    return
+  }
+
+  const settings = getSettingsForSource('userSettings')
+
+  const model = settings?.model
+  if (typeof model === 'string') {
+    if (model.startsWith('fennec-latest[1m]')) {
+      updateSettingsForSource('userSettings', {
+        model: 'opus[1m]',
+      })
+    } else if (model.startsWith('fennec-latest')) {
+      updateSettingsForSource('userSettings', {
+        model: 'opus',
+      })
+    } else if (
+      model.startsWith('fennec-fast-latest') ||
+      model.startsWith('opus-4-5-fast')
+    ) {
+      updateSettingsForSource('userSettings', {
+        model: 'opus[1m]',
+        fastMode: true,
+      })
+    }
+  }
+}