@surething/cockpit 1.0.252 → 1.0.254

package/dist/scheduledTasks.mjs

@@ -10,7 +10,7 @@ import {
   setRunAbort,
   startRun,
   updateGlobalState
-} from "./chunk-RUNUGDPP.mjs";
+} from "./chunk-H3JSYJCZ.mjs";
 import {
   AgentError,
   AppRuntime,
@@ -24,20 +24,24 @@ import {
   SKILLS_FILE,
   SnapshotService,
   createOllamaModel,
+  createOpenAiCompatModel,
   encodePath,
   findCodexSessionPath,
   findKimiSessionPath,
+  getBuiltinSessionsRoot,
   getClaude2SessionPath,
   getClaudeSessionPath,
+  getDeepseekBuiltinSessionPath,
   getDeepseekSessionPath,
   getOllamaSessionPath,
   mutateJsonFile,
   notePendingRecord,
   readJsonFile,
+  sanitizedSpawnEnv,
   settlePendingRecord,
   withFileLock,
   writeJsonFile
-} from "./chunk-BRW4ZEIC.mjs";
+} from "./chunk-7G4OXJJ4.mjs";
 import {
   __export
 } from "./chunk-7P6ASYW6.mjs";
@@ -1629,23 +1633,84 @@ Output confirmation: branch name, current HEAD commit, and sync status against o
 // packages/feature/agent/src/server/lib/qaPrompt.ts
 var QA_PROMPT_ZH = `---
 name: qa
-description: "\u8FDB\u5165\u9700\u6C42\u6F84\u6E05\u8BA8\u8BBA\u6A21\u5F0F\uFF1A\u7406\u89E3\u5E76\u590D\u8FF0\u9700\u6C42\uFF0C\u5BF9\u4E0D\u660E\u786E\u70B9\u56DE\u95EE\u786E\u8BA4\uFF0C\u53EA\u8F93\u51FA\u7406\u89E3\u4E0D\u6539\u4EE3\u7801\uFF0C\u9075\u5FAA KISS\u3002"
+description: "\u8FDB\u5165\u9700\u6C42\u6F84\u6E05\u8BA8\u8BBA\u6A21\u5F0F\uFF1A\u590D\u8FF0\u5BF9\u9700\u6C42\u7684\u7406\u89E3\uFF0C\u628A\u5F85\u786E\u8BA4\u70B9\u505A\u6210\u5E26\u63A8\u8350\u7B54\u6848\u7684\u9009\u62E9\u9898\u8868\u683C\uFF0C\u53EA\u8F93\u51FA\u7406\u89E3\u4E0D\u6539\u4EE3\u7801\uFF0C\u9075\u5FAA KISS\u3002"
 ---
 
-\u8FDB\u5165\u9700\u6C42\u6F84\u6E05\u8BA8\u8BBA\u6A21\u5F0F
-\u5C1D\u8BD5\u7406\u89E3\u7528\u6237\u7684\u9700\u6C42\u5E76\u7ED9\u51FA\u4F60\u5BF9\u9700\u6C42\u7684\u7406\u89E3\uFF0C\u6709\u4E0D\u660E\u786E\u7684\u70B9\u9700\u8981\u5411\u6211\u786E\u8BA4\uFF0C\u907F\u514D\u7406\u89E3\u4E0D\u4E00\u81F4\u800C\u5BFC\u81F4\u65E0\u6548\u7684\u4EE3\u7801\u4FEE\u6539
-\u9075\u5FAA KISS \u539F\u5219
-\u8F93\u51FA\u7406\u89E3\uFF0C\u4E0D\u6539\u4EE3\u7801`;
+\u8FDB\u5165\u9700\u6C42\u6F84\u6E05\u8BA8\u8BBA\u6A21\u5F0F\u3002\u76EE\u6807\u662F\u52A8\u4EE3\u7801\u524D\u5BF9\u9F50\u7406\u89E3\uFF0C\u907F\u514D\u56E0\u7406\u89E3\u4E0D\u4E00\u81F4\u5BFC\u81F4\u65E0\u6548\u7684\u4EE3\u7801\u4FEE\u6539\u3002
+
+## \u6B65\u9AA4
+
+1. \u590D\u8FF0\u7406\u89E3\uFF1A\u51E0\u53E5\u8BDD\u8BF4\u6E05\u6539\u54EA\u91CC\u3001\u6539\u4EC0\u4E48\u3001\u73B0\u72B6\u662F\u4EC0\u4E48\u3002\u5148\u8BFB\u4EE3\u7801\u786E\u8BA4\u73B0\u72B6\u518D\u590D\u8FF0\uFF0C\u4E0D\u8981\u51ED\u731C\u6D4B\u2014\u2014\u731C\u9519\u7684\u590D\u8FF0\u6BD4\u4E0D\u590D\u8FF0\u66F4\u6D6A\u8D39\u8F6E\u6B21\u3002
+2. \u5217\u5F85\u786E\u8BA4\u70B9\uFF1A\u505A\u6210\u9009\u62E9\u9898\u8868\u683C\uFF08\u683C\u5F0F\u89C1\u4E0B\uFF09\u3002
+3. \u505C\u4E0B\u7B49\u786E\u8BA4\uFF1A\u4E0D\u6539\u4EE3\u7801\uFF0C\u7B49\u7528\u6237\u56DE\u590D\u518D\u52A8\u624B\u3002
+
+## \u5F85\u786E\u8BA4\u70B9\u8868\u683C
+
+\u5FC5\u987B\u7528\u8868\u683C\uFF0C\u6BCF\u4E2A\u70B9\u5FC5\u987B\u7ED9\u51FA\u5177\u4F53\u9009\u9879\u548C\u63A8\u8350\u7B54\u6848\u3002\u8BA9\u7528\u6237\u56DE\u4E00\u4E2A\u5B57\u6BCD\u5C31\u80FD\u5B9A\u7A3F\uFF0C\u800C\u4E0D\u662F\u56DE\u7B54\u5F00\u653E\u5F0F\u95EE\u9898\u3002
+
+| # | \u5F85\u786E\u8BA4\u70B9 | \u9009\u9879 | \u63A8\u8350 | \u7406\u7531 |
+|---|---|---|---|---|
+| 1 | <\u8981\u5B9A\u7684\u90A3\u4E2A\u51B3\u7B56> | A <\u505A\u6CD5\u4E00><br>B <\u505A\u6CD5\u4E8C><br>C <\u505A\u6CD5\u4E09> | **A** | <\u4E3A\u4EC0\u4E48\u4E0D\u9009 B / C\uFF0C\u4E00\u53E5\u8BDD\u53D6\u820D> |
+| 2 | <\u8981\u5B9A\u7684\u90A3\u4E2A\u51B3\u7B56> | A <\u505A\u6CD5\u4E00><br>B <\u505A\u6CD5\u4E8C> | **B** | <\u4E3A\u4EC0\u4E48\u4E0D\u9009 A\uFF0C\u4E00\u53E5\u8BDD\u53D6\u820D> |
+
+\u8868\u683C\u540E\u9762\u8DDF\u4E00\u53E5\uFF1A\u300C\u76F4\u63A5\u56DE 1A 2B\uFF0C\u6216\u56DE\u300E\u90FD\u6309\u63A8\u8350\u300F\u300D\u3002
+
+\u89C4\u5219\uFF1A
+- \u9009\u9879\u4E00\u884C\u4E00\u4E2A\uFF0C\u7528 <br> \u5206\u9694\uFF0C\u4E0D\u8981\u7528\u659C\u6760\u6324\u5728\u4E00\u884C\u2014\u2014\u9009\u9879\u8D8A\u957F\uFF0C\u6324\u6210\u4E00\u884C\u8D8A\u96BE\u6BD4\u5BF9\u3002
+- \u9009\u9879\u4E92\u65A5\u4E14\u7A77\u5C3D\uFF0C\u6700\u591A 3 \u4E2A\u3002\u60F3\u4E0D\u51FA\u7B2C\u4E8C\u4E2A\u9009\u9879\uFF0C\u8BF4\u660E\u5B83\u4E0D\u662F\u5F85\u786E\u8BA4\u70B9\u2014\u2014\u522B\u51D1\u6570\u3002
+- \u63A8\u8350\u5217\u5FC5\u987B\u586B\uFF0C\u4E0D\u80FD\u5199\u300C\u770B\u4F60\u300D\u300C\u90FD\u884C\u300D\u3002
+- \u7406\u7531\u4E00\u53E5\u8BDD\uFF0C\u8BB2\u53D6\u820D\uFF08\u4E3A\u4EC0\u4E48\u4E0D\u9009\u53E6\u4E00\u4E2A\uFF09\uFF0C\u4E0D\u8BB2\u529F\u80FD\u662F\u4EC0\u4E48\u3002
+- \u786C\u7EA6\u675F\u5355\u72EC\u5199\uFF1A\u5982\u679C\u67D0\u4E2A\u9009\u9879\u4F1A\u8FDE\u5E26\u8E29\u5751\uFF08\u6709\u5199\u6B7B\u7684\u5E38\u91CF\u4F9D\u8D56\u3001\u6539\u4E86\u8FD9\u91CC\u4F1A\u8BA9\u522B\u5904\u5931\u6548\uFF09\uFF0C\u5355\u5F00\u4E00\u4E2A\u5C0F\u8868\u6216\u6BB5\u843D\u8BB2\u6E05\u695A\uFF0C\u4E0D\u8981\u585E\u8FDB\u7406\u7531\u5217\u2014\u2014\u90A3\u662F\u51B3\u7B56\u4F9D\u636E\uFF0C\u4E0D\u662F\u7406\u7531\u3002
+
+## \u8FB9\u754C
+
+- \u53EA\u8F93\u51FA\u7406\u89E3\uFF0C\u4E0D\u6539\u4EE3\u7801\u3001\u4E0D\u5199\u6587\u4EF6\u3001\u4E0D\u8DD1\u6539\u52A8\u6027\u547D\u4EE4\u3002\u8BFB\u4EE3\u7801\u786E\u8BA4\u73B0\u72B6\u662F\u5141\u8BB8\u4E14\u9F13\u52B1\u7684\u3002
+- \u9075\u5FAA KISS \u539F\u5219\uFF1A\u53EA\u5217\u771F\u6B63\u5F71\u54CD\u5B9E\u73B0\u65B9\u5411\u7684\u70B9\u3002\u80FD\u81EA\u5DF1\u67E5\u6E05\u695A\u7684\u81EA\u5DF1\u67E5\uFF0C\u4E0D\u8981\u4E3A\u4E86\u663E\u5F97\u5468\u5168\u800C\u5806\u786E\u8BA4\u70B9\u3002
+- \u6CA1\u6709\u4E0D\u660E\u786E\u7684\u70B9\uFF0C\u76F4\u63A5\u8BF4\u300C\u7406\u89E3\u65E0\u6B67\u4E49\uFF0C\u53EF\u4EE5\u5F00\u59CB\u300D\uFF0C\u4E0D\u8981\u786C\u51D1\u8868\u683C\u3002
+
+## \u9A8C\u8BC1
+
+\u7528\u6237\u80FD\u53EA\u56DE\u5B57\u6BCD\u6216\u300C\u90FD\u6309\u63A8\u8350\u300D\u5C31\u8FDB\u5165\u5B9E\u73B0\uFF0C\u8BF4\u660E\u8FD9\u6B21\u6F84\u6E05\u662F\u5408\u683C\u7684\uFF1B\u5982\u679C\u7528\u6237\u8FD8\u5F97\u8865\u4E00\u6BB5\u6563\u6587\u89E3\u91CA\uFF0C\u8BF4\u660E\u9009\u9879\u6CA1\u7A77\u5C3D\u6216\u63A8\u8350\u6CA1\u7ED9\u5230\u4F4D\u3002`;
 var QA_PROMPT_EN = `---
 name: qa
