@aion0/forge 0.10.6 → 0.10.12

package/RELEASE_NOTES.md

@@ -1,11 +1,8 @@
-# Forge v0.10.6
+# Forge v0.10.12
 
 Released: 2026-05-30
 
-## Changes since v0.10.5
+## Changes since v0.10.11
 
-### Other
-- feat(settings): folder picker for Add Project / Add Document Directory
 
-
-**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.10.5...v0.10.6
+**Full Changelog**: https://github.com/aiwatching/forge/compare/v0.10.11...v0.10.12

package/app/api/skills/install-local/route.ts

@@ -29,6 +29,7 @@ import AdmZip from 'adm-zip';
 import { homedir } from 'node:os';
 import { getDb } from '@/src/core/db/database';
 import { getDbPath } from '@/src/config';
+import { getClaudeDir } from '@/lib/dirs';
 
 /**
  * Refuse to clobber an existing skill (registry-synced or previously
@@ -52,7 +53,7 @@ function db() { return getDb(getDbPath()); }
 // ─── Helpers ──────────────────────────────────────────────
 
 function getClaudeHome(): string {
-  return process.env.CLAUDE_HOME || join(homedir(), '.claude');
+  return getClaudeDir();
 }
 
 function isValidName(s: string): boolean {

package/cli/mw.mjs

@@ -745,7 +745,7 @@ __export(dirs_exports, {
 });
 import { homedir as homedir2 } from "node:os";
 import { join as join3 } from "node:path";
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, renameSync, copyFileSync, readFileSync as readFileSync2 } from "node:fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, renameSync, copyFileSync } from "node:fs";
 function getConfigDir() {
   return join3(homedir2(), ".forge");
 }
@@ -797,17 +797,7 @@ function migrateDataDir() {
   console.log("[forge] Migration complete. Old files kept as backup.");
 }
 function getClaudeDir() {
-  if (process.env.CLAUDE_HOME) return process.env.CLAUDE_HOME;
-  try {
-    const settingsFile = join3(getDataDir(), "settings.yaml");
-    if (existsSync3(settingsFile)) {
-      const raw = readFileSync2(settingsFile, "utf-8");
-      const m = raw.match(/^\s*claudeHome:\s*["']?(.+?)["']?\s*$/m);
-      if (m?.[1]) return m[1].replace(/^~/, homedir2());
-    }
-  } catch {
-  }
-  return join3(homedir2(), ".claude");
+  return process.env.CLAUDE_HOME || join3(homedir2(), ".claude");
 }
 var MIGRATE_FILES, MIGRATE_DIRS, migrated;
 var init_dirs = __esm({
@@ -835,10 +825,10 @@ var BASE2 = process.env.MW_URL || `http://localhost:${_cliPort || "3000"}`;
 var [, , cmd, ...args] = process.argv;
 async function checkForUpdate() {
   try {
-    const { readFileSync: readFileSync3 } = await import("node:fs");
+    const { readFileSync: readFileSync2 } = await import("node:fs");
     const { join: join4, dirname } = await import("node:path");
     const { fileURLToPath } = await import("node:url");
-    const pkg = JSON.parse(readFileSync3(join4(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync2(join4(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
     const current = pkg.version;
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 3e3);
@@ -872,11 +862,11 @@ async function api3(path, opts) {
 }
 async function main() {
   if (cmd === "--version" || cmd === "-v") {
-    const { readFileSync: readFileSync3 } = await import("node:fs");
+    const { readFileSync: readFileSync2 } = await import("node:fs");
     const { join: join4, dirname } = await import("node:path");
     const { fileURLToPath } = await import("node:url");
     try {
-      const pkg = JSON.parse(readFileSync3(join4(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
+      const pkg = JSON.parse(readFileSync2(join4(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
       console.log(`@aion0/forge v${pkg.version}`);
     } catch {
       console.log("forge (version unknown)");
@@ -1193,14 +1183,14 @@ Resume in CLI:`);
     }
     case "tunnel_code":
     case "tcode": {
-      const { readFileSync: readFileSync3, existsSync: existsSync4 } = await import("node:fs");
+      const { readFileSync: readFileSync2, existsSync: existsSync4 } = await import("node:fs");
       const { join: join4 } = await import("node:path");
       const { getDataDir: _gdd } = await Promise.resolve().then(() => (init_dirs(), dirs_exports));
       const dataDir2 = _gdd();
       const codeFile = join4(dataDir2, "session-code.json");
       try {
         if (existsSync4(codeFile)) {
-          const data = JSON.parse(readFileSync3(codeFile, "utf-8"));
+          const data = JSON.parse(readFileSync2(codeFile, "utf-8"));
           if (data.code) {
             console.log(`Session code: ${data.code}`);
           } else {
@@ -1212,7 +1202,7 @@ Resume in CLI:`);
       } catch {
       }
       try {
-        const tunnelState = JSON.parse(readFileSync3(join4(dataDir2, "tunnel-state.json"), "utf-8"));
+        const tunnelState = JSON.parse(readFileSync2(join4(dataDir2, "tunnel-state.json"), "utf-8"));
         if (tunnelState.url) console.log(`Tunnel URL: ${tunnelState.url}`);
       } catch {
       }
@@ -1356,9 +1346,9 @@ ${task.gitDiff.slice(0, 2e3)}`);
             cwd: homedir3()
           });
           try {
-            const { readFileSync: readFileSync3 } = await import("node:fs");
+            const { readFileSync: readFileSync2 } = await import("node:fs");
             const globalRoot = execSync2("npm root -g", { encoding: "utf-8", cwd: homedir3() }).trim();
-            const pkg = JSON.parse(readFileSync3(join4(globalRoot, "@aion0", "forge", "package.json"), "utf-8"));
+            const pkg = JSON.parse(readFileSync2(join4(globalRoot, "@aion0", "forge", "package.json"), "utf-8"));
             console.log(`[forge] Upgraded to v${pkg.version}. Run: forge server restart`);
           } catch {
             console.log("[forge] Upgraded. Run: forge server restart");

package/lib/agents/index.ts

@@ -91,7 +91,7 @@ export function listAgents(): AgentConfig[] {
           enabled: cfg.enabled !== false,
           isProfile: true,
           backendType: 'cli',
-          model: cfg.model || cfg.models?.task,
+          model: cfg.models?.task,
           skipPermissionsFlag: cfg.skipPermissionsFlag || baseAgent?.skipPermissionsFlag,
           env: cfg.env,
           cliType: (baseAgent as any)?.cliType || 'generic',
@@ -117,7 +117,7 @@ export function listAgents(): AgentConfig[] {
           base: cfg.base,
           isProfile: true,
           backendType: 'cli',
-          model: cfg.model || cfg.models?.task,
+          model: cfg.models?.task,
           skipPermissionsFlag: cfg.skipPermissionsFlag || baseAgent?.skipPermissionsFlag,
           env: cfg.env,
           cliType: cfg.cliType || (baseAgent as any)?.cliType || 'generic',
@@ -262,20 +262,19 @@ export function resolveTerminalLaunch(agentId?: string): TerminalLaunchInfo {
     || (cliType === 'codex' ? probeCodexSkipFlag(agentCfg.path || 'codex') : cli.skip)
     || undefined;
 
-  // Resolve env/model: either from this agent's own profile fields, or from linked profile
+  // Resolve env/model from this agent's per-use models sub-table.
+  // 顶层 model 字段已在 0.10 起被 migrate.ts 清理,这里只读 models.terminal。
   let env: Record<string, string> | undefined;
   let model: string | undefined;
-  if (agentCfg.base || agentCfg.env || agentCfg.model || agentCfg.models) {
-    // This agent has profile-like config — read env/model directly
+  if (agentCfg.base || agentCfg.env || agentCfg.models) {
     if (agentCfg.env) env = { ...agentCfg.env };
-    model = agentCfg.model || agentCfg.models?.terminal;
-    if (model === 'default') model = undefined; // 'default' means no override
+    model = agentCfg.models?.terminal;
+    if (model === 'default') model = undefined; // 'default' = 不加 --model
   } else if (agentCfg.profile) {
-    // Agent links to a separate profile — read from that
     const profileCfg = settings.agents?.[agentCfg.profile];
     if (profileCfg) {
       if (profileCfg.env) env = { ...profileCfg.env };
-      model = profileCfg.model || profileCfg.models?.terminal;
+      model = profileCfg.models?.terminal;
       if (model === 'default') model = undefined;
     }
   }

package/lib/agents/migrate.ts

@@ -74,9 +74,19 @@ export function migrateAgentsFlatten(settings: Settings): boolean {
     }
     if (raw.type !== undefined) { delete raw.type; mutated = true; }
 
-    // 老嵌套 models.task → 扁平 model(如果 model 字段空)
-    if (!raw.model && raw.models?.task && raw.models.task !== 'default') {
-      raw.model = raw.models.task;
+    // 顶层 model 字段已被 per-use models 子表完整取代(terminal / task /
+    // telegram / help / mobile 各自可配)。0.10 之前的迁移逻辑反方向复制了
+    // models.task → model,导致 resolveTerminalLaunch 错把"task 模型"
+    // 当成"全场景兜底",新建项目终端被强插 --model。
+    //
+    // 这里反向收尾:把残留的 model 搬回 models.task(只在 task 为空或
+    // 'default' 时填,避免覆盖用户更近期的选择),然后彻底删字段。
+    if (raw.model !== undefined) {
+      if (!raw.models) raw.models = {};
+      if ((!raw.models.task || raw.models.task === 'default') && raw.model !== 'default') {
+        raw.models.task = raw.model;
+      }
+      delete raw.model;
       mutated = true;
     }
   }
@@ -116,6 +126,7 @@ function detectsLegacyShape(settings: Settings): boolean {
     if (cfg.type === 'api') return true;
     if (cfg.base !== undefined) return true;
     if (cfg.cliType !== undefined) return true;
+    if (cfg.model !== undefined) return true;     // 顶层 model 已废,改 models.task
     // 没有 tool + 是 builtin id → 也算需要迁移(补 tool 字段)
   }
   // 内置 agent 没有 tool 字段也需要补

package/lib/dirs.ts

@@ -9,7 +9,7 @@
 
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { existsSync, mkdirSync, renameSync, copyFileSync, readFileSync } from 'node:fs';
+import { existsSync, mkdirSync, renameSync, copyFileSync } from 'node:fs';
 
 /** Shared config directory — only binaries, fixed at ~/.forge/ */
 export function getConfigDir(): string {
@@ -85,30 +85,10 @@ export function migrateDataDir(): void {
   console.log('[forge] Migration complete. Old files kept as backup.');
 }
 
-/** Claude Code home directory — skills, commands, sessions.
- *
- *  Circular-dep note: dirs ↔ settings (settings.ts imports getDataDir).
- *  Used to do `require('./settings')` here as a lazy hack — but that
- *  fires ReferenceError under ESM concurrent loads, and dirs is on
- *  the hot path for every task / connector / pipeline node.
- *
- *  Cut the cycle by reading the YAML directly here. No parser needed:
- *  we only need one field (`claudeHome`), which is plain "key: value".
- *  Falls back to ~/.claude if anything goes sideways.
- */
+/** Claude config directory — skills, commands, sessions, etc. Override
+ *  via the `CLAUDE_HOME` env var (same name claude CLI uses); defaults
+ *  to `~/.claude`. The settings.yaml `claudeHome` field was removed in
+ *  0.10.10 — set the env var if you need a non-default location. */
 export function getClaudeDir(): string {
-  if (process.env.CLAUDE_HOME) return process.env.CLAUDE_HOME;
-  try {
-    const settingsFile = join(getDataDir(), 'settings.yaml');
-    if (existsSync(settingsFile)) {
-      const raw = readFileSync(settingsFile, 'utf-8');
-      // Match a top-level `claudeHome: <value>` line. Tolerates quoted /
-      // unquoted strings and stray whitespace. Not a full YAML parser
-      // because we explicitly want to avoid loading the YAML module
-      // (and settings.ts) from this hot path.
-      const m = raw.match(/^\s*claudeHome:\s*["']?(.+?)["']?\s*$/m);
-      if (m?.[1]) return m[1].replace(/^~/, homedir());
-    }
-  } catch {}
-  return join(homedir(), '.claude');
+  return process.env.CLAUDE_HOME || join(homedir(), '.claude');
 }

package/lib/settings.ts

@@ -27,10 +27,11 @@ export interface AgentEntry {
   models?: { terminal?: string; task?: string; telegram?: string; help?: string; mobile?: string };
   skipPermissionsFlag?: string;
   requiresTTY?: boolean;
-  model?: string;                // flat model override
   env?: Record<string, string>;  // environment variables injected when spawning CLI
 
   // === Deprecated (kept for migration compat; removed in a later release) ===
+  /** @deprecated 顶层 model 被 models.terminal/task/... 子表替代,migrate.ts 自动清掉 */
+  model?: string;
   /** @deprecated migrated to `tool` */
   base?: string;
   /** @deprecated migrated to `tool` */
@@ -84,7 +85,9 @@ export interface Settings {
   projectRoots: string[];
   docRoots: string[];
   claudePath: string;
-  claudeHome: string;
+  // claudeHome removed in 0.10.10 — was a never-UI-exposed override that
+  // mostly served to leak `claudeHome: ""` into every yaml. Set the
+  // CLAUDE_HOME env var if you need to point at a non-default ~/.claude.
   telegramBotToken: string;
   telegramChatId: string;
   notifyOnComplete: boolean;
@@ -184,7 +187,11 @@ const defaults: Settings = {
   projectRoots: [],
   docRoots: [],
   claudePath: '',
-  claudeHome: '',
+  // claudeHome intentionally omitted — it's an optional override (most users
+  // have claude at ~/.claude). Keeping it as a default empty string used to
+  // leak `claudeHome: ""` into every saved settings.yaml, which the dirs.ts
+  // regex then mis-parsed as the value `"`. See loadSettings normalizer +
+  // dirs.ts:getClaudeDir for the read-side handling.
   telegramBotToken: '',
   telegramChatId: '',
   notifyOnComplete: true,
@@ -279,7 +286,21 @@ export function loadSettings(): Settings {
   if (!existsSync(SETTINGS_FILE)) return { ...defaults };
   try {
     const raw = readFileSync(SETTINGS_FILE, 'utf-8');
-    const parsed = { ...defaults, ...YAML.parse(raw) };
+    const parsed: any = { ...defaults, ...YAML.parse(raw) };
+    // claudeHome was removed from the schema in 0.10.10. Drop any leftover
+    // value so it stops round-tripping through saveSettings. If a user had
+    // set a real override (rare — UI never exposed the field), surface a
+    // one-time warning pointing them at the CLAUDE_HOME env var.
+    if ('claudeHome' in parsed) {
+      const old = parsed.claudeHome;
+      delete parsed.claudeHome;
+      if (old && old !== '') {
+        console.warn(
+          `[settings] claudeHome="${old}" is no longer read. ` +
+          `If you need to override the claude config dir, set CLAUDE_HOME env var instead.`,
+        );
+      }
+    }
     // Decrypt top-level secret fields
     for (const field of SECRET_FIELDS) {
       if (parsed[field] && isEncrypted(parsed[field])) {

package/lib/skills.ts

@@ -8,6 +8,7 @@ import { homedir } from 'node:os';
 import { getDb } from '../src/core/db/database';
 import { getDbPath } from '../src/config';
 import { loadSettings } from './settings';
+import { getClaudeDir } from './dirs';
 
 type ItemType = 'skill' | 'command';
 
@@ -271,8 +272,7 @@ async function downloadFile(url: string): Promise<string> {
 // ─── Install ─────────────────────────────────────────────────
 
 function getClaudeHome(): string {
-  const settings = loadSettings();
-  return settings.claudeHome || join(homedir(), '.claude');
+  return getClaudeDir();
 }
 
 function getSkillDir(name: string, type: ItemType, projectPath?: string): string {

package/lib/workspace/watch-manager.ts

@@ -13,6 +13,7 @@ import { homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 import type { WorkspaceAgentConfig, WatchTarget, WatchConfig } from './types';
 import { appendAgentLog } from './persistence';
+import { getClaudeDir } from '../dirs';
 
 // ─── Snapshot types ──────────────────────────────────────
 
@@ -219,7 +220,10 @@ function detectAgentLogChanges(workspaceId: string, targetAgentId: string, patte
 const lastSessionFile = new Map<string, string>();
 
 function detectSessionChanges(projectPath: string, pattern: string | undefined, prevLineCount: number, contextChars = 500, sessionId?: string): { changes: WatchChange | null; lineCount: number } {
-  const claudeHome = join(homedir(), '.claude', 'projects');
+  // Honor CLAUDE_HOME env var so watch-manager looks in the same place as
+  // session detection, skills installer, etc. Was previously hardcoded to
+  // ~/.claude, which silently broke for users with a custom claude dir.
+  const claudeHome = join(getClaudeDir(), 'projects');
   const encoded = projectPath.replace(/[^a-zA-Z0-9]/g, '-');
   const sessionDir = join(claudeHome, encoded);
   if (!existsSync(sessionDir)) return { changes: null, lineCount: prevLineCount };

package/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aion0/forge",
-  "version": "0.10.6",
+  "version": "0.10.12",
   "description": "Unified AI workflow platform — multi-model task orchestration, persistent sessions, web terminal, remote access",
   "type": "module",
   "scripts": {

package/scripts/test-agents-migrate.ts

@@ -15,7 +15,7 @@ const pass = (msg: string) => console.log(`  ✓ ${msg}`);
 
 function baseSettings(): Settings {
   return {
-    projectRoots: [], docRoots: [], claudePath: '', claudeHome: '',
+    projectRoots: [], docRoots: [], claudePath: '',
     telegramBotToken: '', telegramChatId: '',
     notifyOnComplete: true, notifyOnFailure: true,
     tunnelAutoStart: false, telegramTunnelPassword: '',
@@ -114,7 +114,7 @@ function baseSettings(): Settings {
   const s = baseSettings();
   s.agents = {
     claude: { tool: 'claude', enabled: true, path: '' },
-    'forti-coder': { tool: 'claude', enabled: true, model: 'sonnet', env: {} },
+    'forti-coder': { tool: 'claude', enabled: true, models: { task: 'sonnet' }, env: {} },
   };
   (s as any).apiProfiles = {
     'forti-api': { provider: 'openai-compatible', model: 'X', apiKey: 'k', enabled: true },