Merge pull request #183 from Kaguya-19/fix/mem-setting

Gucc111 · web-flow · commit d94ec37bbce1 · 2026-06-09T19:49:14.000+08:00
fix(memory): inherit agent model and accept flat schedule fields in gateway config
diff --git a/scripts/dev-launcher.mjs b/scripts/dev-launcher.mjs
@@ -122,7 +122,7 @@ async function main() {
   const child = spawn(
     'npm',
     ['--workspace', 'ui', 'run', 'dev:concurrent'],
-    { cwd: repoRoot, env, stdio: 'inherit' },
+    { cwd: repoRoot, env, stdio: 'inherit', shell: true },
   );
 
   const forward = (signal) => {
diff --git a/src/cli/createLocalGateway.ts b/src/cli/createLocalGateway.ts
@@ -583,6 +583,7 @@ class ProjectRuntimeRegistry {
     const memory = createEdgeClawMemoryProviderFromConfig({
       config: snapshot.config.memory,
       modelConfig: snapshot.config.model,
+      agentModel: snapshot.config.agent.model.id,
       projectRoot,
       now: this.options.now,
       telemetry: this.options.telemetry,
diff --git a/src/context/DefaultContextRuntime.ts b/src/context/DefaultContextRuntime.ts
@@ -90,7 +90,7 @@ export type DefaultContextRuntimeOptions = {
 const DEFAULT_MAX_CONTEXT_TOKENS = 8192;
 const DEFAULT_TRUNCATE_FIRST_RATIO = 0.5;
 const DEFAULT_TRUNCATE_SECOND_RATIO = 0.25;
-const DEFAULT_MEMORY_RETRIEVAL_TIMEOUT_MS = 5_000;
+const DEFAULT_MEMORY_RETRIEVAL_TIMEOUT_MS = 30_000;
 
 export class DefaultContextRuntime implements ContextRuntime {
   private readonly extension: ExtensionResolver;
diff --git a/src/context/memory/createEdgeClawMemoryProviderFromConfig.ts b/src/context/memory/createEdgeClawMemoryProviderFromConfig.ts
@@ -25,6 +25,8 @@ import type { TelemetryClient } from "../../telemetry/index.js";
 export type CreateEdgeClawMemoryProviderOptions = {
   config: PilotMemoryConfig | undefined;
   modelConfig?: ModelConfig;
+  /** Fallback model ref ("provider/model") when memory.model is not set. */
+  agentModel?: string;
   projectRoot: string;
   /** Optional logger forwarded to the underlying service. */
   logger?: {
@@ -47,7 +49,7 @@ export function createEdgeClawMemoryProviderFromConfig(
   const workspaceDir = options.projectRoot;
   const rootDir = cfg.rootDir;
 
-  const llm = resolveMemoryLlm(cfg, options.modelConfig);
+  const llm = resolveMemoryLlm(cfg, options.modelConfig, options.agentModel);
 
   const service = new EdgeClawMemoryService({
     workspaceDir,
@@ -76,14 +78,16 @@ export function createEdgeClawMemoryProviderFromConfig(
 function resolveMemoryLlm(
   cfg: PilotMemoryConfig,
   modelConfig?: ModelConfig,
+  agentModel?: string,
 ): EdgeClawMemoryLlmOptions | undefined {
-  if (!cfg.model) return undefined;
+  const modelRef = cfg.model || agentModel;
+  if (!modelRef) return undefined;
 
-  const sep = cfg.model.indexOf("/");
+  const sep = modelRef.indexOf("/");
   if (sep < 0) return undefined;
 
-  const providerId = cfg.model.slice(0, sep);
-  const modelId = cfg.model.slice(sep + 1);
+  const providerId = modelRef.slice(0, sep);
+  const modelId = modelRef.slice(sep + 1);
   const providerEntry = modelConfig?.providers[providerId];
 
   const llm: EdgeClawMemoryLlmOptions = {
diff --git a/src/context/memory/edgeclaw-memory-core/lib/core/storage/sqlite.js b/src/context/memory/edgeclaw-memory-core/lib/core/storage/sqlite.js
@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { MEMORY_EXPORT_FORMAT_VERSION, } from "../types.js";
 import { FileMemoryStore } from "../file-memory.js";
@@ -285,6 +285,25 @@ function createSiblingTempPath(targetDir, label) {
     const parentDir = dirname(targetDir);
     return join(parentDir, `.${basename(targetDir)}.${label}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`);
 }
+/**
+ * Attempt `renameSync`; on Windows EPERM/EACCES (file-locking by indexer,
+ * antivirus, or watchers), fall back to recursive copy + delete.
+ */
+function robustRenameSync(src, dst) {
+    try {
+        renameSync(src, dst);
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === "EPERM" || code === "EACCES") {
+            cpSync(src, dst, { recursive: true });
+            rmSync(src, { recursive: true, force: true });
+        }
+        else {
+            throw error;
+        }
+    }
+}
 function sortSnapshotFiles(files) {
     return [...files].sort((left, right) => left.relativePath.localeCompare(right.relativePath));
 }
@@ -990,17 +1009,17 @@ export class MemoryRepository {
         let movedLiveRoot = false;
         try {
             if (existsSync(liveRoot)) {
-                renameSync(liveRoot, backupRoot);
+                robustRenameSync(liveRoot, backupRoot);
                 movedLiveRoot = true;
             }
-            renameSync(stagedRoot, liveRoot);
+            robustRenameSync(stagedRoot, liveRoot);
         }
         catch (error) {
             if (existsSync(stagedRoot)) {
                 rmSync(stagedRoot, { recursive: true, force: true });
             }
             if (movedLiveRoot && !existsSync(liveRoot) && existsSync(backupRoot)) {
-                renameSync(backupRoot, liveRoot);
+                robustRenameSync(backupRoot, liveRoot);
             }
             throw error;
         }
diff --git a/src/context/memory/edgeclaw-memory-core/src/core/storage/sqlite.ts b/src/context/memory/edgeclaw-memory-core/src/core/storage/sqlite.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import {
   type CaseTraceRecord,
@@ -427,6 +427,24 @@ function createSiblingTempPath(targetDir: string, label: string): string {
   );
 }
 
+/**
+ * Attempt `renameSync`; on Windows EPERM/EACCES (file-locking by indexer,
+ * antivirus, or watchers), fall back to recursive copy + delete.
+ */
+function robustRenameSync(src: string, dst: string): void {
+  try {
+    renameSync(src, dst);
+  } catch (error: unknown) {
+    const code = (error as NodeJS.ErrnoException).code;
+    if (code === "EPERM" || code === "EACCES") {
+      cpSync(src, dst, { recursive: true });
+      rmSync(src, { recursive: true, force: true });
+    } else {
+      throw error;
+    }
+  }
+}
+
 function sortSnapshotFiles(files: readonly MemorySnapshotFileRecord[]): MemorySnapshotFileRecord[] {
   return [...files].sort((left, right) => left.relativePath.localeCompare(right.relativePath));
 }
@@ -1249,16 +1267,16 @@ export class MemoryRepository {
     let movedLiveRoot = false;
     try {
       if (existsSync(liveRoot)) {
-        renameSync(liveRoot, backupRoot);
+        robustRenameSync(liveRoot, backupRoot);
         movedLiveRoot = true;
       }
-      renameSync(stagedRoot, liveRoot);
+      robustRenameSync(stagedRoot, liveRoot);
     } catch (error) {
       if (existsSync(stagedRoot)) {
         rmSync(stagedRoot, { recursive: true, force: true });
       }
       if (movedLiveRoot && !existsSync(liveRoot) && existsSync(backupRoot)) {
-        renameSync(backupRoot, liveRoot);
+        robustRenameSync(backupRoot, liveRoot);
       }
       throw error;
     }
diff --git a/src/cron/storage/CronTaskStore.ts b/src/cron/storage/CronTaskStore.ts
@@ -1,4 +1,4 @@
-import { appendFile, mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { appendFile, copyFile, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 import type { GatewayEvent } from "../../gateway/index.js";
 import type { CronRunRecord, CronTask } from "../protocol/types.js";
@@ -120,7 +120,17 @@ export class CronTaskStore {
     await mkdir(dirname(this.paths.tasksFile), { recursive: true });
     const tempPath = `${this.paths.tasksFile}.${process.pid}.${Date.now()}.tmp`;
     await writeFile(tempPath, JSON.stringify(file, null, 2), "utf-8");
-    await rename(tempPath, this.paths.tasksFile);
+    try {
+      await rename(tempPath, this.paths.tasksFile);
+    } catch (err: unknown) {
+      const code = (err as NodeJS.ErrnoException).code;
+      if (code === "EPERM" || code === "EACCES") {
+        await copyFile(tempPath, this.paths.tasksFile);
+        await unlink(tempPath).catch(() => {});
+      } else {
+        throw err;
+      }
+    }
   }
 }
 
diff --git a/src/pilot/config/parseMemoryConfig.ts b/src/pilot/config/parseMemoryConfig.ts
@@ -44,22 +44,17 @@ export function parseMemoryConfig(
   }
 
   const memoryModel = parseMemoryModelRef(rawMemory.model, diagnostics, modelConfig);
-  const schedule = parseMemorySchedule(rawMemory.schedule, diagnostics);
+  const schedule = parseMemorySchedule(rawMemory.schedule, diagnostics)
+    ?? buildScheduleFromFlatFields(rawMemory);
 
+  const KNOWN_FIELDS = new Set([
+    "enabled", "provider", "rootDir", "captureStrategy", "includeAssistant",
+    "maxMessageChars", "retrievalTimeoutMs", "model", "apiType", "schedule",
+    "heartbeatBatchSize",
+    "reasoningMode", "autoIndexIntervalMinutes", "autoDreamIntervalMinutes",
+  ]);
   for (const key of Object.keys(rawMemory)) {
-    if (
-      key !== "enabled"
-      && key !== "provider"
-      && key !== "rootDir"
-      && key !== "captureStrategy"
-      && key !== "includeAssistant"
-      && key !== "maxMessageChars"
-      && key !== "retrievalTimeoutMs"
-      && key !== "model"
-      && key !== "apiType"
-      && key !== "schedule"
-      && key !== "heartbeatBatchSize"
-    ) {
+    if (!KNOWN_FIELDS.has(key)) {
       diagnostics.push({
         code: "CONFIG_MEMORY_UNKNOWN_FIELD",
         severity: "warning",
@@ -129,15 +124,31 @@ function parseMemorySchedule(
   return Object.keys(schedule).length > 0 ? schedule : undefined;
 }
 
+function buildScheduleFromFlatFields(rawMemory: Record<string, unknown>): PilotMemoryScheduleConfig | undefined {
+  const schedule: PilotMemoryScheduleConfig = {};
+  const reasoningMode = readOptionalMemoryReasoningMode(rawMemory.reasoningMode);
+  if (reasoningMode !== undefined) schedule.reasoningMode = reasoningMode;
+  if (typeof rawMemory.autoIndexIntervalMinutes === "number" && rawMemory.autoIndexIntervalMinutes >= 0) {
+    schedule.autoIndexIntervalMinutes = rawMemory.autoIndexIntervalMinutes;
+  }
+  if (typeof rawMemory.autoDreamIntervalMinutes === "number" && rawMemory.autoDreamIntervalMinutes >= 0) {
+    schedule.autoDreamIntervalMinutes = rawMemory.autoDreamIntervalMinutes;
+  }
+  return Object.keys(schedule).length > 0 ? schedule : undefined;
+}
+
 function parseMemoryModelRef(
   value: unknown,
   diagnostics: PilotConfigDiagnostic[],
   modelConfig?: ModelConfig,
 ): string | undefined {
-  if (value === undefined) {
+  if (value === undefined || value === null) {
     return undefined;
   }
-  if (typeof value !== "string" || value.length === 0) {
+  if (typeof value === "string" && value.trim().length === 0) {
+    return undefined;
+  }
+  if (typeof value !== "string") {
     throw new PilotConfigError(
       "CONFIG_MEMORY_MODEL_INVALID",
       'memory.model must be a "provider/model" string.',
diff --git a/ui/server/routes/taskmaster.js b/ui/server/routes/taskmaster.js
@@ -478,7 +478,8 @@ router.get('/next/:projectName', async (req, res) => {
             
             const nextTaskCommand = spawn('task-master', ['next'], {
                 cwd: projectPath,
-                stdio: ['pipe', 'pipe', 'pipe']
+                stdio: ['pipe', 'pipe', 'pipe'],
+                shell: true
             });
 
             let stdout = '';
@@ -998,7 +999,8 @@ router.post('/init/:projectName', async (req, res) => {
         // Run taskmaster init command
         const initProcess = spawn('npx', ['task-master', 'init'], {
             cwd: projectPath,
-            stdio: ['pipe', 'pipe', 'pipe']
+            stdio: ['pipe', 'pipe', 'pipe'],
+            shell: true
         });
 
         let stdout = '';
@@ -1101,7 +1103,8 @@ router.post('/add-task/:projectName', async (req, res) => {
         // Run task-master add-task command
         const addTaskProcess = spawn('npx', args, {
             cwd: projectPath,
-            stdio: ['pipe', 'pipe', 'pipe']
+            stdio: ['pipe', 'pipe', 'pipe'],
+            shell: true
         });
 
         let stdout = '';
@@ -1181,7 +1184,8 @@ router.put('/update-task/:projectName/:taskId', async (req, res) => {
         if (status && Object.keys(req.body).length === 1) {
             const setStatusProcess = spawn('npx', ['task-master-ai', 'set-status', `--id=${taskId}`, `--status=${status}`], {
                 cwd: projectPath,
-                stdio: ['pipe', 'pipe', 'pipe']
+                stdio: ['pipe', 'pipe', 'pipe'],
+                shell: true
             });
 
             let stdout = '';
@@ -1233,7 +1237,8 @@ router.put('/update-task/:projectName/:taskId', async (req, res) => {
 
             const updateProcess = spawn('npx', ['task-master-ai', 'update-task', `--id=${taskId}`, `--prompt=${prompt}`], {
                 cwd: projectPath,
-                stdio: ['pipe', 'pipe', 'pipe']
+                stdio: ['pipe', 'pipe', 'pipe'],
+                shell: true
             });
 
             let stdout = '';
@@ -1332,7 +1337,8 @@ router.post('/parse-prd/:projectName', async (req, res) => {
         // Run task-master parse-prd command
         const parsePRDProcess = spawn('npx', args, {
             cwd: projectPath,
-            stdio: ['pipe', 'pipe', 'pipe']
+            stdio: ['pipe', 'pipe', 'pipe'],
+            shell: true
         });
 
         let stdout = '';
diff --git a/ui/server/services/pilotdeckConfig.js b/ui/server/services/pilotdeckConfig.js
@@ -560,6 +560,12 @@ export async function writePilotDeckConfig(config) {
       ),
     ),
   );
+  if (isRecord(sanitized.memory)) {
+    const memModel = sanitized.memory.model;
+    if (typeof memModel === 'string' && !memModel.trim()) {
+      delete sanitized.memory.model;
+    }
+  }
   const validation = validatePilotDeckConfig(sanitized);
   if (!validation.valid) {
     const error = new Error('Invalid PilotDeck config');
@@ -569,6 +575,12 @@ export async function writePilotDeckConfig(config) {
   const configPath = getPilotDeckConfigPath();
   await fsPromises.mkdir(path.dirname(configPath), { recursive: true });
   const yamlObj = validation.config;
+  if (isRecord(yamlObj.memory)) {
+    const memModel = yamlObj.memory.model;
+    if (typeof memModel === 'string' && !memModel.trim()) {
+      delete yamlObj.memory.model;
+    }
+  }
   const raw = stringifyYaml(yamlObj, { lineWidth: 0 });
   await fsPromises.writeFile(configPath, raw, 'utf8');
   return { configPath, raw, validation, config: yamlObj };
diff --git a/ui/server/utils/plugin-loader.js b/ui/server/utils/plugin-loader.js
@@ -109,6 +109,7 @@ function runBuildIfNeeded(dir, packageJsonPath, onSuccess, onError) {
   const buildProcess = spawn('npm', ['run', 'build'], {
     cwd: dir,
     stdio: ['ignore', 'pipe', 'pipe'],
+    shell: true,
   });
 
   let stderr = '';
@@ -341,6 +342,7 @@ export function installPluginFromGit(url) {
         const npmProcess = spawn('npm', ['install', '--ignore-scripts'], {
           cwd: tempDir,
           stdio: ['ignore', 'pipe', 'pipe'],
+          shell: true,
         });
 
         npmProcess.on('close', (npmCode) => {
@@ -408,6 +410,7 @@ export function updatePluginFromGit(name) {
         const npmProcess = spawn('npm', ['install', '--ignore-scripts'], {
           cwd: pluginDir,
           stdio: ['ignore', 'pipe', 'pipe'],
+          shell: true,
         });
         npmProcess.on('close', (npmCode) => {
           if (npmCode !== 0) {