-description: "Enter requirement clarification mode: understand and restate the need, ask back on ambiguities, output understanding only without modifying code, follow KISS."
+description: "Enter requirement clarification mode: restate your understanding, turn open questions into a multiple-choice table with a recommended answer for each, output understanding only without modifying code, follow KISS."
 ---
 
-Enter requirement clarification mode.
-Understand the user's needs and state your understanding.
-Ask for clarification on ambiguous points to avoid unnecessary code changes.
-Follow the KISS principle.
-Output your understanding only; do not modify code.`;
+Enter requirement clarification mode. The goal is to align on intent before touching code, so a misread requirement never turns into wasted changes.
+
+## Steps
+
+1. Restate your understanding: a few sentences on what changes, where, and what the current behaviour is. Read the code to confirm the current state first \u2014 a restatement built on a guess wastes more turns than no restatement at all.
+2. List the open questions as a multiple-choice table (format below).
+3. Stop and wait: do not modify code until the user answers.
+
+## Open-questions table
+
+Always use a table, and always give every question concrete options plus a recommendation. The user should be able to lock the design by replying with letters, not by answering open-ended prose questions.
+
+| # | Question | Options | Recommend | Why |
+|---|---|---|---|---|
+| 1 | <the decision to settle> | A <option one><br>B <option two><br>C <option three> | **A** | <why not B / C \u2014 one line of trade-off> |
+| 2 | <the decision to settle> | A <option one><br>B <option two> | **B** | <why not A \u2014 one line of trade-off> |
+
+Follow the table with: "Reply 1A 2B, or say 'all as recommended'".
+
+Rules:
+- One option per line, separated by <br> \u2014 never slash-joined on a single line. The longer the options, the harder a single line is to compare.
+- Options must be mutually exclusive and exhaustive, at most 3. If you cannot name a second option, it was never an open question \u2014 do not pad the table.
+- The Recommend column must always be filled. Never "up to you" or "either works".
+- Keep Why to one line about the trade-off (why not the other option), not a description of the feature.
+- Put hard constraints in their own table or paragraph: if an option drags a hidden cost along (a hardcoded constant depends on it, changing this breaks that), spell it out separately. It is decision input, not a reason cell.
+
+## Boundaries
+
+- Output understanding only: do not modify code, write files, or run mutating commands. Reading code to confirm the current state is allowed and encouraged.
+- Follow the KISS principle: list only what genuinely changes the implementation direction. Anything you can settle by looking it up, look it up.
+- If nothing is ambiguous, just say so and offer to start \u2014 do not manufacture a table.
+
+## Verification
+
+If the user can reply with only letters or "all as recommended" and you can start implementing, the clarification was good. If they have to write a paragraph back, your options were not exhaustive or your recommendation was missing.`;
 
 // packages/feature/agent/src/server/lib/skillifyPrompt.ts
 var SKILLIFY_PROMPT_ZH = `---
@@ -2516,7 +2581,7 @@ ${tempImageFiles.map((f) => f.path).join("\n")}` : prompt;
         cols,
         rows,
         cwd,
