@oxgeneral/orch 0.3.4 → 1.0.0

package/dist/{App-RKAPZNZO.js → App-GJVTVGRU.js}

@@ -473,11 +473,16 @@ var GoalRow = React5.memo(function GoalRow2({ goal, selected, width, agentNameMa
         children: goal.title.length > titleWidth ? goal.title.slice(0, titleWidth - 1) + "\u2026" : goal.title
       }
     ) }),
-    hasProgress && /* @__PURE__ */ jsxs(Box, { width: progressW, children: [
-      /* @__PURE__ */ jsx(Text, { color: tuiColors.green, children: FILLED_BLOCK.repeat(Math.min(doneTasks, 6)) }),
-      /* @__PURE__ */ jsx(Text, { color: tuiColors.ghost, children: EMPTY_BLOCK.repeat(Math.max(0, Math.min(totalTasks, 6) - doneTasks)) }),
-      /* @__PURE__ */ jsx(Text, { color: tuiColors.dim, children: ` ${doneTasks}/${totalTasks}` })
-    ] }),
+    hasProgress && (() => {
+      const barW = 6;
+      const filled = totalTasks > 0 ? Math.round(doneTasks / totalTasks * barW) : 0;
+      const empty = barW - filled;
+      return /* @__PURE__ */ jsxs(Box, { width: progressW, children: [
+        /* @__PURE__ */ jsx(Text, { color: tuiColors.green, children: FILLED_BLOCK.repeat(filled) }),
+        /* @__PURE__ */ jsx(Text, { color: tuiColors.ghost, children: EMPTY_BLOCK.repeat(empty) }),
+        /* @__PURE__ */ jsx(Text, { color: tuiColors.dim, children: ` ${doneTasks}/${totalTasks}` })
+      ] });
+    })(),
     /* @__PURE__ */ jsx(Box, { width: assigneeWidth, children: assigneeName ? /* @__PURE__ */ jsxs(Text, { backgroundColor: chipBg3.green, color: tuiColors.green, wrap: "truncate", children: [
       " ",
       assigneeName.length > assigneeWidth - 2 ? assigneeName.slice(0, assigneeWidth - 3) + "\u2026" : assigneeName,
@@ -1265,6 +1270,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
   const [multiSelected, setMultiSelected] = useState(/* @__PURE__ */ new Set());
   const [browsingSuggestions, setBrowsingSuggestions] = useState(false);
   const [suggestionIndex, setSuggestionIndex] = useState(0);
+  const [dirty, setDirty] = useState(false);
   const [validationError, setValidationError] = useState(null);
   const [enterBlockHint, setEnterBlockHint] = useState(false);
   const debounceTimerRef = useRef(null);
@@ -1324,6 +1330,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
     setMultiSelected(/* @__PURE__ */ new Set());
     setBrowsingSuggestions(false);
     setSuggestionIndex(0);
+    setDirty(false);
     setValidationError(null);
     setEnterBlockHint(false);
     if (debounceTimerRef.current) clearTimeout(debounceTimerRef.current);
@@ -1392,10 +1399,13 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
     setCurrentStep(prevActiveIdx >= 0 ? prevActiveIdx : 0);
     setBrowsingSuggestions(false);
     setSuggestionIndex(0);
+    setDirty(false);
     setValidationError(null);
     setEnterBlockHint(false);
     if (debounceTimerRef.current) clearTimeout(debounceTimerRef.current);
     const prevStep = steps[prevOrigIdx];
+    const hasPrevValue = !!values[prevStep.id];
+    if (hasPrevValue) setDirty(true);
     if (prevStep.type === "text") {
       const val = values[prevStep.id] ?? prevStep.defaultValue ?? "";
       setTextInput(val);
@@ -1456,8 +1466,12 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
       }
       if (key.return) {
         const val = textInput.trim();
-        if (step.required && !val) return;
+        if (step.required && !val) {
+          setDirty(true);
+          return;
+        }
         if (validationError !== null) {
+          setDirty(true);
           setEnterBlockHint(true);
           if (enterBlockTimerRef.current) clearTimeout(enterBlockTimerRef.current);
           enterBlockTimerRef.current = setTimeout(() => setEnterBlockHint(false), 2e3);
@@ -1491,6 +1505,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
         return;
       }
       if (input && !key.ctrl && !key.meta && !key.escape) {
+        setDirty(true);
         setBrowsingSuggestions(false);
         setSuggestionIndex(0);
         setTextInput((v) => v.slice(0, cursorPos) + input + v.slice(cursorPos));
@@ -1501,8 +1516,12 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
     if (step.type === "textarea") {
       if (key.return && !key.shift) {
         const val = taLines.join("\n").trim();
-        if (step.required && !val) return;
+        if (step.required && !val) {
+          setDirty(true);
+          return;
+        }
         if (validationError !== null) {
+          setDirty(true);
           setEnterBlockHint(true);
           if (enterBlockTimerRef.current) clearTimeout(enterBlockTimerRef.current);
           enterBlockTimerRef.current = setTimeout(() => setEnterBlockHint(false), 2e3);
@@ -1584,6 +1603,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
         return;
       }
       if (input && !key.ctrl && !key.meta && !key.escape) {
+        setDirty(true);
         const parts = input.split(/\r?\n/);
         if (parts.length === 1) {
           setTaLines((lines) => {
@@ -1637,6 +1657,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
             if (step.validate) {
               const err = step.validate(selected.value);
               if (err !== null) {
+                setDirty(true);
                 setValidationError(err);
                 setEnterBlockHint(true);
                 if (enterBlockTimerRef.current) clearTimeout(enterBlockTimerRef.current);
@@ -1681,6 +1702,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
     }
   });
   if (!step) return null;
+  const visibleError = dirty ? validationError : null;
   const maxW = Math.max(20, width - 6);
   const progressText = `${currentStep + 1}/${totalSteps}`;
   const optionsH = Math.max(2, height - 4);
@@ -1719,7 +1741,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
       !step.required && /* @__PURE__ */ jsx(Text, { color: tuiColors.dim, children: " (optional, Enter to skip)" })
     ] }),
     step.type === "text" && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs(Box, { borderStyle: validationError ? "round" : void 0, borderColor: validationError ? tuiColors.red : void 0, children: [
+      /* @__PURE__ */ jsxs(Box, { borderStyle: visibleError ? "round" : void 0, borderColor: visibleError ? tuiColors.red : void 0, children: [
         /* @__PURE__ */ jsxs(Text, { color: tuiColors.amber, children: [
           "  ",
           ">",
@@ -1734,9 +1756,9 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
           /* @__PURE__ */ jsx(Text, { color: tuiColors.amber, children: CURSOR })
         ] }) : /* @__PURE__ */ jsx(Text, { color: tuiColors.amber, children: CURSOR })
       ] }),
-      validationError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
+      visibleError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
         "  ",
-        validationError
+        visibleError
       ] }),
       enterBlockHint && /* @__PURE__ */ jsx(Text, { color: tuiColors.red, children: "  Fix the error above" })
     ] }),
@@ -1781,7 +1803,7 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
       const visibleLines = taLines.slice(taScrollStart, taScrollStart + taVisibleH);
       const lineNumWidth = String(taLines.length).length;
       return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: validationError ? "round" : void 0, borderColor: validationError ? tuiColors.red : void 0, children: [
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: visibleError ? "round" : void 0, borderColor: visibleError ? tuiColors.red : void 0, children: [
           visibleLines.map((line, i) => {
             const realRow = i + taScrollStart;
             const lineNum = String(realRow + 1).padStart(lineNumWidth, " ");
@@ -1810,9 +1832,9 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
             step.placeholder
           ] }) })
         ] }),
-        validationError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
+        visibleError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
           "  ",
-          validationError
+          visibleError
         ] }),
         enterBlockHint && /* @__PURE__ */ jsx(Text, { color: tuiColors.red, children: "  Fix the error above" })
       ] });
