npm - @shawnstack/quickforge - Versions diffs - 1.5.2 → 1.5.4 - Mend

@shawnstack/quickforge 1.5.2 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/README.md +108 -12
package/dist/assets/{AgentProfilesPage-DKyIh3dE.js → AgentProfilesPage-CGm7ZzRM.js} +1 -1
package/dist/assets/ChatPanelHost-nzOC6Tbg.js +242 -0
package/dist/assets/{PluginsPage-CN-SFQ_s.js → PluginsPage-K3o4AB2E.js} +1 -1
package/dist/assets/{ScheduledTasksPage-C0htXZk2.js → ScheduledTasksPage-BVjejep8.js} +1 -1
package/dist/assets/{SharedConversationPage-CxbAx1fN.js → SharedConversationPage-BwmUajLr.js} +1 -1
package/dist/assets/{TerminalDock-_voUf7d-.js → TerminalDock-D-GWlS7P.js} +1 -1
package/dist/assets/{WorkspaceInspector-Ci4FuaZH.js → WorkspaceInspector-CEU6nnM-.js} +2 -2
package/dist/assets/{WorkspaceReaderDialog-D75__GFg.js → WorkspaceReaderDialog-D9Qy6LUm.js} +1 -1
package/dist/assets/{diff-line-counts-DHyWKEXk.js → diff-line-counts-DCot_pZu.js} +1 -1
package/dist/assets/index-CkQWeO9c.css +3 -0
package/dist/assets/index-DTiIspXQ.js +1482 -0
package/dist/favicon.svg +16 -16
package/dist/index.html +2 -2
package/dist/pwa-icon-192.png +0 -0
package/dist/pwa-icon-512.png +0 -0
package/dist/pwa-maskable-512.png +0 -0
package/package.json +2 -1
package/server/index.mjs +76 -6
package/server/mcp/config.mjs +20 -20
package/server/public-api.mjs +196 -0
package/server/routes/backup.mjs +84 -20
package/server/routes/system.mjs +2 -1
package/server/storage.mjs +182 -48
package/server/update-supervisor.mjs +121 -0
package/dist/assets/ChatPanelHost-BUZ6scv9.js +0 -242
package/dist/assets/index-BI7xZuj-.css +0 -3
package/dist/assets/index-BzOV50wA.js +0 -1442

package/dist/favicon.svg CHANGED Viewed

@@ -1,16 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" fill="none">
-  <defs>
-    <linearGradient id="stroke" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0" stop-color="#bd86ff" />
-      <stop offset="1" stop-color="#7e14ff" />
-    </linearGradient>
-    <linearGradient id="bolt" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0" stop-color="#7dd4ff" />
-      <stop offset="1" stop-color="#37a6ff" />
-    </linearGradient>
-  </defs>
-  <polygon points="32,6 52.78,18 52.78,42 32,54 11.22,42 11.22,18"
-    fill="none" stroke="url(#stroke)" stroke-width="4.5" stroke-linejoin="round" />
-  <path d="M37.2 13 L22 34 L30.6 34 L26.8 50 L42.8 26 L33.8 26 Z" fill="url(#bolt)" />
-  <path d="M37.2 13 L22 34 L30.6 34 L33.8 26 Z" fill="#cdeeff" opacity="0.5" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" fill="none">
+  <defs>
+    <linearGradient id="stroke" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#9ca3af" />
+      <stop offset="1" stop-color="#4b5563" />
+    </linearGradient>
+    <linearGradient id="bolt" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#374151" />
+      <stop offset="1" stop-color="#0f172a" />
+    </linearGradient>
+  </defs>
+  <polygon points="32,6 52.78,18 52.78,42 32,54 11.22,42 11.22,18"
+    fill="none" stroke="url(#stroke)" stroke-width="4.5" stroke-linejoin="round" />
+  <path d="M37.2 13 L22 34 L30.6 34 L26.8 50 L42.8 26 L33.8 26 Z" fill="url(#bolt)" />
+  <path d="M37.2 13 L22 34 L30.6 34 L33.8 26 Z" fill="#e5e7eb" opacity="0.4" />
+</svg>

package/dist/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
     <meta name="apple-mobile-web-app-title" content="QuickForge" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <title>速构 QuickForge</title>