-        env: process.env
+        env: sanitizedSpawnEnv()
       });
     } catch (e) {
       cleanupImages();
@@ -2976,8 +3041,10 @@ function buildClaudeOptions(ctx) {
     },
     includePartialMessages: true,
     abortController: abort,
-    // claude2 engine: override config directory to ~/.claude2.
-    ...engine === "claude2" && { env: { ...process.env, CLAUDE_CONFIG_DIR: CLAUDE2_DIR } }
+    // env is ALWAYS passed (not just for claude2): without it the SDK inherits
+    // process.env verbatim, handing the agent this server's NODE_ENV=production.
+    // See sanitizedSpawnEnv. claude2 additionally points at ~/.claude2.
+    env: sanitizedSpawnEnv(engine === "claude2" ? { CLAUDE_CONFIG_DIR: CLAUDE2_DIR } : {})
   });
 }
 var claudeSpec = {
@@ -3001,93 +3068,82 @@ async function readDeepseekApiKey() {
   return creds.apiKey?.trim() ?? "";
 }
 
-// packages/feature/agent/src/server/engines/deepseek.ts
-var DEEPSEEK_BASE_URL = "https://api.deepseek.com/anthropic";
-var DEFAULT_MODEL = "deepseek-v4-pro";
-var SMALL_FAST_MODEL = "deepseek-v4-flash";
-var ALLOWED_MODELS = /* @__PURE__ */ new Set(["deepseek-v4-flash", "deepseek-v4-pro"]);
-async function readSettings() {
-  return readJsonFile(SETTINGS_FILE, {});
-}
-function resolveModel(requested, saved) {
-  if (typeof requested === "string" && ALLOWED_MODELS.has(requested)) return requested;
-  if (saved && ALLOWED_MODELS.has(saved)) return saved;
-  return DEFAULT_MODEL;
-}
-function buildDeepseekEnv(apiKey, model) {
-  const { ANTHROPIC_AUTH_TOKEN: _t, ANTHROPIC_API_KEY: _k, ...inherited } = process.env;
-  void _t;
-  void _k;
-  return {
-    ...inherited,
-    ANTHROPIC_BASE_URL: DEEPSEEK_BASE_URL,
-    ANTHROPIC_API_KEY: apiKey,
-    // DeepSeek sends this as x-api-key (fully supported)
-    ANTHROPIC_MODEL: model,
-    ANTHROPIC_SMALL_FAST_MODEL: SMALL_FAST_MODEL,
-    CLAUDE_CONFIG_DIR: DEEPSEEK_DIR,
-    DISABLE_PROMPT_CACHING: "1",
-    // DeepSeek runs its own server-side prefix KV cache
-    CLAUDE_CODE_USE_BEDROCK: "0",
-    CLAUDE_CODE_USE_VERTEX: "0",
-    CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1"
-  };
-}
-function buildDeepseekOptions(ctx, env) {
-  return (abort, resume) => ({
-    ...resume && { resume },
-    ...ctx.cwd && { cwd: ctx.cwd },
-    settingSources: ["user", "project", "local"],
-    permissionMode: "bypassPermissions",
-    allowDangerouslySkipPermissions: true,
-    includePartialMessages: true,
-    abortController: abort,
-    env
-  });
-}
-var deepseekSpec = {
-  name: "deepseek",
-  // Pre-check BEFORE startRun: API key must exist; resolve model into params (no registry pollution).
-  async preflight(params) {
-    const settings = await readSettings();
-    const apiKey = await readDeepseekApiKey();
-    if (!apiKey) {
-      return {
-        ok: false,
-        status: 400,
-        error: "DeepSeek API key is not configured. Open the DeepSeek picker in the chat header to set one."
-      };
-    }
-    params.model = resolveModel(typeof params.model === "string" ? params.model : void 0, settings.engines?.deepseek?.model);
-    return { ok: true };
-  },
-  runner: {
-    async run(ctx) {
-      const apiKey = await readDeepseekApiKey();
-      const model = typeof ctx.params.model === "string" ? ctx.params.model : DEFAULT_MODEL;
-      const env = buildDeepseekEnv(apiKey, model);
-      await runSdkLoop(ctx, buildDeepseekOptions(ctx, env));
-    },
-    resolveTitle: (cwd, sessionId) => getSessionTitle(cwd, sessionId)
-  }
-};
-
-// packages/feature/agent/src/server/engines/ollama/index.ts
+// packages/feature/agent/src/server/engines/builtinAgent/index.ts
 import { streamText, stepCountIs } from "ai";
 import { randomUUID as randomUUID3 } from "crypto";
 
-// packages/feature/agent/src/server/engines/ollama/session.ts
+// packages/feature/agent/src/server/engines/builtinAgent/prompt.ts
+function buildSystemPrompt(cwd) {
+  return `You are a coding agent. You help the user build and modify software using the provided tools.
+
+CWD: ${cwd}
+
+## Language
+
+ALWAYS reply in the SAME language as the user's most recent message \u2014 whatever language they used (Chinese, English, Japanese, French, Spanish, \u2026), mirror it. Do NOT default to English just because this system prompt is written in English. If the user switches language mid-conversation, switch with them on the next reply.
+
+Exceptions that stay as-is regardless of reply language:
+- Tool "thought" parameters: keep the "PREVIOUS / THIS / EXPECT" template in English.
+- Code, identifiers, file paths, shell commands, and error messages quoted from tool output: keep original.
+- Only your natural-language prose to the user follows the user's language.
+
+## Workflow
+
+1. Plan: call TodoWrite FIRST to break down the task into steps (all pending, first one in_progress).
+2. Act: execute steps one by one. After completing each step, call TodoWrite to update progress (mark completed, set next in_progress).
+3. Check: after each tool call, assess \u2014 did it succeed? Is the overall task done? If not, continue to the next step.
+4. Respond: you MUST always end with a text response to the user. Summarize what was done, what was found, or what remains.
+
+IMPORTANT: never stop in the middle of a task silently. If you cannot continue (error, missing info, blocked), respond to the user explaining why and what is needed.
+
+NEVER repeat a tool call with the same or similar arguments. When a search finds nothing, follow this escalation:
+1. Simplify the pattern (shorter keyword, remove qualifiers, use a single core term)
+2. Broaden the path (search parent directory, or omit path to search entire CWD)
+3. Switch tool (Grep \u2192 Glob for filenames, Grep \u2192 Bash with find, or Read a likely file directly)
+4. Give up after 3 failed attempts on the same topic \u2014 tell the user what you tried and ask for guidance.
+
+## Tools
+
+- Read: read a file by line range.
+- Edit: exact string replacement in an existing file (prefer over Write).
+- Write: create new files or full rewrites only.
+- Bash: run shell commands.
+- Grep: ripgrep search. ALWAYS use Grep (never rg/grep via Bash).
+- Glob: fast file listing by glob pattern.
+- TodoWrite: plan tasks and track progress. ALWAYS call this first.
+
+Every tool has a "thought" parameter \u2014 ALWAYS fill it using this format:
+"PREVIOUS: [what the last tool returned and whether it achieved the goal] \u2192 THIS: [what I am doing now and why] \u2192 EXPECT: [what result I expect]"
+Example: "PREVIOUS: Grep found 3 matches in cache.go \u2192 THIS: Read cache.go to see full implementation \u2192 EXPECT: understand the caching logic"
+If this is the first tool call, write "PREVIOUS: n/a" for the first part.
+
+## Rules
+
+Tool usage:
+- Read before modify: do NOT edit a file you haven't Read.
+- Absolute paths only: resolve relative paths against CWD.
+
+Accuracy:
+- Verify before retracting: when the user questions you, use tools to verify first, then respond based on evidence. Do NOT blindly agree you were wrong.
+- Honesty over confidence: only state what is backed by tool output. If unsure, say so and state what info is needed or propose a verification plan. Never fabricate data.
+
+## Output
+
+- Be concise. Lead with the action or answer.
+- Only elaborate on decisions, blockers, or milestones.`;
+}
+
+// packages/feature/agent/src/server/engines/builtinAgent/session.ts
 import { readFileSync as readFileSync3, existsSync, mkdirSync as mkdirSync2, appendFileSync } from "fs";
 import { join as join3 } from "path";
-var SESSIONS_ROOT = join3(COCKPIT_DIR, "ollama-sessions");
-function getSessionDir(cwd) {
-  return join3(SESSIONS_ROOT, encodePath(cwd));
+function getSessionDir(root, cwd) {
+  return join3(root, encodePath(cwd));
 }
-function getSessionPath(cwd, sessionId) {
-  return join3(getSessionDir(cwd), `${sessionId}.jsonl`);
+function getSessionPath(root, cwd, sessionId) {
+  return join3(getSessionDir(root, cwd), `${sessionId}.jsonl`);
 }
-function readSessionMessages(cwd, sessionId) {
-  const path2 = getSessionPath(cwd, sessionId);
+function readSessionMessages(root, cwd, sessionId) {
+  const path2 = getSessionPath(root, cwd, sessionId);
   if (!existsSync(path2)) return [];
   const lines = readFileSync3(path2, "utf-8").split("\n").filter(Boolean);
   const transcriptEntries = [];
@@ -3179,14 +3235,14 @@ function readSessionMessages(cwd, sessionId) {
   }
   return messages;
 }
-function appendSessionLine(cwd, sessionId, line) {
-  const dir = getSessionDir(cwd);
+function appendSessionLine(root, cwd, sessionId, line) {
+  const dir = getSessionDir(root, cwd);
   mkdirSync2(dir, { recursive: true });
-  const path2 = getSessionPath(cwd, sessionId);
+  const path2 = getSessionPath(root, cwd, sessionId);
   appendFileSync(path2, JSON.stringify(line) + "\n", "utf-8");
 }
-function appendUserText(cwd, sessionId, text, opts) {
-  appendSessionLine(cwd, sessionId, {
+function appendUserText(root, cwd, sessionId, text, opts) {
+  appendSessionLine(root, cwd, sessionId, {
     type: "user",
     uuid: opts?.uuid,
     sessionId,
@@ -3194,8 +3250,8 @@ function appendUserText(cwd, sessionId, text, opts) {
     message: { role: "user", content: [{ type: "text", text }] }
   });
 }
-function appendAssistantMessage(cwd, sessionId, content, opts) {
-  appendSessionLine(cwd, sessionId, {
+function appendAssistantMessage(root, cwd, sessionId, content, opts) {
+  appendSessionLine(root, cwd, sessionId, {
     type: "assistant",
     uuid: opts?.uuid,
     sessionId,
@@ -3203,8 +3259,8 @@ function appendAssistantMessage(cwd, sessionId, content, opts) {
     message: { role: "assistant", content, ...opts?.usage ? { usage: opts.usage } : {} }
   });
 }
-function appendToolResult(cwd, sessionId, toolUseId, content, opts) {
-  appendSessionLine(cwd, sessionId, {
+function appendToolResult(root, cwd, sessionId, toolUseId, content, opts) {
+  appendSessionLine(root, cwd, sessionId, {
     type: "user",
     uuid: opts?.uuid,
     sessionId,
@@ -3222,7 +3278,7 @@ function appendToolResult(cwd, sessionId, toolUseId, content, opts) {
   });
 }
 
-// packages/feature/agent/src/server/engines/ollama/tools.ts
+// packages/feature/agent/src/server/engines/builtinAgent/tools.ts
 import { tool, zodSchema } from "ai";
 
 // node_modules/zod/v4/classic/external.js
@@ -16993,7 +17049,7 @@ function date4(params) {
 // node_modules/zod/v4/classic/external.js
 config(en_default());
 
-// packages/feature/agent/src/server/engines/ollama/tools.ts
+// packages/feature/agent/src/server/engines/builtinAgent/tools.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
 import { writeFile, mkdir, readdir, stat, unlink } from "fs/promises";
 import { isAbsolute, join as join4 } from "path";
@@ -17172,7 +17228,7 @@ function createTools(context) {
             encoding: "utf-8",
             timeout: timeout ?? 6e4,
             maxBuffer: 10 * 1024 * 1024,
-            env: { ...process.env, FORCE_COLOR: "0", CI: "1" }
+            env: sanitizedSpawnEnv({ FORCE_COLOR: "0", CI: "1" })
           });
           if (stdout.length === 0) {
             if (stderr.length === 0) {
@@ -17271,7 +17327,7 @@ ${stderrCapped}`;
             encoding: "utf-8",
             timeout: 15e3,
             maxBuffer: 10 * 1024 * 1024,
-            env: { ...process.env, FORCE_COLOR: "0" }
+            env: sanitizedSpawnEnv({ FORCE_COLOR: "0" })
           });
           const GREP_CAP = 32e3;
           const spillPath = stdout.length > GREP_CAP ? await spillToFile(stdout, "grep") : void 0;
@@ -17311,7 +17367,7 @@ ${summary}`;
   };
 }
 
-// packages/feature/agent/src/server/engines/ollama/stream.ts
+// packages/feature/agent/src/server/engines/builtinAgent/stream.ts
 async function consumeStream(fullStream, safeEnqueue, _sessionId, opts) {
   let text = "";
   const toolCalls = [];
@@ -17405,194 +17461,242 @@ function emitResultMessage(promptTokens, completionTokens, safeEnqueue) {
   );
 }
 
-// packages/feature/agent/src/server/engines/ollama/index.ts
-var DEFAULT_MODEL2 = "qwen3.5:35b-a3b-coding-nvfp4";
-function buildSystemPrompt(cwd) {
-  return `You are a coding agent. You help the user build and modify software using the provided tools.
-
-CWD: ${cwd}
-
-## Language
-
-ALWAYS reply in the SAME language as the user's most recent message \u2014 whatever language they used (Chinese, English, Japanese, French, Spanish, \u2026), mirror it. Do NOT default to English just because this system prompt is written in English. If the user switches language mid-conversation, switch with them on the next reply.
-
-Exceptions that stay as-is regardless of reply language:
-- Tool "thought" parameters: keep the "PREVIOUS / THIS / EXPECT" template in English.
-- Code, identifiers, file paths, shell commands, and error messages quoted from tool output: keep original.
-- Only your natural-language prose to the user follows the user's language.
-
-## Workflow
-
-1. Plan: call TodoWrite FIRST to break down the task into steps (all pending, first one in_progress).
-2. Act: execute steps one by one. After completing each step, call TodoWrite to update progress (mark completed, set next in_progress).
-3. Check: after each tool call, assess \u2014 did it succeed? Is the overall task done? If not, continue to the next step.
-4. Respond: you MUST always end with a text response to the user. Summarize what was done, what was found, or what remains.
-
-IMPORTANT: never stop in the middle of a task silently. If you cannot continue (error, missing info, blocked), respond to the user explaining why and what is needed.
-
-NEVER repeat a tool call with the same or similar arguments. When a search finds nothing, follow this escalation:
-1. Simplify the pattern (shorter keyword, remove qualifiers, use a single core term)
-2. Broaden the path (search parent directory, or omit path to search entire CWD)
-3. Switch tool (Grep \u2192 Glob for filenames, Grep \u2192 Bash with find, or Read a likely file directly)
-4. Give up after 3 failed attempts on the same topic \u2014 tell the user what you tried and ask for guidance.
-
-## Tools
-
-- Read: read a file by line range.
-- Edit: exact string replacement in an existing file (prefer over Write).
-- Write: create new files or full rewrites only.
-- Bash: run shell commands.
-- Grep: ripgrep search. ALWAYS use Grep (never rg/grep via Bash).
-- Glob: fast file listing by glob pattern.
-- TodoWrite: plan tasks and track progress. ALWAYS call this first.
-
-Every tool has a "thought" parameter \u2014 ALWAYS fill it using this format:
-"PREVIOUS: [what the last tool returned and whether it achieved the goal] \u2192 THIS: [what I am doing now and why] \u2192 EXPECT: [what result I expect]"
-Example: "PREVIOUS: Grep found 3 matches in cache.go \u2192 THIS: Read cache.go to see full implementation \u2192 EXPECT: understand the caching logic"
-If this is the first tool call, write "PREVIOUS: n/a" for the first part.
-
-## Rules
-
-Tool usage:
-- Read before modify: do NOT edit a file you haven't Read.
-- Absolute paths only: resolve relative paths against CWD.
-
-Accuracy:
-- Verify before retracting: when the user questions you, use tools to verify first, then respond based on evidence. Do NOT blindly agree you were wrong.
-- Honesty over confidence: only state what is backed by tool output. If unsure, say so and state what info is needed or propose a verification plan. Never fabricate data.
-
-## Output
-
-- Be concise. Lead with the action or answer.
-- Only elaborate on decisions, blockers, or milestones.`;
+// packages/feature/agent/src/server/engines/builtinAgent/index.ts
+function requireTextPrompt(params) {
+  return typeof params.prompt === "string" && params.prompt.trim() ? { ok: true } : { ok: false, status: 400, error: "The built-in agent requires a text prompt" };
 }
-var ollamaSpec = {
-  name: "ollama",
-  // Ollama has no image support here — require a text prompt (the SDK orchestrator allows
-  // images-only for claude/deepseek; without this an images-only message reaches the runner
-  // with an undefined prompt).
-  async preflight(params) {
-    return typeof params.prompt === "string" && params.prompt.trim() ? { ok: true } : { ok: false, status: 400, error: "ollama requires a text prompt" };
-  },
-  runner: {
-    async run(ctx) {
-      const cwd = ctx.cwd || process.cwd();
-      const sid = ctx.currentKey();
-      ctx.rekey(sid);
-      const model = typeof ctx.params.model === "string" && ctx.params.model || DEFAULT_MODEL2;
-      const prompt = ctx.prompt;
-      const emit = (data) => {
-        if (data.startsWith("data: [DONE]")) return;
-        try {
-          ctx.emit(JSON.parse(data.slice(6)));
-        } catch {
-        }
-      };
-      const existing = readSessionMessages(cwd, sid);
-      const messages = [...existing, { role: "user", content: prompt }];
-      appendUserText(cwd, sid, prompt, { uuid: randomUUID3(), timestamp: (/* @__PURE__ */ new Date()).toISOString() });
-      emit(`data: ${JSON.stringify({ type: "system", subtype: "init", session_id: sid })}
+async function runBuiltinAgent(ctx, config2) {
+  const { sessionsRoot } = config2;
+  const cwd = ctx.cwd || process.cwd();
+  const sid = ctx.currentKey();
+  ctx.rekey(sid);
+  const model = typeof ctx.params.model === "string" && ctx.params.model || config2.defaultModel;
+  const prompt = ctx.prompt;
+  const emit = (data) => {
+    if (data.startsWith("data: [DONE]")) return;
+    try {
+      ctx.emit(JSON.parse(data.slice(6)));
+    } catch {
+    }
+  };
+  const noHistory = ctx.params.noHistory === true;
+  const existing = noHistory ? [] : readSessionMessages(sessionsRoot, cwd, sid);
+  const messages = [...existing, { role: "user", content: prompt }];
+  appendUserText(sessionsRoot, cwd, sid, prompt, { uuid: randomUUID3(), timestamp: (/* @__PURE__ */ new Date()).toISOString() });
+  emit(`data: ${JSON.stringify({ type: "system", subtype: "init", session_id: sid })}
 
 `);
-      const context = { cwd, todos: [] };
-      const languageModel = await createOllamaModel(model);
-      const result = streamText({
-        model: languageModel,
-        system: buildSystemPrompt(cwd),
-        messages,
-        tools: createTools(context),
-        stopWhen: stepCountIs(256),
-        temperature: 0,
-        abortSignal: ctx.signal
-      });
-      const pendingToolCalls = /* @__PURE__ */ new Map();
-      const flushPendingToolCallsAsErrors = (reason) => {
-        if (pendingToolCalls.size === 0) return;
-        for (const [toolUseId] of pendingToolCalls) {
+  const context = { cwd, todos: [] };
+  const languageModel = await config2.createModel(model);
+  const result = streamText({
+    model: languageModel,
+    system: buildSystemPrompt(cwd),
+    messages,
+    tools: createTools(context),
+    stopWhen: stepCountIs(256),
+    temperature: 0,
+    abortSignal: ctx.signal
+  });
+  const pendingToolCalls = /* @__PURE__ */ new Map();
+  const flushPendingToolCallsAsErrors = (reason) => {
+    if (pendingToolCalls.size === 0) return;
+    for (const [toolUseId] of pendingToolCalls) {
+      try {
+        appendToolResult(sessionsRoot, cwd, sid, toolUseId, reason, {
+          uuid: randomUUID3(),
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          is_error: true
+        });
+      } catch {
+      }
+      try {
+        emit(
+          `data: ${JSON.stringify({
+            type: "user",
+            message: { content: [{ type: "tool_result", tool_use_id: toolUseId, content: reason, is_error: true }] }
+          })}
+
+`
+        );
+      } catch {
+      }
+    }
+    pendingToolCalls.clear();
+  };
+  try {
+    const { text } = await consumeStream(
+      result.fullStream,
+      emit,
+      sid,
+      {
+        onToolCall: (toolUseId, toolName, input) => {
+          try {
+            pendingToolCalls.set(toolUseId, { name: toolName, input });
+            appendAssistantMessage(
+              sessionsRoot,
+              cwd,
+              sid,
+              [{ type: "tool_use", id: toolUseId, name: toolName, input }],
+              { uuid: randomUUID3(), timestamp: (/* @__PURE__ */ new Date()).toISOString() }
+            );
+          } catch {
+          }
+        },
+        onToolResult: (toolUseId, content) => {
           try {
-            appendToolResult(cwd, sid, toolUseId, reason, {
+            pendingToolCalls.delete(toolUseId);
+            appendToolResult(sessionsRoot, cwd, sid, toolUseId, content, {
               uuid: randomUUID3(),
               timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-              is_error: true
+              is_error: false
             });
           } catch {
           }
+        },
+        onTextFlush: (flushedText) => {
           try {
-            emit(
-              `data: ${JSON.stringify({
-                type: "user",
-                message: { content: [{ type: "tool_result", tool_use_id: toolUseId, content: reason, is_error: true }] }
-              })}
-
-`
-            );
+            appendAssistantMessage(sessionsRoot, cwd, sid, [{ type: "text", text: flushedText }], {
+              uuid: randomUUID3(),
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            });
           } catch {
           }
         }
-        pendingToolCalls.clear();
-      };
-      try {
-        const { text } = await consumeStream(
-          result.fullStream,
-          emit,
-          sid,
-          {
-            onToolCall: (toolUseId, toolName, input) => {
-              try {
-                pendingToolCalls.set(toolUseId, { name: toolName, input });
-                appendAssistantMessage(cwd, sid, [{ type: "tool_use", id: toolUseId, name: toolName, input }], {
-                  uuid: randomUUID3(),
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                });
-              } catch {
-              }
-            },
-            onToolResult: (toolUseId, content) => {
-              try {
-                pendingToolCalls.delete(toolUseId);
-                appendToolResult(cwd, sid, toolUseId, content, {
-                  uuid: randomUUID3(),
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-                  is_error: false
-                });
-              } catch {
-              }
-            },
-            onTextFlush: (flushedText) => {
-              try {
-                appendAssistantMessage(cwd, sid, [{ type: "text", text: flushedText }], {
-                  uuid: randomUUID3(),
-                  timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                });
-              } catch {
-              }
-            }
-          }
-        );
-        const usage = await result.usage;
-        emitResultMessage(usage.inputTokens || 0, usage.outputTokens || 0, emit);
-        if (!ctx.signal.aborted) {
-          appendAssistantMessage(cwd, sid, text ? [{ type: "text", text }] : [], {
-            uuid: randomUUID3(),
-            timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-            usage: {
-              input_tokens: usage.inputTokens || 0,
-              output_tokens: usage.outputTokens || 0,
-              cache_creation_input_tokens: 0,
-              cache_read_input_tokens: 0
-            }
-          });
-        }
-      } catch (error48) {
-        if (ctx.signal.aborted) {
-          flushPendingToolCallsAsErrors("Tool call cancelled (request aborted).");
-          return;
-        }
-        flushPendingToolCallsAsErrors("Tool call failed (stream error).");
-        throw error48;
       }
+    );
+    const usage = await result.usage;
+    emitResultMessage(usage.inputTokens || 0, usage.outputTokens || 0, emit);
+    if (!ctx.signal.aborted) {
+      appendAssistantMessage(sessionsRoot, cwd, sid, text ? [{ type: "text", text }] : [], {
+        uuid: randomUUID3(),
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        usage: {
+          input_tokens: usage.inputTokens || 0,
+          output_tokens: usage.outputTokens || 0,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 0
+        }
+      });
+    }
+  } catch (error48) {
+    if (ctx.signal.aborted) {
+      flushPendingToolCallsAsErrors("Tool call cancelled (request aborted).");
+      return;
+    }
+    flushPendingToolCallsAsErrors("Tool call failed (stream error).");
+    throw error48;
+  }
+}
+
+// packages/feature/agent/src/server/engines/deepseek.ts
+var DEEPSEEK_BASE_URL = "https://api.deepseek.com/anthropic";
+var DEFAULT_MODEL = "deepseek-v4-pro";
+var SMALL_FAST_MODEL = "deepseek-v4-flash";
+var ALLOWED_MODELS = /* @__PURE__ */ new Set(["deepseek-v4-flash", "deepseek-v4-pro"]);
+var DEEPSEEK_OPENAI_BASE_URL = "https://api.deepseek.com/v1";
+var BUILTIN_DEFAULT_MODEL = DEFAULT_MODEL;
+async function readSettings() {
+  return readJsonFile(SETTINGS_FILE, {});
+}
+function resolveModel(requested, saved) {
+  if (typeof requested === "string" && ALLOWED_MODELS.has(requested)) return requested;
+  if (saved && ALLOWED_MODELS.has(saved)) return saved;
+  return DEFAULT_MODEL;
+}
+function resolveBuiltinModel(requested, saved) {
+  if (typeof requested === "string" && requested.trim()) return requested.trim();
+  if (saved && saved.trim()) return saved.trim();
+  return BUILTIN_DEFAULT_MODEL;
+}
+function buildBuiltinConfig(apiKey) {
+  return {
+    sessionsRoot: getBuiltinSessionsRoot("deepseek"),
+    defaultModel: BUILTIN_DEFAULT_MODEL,
+    createModel: async (modelName) => createOpenAiCompatModel({ baseURL: DEEPSEEK_OPENAI_BASE_URL, apiKey, modelName })
+  };
+}
+function buildDeepseekEnv(apiKey, model) {
+  return sanitizedSpawnEnv({
+    ANTHROPIC_AUTH_TOKEN: void 0,
+    ANTHROPIC_BASE_URL: DEEPSEEK_BASE_URL,
+    ANTHROPIC_API_KEY: apiKey,
+    // DeepSeek sends this as x-api-key (fully supported)
+    ANTHROPIC_MODEL: model,
+    ANTHROPIC_SMALL_FAST_MODEL: SMALL_FAST_MODEL,
+    CLAUDE_CONFIG_DIR: DEEPSEEK_DIR,
+    DISABLE_PROMPT_CACHING: "1",
+    // DeepSeek runs its own server-side prefix KV cache
+    CLAUDE_CODE_USE_BEDROCK: "0",
+    CLAUDE_CODE_USE_VERTEX: "0",
+    CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1"
+  });
+}
+function buildDeepseekOptions(ctx, env) {
+  return (abort, resume) => ({
+    ...resume && { resume },
+    ...ctx.cwd && { cwd: ctx.cwd },
+    settingSources: ["user", "project", "local"],
+    permissionMode: "bypassPermissions",
+    allowDangerouslySkipPermissions: true,
+    includePartialMessages: true,
+    abortController: abort,
+    env
+  });
+}
+var isBuiltinMode = (params) => params.mode === "builtin";
+var deepseekSpec = {
+  name: "deepseek",
+  // Pre-check BEFORE startRun: API key must exist; resolve model into params (no registry pollution).
+  async preflight(params) {
+    const settings = await readSettings();
+    const apiKey = await readDeepseekApiKey();
+    if (!apiKey) {
+      return {
+        ok: false,
+        status: 400,
+        error: "DeepSeek API key is not configured. Open the DeepSeek picker in the chat header to set one."
+      };
     }
-    // No resolveTitle → teardown uses 'unread' with undefined title (matches original).
+    const requested = typeof params.model === "string" ? params.model : void 0;
+    if (isBuiltinMode(params)) {
+      const textCheck = requireTextPrompt(params);
+      if (!textCheck.ok) return textCheck;
+      params.model = resolveBuiltinModel(requested, settings.engines?.deepseek?.builtinModel);
+      return { ok: true };
+    }
+    params.model = resolveModel(requested, settings.engines?.deepseek?.model);
+    return { ok: true };
+  },
+  runner: {
+    async run(ctx) {
+      const apiKey = await readDeepseekApiKey();
+      if (isBuiltinMode(ctx.params)) {
+        await runBuiltinAgent(ctx, buildBuiltinConfig(apiKey));
+        return;
+      }
+      const model = typeof ctx.params.model === "string" ? ctx.params.model : DEFAULT_MODEL;
+      const env = buildDeepseekEnv(apiKey, model);
+      await runSdkLoop(ctx, buildDeepseekOptions(ctx, env));
+    },
+    resolveTitle: (cwd, sessionId) => getSessionTitle(cwd, sessionId)
+  }
+};
+
+// packages/feature/agent/src/server/engines/ollama.ts
+var DEFAULT_MODEL2 = "qwen3.5:35b-a3b-coding-nvfp4";
+var OLLAMA_CONFIG = {
+  sessionsRoot: getBuiltinSessionsRoot("ollama"),
+  defaultModel: DEFAULT_MODEL2,
+  createModel: (model) => createOllamaModel(model)
+};
+var ollamaSpec = {
+  name: "ollama",
+  async preflight(params) {
+    return requireTextPrompt(params);
+  },
+  runner: {
+    run: (ctx) => runBuiltinAgent(ctx, OLLAMA_CONFIG)
+    // No resolveTitle → teardown uses 'unread' with undefined title.
   }
 };
 
@@ -17650,7 +17754,7 @@ var kimiSpec = {
         const child = spawn2("kimi", args, {
           stdio: ["ignore", "pipe", "pipe"],
           cwd: cwd || void 0,
-          env: { ...process.env }
+          env: sanitizedSpawnEnv()
         });
         ctx.signal.addEventListener("abort", () => child.kill("SIGTERM"), { once: true });
         if (sessionId) {
@@ -17787,7 +17891,7 @@ var codexSpec = {
         const child = spawn3("codex", args, {
           stdio: ["ignore", "pipe", "pipe"],
           cwd: cwd || void 0,
-          env: { ...process.env }
+          env: sanitizedSpawnEnv()
         });
         ctx.signal.addEventListener("abort", () => child.kill("SIGTERM"), { once: true });
         const pendingToolCalls = /* @__PURE__ */ new Map();
@@ -17974,7 +18078,11 @@ var dispatchEngineMessageEff = (task, engine, startFresh) => Effect_exports.tryP
       cwd: task.cwd,
       engine,
       // selects claude2's CLAUDE_CONFIG_DIR; no-op for the others
-      ...task.model && { model: task.model }
+      ...task.model && { model: task.model },
+      // Execution mode is NOT snapshotted on the task — it is derived from where the
+      // session actually lives, so a task made from a Built-in Agent tab keeps running
+      // the built-in loop instead of silently switching backends mid-schedule.
+      ...isDeepseekBuiltinSession(engine, task) && { mode: "builtin" }
     });
     if (!outcome.ok) {
       throw new Error(`${engine} dispatch rejected (${outcome.status}): ${outcome.error}`);
@@ -18008,9 +18116,13 @@ var dispatchEngineMessageEff = (task, engine, startFresh) => Effect_exports.tryP
     cause
   })
 });
+function isDeepseekBuiltinSession(engine, task) {
+  return engine === "deepseek" && existsSync3(getDeepseekBuiltinSessionPath(task.cwd, task.sessionId));
+}
 function sessionPathFor(engine, task) {
   if (engine === "claude2") return getClaude2SessionPath(task.cwd, task.sessionId);
   if (engine === "ollama") return getOllamaSessionPath(task.cwd, task.sessionId);
+  if (isDeepseekBuiltinSession(engine, task)) return getDeepseekBuiltinSessionPath(task.cwd, task.sessionId);
   if (engine === "deepseek") return getDeepseekSessionPath(task.cwd, task.sessionId);
   if (engine === "codex") return findCodexSessionPath(task.sessionId);
   if (engine === "kimi") return findKimiSessionPath(task.sessionId);