@aion0/forge 0.9.18 → 0.10.2

package/components/SettingsModal.tsx

@@ -882,14 +882,16 @@ interface AgentEntry {
   backendType?: string;
 }
 
-function ProfileRow({ id, cfg, inputClass, onUpdate, onDelete }: {
+function ProfileRow({ id, cfg, inputClass, onUpdate, onDelete, isApi: isApiProp }: {
   id: string; cfg: any; inputClass: string;
   onUpdate: (cfg: any) => void; onDelete: () => void;
+  isApi?: boolean;
 }) {
   const [expanded, setExpanded] = useState(false);
   const [testing, setTesting] = useState(false);
   const [testResult, setTestResult] = useState<{ ok: boolean; message?: string; error?: string; duration_ms?: number } | null>(null);
-  const isApi = cfg.type === 'api';
+  // Post-migration apiProfile entries no longer carry `type: 'api'`. Caller passes isApi explicitly.
+  const isApi = isApiProp ?? (cfg.type === 'api');
 
   async function runTest() {
     setTesting(true);
@@ -1379,16 +1381,16 @@ function AgentsSection({ settings, setSettings }: { settings: any; setSettings:
       const agentsCfg: Record<string, any> = { ...(prev.agents || {}) };
       for (const a of updated) {
         const existing = agentsCfg[a.id] || {};
-        // NOTE: do NOT write `cliType` from the entry here. cliType is the
-        // load-time discriminator between agents and CLI profiles (see the
-        // filter ~line 1349 — `if (cfg.cliType || cfg.base) continue`).
-        // The Agents-add form seeds newAgent.cliType for cliDefaults lookup
-        // (taskFlags / resumeFlag presets), but persisting it would make
-        // the new agent show up as a profile on reload. `...existing`
-        // carries forward cliType for detected agents whose inline selector
-        // wrote it via setSettings directly (line ~1540).
+        // Persist `tool` (which CLI binary to wrap) — listAgents reads this
+        // post-migration to clone the matching builtin's adapter. cliType in
+        // the AgentEntry is the form's selector value; map it to tool.
+        const cliType = (a as any).cliType || existing.cliType;
+        const tool = existing.tool
+          || (cliType === 'claude-code' ? 'claude' : cliType === 'codex' ? 'codex' : cliType === 'aider' ? 'aider' : undefined)
+          || (['claude', 'codex', 'aider', 'opencode'].includes(a.id) ? a.id : undefined);
         agentsCfg[a.id] = {
-          ...existing, // preserve profile-specific fields + any prior cliType
+          ...existing,
+          ...(tool ? { tool } : {}),
           name: a.name,
           path: a.path,
           enabled: a.enabled,
@@ -1447,10 +1449,9 @@ function AgentsSection({ settings, setSettings }: { settings: any; setSettings:
     // settings.agents is one map keyed by id — agents + CLI profiles + API
     // profiles all coexist. A duplicate id silently overwrites whichever
     // entry was there first. Block the add and tell the user why.
-    if (agents.some(a => a.id === newAgent.id) || settings.agents?.[newAgent.id]) {
-      const existing = settings.agents?.[newAgent.id] as any;
-      const kind = existing?.type === 'api' ? 'API profile' : existing?.cliType || existing?.base ? 'CLI profile' : 'agent';
-      alert(`id "${newAgent.id}" is already in use by a ${kind}. Pick a different id.`);
+    if (agents.some(a => a.id === newAgent.id) || settings.agents?.[newAgent.id] || (settings as any).apiProfiles?.[newAgent.id]) {
+      const kind = (settings as any).apiProfiles?.[newAgent.id] ? 'API profile' : 'agent';
+      alert(`id "${newAgent.id}" is already in use by an ${kind}. Pick a different id.`);
       return;
     }
     const entry: AgentEntry = {
@@ -1552,8 +1553,12 @@ function AgentsSection({ settings, setSettings }: { settings: any; setSettings:
                     </div>
                     <div className="w-36">
                       <label className="text-[9px] text-[var(--text-secondary)]">CLI Type</label>
-                      <select value={(settings.agents?.[a.id] as any)?.cliType || (a.id === 'claude' ? 'claude-code' : a.id === 'codex' ? 'codex' : a.id === 'aider' ? 'aider' : 'generic')}
-                        onChange={e => setSettings({ ...settings, agents: { ...settings.agents, [a.id]: { ...(settings.agents?.[a.id] || {}), cliType: e.target.value } } })}
+                      <select value={(settings.agents?.[a.id] as any)?.tool || (settings.agents?.[a.id] as any)?.cliType || (a.id === 'claude' ? 'claude-code' : a.id === 'codex' ? 'codex' : a.id === 'aider' ? 'aider' : 'generic')}
+                        onChange={e => {
+                          const v = e.target.value;
+                          const tool = v === 'claude-code' ? 'claude' : v === 'generic' ? undefined : v;
+                          setSettings({ ...settings, agents: { ...settings.agents, [a.id]: { ...(settings.agents?.[a.id] || {}), ...(tool ? { tool } : {}), cliType: v } } });
+                        }}
                         className={inputClass}>
                         <option value="claude-code">Claude Code</option>
                         <option value="codex">Codex</option>
@@ -1647,24 +1652,58 @@ function AgentsSection({ settings, setSettings }: { settings: any; setSettings:
                     Requires terminal environment (TTY)
                     <span className="text-[8px]">— enable for agents that need a terminal to run (e.g. Codex)</span>
                   </label>
+
+                  {/* Env vars — was the CLI Profile feature, now lives on the agent itself */}
+                  {(() => {
+                    const envObj: Record<string, string> = ((settings.agents?.[a.id] as any)?.env) || {};
+                    const envStr = Object.entries(envObj).map(([k, v]) => `${k}=${v}`).join('\n');
+                    const tool = (settings.agents?.[a.id] as any)?.tool || (settings.agents?.[a.id] as any)?.cliType;
+                    const TEMPLATES: Record<string, string> = {
+                      claude: 'ANTHROPIC_AUTH_TOKEN=\nANTHROPIC_BASE_URL=\nANTHROPIC_SMALL_FAST_MODEL=\nCLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=true\nDISABLE_TELEMETRY=true\nDISABLE_ERROR_REPORTING=true\nDISABLE_AUTOUPDATER=true\nDISABLE_NON_ESSENTIAL_MODEL_CALLS=true',
+                      'claude-code': 'ANTHROPIC_AUTH_TOKEN=\nANTHROPIC_BASE_URL=\nANTHROPIC_SMALL_FAST_MODEL=\nCLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=true\nDISABLE_TELEMETRY=true\nDISABLE_ERROR_REPORTING=true\nDISABLE_AUTOUPDATER=true\nDISABLE_NON_ESSENTIAL_MODEL_CALLS=true',
+                      codex: 'OPENAI_API_KEY=\nOPENAI_BASE_URL=',
+                      aider: 'ANTHROPIC_API_KEY=\nOPENAI_API_KEY=',
+                    };
+                    const tpl = tool ? TEMPLATES[tool] : '';
+                    return (
+                      <div>
+                        <div className="flex items-center gap-2">
+                          <label className="text-[9px] text-[var(--text-secondary)]">Environment Variables <span className="text-[8px]">(KEY=VALUE per line, applied to this agent's spawned process)</span></label>
+                          {tpl && (
+                            <button onClick={() => {
+                              const merged: Record<string, string> = {};
+                              for (const line of tpl.split('\n')) {
+                                const eq = line.indexOf('=');
+                                if (eq > 0) merged[line.slice(0, eq).trim()] = line.slice(eq + 1).trim();
+                              }
+                              Object.assign(merged, envObj);   // existing values win
+                              setSettings({ ...settings, agents: { ...settings.agents, [a.id]: { ...(settings.agents?.[a.id] || {}), env: merged } } });
+                            }} className="text-[8px] px-1.5 py-0.5 rounded bg-[var(--accent)]/10 text-[var(--accent)] hover:bg-[var(--accent)]/20">
+                              Fill {tool} template
+                            </button>
+                          )}
+                        </div>
+                        <textarea
+                          value={envStr}
+                          onChange={e => {
+                            const next: Record<string, string> = {};
+                            for (const line of e.target.value.split('\n')) {
+                              const eq = line.indexOf('=');
+                              if (eq > 0) next[line.slice(0, eq).trim()] = line.slice(eq + 1).trim();
+                            }
+                            setSettings({ ...settings, agents: { ...settings.agents, [a.id]: { ...(settings.agents?.[a.id] || {}), env: Object.keys(next).length > 0 ? next : undefined } } });
+                          }}
+                          rows={4}
+                          placeholder="ANTHROPIC_AUTH_TOKEN=sk-...&#10;ANTHROPIC_BASE_URL=https://..."
+                          className={inputClass + ' resize-none font-mono'}
+                        />
+                      </div>
+                    );
+                  })()}
+
                   {a.id !== 'claude' && (
                     <button onClick={() => removeAgent(a.id)} className="text-[9px] text-red-400 hover:underline">Remove Agent</button>
                   )}
-
-                  {/* Profile selector */}
-                  <div>
-                    <label className="text-[9px] text-[var(--text-secondary)]">Profile <span className="text-[8px]">— select to override model, env vars, API endpoint</span></label>
-                    <select
-                      value={(settings.agents?.[a.id] as any)?.profile || ''}
-                      onChange={e => setSettings({ ...settings, agents: { ...settings.agents, [a.id]: { ...(settings.agents?.[a.id] || {}), profile: e.target.value || undefined } } })}
-                      className={inputClass}
-                    >
-                      <option value="">Default (no profile)</option>
-                      {Object.entries(settings.agents || {}).filter(([, cfg]: [string, any]) => cfg.cliType || cfg.base || cfg.type === 'profile' || cfg.type === 'api').map(([pid, cfg]: [string, any]) => (
-                        <option key={pid} value={pid}>{cfg.name || pid}{cfg.model ? ` (${cfg.model})` : ''}</option>
-                      ))}
-                    </select>
-                  </div>
                 </div>
               )}
             </div>
@@ -1738,54 +1777,34 @@ function AgentsSection({ settings, setSettings }: { settings: any; setSettings:
         </div>
       )}
 
-      {/* ── Profiles Section ── */}
+      {/* ── API Profiles Section ── */}
       <div className="mt-4 pt-3 border-t border-[var(--border)]">
         <div className="flex items-center gap-2 mb-2">
-          <label className="text-xs text-[var(--text-secondary)] font-semibold uppercase">Profiles</label>
-          <span className="text-[8px] text-[var(--text-secondary)]">Shared across workspace and terminal — override model, env vars, API endpoint</span>
+          <label className="text-xs text-[var(--text-secondary)] font-semibold uppercase">API Profiles</label>
+          <span className="text-[8px] text-[var(--text-secondary)]">HTTP endpoints used by chat / web / Telegram (separate from CLI agents above)</span>
         </div>
 
-        {/* All profiles (CLI + API). CLI profile marker is `cliType`
-            (new) or `base` (legacy); API profile is `type: 'api'`. */}
-        {Object.entries(settings.agents || {}).filter(([, cfg]: [string, any]) => cfg.cliType || cfg.base || cfg.type === 'api').map(([id, cfg]: [string, any]) => (
-          <ProfileRow key={id} id={id} cfg={cfg} inputClass={inputClass}
-            onUpdate={(updated) => setSettings({ ...settings, agents: { ...settings.agents, [id]: updated } })}
+        {Object.entries((settings as any).apiProfiles || {}).map(([id, cfg]: [string, any]) => (
+          <ProfileRow key={id} id={id} cfg={cfg} inputClass={inputClass} isApi
+            onUpdate={(updated) => setSettings({ ...settings, apiProfiles: { ...((settings as any).apiProfiles || {}), [id]: updated } })}
             onDelete={() => {
-              const updated = { ...settings.agents };
+              const updated = { ...((settings as any).apiProfiles || {}) };
               delete updated[id];
-              setSettings({ ...settings, agents: updated });
+              setSettings({ ...settings, apiProfiles: updated });
             }}
           />
         ))}
 
         <div className="flex gap-2 mt-1">
-          {/* Functional setSettings — non-functional form captures a stale
-              `settings` snapshot, which clobbers any agent that was saved
-              between this component's last render and the Add click
-              (debouncedSave for the Agents section fires 1s later, so the
-              window is real). Also: settings.agents is a single map keyed
-              by id — agents + CLI profiles + API profiles share it — so
-              reusing an id silently overwrites. Block dups with an alert. */}
-          <AddProfileForm type="cli" baseAgents={agents.filter(a => !a.isProfile && a.detected)} onAdd={(id, cfg) => {
-            setSettings((prev: any) => {
-              if (prev.agents?.[id]) {
-                const existing = prev.agents[id] as any;
-                const kind = existing.type === 'api' ? 'API profile' : existing.cliType || existing.base ? 'CLI profile' : 'agent';
-                alert(`id "${id}" is already in use by a ${kind}. Pick a different id.`);
-                return prev;
-              }
-              return { ...prev, agents: { ...(prev.agents || {}), [id]: cfg } };
-            });
-          }} />
+          {/* Functional setSettings — captures stale snapshot otherwise (debouncedSave window is real). */}
           <AddProfileForm type="api" baseAgents={[]} onAdd={(id, cfg) => {
             setSettings((prev: any) => {
-              if (prev.agents?.[id]) {
-                const existing = prev.agents[id] as any;
-                const kind = existing.type === 'api' ? 'API profile' : existing.cliType || existing.base ? 'CLI profile' : 'agent';
-                alert(`id "${id}" is already in use by a ${kind}. Pick a different id.`);
+              if ((prev.apiProfiles || {})[id]) {
+                alert(`API profile id "${id}" already exists. Pick a different id.`);
                 return prev;
               }
-              return { ...prev, agents: { ...(prev.agents || {}), [id]: cfg } };
+              const { type, ...rest } = cfg;   // drop legacy type:'api' field; not in new shape
+              return { ...prev, apiProfiles: { ...(prev.apiProfiles || {}), [id]: { ...rest, enabled: true } } };
             });
           }} />
         </div>
@@ -1953,8 +1972,8 @@ function TemperSection({ settings, setSettings, secretStatus, setEditingSecret }
 // Telegram /chat) picks the API profile listed here. The user can override
 // per-session by setting Session.provider to a profile id.
 function ChatAgentSelect({ settings, setSettings }: { settings: any; setSettings: (s: any) => void }) {
-  const apiProfiles = Object.entries(settings.agents || {})
-    .filter(([, a]: [string, any]) => a && a.type === 'api' && a.enabled !== false);
+  const apiProfiles = Object.entries((settings as any).apiProfiles || {})
+    .filter(([, a]: [string, any]) => a && a.enabled !== false);
 
   return (
     <div className="mt-4 pt-3 border-t border-[var(--border)]">
@@ -1974,7 +1993,7 @@ function ChatAgentSelect({ settings, setSettings }: { settings: any; setSettings
       </div>
       {apiProfiles.length === 0 ? (
         <div className="text-[9px] text-[var(--text-secondary)] mt-1.5">
-          No API profile yet. Add one in the Profiles section above (type: API). LiteLLM proxies are supported via the Base URL field.
+          No API profile yet. Add one in the API Profiles section above. LiteLLM proxies are supported via the Base URL field.
         </div>
       ) : (
         <div className="text-[9px] text-[var(--text-secondary)] mt-1.5">

package/lib/agents/claude-adapter.ts

@@ -72,7 +72,12 @@ export function createClaudeAdapter(config: AgentConfig): AgentAdapter {
 
       args.push(opts.prompt);
 
-      return { cmd: resolved.cmd, args };
+      // Forward agent-level env (e.g. ANTHROPIC_AUTH_TOKEN/BASE_URL on a
+      // user-named CLI agent that wraps claude). task-manager merges this
+      // into the child env, letting one agent point claude at a custom
+      // endpoint without touching the user's global ~/.claude config.
+      const env = (config as any).env as Record<string, string> | undefined;
+      return { cmd: resolved.cmd, args, ...(env && Object.keys(env).length ? { env } : {}) };
     },
 
     buildTerminalCommand(opts) {

package/lib/agents/generic-adapter.ts

@@ -31,7 +31,8 @@ export function createGenericAdapter(config: AgentConfig): AgentAdapter {
         args.push(...opts.extraFlags);
       }
 
-      return { cmd: config.path, args };
+      const env = (config as any).env as Record<string, string> | undefined;
+      return { cmd: config.path, args, ...(env && Object.keys(env).length ? { env } : {}) };
     },
 
     buildTerminalCommand(opts) {

package/lib/agents/index.ts

@@ -73,35 +73,39 @@ export function listAgents(): AgentConfig[] {
     agents.push({ ...aider, enabled: aiderConfig?.enabled !== false, detected: true, skipPermissionsFlag: aiderConfig?.skipPermissionsFlag || '--yes', cliType: 'aider' } as any);
   }
 
-  // Custom agents + profiles from settings
+  // User-named CLI agents from settings (post-migration shape: tool field)
   if (settings.agents) {
     for (const [id, cfg] of Object.entries(settings.agents)) {
-      if (['claude', 'codex', 'aider'].includes(id)) continue;
-
-      // API profile — no CLI detection needed. Tagged with
-      // backendType='api' so CLI-only dropdowns (Terminal launcher,
-      // NewTaskModal etc.) can filter them out via
-      // `agents.filter(a => a.backendType !== 'api')`. WorkspaceView's
-      // API mode keeps them visible. Chat backend doesn't go through
-      // this path at all — it reads settings.agents directly.
-      if (cfg.type === 'api') {
+      if (['claude', 'codex', 'aider'].includes(id)) continue;  // builtins handled above
+
+      // Post-migration: tool field identifies which CLI to wrap.
+      // Find the matching builtin we already detected and clone its
+      // adapter shape, overriding model / env / etc. from this entry.
+      if (cfg.tool) {
+        const baseAgent = agents.find(a => a.id === cfg.tool);
         agents.push({
+          ...(baseAgent || { type: 'generic' as const, capabilities: { supportsResume: false, supportsStreamJson: false, supportsModel: false, supportsSkipPermissions: false, hasSessionFiles: false, requiresTTY: false } }),
           id,
           name: cfg.name || id,
-          path: '',
+          path: baseAgent?.path || '',
           enabled: cfg.enabled !== false,
-          type: 'generic' as const,
-          capabilities: { supportsResume: false, supportsStreamJson: false, supportsModel: false, supportsSkipPermissions: false, hasSessionFiles: false, requiresTTY: false },
           isProfile: true,
-          backendType: 'api',
-          provider: cfg.provider,
-          model: cfg.model,
-          apiKey: cfg.apiKey,
+          backendType: 'cli',
+          model: cfg.model || cfg.models?.task,
+          skipPermissionsFlag: cfg.skipPermissionsFlag || baseAgent?.skipPermissionsFlag,
+          env: cfg.env,
+          cliType: (baseAgent as any)?.cliType || 'generic',
         } as any);
         continue;
       }
 
-      // CLI profile (has base) — inherit from base agent
+      // === Legacy fallback (pre-migration / un-migrated) ===
+      // type: 'api' — already moved to settings.apiProfiles by migration,
+      // but keep this branch for the migration window in case someone hits
+      // it before migrateAgentsFlatten runs. After 1-2 versions, remove.
+      if (cfg.type === 'api') continue;   // silently skip — apiProfiles is canonical now
+
+      // CLI profile via base (legacy) — same path as tool branch above
       if (cfg.base) {
         const baseAgent = agents.find(a => a.id === cfg.base);
         agents.push({
@@ -121,7 +125,7 @@ export function listAgents(): AgentConfig[] {
         continue;
       }
 
-      // Custom agent (not a profile) — detect binary
+      // Custom agent — explicit path
       if (!cfg.path) continue;
       const flags = cfg.taskFlags ? cfg.taskFlags.split(/\s+/).filter(Boolean) : cfg.flags;
       const detected = detectAgent(id, cfg.name || id, cfg.path, flags);

package/lib/agents/migrate.ts

@@ -0,0 +1,159 @@
+/**
+ * One-time migration: agents flat dict → agents (CLI) + apiProfiles (API).
+ *
+ * Pre-v0.9.20 `settings.agents` held both CLI agent configs (claude /
+ * codex / aider / user-named "CLI profiles" with `base:`) AND HTTP API
+ * profiles (`type: 'api'`). Two distinct concepts crammed into one
+ * dict with field overlap → the new-install pipeline-uses-API-model
+ * bug (see todo_pipeline_model_resolution memory).
+ *
+ * Migration walks settings.agents once on startup:
+ *   - `type: 'api'` entries → moved to settings.apiProfiles
+ *   - CLI entries: best-effort flatten `base` / `cliType` → `tool`
+ *     (if neither can be inferred, entry stays put; UI will skip it
+ *     and the user re-adds manually)
+ *   - defaultAgent / chatAgent get validated against the new dicts and
+ *     downgraded to safe defaults if they point to the wrong kind
+ *
+ * Before writing anything we drop a backup at
+ * `<dataDir>/settings.backup.agents-<ts>.yaml` containing just the
+ * agent-related slices of settings.yaml, so a botched migration can be
+ * rolled back by hand.
+ *
+ * Idempotent: once the deprecated fields are gone, the next call is a
+ * no-op (returns false, no save).
+ */
+
+import { writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import YAML from 'yaml';
+import { getDataDir } from '../dirs';
+import type { Settings } from '../settings';
+
+const BUILTIN_TOOLS = new Set(['claude', 'codex', 'aider', 'opencode']);
+
+/** Returns true if anything was mutated (caller should save). */
+export function migrateAgentsFlatten(settings: Settings): boolean {
+  const needsMigration = detectsLegacyShape(settings);
+  if (!needsMigration) return false;
+
+  writeBackup(settings);
+
+  let mutated = false;
+  (settings as any).apiProfiles ??= {};
+
+  for (const [id, raw] of Object.entries(settings.agents ?? {}) as [string, any][]) {
+    // === 必须 — type='api' 搬到 apiProfiles ===
+    if (raw.type === 'api') {
+      (settings as any).apiProfiles[id] = {
+        name: raw.name ?? id,
+        enabled: raw.enabled !== false,
+        provider: mapProvider(raw.provider),
+        model: raw.model ?? '',
+        apiKey: raw.apiKey ?? '',
+        baseUrl: raw.baseUrl ?? '',
+      };
+      delete settings.agents[id];
+      mutated = true;
+      continue;
+    }
+
+    // === Best-effort — 推断 tool 字段 ===
+    if (!raw.tool) {
+      if (raw.base && BUILTIN_TOOLS.has(raw.base)) raw.tool = raw.base;
+      else if (raw.cliType === 'claude-code') raw.tool = 'claude';
+      else if (raw.cliType && BUILTIN_TOOLS.has(raw.cliType)) raw.tool = raw.cliType;
+      else if (BUILTIN_TOOLS.has(id)) raw.tool = id;
+      if (raw.tool) mutated = true;
+      // 推断不出 → 留原样,listAgents 会跳过,用户接受手动重加
+    }
+
+    // 清掉已过期的字段(只有迁移产生过 tool 才删 base/cliType,避免无 tool 的孤儿丢标识)
+    if (raw.tool) {
+      if (raw.base !== undefined) { delete raw.base; mutated = true; }
+      if (raw.cliType !== undefined) { delete raw.cliType; mutated = true; }
+    }
+    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;
+      mutated = true;
+    }
+  }
+
+  // === 兜底校验 defaultAgent / chatAgent ===
+  if (settings.defaultAgent && !settings.agents?.[settings.defaultAgent]) {
+    const wasApi = (settings as any).apiProfiles[settings.defaultAgent];
+    console.warn(
+      `[migrate-agents] defaultAgent="${settings.defaultAgent}" ` +
+      (wasApi ? 'is an API profile, not allowed for tasks. ' : 'not found. ') +
+      `Falling back to 'claude'.`
+    );
+    settings.defaultAgent = 'claude';
+    mutated = true;
+  }
+  if (settings.chatAgent && !(settings as any).apiProfiles[settings.chatAgent]) {
+    const wasCli = settings.agents?.[settings.chatAgent];
+    console.warn(
+      `[migrate-agents] chatAgent="${settings.chatAgent}" ` +
+      (wasCli ? 'is a CLI agent, not allowed for chat. ' : 'not found. ') +
+      `Falling back.`
+    );
+    const firstApi = Object.entries((settings as any).apiProfiles)
+      .find(([, p]: any) => p.enabled)?.[0];
+    settings.chatAgent = firstApi ?? '';
+    mutated = true;
+  }
+
+  if (mutated) {
+    console.log('[migrate-agents] migrated settings.agents → agents + apiProfiles');
+  }
+  return mutated;
+}
+
+function detectsLegacyShape(settings: Settings): boolean {
+  for (const cfg of Object.values(settings.agents ?? {}) as any[]) {
+    if (cfg.type === 'api') return true;
+    if (cfg.base !== undefined) return true;
+    if (cfg.cliType !== undefined) return true;
+    // 没有 tool + 是 builtin id → 也算需要迁移(补 tool 字段)
+  }
+  // 内置 agent 没有 tool 字段也需要补
+  for (const [id, cfg] of Object.entries(settings.agents ?? {}) as [string, any][]) {
+    if (!cfg.tool && BUILTIN_TOOLS.has(id)) return true;
+  }
+  // defaultAgent 指向不存在的 entry 也需要兜底
+  if (settings.defaultAgent && !settings.agents?.[settings.defaultAgent]) {
+    return true;
+  }
+  return false;
+}
+
+function writeBackup(settings: Settings): void {
+  try {
+    const ts = Date.now();
+    const backupPath = join(getDataDir(), `settings.backup.agents-${ts}.yaml`);
+    const slice = {
+      _backup_note: 'Pre-migration snapshot of agent-related settings. Safe to delete after verifying migration worked.',
+      _backup_ts: new Date(ts).toISOString(),
+      agents: settings.agents,
+      defaultAgent: settings.defaultAgent,
+      chatAgent: settings.chatAgent,
+      telegramAgent: settings.telegramAgent,
+      docsAgent: settings.docsAgent,
+      telegramModel: settings.telegramModel,
+      taskModel: settings.taskModel,
+      pipelineModel: settings.pipelineModel,
+    };
+    writeFileSync(backupPath, YAML.stringify(slice), 'utf-8');
+    console.log(`[migrate-agents] backup → ${backupPath}`);
+  } catch (err) {
+    console.warn('[migrate-agents] backup write failed (continuing anyway):', err instanceof Error ? err.message : err);
+  }
+}
+
+function mapProvider(p?: string): 'anthropic' | 'openai-compatible' {
+  if (!p) return 'openai-compatible';
+  return /anthropic/i.test(p) ? 'anthropic' : 'openai-compatible';
+}

package/lib/chat/agent-loop.ts

@@ -16,16 +16,17 @@ import { loadSettings } from '../settings';
 import {
   appendMessage,
   getSession,
-  listMessages,
+  listMessagesCapped,
 } from './session-store';
 import {
   dispatchTool,
   BUILTIN_TOOL_DEFS,
   type BuiltinHandler,
 } from './tool-dispatcher';
-import { renderMemoryContext } from './temper';
 import { getMemoryStore } from './memory-store';
+import { buildMemoryContext } from './build-memory-context';
 import { buildMemoryTools } from './memory-tools';
+import { estimateTokens } from '../memory/token-estimate';
 import {
   listInstalledConnectors,
   getConnector,
@@ -41,6 +42,28 @@ import type {
 
 const MAX_ITERATIONS = 6;
 const MAX_TOKENS = 16000;
+// Working-window budgets for the LLM history. Capped by message count
+// AND by token estimate (whichever hits first), see design §8. Older
+// raw is summarized by the memory-standalone Temper Summary sub-task
+// and recalled via buildMemoryContext as compact blocks instead.
+const HISTORY_MSG_BUDGET = 60;
+const HISTORY_TOKEN_BUDGET = 8000;
+
+// After clipping to last N, the first kept message may be a tool_result
+// whose tool_use was cut. Anthropic/OpenAI both reject that, so drop
+// leading tool_result-bearing user messages until the slice starts clean.
+function trimOrphanToolResults(history: Message[]): Message[] {
+  let i = 0;
+  while (i < history.length) {
+    const m = history[i];
+    const hasToolResult = m.role === 'user'
+      && Array.isArray(m.blocks)
+      && m.blocks.some((b) => (b as any).type === 'tool_result');
+    if (!hasToolResult) break;
+    i += 1;
+  }
+  return i === 0 ? history : history.slice(i);
+}
 
 export interface AgentEvent {
   type:
@@ -59,7 +82,7 @@ export type AgentCallbacks = {
   onEvent: (event: AgentEvent) => void;
 };
 
-interface ProviderResolution {
+export interface ProviderResolution {
   name: string;
   type: 'anthropic' | 'openai';
   apiKey: string;
@@ -126,38 +149,36 @@ export function pickApiKey(profile: { apiKey?: string; env?: Record<string, stri
   return env.OPENAI_API_KEY || '';
 }
 
-function resolveProvider(sessionProvider: string | null, sessionModel: string | null): ProviderResolution | { error: string } {
+export function resolveProvider(sessionProvider: string | null, sessionModel: string | null): ProviderResolution | { error: string } {
   const settings = loadSettings();
-  const agents = settings.agents || {};
+  const profiles = settings.apiProfiles || {};
 
-  // Candidate API profiles: type=='api', enabled, with a usable apiKey (direct or via env).
-  const candidates = Object.entries(agents).filter(([_, a]) => {
-    if (!a || a.type !== 'api' || a.enabled === false) return false;
-    const adapter = inferAdapter(a.provider);
-    return pickApiKey(a, adapter).length > 0;
+  // Candidate API profiles: enabled + has apiKey.
+  const candidates = Object.entries(profiles).filter(([_, p]) => {
+    if (!p || p.enabled === false) return false;
+    return (p.apiKey || '').length > 0;
   });
   if (candidates.length === 0) {
-    return { error: 'No API agent profile with an API key. Add one under Settings → Agents (type: API) and pick it as the chat agent.' };
+    return { error: 'No API profile with an API key. Add one under Settings → API Profiles and pick it as the chat profile.' };
   }
 
-  // Preferred: session.provider (an agent profile id), then settings.chatAgent, else first candidate.
+  // Preferred: session.provider (an apiProfile id), then settings.chatAgent, else first candidate.
   const preferredId = sessionProvider || settings.chatAgent || candidates[0]![0];
-  const profile = agents[preferredId] && agents[preferredId].type === 'api'
-    ? agents[preferredId]
+  const profile = profiles[preferredId] && profiles[preferredId].enabled !== false
+    ? profiles[preferredId]
     : candidates[0]![1];
-  const name = agents[preferredId]?.type === 'api' ? preferredId : candidates[0]![0];
+  const name = (profiles[preferredId] && profiles[preferredId].enabled !== false) ? preferredId : candidates[0]![0];
 
-  const adapter = inferAdapter(profile.provider);
-  const apiKey = pickApiKey(profile, adapter);
-  if (!apiKey) return { error: `Agent profile "${name}" has no apiKey (direct or via env).` };
+  const adapter: 'anthropic' | 'openai' = profile.provider === 'anthropic' ? 'anthropic' : 'openai';
+  if (!profile.apiKey) return { error: `API profile "${name}" has no apiKey.` };
 
   const model = sessionModel || profile.model || (adapter === 'anthropic' ? 'claude-sonnet-4-6' : 'gpt-4o-mini');
 
   return {
     name,
     type: adapter,
-    apiKey,
-    baseUrl: pickBaseUrl(profile, adapter),
+    apiKey: profile.apiKey,
+    baseUrl: profile.baseUrl || defaultBaseUrl(profile.provider),
     model,
   };
 }
@@ -372,18 +393,24 @@ export async function runTurn(args: RunTurnArgs): Promise<{ ok: boolean; error?:
   for (const t of memTools) memHandlers[t.def.name] = t.handle;
 
   if (memStore.enabled) {
-    const [bp, ba, sp] = await Promise.allSettled([
+    // Inspector strip (memory_status event) wants the full inventory —
+    // keep its own listBlocks call. The prompt-injection text comes
+    // from buildMemoryContext which excludes internal bookkeeping
+    // (cursor / health) and combines pinned + query-driven retrieval
+    // hits in one pass.
+    const [bp, ba, sp, ctx] = await Promise.allSettled([
       memStore.listBlocks({ pinned: true, scope: 'both' }),
       memStore.listBlocks({ scope: 'both' }),
       memStore.search(args.userText, 8),
+      buildMemoryContext({ store: memStore, currentUserMessage: args.userText }),
     ]);
     const pinnedBlocks = bp.status === 'fulfilled' ? bp.value : [];
     const allBlocks = ba.status === 'fulfilled' ? ba.value : [];
     const searchHits = sp.status === 'fulfilled' ? sp.value : [];
-    const firstErr = [bp, ba, sp].find((r) => r.status === 'rejected') as PromiseRejectedResult | undefined;
+    const firstErr = [bp, ba, sp, ctx].find((r) => r.status === 'rejected') as PromiseRejectedResult | undefined;
     const memError = firstErr ? (firstErr.reason instanceof Error ? firstErr.reason.message : String(firstErr.reason)) : undefined;
 
-    memContext = renderMemoryContext(allBlocks, searchHits);
+    memContext = ctx.status === 'fulfilled' ? ctx.value.text : '';
 
     cb({
       type: 'memory_status',
@@ -470,7 +497,9 @@ export async function runTurn(args: RunTurnArgs): Promise<{ ok: boolean; error?:
     while (iter < MAX_ITERATIONS) {
       iter += 1;
 
-      const history = listMessages(args.sessionId);
+      const history = trimOrphanToolResults(
+        listMessagesCapped(args.sessionId, HISTORY_MSG_BUDGET, HISTORY_TOKEN_BUDGET, estimateTokens),
+      );
 
       assistantBlocksAccum = [];
       let currentTextBuf = '';