-    <script type="module" crossorigin src="/assets/index-BzOV50wA.js"></script>
+    <script type="module" crossorigin src="/assets/index-DTiIspXQ.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-DWdDZTNf.js">
     <link rel="modulepreload" crossorigin href="/assets/pi-ai-Cx633yhb.js">
     <link rel="modulepreload" crossorigin href="/assets/lit-vendor-Dr3cpBGF.js">
@@ -20,7 +20,7 @@
     <link rel="modulepreload" crossorigin href="/assets/icons-DzxBk7tb.js">
     <link rel="modulepreload" crossorigin href="/assets/react-vendor-DsAeMFcm.js">
     <link rel="modulepreload" crossorigin href="/assets/logger-B65Akg8A.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-BI7xZuj-.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CkQWeO9c.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/pwa-icon-192.png CHANGED Viewed

Binary file

package/dist/pwa-icon-512.png CHANGED Viewed

Binary file

package/dist/pwa-maskable-512.png CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@shawnstack/quickforge",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "AI chat application with Agent access modes for local workspace tools. React + Vite + Tailwind CSS frontend, local Node.js storage server.",
   "keywords": [
     "ai",
@@ -28,6 +28,7 @@
   },
   "homepage": "https://github.com/shawnstack/quickforge#readme",
   "type": "module",