@@ -1833,9 +1855,9 @@ function FormWizard({ title, steps, onComplete, onCancel, width, height, onPaste
           ] })
         ] }, opt.value);
       }),
-      validationError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
+      visibleError && /* @__PURE__ */ jsxs(Text, { color: tuiColors.red, dimColor: true, children: [
         "  ",
-        validationError
+        visibleError
       ] }),
       enterBlockHint && /* @__PURE__ */ jsx(Text, { color: tuiColors.red, children: "  Fix the error above" })
     ] }),
@@ -2687,11 +2709,22 @@ var CURSOR_MODELS = [
   { value: "gpt-5.3-codex", label: "GPT-5.3 Codex", hint: "OpenAI" },
   { value: "claude-sonnet-4-6", label: "Claude Sonnet 4.6", hint: "Anthropic" }
 ];
+var OPENCODE_MODELS = [
+  { value: "", label: "Default", hint: "use model configured in opencode" },
+  { value: "openrouter/anthropic/claude-sonnet-4.6", label: "Claude Sonnet 4.6", hint: "fast, balanced" },
+  { value: "openrouter/anthropic/claude-opus-4.6", label: "Claude Opus 4.6", hint: "most capable" },
+  { value: "openrouter/google/gemini-2.5-pro", label: "Gemini 2.5 Pro", hint: "Google" },
+  { value: "openrouter/google/gemini-2.5-flash", label: "Gemini 2.5 Flash", hint: "Google, fast" },
+  { value: "openrouter/deepseek/deepseek-v3.2", label: "DeepSeek V3.2", hint: "open-source" },
+  { value: "openrouter/deepseek/deepseek-r1:free", label: "DeepSeek R1", hint: "reasoning, free" },
+  { value: "opencode/big-pickle", label: "Big Pickle", hint: "opencode native" }
+];
 var SHELL_MODELS = [
   { value: "", label: "Default", hint: "use shell adapter default" }
 ];
 var ADAPTERS = [
   { value: "claude", label: "Claude", hint: "Claude Code CLI" },
+  { value: "opencode", label: "OpenCode", hint: "OpenCode \u2014 multi-provider" },
   { value: "codex", label: "Codex", hint: "OpenAI Codex CLI" },
   { value: "cursor", label: "Cursor", hint: "Cursor Agent CLI" },
   { value: "shell", label: "Shell", hint: "custom shell command" }
@@ -2702,11 +2735,12 @@ var PRIORITY_OPTIONS = [
   { value: "3", label: "P3 Medium", hint: "default priority" },
   { value: "4", label: "P4 Low", hint: "nice to have" }
 ];
-var AGENT_HINT_MAX_LEN = 80;
+var AGENT_ROLE_MAX_LEN = 60;
 function mapAgentOptions(agents) {
   return agents.filter((a) => a.status !== "disabled").map((a) => {
-    const raw = (a.role ?? a.adapter).split("\n")[0].trim();
-    const hint = raw.length > AGENT_HINT_MAX_LEN ? raw.slice(0, AGENT_HINT_MAX_LEN - 1) + "\u2026" : raw;
+    const roleLine = (a.role ?? "").split("\n")[0].trim();
+    const role = roleLine.length > AGENT_ROLE_MAX_LEN ? roleLine.slice(0, AGENT_ROLE_MAX_LEN - 1) + "\u2026" : roleLine;
+    const hint = role ? `[${a.adapter}] ${role}` : a.adapter;
     return { value: a.id, label: a.name, hint };
   });
 }
@@ -2800,6 +2834,7 @@ function getAgentWizardSteps(agents, teams) {
       label: "Model",
       type: "select",
       getOptions: (vals) => {
+        if (vals.adapter === "opencode") return OPENCODE_MODELS;
         if (vals.adapter === "codex") return CODEX_MODELS;
         if (vals.adapter === "cursor") return CURSOR_MODELS;
         if (vals.adapter === "shell") return SHELL_MODELS;
@@ -2997,7 +3032,7 @@ function editTaskWizardToFields(vals) {
 function getEditAgentWizardSteps(agent, agents, teams) {
   const currentRoleInPresets = ROLE_PRESETS.find((r) => r.value === agent.role);
   const roleDefault = currentRoleInPresets ? agent.role : agent.role ? "__custom__" : "";
-  const modelOptions = agent.adapter === "codex" ? CODEX_MODELS : agent.adapter === "cursor" ? CURSOR_MODELS : agent.adapter === "shell" ? SHELL_MODELS : CLAUDE_MODELS;
+  const modelOptions = agent.adapter === "opencode" ? OPENCODE_MODELS : agent.adapter === "codex" ? CODEX_MODELS : agent.adapter === "cursor" ? CURSOR_MODELS : agent.adapter === "shell" ? SHELL_MODELS : CLAUDE_MODELS;
   const teamOptions = buildTeamOptions(teams);
   const currentTeamId = teams?.find((t) => t.members.some((m) => m.agent_id === agent.id))?.id;
   return [
@@ -6521,7 +6556,7 @@ function formatAgentOutput(raw) {
       const summary = summarizeToolResult(content);
       return { summary: `\u2190 ${summary.slice(0, 180)}`, detail: detail() };
     }
-    if (parsed.type === "tool_use") {
+    if (parsed.type === "tool_use" || typeof parsed.name === "string" && "input" in parsed) {
       const name = parsed.name ?? "tool";
       const hint = formatToolInput(name, parsed.input);
       return { summary: `\u2699 ${name}(${hint})`, detail: detail() };

package/dist/{agent-KBTLGGCT.js → agent-7ZJ3ZDJ7.js}

@@ -5,7 +5,7 @@ import { printSuccess, agentName, printTable, dim, statusIcon, formatTokens, pri
 // src/cli/commands/agent.ts
 function registerAgentCommand(program, container) {
   const agent = program.command("agent").description("Manage agents");
-  agent.command("add <name>").description("Add a new agent").requiredOption("--adapter <adapter>", "Adapter type: claude, shell, codex, cursor").option("--role <role>", "Agent role description").option("--command <cmd>", "Shell command (for shell adapter)").option("--model <model>", "Model name (for AI adapters)").option("--max-turns <n>", "Max turns per run").option("--timeout <ms>", "Timeout in ms").option("--approval-policy <policy>", "suggest|auto|manual").option("--workspace-mode <mode>", "shared|worktree|isolated").option("--skills <skills>", "Comma-separated list of agent skills").option("-e, --edit", "Open $EDITOR to write the role description").action(async (name, opts) => {
+  agent.command("add <name>").description("Add a new agent").requiredOption("--adapter <adapter>", "Adapter type: claude, opencode, codex, cursor, shell").option("--role <role>", "Agent role description").option("--command <cmd>", "Shell command (for shell adapter)").option("--model <model>", "Model name (for AI adapters)").option("--max-turns <n>", "Max turns per run").option("--timeout <ms>", "Timeout in ms").option("--approval-policy <policy>", "suggest|auto|manual").option("--workspace-mode <mode>", "shared|worktree|isolated").option("--skills <skills>", "Comma-separated list of agent skills").option("-e, --edit", "Open $EDITOR to write the role description").action(async (name, opts) => {
     await container.paths.requireInit();
     let role = opts.role;
     if (opts.edit) {

package/dist/{chunk-D6RFF3KN.js → chunk-4IFIOMCW.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createStreamingEvents, extractTokens } from './chunk-W6RSVMXR.js';
+import { createStreamingEvents, extractTokens } from './chunk-MGGSRXWJ.js';
 import { classifyAdapterError } from './chunk-2C2TFQ7K.js';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
@@ -37,8 +37,9 @@ var ClaudeAdapter = class {
     if (params.config.model) {
       args.push("--model", params.config.model);
     }
-    if (params.config.system_prompt) {
-      args.push("--system-prompt", params.config.system_prompt);
+    const effectiveSystemPrompt = params.systemPrompt ?? params.config.system_prompt;
+    if (effectiveSystemPrompt) {
+      args.push("--system-prompt", effectiveSystemPrompt);
     }
     args.push(params.prompt);
     const { process: proc, pid } = this.processManager.spawn("claude", args, {

package/dist/{chunk-S3QYSBW4.js → chunk-C6XZ3FJT.js}

@@ -3,6 +3,9 @@ import { classifyAdapterError } from './chunk-NLQAJ7TW.js';
 import { readLines } from './chunk-O2MSGW3V.js';
 
 // src/infrastructure/adapters/utils.ts
+function buildFullPrompt(systemPrompt, userPrompt) {
+  return systemPrompt ? systemPrompt + "\n\n" + userPrompt : userPrompt;
+}
 function extractTokens(parsed, opts) {
   let usage = parsed.usage;
   if (!usage && opts?.statsFallback) {
@@ -58,6 +61,6 @@ function createStreamingEvents(proc, parseEvent, adapterName, signal) {
   return generate();
 }
 
-export { createStreamingEvents, extractTokens };
-//# sourceMappingURL=chunk-S3QYSBW4.js.map
-//# sourceMappingURL=chunk-S3QYSBW4.js.map
+export { buildFullPrompt, createStreamingEvents, extractTokens };
+//# sourceMappingURL=chunk-C6XZ3FJT.js.map
+//# sourceMappingURL=chunk-C6XZ3FJT.js.map

package/dist/chunk-C6XZ3FJT.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/infrastructure/adapters/utils.ts"],"names":[],"mappings":"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","file":"chunk-C6XZ3FJT.js","sourcesContent":["/**\n * Shared utilities for agent adapters.\n *\n * Deduplicates extractTokens and streaming event generation logic\n * common to claude, codex, and cursor adapters.\n */\n\nimport type { ChildProcess } from 'node:child_process';\nimport type { AgentEvent } from './interface.js';\nimport { readLines } from '../process/process-manager.js';\nimport { createTokenUsage } from '../../domain/run.js';\nimport { classifyAdapterError } from '../../domain/errors.js';\n\nexport type TokenInfo = { input: number; output: number; total: number };\n\n/** Combine system and user prompts. Adapters without native system prompt support use this. */\nexport function buildFullPrompt(systemPrompt: string | undefined, userPrompt: string): string {\n  return systemPrompt ? systemPrompt + '\\n\\n' + userPrompt : userPrompt;\n}\n\n/**\n * Extract token usage from a parsed JSON event.\n *\n * @param parsed - The parsed JSON object from an adapter event line.\n * @param opts.statsFallback - If true, also checks `parsed.stats?.usage` (Claude-specific).\n */\nexport function extractTokens(\n  parsed: Record<string, unknown>,\n  opts?: { statsFallback?: boolean },\n): TokenInfo | undefined {\n  let usage = parsed.usage as Record<string, unknown> | undefined;\n\n  if (!usage && opts?.statsFallback) {\n    const stats = parsed.stats as Record<string, unknown> | undefined;\n    usage = stats?.usage as Record<string, unknown> | undefined;\n  }\n\n  if (usage && typeof usage.input_tokens === 'number') {\n    const input = usage.input_tokens;\n    const output = typeof usage.output_tokens === 'number' ? usage.output_tokens : 0;\n    return createTokenUsage(input, output);\n  }\n  return undefined;\n}\n\n/**\n * Create an async generator that streams AgentEvents from a child process.\n *\n * Handles: exit promise setup, line-by-line reading, abort signal, exit code checking.\n *\n * @param proc - The spawned child process.\n * @param parseEvent - Adapter-specific function to parse a line into an AgentEvent.\n * @param adapterName - Name used in error messages (e.g. \"Claude\", \"Codex\").\n * @param signal - Optional abort signal.\n */\nexport function createStreamingEvents(\n  proc: ChildProcess,\n  parseEvent: (line: string) => AgentEvent | null,\n  adapterName: string,\n  signal?: AbortSignal,\n): AsyncGenerator<AgentEvent> {\n  async function* generate(): AsyncGenerator<AgentEvent> {\n    let gotDoneEvent = false;\n\n    let exitCode: number | null = null;\n    let exitError: Error | null = null;\n    const exitPromise = new Promise<void>((resolve) => {\n      proc.on('close', (code) => { exitCode = code; resolve(); });\n      proc.on('error', (err) => { exitError = err; resolve(); });\n    });\n\n    if (proc.stdout) {\n      for await (const line of readLines(proc.stdout)) {\n        if (signal?.aborted) break;\n        const event = parseEvent(line);\n        if (event) {\n          if (event.type === 'done') gotDoneEvent = true;\n          yield event;\n        }\n      }\n    }\n\n    await exitPromise;\n\n    if (exitError && !signal?.aborted && !gotDoneEvent) {\n      const spawnErr = exitError as Error;\n      const classified = classifyAdapterError(spawnErr.message, exitCode ?? undefined);\n      const err = Object.assign(new Error(spawnErr.message), { errorKind: classified });\n      throw err;\n    }\n    if (exitCode !== 0 && exitCode !== null && !signal?.aborted && !gotDoneEvent) {\n      const msg = `${adapterName} process exited with code ${exitCode}`;\n      const classified = classifyAdapterError(msg, exitCode);\n      const err = Object.assign(new Error(msg), { errorKind: classified });\n      throw err;\n    }\n  }\n\n  return generate();\n}\n"]}

package/dist/{chunk-VMDQVRBR.js → chunk-GBXUNDKN.js}

@@ -1,4 +1,4 @@
-import { AUTONOMOUS_LABEL, DEFAULT_PROMPT_TEMPLATE, buildPromptContext } from './chunk-B4JQM4NU.js';
+import { AUTONOMOUS_LABEL, DEFAULT_SYSTEM_TEMPLATE, DEFAULT_USER_TEMPLATE, buildPromptContext } from './chunk-VG4465AG.js';
 import { LockConflictError, WorkspaceError, TaskAlreadyRunningError, NoAgentsError, classifyAdapterError } from './chunk-NLQAJ7TW.js';
 import { dirname } from 'path';
 import fs from 'fs/promises';
@@ -941,7 +941,9 @@ Agent role: ${role}` : `Autonomous work cycle. Agent role: ${role}`;
         agent,
         this.deps.config
       );
-      const template = this.deps.config.prompt?.template ?? DEFAULT_PROMPT_TEMPLATE;
+      const systemTemplate = this.deps.config.prompt?.system_template ?? DEFAULT_SYSTEM_TEMPLATE;
+      const userTemplate = this.deps.config.prompt?.user_template ?? DEFAULT_USER_TEMPLATE;
+      const legacyTemplate = this.deps.config.prompt?.template;
       const attempt = task.attempts + 1;
       let retryContext;
       if (attempt > 1) {
@@ -964,14 +966,13 @@ Agent role: ${role}` : `Autonomous work cycle. Agent role: ${role}`;
         const allTasks = await this.cachedTaskStore.list();
         const goalTasks = allTasks.filter((t) => t.goalId === goalId);
         const progressEntry = await this.deps.contextStore?.get(`${goalId}-progress`);
-        const MAX_GOAL_TASK_NAMES = 30;
         const taskNames = goalTasks.map((t) => `[${t.status}] ${t.title}`);
         goalContext = {
           id: goalRaw.id,
           title: goalRaw.title,
           description: goalRaw.description,
           status: goalRaw.status,
-          task_names: taskNames.length > MAX_GOAL_TASK_NAMES ? [...taskNames.slice(0, MAX_GOAL_TASK_NAMES), `... and ${taskNames.length - MAX_GOAL_TASK_NAMES} more`] : taskNames,
+          task_names: taskNames,
           progress: progressEntry?.value
         };
       }
@@ -983,7 +984,14 @@ Agent role: ${role}` : `Autonomous work cycle. Agent role: ${role}`;
         this.deps.config,
         { allAgents, retryContext, sharedContext, feedback: task.feedback, messages: pendingMessages.length ? pendingMessages : void 0, goal: goalContext }
       );
-      const prompt = await this.deps.templateEngine.render(template, context);
+      let prompt;
+      let systemPrompt;
+      if (legacyTemplate) {
+        prompt = await this.deps.templateEngine.render(legacyTemplate, context);
+      } else {
+        systemPrompt = await this.deps.templateEngine.render(systemTemplate, context);
+        prompt = await this.deps.templateEngine.render(userTemplate, context);
+      }
       const run = await this.deps.runService.create({
         taskId: task.id,
         agentId: agent.id,
@@ -1014,6 +1022,7 @@ Agent role: ${role}` : `Autonomous work cycle. Agent role: ${role}`;
       this.abortControllers.set(taskId, abortController);
       const handle = adapter.execute({
         prompt,
+        systemPrompt,
         workspace: workspacePath,
         env: {
           ...agent.config.env,
@@ -1467,5 +1476,5 @@ function serializeEventData(data, maxLen) {
 }
 
 export { Orchestrator, canTransition, isBlocked, isDispatchable, isTerminal, resolveFailureStatus };
-//# sourceMappingURL=chunk-VMDQVRBR.js.map
-//# sourceMappingURL=chunk-VMDQVRBR.js.map
+//# sourceMappingURL=chunk-GBXUNDKN.js.map
+//# sourceMappingURL=chunk-GBXUNDKN.js.map