+  "main": "./server/public-api.mjs",
   "bin": {
     "quickforge": "bin/quickforge.mjs",
     "qf": "bin/quickforge.mjs"

package/server/index.mjs CHANGED Viewed

@@ -31,7 +31,7 @@ import { handleChannelsApi } from './routes/channels.mjs'
 import { handleModelsApi } from './routes/models.mjs'
 import { serveStatic } from './routes/static.mjs'
 import { logger, flushLogger } from './utils/logger.mjs'
-import { getPackageInfo, checkForUpdates, installLatestVersion } from './utils/package-update.mjs'
+import { getPackageInfo, checkForUpdates } from './utils/package-update.mjs'
 import { installAiHttpLogger } from './ai-http-logger.mjs'
 import { isLoopbackAddress, getLanUrls } from './utils/network.mjs'
 import { parseCookies } from './share-store.mjs'
@@ -46,6 +46,7 @@ const __dirname = path.dirname(__filename)
 const projectRoot = path.resolve(__dirname, '..')
 const serverScript = path.join(__dirname, 'index.mjs')
 const restartSupervisorScript = path.join(__dirname, 'restart-supervisor.mjs')
+const updateSupervisorScript = path.join(__dirname, 'update-supervisor.mjs')
 const bootId = randomUUID()
 const startedAt = new Date().toISOString()
@@ -175,6 +176,56 @@ async function requestRestart() {
   return { ok: true, restarting: true, bootId }
 }
+function updateLogFile() {
+  const stamp = new Date().toISOString().replace(/[:.]/g, '-').replace('T', '_').replace('Z', '')
+  return path.join(logsDir, `update-${stamp}.log`)
+}
+function spawnUpdateSupervisor(update) {
+  const logFile = updateLogFile()
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [
+      updateSupervisorScript,
+      String(process.pid),
+      update.name,
+      update.latestVersion,
+      serverScript,
+      projectRoot,
+      logFile,
+      ...process.argv.slice(2),
+    ], {
+      cwd: dataDir,
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+      shell: false,
+      env: {
+        ...process.env,
+        QUICKFORGE_NO_OPEN: '1',
+      },
+    })
+    child.once('error', reject)
+    child.once('spawn', () => {
+      child.unref()
+      resolve({ pid: child.pid, logFile })
+    })
+  })
+}
+async function shutdownForUpdate() {
+  logger.info('Shutting down QuickForge for external updater.')
+  stopScheduledTaskRunner()
+  stopVite()
+  await shutdownAgentManager()
+  await shutdownMcpConnections()
+  await shutdownChannels()
+  shutdownTerminalSessions()
+  await closeHttpServer()
+  flushLogger()
+  process.exit(0)
+}
 async function updateQuickForge() {
   if (updateInProgress) {
     const error = new Error('Update already in progress')
@@ -186,15 +237,34 @@ async function updateQuickForge() {
   try {
     const update = await checkForUpdates(projectRoot)
     if (!update.updateAvailable) {
+      updateInProgress = false
       return { ...update, ok: true, updated: false }
     }
-    logger.info(`Updating QuickForge from ${update.currentVersion} to ${update.latestVersion}.`)
-    await installLatestVersion(update.name, { cwd: projectRoot })
-    logger.info('QuickForge update completed.')
-    return { ...update, ok: true, updated: true }
-  } finally {
+    logger.info(`Starting external QuickForge updater from ${update.currentVersion} to ${update.latestVersion}.`)
+    const supervisor = await spawnUpdateSupervisor(update)
+    logger.info(`Update supervisor started (PID ${supervisor.pid}). Log: ${supervisor.logFile}`)
+    setTimeout(() => {
+      void shutdownForUpdate().catch((error) => {
+        logger.error('Failed to shut down for QuickForge update:', error)
+        updateInProgress = false
+      })
+    }, 100)
+    return {
+      ...update,
+      ok: true,
+      updated: false,
+      updateStarted: true,
+      restarting: true,
+      updaterPid: supervisor.pid,
+      logFile: supervisor.logFile,
+      bootId,
+    }
+  } catch (error) {
     updateInProgress = false
+    throw error
   }
 }

package/server/mcp/config.mjs CHANGED Viewed

@@ -163,43 +163,43 @@ export function normalizeMcpServers(value) {
 }
 export async function readMcpServers() {
-  const settings = await readStore('settings')
-  return normalizeMcpServers(settings?.[MCP_CONFIG_KEY])
+  const mcp = await readStore('mcp')
+  return normalizeMcpServers(mcp?.[MCP_CONFIG_KEY])
 }
 export async function writeMcpServers(servers) {
   const normalized = normalizeMcpServers(servers)
-  return atomicUpdate('settings', (settings) => {
-    settings[MCP_CONFIG_KEY] = normalized.map((server) => ({ ...server, updatedAt: new Date().toISOString() }))
-    return settings
-  }).then((settings) => normalizeMcpServers(settings?.[MCP_CONFIG_KEY]))
+  return atomicUpdate('mcp', (mcp) => {
+    mcp[MCP_CONFIG_KEY] = normalized.map((server) => ({ ...server, updatedAt: new Date().toISOString() }))
+    return mcp
+  }).then((mcp) => normalizeMcpServers(mcp?.[MCP_CONFIG_KEY]))
 }
 export async function upsertMcpServer(server) {
   const normalized = normalizeMcpServerConfig(server)
-  return atomicUpdate('settings', (settings) => {
-    const servers = normalizeMcpServers(settings?.[MCP_CONFIG_KEY])
+  return atomicUpdate('mcp', (mcp) => {
+    const servers = normalizeMcpServers(mcp?.[MCP_CONFIG_KEY])
     const index = servers.findIndex((item) => item.name === normalized.name)
     const next = { ...normalized, updatedAt: new Date().toISOString() }
     if (index >= 0) servers[index] = next
     else servers.push(next)
-    settings[MCP_CONFIG_KEY] = servers
-    return settings
-  }).then((settings) => normalizeMcpServers(settings?.[MCP_CONFIG_KEY]))
+    mcp[MCP_CONFIG_KEY] = servers
+    return mcp
+  }).then((mcp) => normalizeMcpServers(mcp?.[MCP_CONFIG_KEY]))
 }
 export async function deleteMcpServer(name) {
   const normalizedName = normalizeName(name)
-  return atomicUpdate('settings', (settings) => {
-    settings[MCP_CONFIG_KEY] = normalizeMcpServers(settings?.[MCP_CONFIG_KEY]).filter((server) => server.name !== normalizedName)
-    return settings
-  }).then((settings) => normalizeMcpServers(settings?.[MCP_CONFIG_KEY]))
+  return atomicUpdate('mcp', (mcp) => {
+    mcp[MCP_CONFIG_KEY] = normalizeMcpServers(mcp?.[MCP_CONFIG_KEY]).filter((server) => server.name !== normalizedName)
+    return mcp
+  }).then((mcp) => normalizeMcpServers(mcp?.[MCP_CONFIG_KEY]))
 }
 export async function setMcpServerEnabled(name, enabled) {
   const normalizedName = normalizeName(name)
-  return atomicUpdate('settings', (settings) => {
-    const servers = normalizeMcpServers(settings?.[MCP_CONFIG_KEY])
+  return atomicUpdate('mcp', (mcp) => {
+    const servers = normalizeMcpServers(mcp?.[MCP_CONFIG_KEY])
     const index = servers.findIndex((server) => server.name === normalizedName)
     if (index < 0) {
       const error = new Error(`MCP server not found: ${normalizedName}`)
@@ -211,7 +211,7 @@ export async function setMcpServerEnabled(name, enabled) {
       enabled: Boolean(enabled),
       updatedAt: new Date().toISOString(),
     }
-    settings[MCP_CONFIG_KEY] = servers
-    return settings
-  }).then((settings) => normalizeMcpServers(settings?.[MCP_CONFIG_KEY]))
+    mcp[MCP_CONFIG_KEY] = servers
+    return mcp
+  }).then((mcp) => normalizeMcpServers(mcp?.[MCP_CONFIG_KEY]))
 }

package/server/public-api.mjs ADDED Viewed

@@ -0,0 +1,196 @@
+import { spawn } from 'node:child_process'
+import path from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const projectRoot = path.resolve(__dirname, '..')
+const serverScript = path.join(__dirname, 'index.mjs')
+const serverScriptUrl = pathToFileURL(serverScript).href
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+function normalizeHost(host) {
+  return host || '127.0.0.1'
+}
+function getProbeHost(host) {
+  if (host === '0.0.0.0' || host === '::') return '127.0.0.1'
+  return host || '127.0.0.1'
+}
+function getDisplayHost(host) {
+  if (host === '0.0.0.0') return '<LAN-IP>'
+  if (host === '::') return '<LAN-IP>'
+  return host || '127.0.0.1'
+}
+function getPort(port) {
+  return Number(port || 5176)
+}
+function buildEnv(options = {}) {
+  const host = normalizeHost(options.host)
+  const port = getPort(options.port)
+  const shareLan = options.shareLan === true
+  const env = {
+    ...process.env,
+    QUICKFORGE_HOST: host,
+    QUICKFORGE_PORT: String(port),
+    QUICKFORGE_SHARE_LAN: shareLan ? '1' : '0',
+    QUICKFORGE_NO_OPEN: options.openBrowser ? '0' : '1',
+  }
+  if (options.dataDir) env.QUICKFORGE_DATA_DIR = path.resolve(options.dataDir)
+  if (options.workspaceDir) env.QUICKFORGE_WORKSPACE_DIR = path.resolve(options.workspaceDir)
+  if (options.vitePort) env.QUICKFORGE_VITE_PORT = String(options.vitePort)
+  if (options.terminal === false) env.QUICKFORGE_TERMINAL = '0'
+  if (process.versions.electron) env.ELECTRON_RUN_AS_NODE = '1'
+  if (options.allowRemote || shareLan) env.QUICKFORGE_ALLOW_REMOTE = '1'
+  return env
+}
+export function getQuickForgeUrl(options = {}) {
+  const host = getDisplayHost(normalizeHost(options.host))
+  const port = getPort(options.port)
+  return `http://${host}:${port}`
+}
+export function getQuickForgeHealthUrl(options = {}) {
+  const host = getProbeHost(normalizeHost(options.host))
+  const port = getPort(options.port)
+  return `http://${host}:${port}/api/health`
+}
+export async function checkQuickForgeHealth(options = {}) {
+  const controller = new AbortController()
+  const timeout = setTimeout(() => controller.abort(), options.requestTimeoutMs || 800)
+  timeout.unref?.()
+  try {
+    const response = await fetch(getQuickForgeHealthUrl(options), {
+      headers: { accept: 'application/json' },
+      signal: controller.signal,
+    })
+    if (!response.ok) return null
+    const payload = await response.json()
+    if (!payload || payload.ok !== true || !payload.pid) return null
+    return payload
+  } catch {
+    return null
+  } finally {
+    clearTimeout(timeout)
+  }
+}
+async function waitForQuickForge(options = {}) {
+  const timeoutMs = options.timeoutMs || 15000
+  const deadline = Date.now() + timeoutMs
+  while (Date.now() < deadline) {
+    const health = await checkQuickForgeHealth(options)
+    if (health) return health
+    await sleep(options.pollIntervalMs || 300)
+  }
+  return null
+}
+export async function startQuickForge(options = {}) {
+  const existingHealth = options.reuseExisting === false ? null : await checkQuickForgeHealth(options)
+  const url = getQuickForgeUrl(options)
+  const healthUrl = getQuickForgeHealthUrl(options)
+  if (existingHealth) {
+    return {
+      url,
+      healthUrl,
+      health: existingHealth,
+      pid: existingHealth.pid,
+      child: null,
+      reused: true,
+      async stop() {
+        return false
+      },
+    }
+  }
+  if (options.inline === true) {
+    await import(serverScriptUrl)
+    const health = await waitForQuickForge(options)
+    if (!health) throw new Error('QuickForge failed to start: health check timed out')
+    return {
+      url,
+      healthUrl,
+      health,
+      pid: health.pid || process.pid,
+      child: null,
+      reused: false,
+      inline: true,
+      async stop() {
+        return false
+      },
+    }
+  }
+  const child = spawn(process.execPath, [serverScript], {
+    cwd: options.cwd ? path.resolve(options.cwd) : projectRoot,
+    detached: options.detached === true,
+    stdio: options.stdio || 'ignore',
+    windowsHide: true,
+    shell: false,
+    env: buildEnv(options),
+  })
+  let exitInfo = null
+  child.once('exit', (code, signal) => {
+    exitInfo = { code, signal }
+  })
+  await new Promise((resolve, reject) => {
+    child.once('spawn', resolve)
+    child.once('error', reject)
+  })
+  const health = await waitForQuickForge(options)
+  if (!health) {
+    if (!child.killed && exitInfo === null) {
+      try {
+        child.kill('SIGTERM')
+      } catch {
+        // ignore best-effort cleanup errors
+      }
+    }
+    const reason = exitInfo
+      ? `process exited early (code ${exitInfo.code ?? 'null'}, signal ${exitInfo.signal ?? 'null'})`
+      : 'health check timed out'
+    throw new Error(`QuickForge failed to start: ${reason}`)
+  }
+  if (options.detached === true) child.unref()
+  return {
+    url,
+    healthUrl,
+    health,
+    pid: health.pid || child.pid,
+    child,
+    reused: false,
+    async stop() {
+      if (child.killed) return false
+      child.kill('SIGTERM')
+      return true
+    },
+  }
+}
+export async function stopQuickForge(instance) {
+  if (!instance?.child || instance.reused) return false
+  if (instance.child.killed) return false
+  instance.child.kill('SIGTERM')
+  return true
+}

package/server/routes/backup.mjs CHANGED Viewed

@@ -16,7 +16,13 @@ import { getWorkspaceRoot } from '../utils/workspace.mjs'
 const BACKUP_VERSION = 1
 const BACKUP_APP = 'quickforge'
 const backupScopes = new Set(['all', 'config', 'sessions'])
-const restoreSectionIds = new Set(['settings', 'providerKeys', 'customProviders', 'projects', 'scheduledTasks', 'conversations'])
+const restoreSectionIds = new Set(['settings', 'mcp', 'providerKeys', 'customProviders', 'projects', 'scheduledTasks', 'conversations'])
+const restoreModes = new Set(['replace', 'merge'])
+function normalizeMode(value) {
+  const mode = String(value || 'replace')
+  return restoreModes.has(mode) ? mode : 'replace'
+}
 function normalizeScope(value) {
   const scope = String(value || 'all')
@@ -109,8 +115,9 @@ async function buildBackup(scope = 'all', options = {}) {
   const data = {}
   if (includeConfig) {
-    const [settings, providerKeys, customProviders, projects, scheduledTasks] = await Promise.all([
+    const [settings, mcp, providerKeys, customProviders, projects, scheduledTasks] = await Promise.all([
       readStore('settings'),
+      readStore('mcp'),
       includeSecrets ? readStore('provider-keys') : Promise.resolve(undefined),
       readStore('custom-providers'),
       readProjectConfigData(),
@@ -118,6 +125,7 @@ async function buildBackup(scope = 'all', options = {}) {
     ])
     Object.assign(data, {
       settings,
+      mcp,
       customProviders,
       projects,
       scheduledTasks,
@@ -160,6 +168,7 @@ function normalizeBackupPayload(payload) {
   const sections = {
     settings: section(data, 'settings'),
+    mcp: section(data, 'mcp'),
     providerKeys: section(data, 'providerKeys', 'provider-keys'),
     customProviders: section(data, 'customProviders', 'custom-providers'),
     projects: section(data, 'projects'),
@@ -168,6 +177,17 @@ function normalizeBackupPayload(payload) {
     sessionsMetadata: section(data, 'sessionsMetadata', 'sessions-metadata'),
   }
+  // Backward compat: older backups stored MCP servers inside settings.mcpServers.
+  if (
+    sections.mcp === undefined &&
+    sections.settings && typeof sections.settings === 'object' && !Array.isArray(sections.settings) &&
+    Object.prototype.hasOwnProperty.call(sections.settings, 'mcpServers')
+  ) {
+    const { mcpServers, ...restSettings } = sections.settings
+    sections.settings = restSettings
+    sections.mcp = { mcpServers: Array.isArray(mcpServers) ? mcpServers : [] }
+  }
   if (Object.values(sections).every((value) => value === undefined)) {
     const error = new Error('Backup does not contain any restorable sections')
     error.statusCode = 400
@@ -197,6 +217,7 @@ function validateBackupPayload(payload) {
     ...backup,
     sections: {
       settings: assertObjectSection(sections.settings, 'settings'),
+      mcp: assertObjectSection(sections.mcp, 'mcp'),
       providerKeys: assertObjectSection(sections.providerKeys, 'providerKeys'),
       customProviders: assertObjectSection(sections.customProviders, 'customProviders'),
       projects: assertProjectConfig(sections.projects),
@@ -249,6 +270,7 @@ function filterRestoreSections(sections, selected) {
   if (!selected) return sections
   return {
     settings: selected.has('settings') ? sections.settings : undefined,
+    mcp: selected.has('mcp') ? sections.mcp : undefined,
     providerKeys: selected.has('providerKeys') ? sections.providerKeys : undefined,
     customProviders: selected.has('customProviders') ? sections.customProviders : undefined,
     projects: selected.has('projects') ? sections.projects : undefined,
@@ -267,7 +289,8 @@ function parseImportPayload(body) {
   const backup = validateBackupPayload(payload)
   const requestedSections = body?.backup && typeof body === 'object' ? body.sections : undefined
   const selected = normalizeRestoreSections(requestedSections, backup.sections)
-  return backupWithSelectedSections(backup, selected)
+  const mode = normalizeMode(body?.mode)
+  return { backup: backupWithSelectedSections(backup, selected), mode }
 }
 function countKeys(value) {
@@ -277,6 +300,7 @@ function countKeys(value) {
 function buildSummary(sections) {
   const summary = {}
   if (sections.settings !== undefined) summary.settings = countKeys(sections.settings)
+  if (sections.mcp !== undefined) summary.mcp = Array.isArray(sections.mcp?.mcpServers) ? sections.mcp.mcpServers.length : countKeys(sections.mcp)
   if (sections.providerKeys !== undefined) summary.providerKeys = countKeys(sections.providerKeys)
   if (sections.customProviders !== undefined) summary.customProviders = countKeys(sections.customProviders)
   if (sections.projects !== undefined) summary.projects = sections.projects.projects.length
@@ -318,46 +342,86 @@ async function writeSafetyBackup() {
   return file
 }
-async function restoreValidatedBackup(backup) {
+// Merge two plain-object stores: backup entries override local on key collision,
+// local-only keys are preserved.
+function mergeRecordStore(localValue, backupValue) {
+  return { ...(localValue && typeof localValue === 'object' ? localValue : {}), ...backupValue }
+}
+// Merge projects config: dedupe the projects array by id (backup wins on
+// collision, local-only entries preserved), take activeProjectId / globalSkills
+// from backup.
+function mergeProjectConfig(localConfig, backupConfig) {
+  const localProjects = Array.isArray(localConfig?.projects) ? localConfig.projects : []
+  const backupProjects = Array.isArray(backupConfig.projects) ? backupConfig.projects : []
+  const merged = new Map()
+  for (const project of localProjects) {
+    if (project && typeof project.id === 'string') merged.set(project.id, project)
+  }
+  for (const project of backupProjects) {
+    if (project && typeof project.id === 'string') merged.set(project.id, project)
+  }
+  return {
+    activeProjectId: typeof backupConfig.activeProjectId === 'string' ? backupConfig.activeProjectId : (localConfig?.activeProjectId ?? null),
+    globalSkills: Array.isArray(backupConfig.globalSkills) ? backupConfig.globalSkills : (Array.isArray(localConfig?.globalSkills) ? localConfig.globalSkills : []),
+    projects: [...merged.values()],
+  }
+}
+async function restoreValidatedBackup(backup, mode = 'replace') {
+  const merge = mode === 'merge'
   const { sections } = backup
   const summary = {}
   if (sections.settings !== undefined) {
-    await writeStore('settings', sections.settings)
-    summary.settings = countKeys(sections.settings)
+    const value = merge ? mergeRecordStore(await readStore('settings'), sections.settings) : sections.settings
+    await writeStore('settings', value)
+    summary.settings = countKeys(value)
+  }
+  if (sections.mcp !== undefined) {
+    const value = merge ? mergeRecordStore(await readStore('mcp'), sections.mcp) : sections.mcp
+    await writeStore('mcp', value)
+    summary.mcp = Array.isArray(value?.mcpServers) ? value.mcpServers.length : countKeys(value)
   }
   if (sections.providerKeys !== undefined) {
-    await writeStore('provider-keys', sections.providerKeys)
-    summary.providerKeys = countKeys(sections.providerKeys)
+    const value = merge ? mergeRecordStore(await readStore('provider-keys'), sections.providerKeys) : sections.providerKeys
+    await writeStore('provider-keys', value)
+    summary.providerKeys = countKeys(value)
   }
   if (sections.customProviders !== undefined) {
-    await writeStore('custom-providers', sections.customProviders)
-    summary.customProviders = countKeys(sections.customProviders)
+    const value = merge ? mergeRecordStore(await readStore('custom-providers'), sections.customProviders) : sections.customProviders
+    await writeStore('custom-providers', value)
+    summary.customProviders = countKeys(value)
   }
   if (sections.projects !== undefined) {
-    await writeProjectConfigData(sections.projects)
+    const value = merge ? mergeProjectConfig(await readProjectConfigData(), sections.projects) : sections.projects
+    await writeProjectConfigData(value)
     await initializeActiveProject()
     setActiveWorkspaceRootForFilesystem(getWorkspaceRoot())
-    summary.projects = sections.projects.projects.length
+    summary.projects = value.projects.length
   }
   if (sections.scheduledTasks !== undefined) {
-    await writeStore('scheduled-tasks', sections.scheduledTasks)
-    summary.scheduledTasks = countKeys(sections.scheduledTasks)
+    const value = merge ? mergeRecordStore(await readStore('scheduled-tasks'), sections.scheduledTasks) : sections.scheduledTasks
+    await writeStore('scheduled-tasks', value)
+    summary.scheduledTasks = countKeys(value)
   }
   if (sections.sessions !== undefined) {
     const sessions = filterSessionsByMetadata(sections.sessions, sections.sessionsMetadata)
-    await writeStore('sessions', sessions)
-    summary.sessions = countKeys(sessions)
+    const value = merge ? mergeRecordStore(await readStore('sessions'), sessions) : sessions
+    await writeStore('sessions', value)
+    summary.sessions = countKeys(value)
   }
   if (sections.sessionsMetadata !== undefined) {
-    await writeStore('sessions-metadata', sections.sessionsMetadata)
-    summary.sessionsMetadata = countKeys(sections.sessionsMetadata)
+    const value = merge ? mergeRecordStore(await readStore('sessions-metadata'), sections.sessionsMetadata) : sections.sessionsMetadata
+    await writeStore('sessions-metadata', value)
+    summary.sessionsMetadata = countKeys(value)
   }
   return summary
@@ -382,9 +446,9 @@ export async function handleBackupApi(req, res, url) {
   if (req.method === 'POST' && url.pathname === '/api/backup/import') {
     await ensureStorage()
     const body = await readJsonBody(req)
-    const backup = parseImportPayload(body)
+    const { backup, mode } = parseImportPayload(body)
     const safetyBackupPath = await writeSafetyBackup()
-    const summary = await restoreValidatedBackup(backup)
+    const summary = await restoreValidatedBackup(backup, mode)
     sendJson(res, 200, { ok: true, safetyBackupPath, summary })
     return
   }

package/server/routes/system.mjs CHANGED Viewed

@@ -25,7 +25,8 @@ export async function handleSystemApi(req, res, url, context) {
       throw error
     }
-    sendJson(res, 200, await context.updateQuickForge())
+    const result = await context.updateQuickForge()
+    sendJson(res, result.updateStarted ? 202 : 200, result)
     return
   }