opencode-supertask 0.1.34 → 0.1.35

package/dist/gateway/index.js

@@ -1204,7 +1204,7 @@ var init_sql = __esm({
         return new SQL([new StringChunk(str)]);
       }
       sql2.raw = raw2;
-      function join6(chunks, separator) {
+      function join7(chunks, separator) {
         const result = [];
         for (const [i, chunk] of chunks.entries()) {
           if (i > 0 && separator !== void 0) {
@@ -1214,7 +1214,7 @@ var init_sql = __esm({
         }
         return new SQL(result);
       }
-      sql2.join = join6;
+      sql2.join = join7;
       function identifier(value) {
         return new Name(value);
       }
@@ -3830,7 +3830,7 @@ var init_select2 = __esm({
         return (table, on) => {
           const baseTableName = this.tableName;
           const tableName = getTableLikeName(table);
-          if (typeof tableName === "string" && this.config.joins?.some((join6) => join6.alias === tableName)) {
+          if (typeof tableName === "string" && this.config.joins?.some((join7) => join7.alias === tableName)) {
             throw new Error(`Alias "${tableName}" is already used in this query`);
           }
           if (!this.isPartialSelect) {
@@ -4672,7 +4672,7 @@ var init_update = __esm({
       createJoin(joinType) {
         return (table, on) => {
           const tableName = getTableLikeName(table);
-          if (typeof tableName === "string" && this.config.joins.some((join6) => join6.alias === tableName)) {
+          if (typeof tableName === "string" && this.config.joins.some((join7) => join7.alias === tableName)) {
             throw new Error(`Alias "${tableName}" is already used in this query`);
           }
           if (typeof on === "function") {
@@ -19628,6 +19628,116 @@ var init_duration = __esm({
   }
 });
 
+// src/core/opencode-catalog.ts
+import { spawn as spawn2 } from "child_process";
+function cleanOutput(value) {
+  return value.replace(ANSI_PATTERN, "").replace(/\r/g, "");
+}
+function runOpenCode(executable, args, cwd, timeoutMs) {
+  return new Promise((resolve4, reject) => {
+    const child = spawn2(executable, args, {
+      cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    let failure = null;
+    let finished = false;
+    const append = (current, chunk) => {
+      const next = current + chunk.toString();
+      if (Buffer.byteLength(next) > MAX_OUTPUT_BYTES && failure === null) {
+        failure = new Error(`OpenCode \u8F93\u51FA\u8D85\u8FC7 ${MAX_OUTPUT_BYTES} bytes`);
+        child.kill("SIGTERM");
+      }
+      return next.slice(-MAX_OUTPUT_BYTES);
+    };
+    child.stdout?.on("data", (chunk) => {
+      stdout = append(stdout, chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr = append(stderr, chunk);
+    });
+    child.once("error", (error) => {
+      failure ??= error;
+    });
+    const timer = setTimeout(() => {
+      failure ??= new Error(`OpenCode \u547D\u4EE4\u8D85\u8FC7 ${timeoutMs}ms \u672A\u5B8C\u6210`);
+      child.kill("SIGTERM");
+    }, timeoutMs);
+    child.once("close", (code) => {
+      if (finished) return;
+      finished = true;
+      clearTimeout(timer);
+      if (failure) {
+        reject(failure);
+        return;
+      }
+      if (code !== 0) {
+        const detail = cleanOutput(stderr).trim() || `\u9000\u51FA\u7801 ${code ?? "null"}`;
+        reject(new Error(`OpenCode ${args.join(" ")} \u5931\u8D25\uFF1A${detail}`));
+        return;
+      }
+      resolve4(cleanOutput(stdout));
+    });
+  });
+}
+function parseOpenCodeModels(output) {
+  return [...new Set(cleanOutput(output).split("\n").map((line) => line.trim()).filter((line) => /^[^\s/]+\/.+/.test(line)))].sort((left, right) => left.localeCompare(right));
+}
+function parseOpenCodeAgents(output) {
+  const agents = /* @__PURE__ */ new Map();
+  for (const line of cleanOutput(output).split("\n")) {
+    const match2 = /^([^\s()]+) \((primary|subagent|all)\)$/.exec(line.trim());
+    if (!match2) continue;
+    const name = match2[1];
+    const mode = match2[2];
+    if (name === "supertask-runner") continue;
+    agents.set(name, { name, mode });
+  }
+  const rank = { primary: 0, all: 1, subagent: 2 };
+  return [...agents.values()].sort((left, right) => rank[left.mode] - rank[right.mode] || left.name.localeCompare(right.name));
+}
+async function loadOpenCodeCatalog(cwd, options = {}) {
+  validateTaskWorkingDirectory(cwd);
+  const executable = options.executable ?? process.env.SUPERTASK_OPENCODE_BIN ?? "opencode";
+  const timeoutMs = options.timeoutMs ?? COMMAND_TIMEOUT_MS;
+  const cacheKey = `${executable}\0${cwd}`;
+  const cached = catalogCache.get(cacheKey);
+  if (options.useCache !== false && cached && cached.expiresAt > Date.now()) {
+    return cached.result;
+  }
+  const result = Promise.all([
+    runOpenCode(executable, ["models"], cwd, timeoutMs),
+    runOpenCode(executable, ["agent", "list"], cwd, timeoutMs)
+  ]).then(([modelsOutput, agentsOutput]) => {
+    const models = parseOpenCodeModels(modelsOutput);
+    const agents = parseOpenCodeAgents(agentsOutput).filter((agent) => agent.mode !== "subagent");
+    if (models.length === 0) throw new Error("OpenCode \u6CA1\u6709\u8FD4\u56DE\u53EF\u7528\u6A21\u578B");
+    if (agents.length === 0) throw new Error("OpenCode \u6CA1\u6709\u8FD4\u56DE\u53EF\u76F4\u63A5\u8FD0\u884C\u7684\u4E3B Agent");
+    return { cwd, models, agents };
+  });
+  if (options.useCache !== false) {
+    catalogCache.set(cacheKey, { expiresAt: Date.now() + CATALOG_CACHE_MS, result });
+    result.catch(() => {
+      if (catalogCache.get(cacheKey)?.result === result) catalogCache.delete(cacheKey);
+    });
+  }
+  return result;
+}
+var CATALOG_CACHE_MS, COMMAND_TIMEOUT_MS, MAX_OUTPUT_BYTES, ANSI_PATTERN, catalogCache;
+var init_opencode_catalog = __esm({
+  "src/core/opencode-catalog.ts"() {
+    "use strict";
+    init_task_working_directory();
+    CATALOG_CACHE_MS = 3e4;
+    COMMAND_TIMEOUT_MS = 2e4;
+    MAX_OUTPUT_BYTES = 4 * 1024 * 1024;
+    ANSI_PATTERN = /\x1B(?:[@-_][0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1B\\))/g;
+    catalogCache = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/core/services/database-maintenance.service.ts
 import { Database as Database3 } from "bun:sqlite";
 import { randomUUID as randomUUID2 } from "crypto";
@@ -20566,7 +20676,8 @@ function icon(name, className = "icon") {
     check: '<path d="m5 12 4 4L19 6"/>',
     alert: '<path d="M12 3 2.8 19h18.4L12 3Z"/><path d="M12 9v4M12 17h.01"/>',
     clock: '<circle cx="12" cy="12" r="9"/><path d="M12 7v5l3 2"/>',
-    database: '<ellipse cx="12" cy="5" rx="8" ry="3"/><path d="M4 5v6c0 1.66 3.58 3 8 3s8-1.34 8-3V5M4 11v6c0 1.66 3.58 3 8 3s8-1.34 8-3v-6"/>'
+    database: '<ellipse cx="12" cy="5" rx="8" ry="3"/><path d="M4 5v6c0 1.66 3.58 3 8 3s8-1.34 8-3V5M4 11v6c0 1.66 3.58 3 8 3s8-1.34 8-3v-6"/>',
+    folder: '<path d="M3 7.5A2.5 2.5 0 0 1 5.5 5H10l2 2h6.5A2.5 2.5 0 0 1 21 9.5v7A2.5 2.5 0 0 1 18.5 19h-13A2.5 2.5 0 0 1 3 16.5v-9Z"/>'
   };
   return `<svg class="${className}" viewBox="0 0 24 24" aria-hidden="true" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round">${paths[name]}</svg>`;
 }
@@ -20621,7 +20732,20 @@ function clientMessages(locale) {
     "feedback.restartTimeout",
     "template.createTitle",
     "template.editTitle",
-    "filter.noResults"
+    "filter.noResults",
+    "catalog.chooseProject",
+    "catalog.defaultModel",
+    "catalog.defaultProvider",
+    "catalog.loading",
+    "catalog.loaded",
+    "catalog.failed",
+    "catalog.primary",
+    "catalog.subagent",
+    "catalog.all",
+    "directory.empty",
+    "feedback.commandCopied",
+    "action.showHidden",
+    "action.hideHidden"
   ];
   return Object.fromEntries(keys.map((key) => [key, t(locale, key)]));
 }
@@ -20689,6 +20813,11 @@ function renderLayout(options) {
     <footer>${t(locale, "app.footer")}</footer>
   </div>
   <div id="toast-region" class="toast-region" role="status" aria-live="polite"></div>
+  <dialog id="directory-dialog" class="directory-dialog">
+    <div class="dialog-head"><div><h2>${t(locale, "directory.title")}</h2><p>${t(locale, "directory.subtitle")}</p></div><button type="button" class="icon-button" onclick="document.getElementById('directory-dialog').close()" aria-label="${t(locale, "action.close")}">${icon("close")}</button></div>
+    <div class="dialog-body"><div class="directory-toolbar"><button id="directory-home" type="button" class="btn">${t(locale, "action.home")}</button><button id="directory-up" type="button" class="btn">${t(locale, "action.up")}</button><button id="directory-hidden" type="button" class="btn">${t(locale, "action.showHidden")}</button><div id="directory-path" class="directory-path"></div></div><div id="directory-list" class="directory-list"></div></div>
+    <div class="dialog-actions"><button type="button" class="btn" onclick="document.getElementById('directory-dialog').close()">${t(locale, "action.cancel")}</button><button id="directory-choose" type="button" class="btn btn-primary">${icon("folder")}${t(locale, "action.chooseThisFolder")}</button></div>
+  </dialog>
   <dialog id="detail-dialog">
     <div class="dialog-head"><div><h2>${t(locale, "details.title")}</h2><p>${t(locale, "details.subtitle")}</p></div><button class="icon-button" onclick="document.getElementById('detail-dialog').close()" aria-label="${t(locale, "action.close")}">${icon("close")}</button></div>
     <div class="dialog-body"><pre id="detail-content" class="json-view"></pre></div>
@@ -20727,21 +20856,38 @@ function renderLayout(options) {
     const showDetail=id=>showRecord('/api/tasks/'+id);const showRunDetail=id=>showRecord('/api/runs/'+id);const showTemplateDetail=id=>showRecord('/api/templates/'+id);
     async function copyDetails(){try{await navigator.clipboard.writeText(document.getElementById('detail-content').textContent);showToast(text('details.copySuccess'))}catch{showToast(text('feedback.copyFailed'),'error')}}
     async function copySessionCommand(id){try{const data=await readJson(await fetch('/api/runs/'+id+'/session-command'));await navigator.clipboard.writeText(data.command);showToast(text('feedback.sessionCommandCopied'))}catch(error){showToast(error.message||text('feedback.copyFailed'),'error')}}
+    async function copyRunCommand(id){try{await navigator.clipboard.writeText(document.getElementById('command-'+id).textContent);showToast(text('feedback.commandCopied'))}catch{showToast(text('feedback.copyFailed'),'error')}}
     function taskField(name){return document.getElementById('task-'+name)}
+    function templateField(name){return document.getElementById('template-'+name)}
     function taskProjects(){const node=document.getElementById('task-project-data');if(!node)return {};try{return JSON.parse(node.textContent||'{}')}catch{return {}}}
     function updateTaskProjectStatus(){const node=taskField('project-status');if(!node)return;const cwd=taskField('cwd').value.trim();if(!cwd){node.textContent='';return}const project=taskProjects()[cwd];node.textContent=project?text('task.projectExisting',project):text('task.projectNew')}
-    function openTaskCreator(){const form=document.getElementById('task-form');form.reset();taskField('id').value='';taskField('cwd').readOnly=false;taskField('cwd').value=form.dataset.defaultCwd||'';taskField('dialog-title').textContent=text('task.createTitle');taskField('save').textContent=text('action.saveTask');updateTaskProjectStatus();document.getElementById('task-dialog').showModal();setTimeout(()=>taskField('name').focus(),50)}
-    async function openTaskEditor(id){try{const data=await readJson(await fetch('/api/tasks/'+id));taskField('id').value=String(id);taskField('name').value=data.name||'';taskField('cwd').value=data.cwd||'';taskField('cwd').readOnly=true;taskField('agent').value=data.agent||'';taskField('model').value=data.model||'default';taskField('prompt').value=data.prompt||'';taskField('category').value=data.category||'general';taskField('batch').value=data.batchId||'';taskField('importance').value=String(data.importance??3);taskField('urgency').value=String(data.urgency??3);taskField('max-retries').value=String(data.maxRetries??3);taskField('retry-backoff').value=durationInput(data.retryBackoffMs??30000);taskField('timeout').value=durationInput(data.timeoutMs);taskField('dialog-title').textContent=text('task.editTitle');taskField('save').textContent=text('action.updateTask');updateTaskProjectStatus();document.getElementById('task-dialog').showModal();setTimeout(()=>taskField('name').focus(),50)}catch(error){showToast(error.message,'error')}}
-    async function saveTask(event){event.preventDefault();const form=document.getElementById('task-form');if(!form.reportValidity())return;const id=taskField('id').value;const body={name:taskField('name').value,cwd:taskField('cwd').value,agent:taskField('agent').value,model:taskField('model').value,prompt:taskField('prompt').value,category:taskField('category').value,batchId:taskField('batch').value,importance:Number(taskField('importance').value),urgency:Number(taskField('urgency').value),maxRetries:Number(taskField('max-retries').value),retryBackoff:taskField('retry-backoff').value,timeout:taskField('timeout').value};const button=taskField('save');button.disabled=true;try{const data=await readJson(await fetch(id?'/api/tasks/'+id:'/api/tasks',{method:id?'PUT':'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}));showToast(text(id?'feedback.taskUpdated':'feedback.taskCreated',{id:data.task.id}));document.getElementById('task-dialog').close();setTimeout(()=>location.assign(id?location.href:'/?cwd='+encodeURIComponent(data.task.cwd||'')),450)}catch(error){showToast(error.message,'error')}finally{button.disabled=false}}
-    function templateField(name){return document.getElementById('template-'+name)}
-    function durationInput(milliseconds){if(milliseconds==null)return '';if(milliseconds===0)return '0';const units=[['d',86400000],['h',3600000],['min',60000],['s',1000],['ms',1]];for(const [unit,factor] of units){if(milliseconds%factor===0)return String(milliseconds/factor)+unit}return String(milliseconds)+'ms'}
+    const catalogTimers={};const catalogRequests={};const catalogModels={};
+    function catalogField(prefix,name){return document.getElementById(prefix+'-'+name)}
+    function resetCatalog(prefix){const agent=catalogField(prefix,'agent');const provider=catalogField(prefix,'model-provider');const model=catalogField(prefix,'model');if(!agent||!provider||!model)return;catalogModels[prefix]=[];agent.replaceChildren(new Option(text('catalog.chooseProject'),''));provider.replaceChildren(new Option(text('catalog.defaultProvider'),''));model.replaceChildren(new Option(text('catalog.defaultModel'),'default'));agent.disabled=false;provider.disabled=true;model.disabled=true;catalogField(prefix,'catalog-status').textContent='';}
+    function appendCurrentOption(select,value){if(!value||[...select.options].some(option=>option.value===value))return;select.appendChild(new Option(value,value));}
+    function modelProvider(value){const slash=value.indexOf('/');return slash>0?value.slice(0,slash):''}
+    function populateModelOptions(prefix,preferredModel=''){const provider=catalogField(prefix,'model-provider');const model=catalogField(prefix,'model');if(!provider||!model)return;const selectedProvider=provider.value;model.replaceChildren();if(!selectedProvider){model.appendChild(new Option(text('catalog.defaultModel'),'default'));model.disabled=true;return}const available=(catalogModels[prefix]||[]).filter(value=>modelProvider(value)===selectedProvider);for(const value of available)model.appendChild(new Option(value,value));if(preferredModel&&available.includes(preferredModel))model.value=preferredModel;model.disabled=available.length===0}
+    async function loadCatalog(prefix,preferredAgent='',preferredModel='default',preserveUnavailable=false){const cwd=catalogField(prefix,'cwd')?.value.trim()||'';const status=catalogField(prefix,'catalog-status');const agent=catalogField(prefix,'agent');const provider=catalogField(prefix,'model-provider');const model=catalogField(prefix,'model');if(!cwd||!status||!agent||!provider||!model){if(!cwd)resetCatalog(prefix);return}const request=(catalogRequests[prefix]||0)+1;catalogRequests[prefix]=request;status.dataset.state='loading';status.textContent=text('catalog.loading');agent.disabled=true;provider.disabled=true;model.disabled=true;try{const data=await readJson(await fetch('/api/opencode/catalog?cwd='+encodeURIComponent(cwd)));if(catalogRequests[prefix]!==request||catalogField(prefix,'cwd').value.trim()!==cwd)return;agent.replaceChildren();for(const item of data.agents){const label=item.name+' \u2014 '+text('catalog.'+item.mode);agent.appendChild(new Option(label,item.name))}if(preserveUnavailable)appendCurrentOption(agent,preferredAgent);const defaultAgent=preferredAgent||data.agents.find(item=>item.name==='build')?.name||data.agents.find(item=>item.mode==='primary')?.name||data.agents[0]?.name||'';agent.value=[...agent.options].some(option=>option.value===defaultAgent)?defaultAgent:(agent.options[0]?.value||'');catalogModels[prefix]=[...data.models];if(preserveUnavailable&&preferredModel&&preferredModel!=='default'&&!catalogModels[prefix].includes(preferredModel))catalogModels[prefix].push(preferredModel);provider.replaceChildren(new Option(text('catalog.defaultProvider'),''));for(const name of [...new Set(catalogModels[prefix].map(modelProvider).filter(Boolean))].sort())provider.appendChild(new Option(name,name));const preferredProvider=preferredModel==='default'?'':modelProvider(preferredModel);provider.value=[...provider.options].some(option=>option.value===preferredProvider)?preferredProvider:'';populateModelOptions(prefix,preferredModel);status.dataset.state='ready';status.textContent=text('catalog.loaded',{agents:data.agents.length,models:data.models.length})}catch(error){if(catalogRequests[prefix]!==request)return;resetCatalog(prefix);if(preserveUnavailable){appendCurrentOption(agent,preferredAgent);if(preferredModel&&preferredModel!=='default'){catalogModels[prefix]=[preferredModel];appendCurrentOption(provider,modelProvider(preferredModel));provider.value=modelProvider(preferredModel);populateModelOptions(prefix,preferredModel)}}status.dataset.state='error';status.textContent=text('catalog.failed',{error:error.message})}finally{if(catalogRequests[prefix]===request){agent.disabled=false;provider.disabled=false;if(provider.value)model.disabled=false}}}
+    function scheduleCatalogLoad(prefix){clearTimeout(catalogTimers[prefix]);catalogTimers[prefix]=setTimeout(()=>loadCatalog(prefix),450)}
+    let directoryTargetId='';let directoryCurrent='';let directoryEntries=[];let directoryShowHidden=false;
+    function renderDirectoryEntries(){const list=document.getElementById('directory-list');list.replaceChildren();const entries=directoryEntries.filter(entry=>directoryShowHidden||!entry.hidden);const hidden=document.getElementById('directory-hidden');hidden.textContent=text(directoryShowHidden?'action.hideHidden':'action.showHidden');if(entries.length===0){const empty=document.createElement('div');empty.className='directory-empty';empty.textContent=text('directory.empty');list.appendChild(empty);return}for(const entry of entries){const button=document.createElement('button');button.type='button';button.className='directory-item';button.innerHTML='${icon("folder")}<span></span>';button.querySelector('span').textContent=entry.name;button.onclick=()=>browseDirectory(entry.path);list.appendChild(button)}}
+    async function browseDirectory(path=''){const choose=document.getElementById('directory-choose');choose.disabled=true;try{const suffix=path?'?path='+encodeURIComponent(path):'';const data=await readJson(await fetch('/api/filesystem/directories'+suffix));directoryCurrent=data.path;directoryEntries=data.directories;document.getElementById('directory-path').textContent=data.path;document.getElementById('directory-up').disabled=data.parent===data.path;document.getElementById('directory-up').onclick=()=>browseDirectory(data.parent);document.getElementById('directory-home').onclick=()=>browseDirectory(data.home);renderDirectoryEntries();choose.disabled=false;return true}catch(error){directoryCurrent='';directoryEntries=[];document.getElementById('directory-path').textContent='';renderDirectoryEntries();showToast(error.message,'error');return false}}
+    document.getElementById('directory-hidden').onclick=()=>{directoryShowHidden=!directoryShowHidden;renderDirectoryEntries()};
+    async function openDirectoryPicker(targetId){const input=document.getElementById(targetId);if(!input||input.readOnly)return;directoryTargetId=targetId;directoryShowHidden=false;document.getElementById('directory-dialog').showModal();if(!await browseDirectory(input.value.trim()||''))await browseDirectory('')}
+    document.getElementById('directory-choose').onclick=()=>{const input=document.getElementById(directoryTargetId);if(!input||!directoryCurrent)return;input.value=directoryCurrent;input.dispatchEvent(new Event('input',{bubbles:true}));document.getElementById('directory-dialog').close();const prefix=directoryTargetId.startsWith('task-')?'task':'template';loadCatalog(prefix)};
+    function updateDurationControl(id){const preset=document.getElementById(id+'-preset');const custom=document.getElementById(id+'-custom');const input=document.getElementById(id+'-value');const visible=preset.value==='custom';custom.hidden=!visible;input.required=visible;if(visible&&!input.value)input.value='1'}
+    function readDuration(id){const preset=document.getElementById(id+'-preset').value;if(preset==='')return '';if(preset!=='custom')return preset==='0'?'0':preset+'ms';const value=document.getElementById(id+'-value').value.trim();return value===''?'':value+document.getElementById(id+'-unit').value}
+    function setDuration(id,milliseconds){const preset=document.getElementById(id+'-preset');const exact=milliseconds==null?'':String(milliseconds);if([...preset.options].some(option=>option.value===exact)){preset.value=exact;updateDurationControl(id);return}preset.value='custom';const input=document.getElementById(id+'-value');const unit=document.getElementById(id+'-unit');const units=[['d',86400000],['h',3600000],['min',60000],['s',1000]];let matched=false;for(const [name,factor] of units){if(milliseconds!=null&&(milliseconds===0||milliseconds%factor===0)){input.value=String(milliseconds/factor);unit.value=name;matched=true;break}}if(!matched){input.value=String((milliseconds??60000)/1000);unit.value='s'}updateDurationControl(id)}
+    function openTaskCreator(){const form=document.getElementById('task-form');form.reset();taskField('id').value='';taskField('cwd').readOnly=false;taskField('cwd-picker').hidden=false;taskField('cwd').value=form.dataset.defaultCwd||'';setDuration('task-retry-backoff',30000);setDuration('task-timeout',null);taskField('dialog-title').textContent=text('task.createTitle');taskField('save').textContent=text('action.saveTask');updateTaskProjectStatus();resetCatalog('task');document.getElementById('task-dialog').showModal();if(taskField('cwd').value)loadCatalog('task');setTimeout(()=>taskField('name').focus(),50)}
+    async function openTaskEditor(id){try{const data=await readJson(await fetch('/api/tasks/'+id));taskField('id').value=String(id);taskField('cwd').value=data.cwd||'';taskField('cwd').readOnly=true;taskField('cwd-picker').hidden=true;taskField('name').value=data.name||'';taskField('prompt').value=data.prompt||'';taskField('category').value=data.category||'general';taskField('batch').value=data.batchId||'';taskField('importance').value=String(data.importance??3);taskField('urgency').value=String(data.urgency??3);taskField('max-retries').value=String(data.maxRetries??3);setDuration('task-retry-backoff',data.retryBackoffMs??30000);setDuration('task-timeout',data.timeoutMs);taskField('dialog-title').textContent=text('task.editTitle');taskField('save').textContent=text('action.updateTask');updateTaskProjectStatus();resetCatalog('task');document.getElementById('task-dialog').showModal();loadCatalog('task',data.agent||'',data.model||'default',true);setTimeout(()=>taskField('name').focus(),50)}catch(error){showToast(error.message,'error')}}
+    async function saveTask(event){event.preventDefault();const form=document.getElementById('task-form');if(!form.reportValidity())return;const id=taskField('id').value;const body={name:taskField('name').value,cwd:taskField('cwd').value,agent:taskField('agent').value,model:taskField('model').value,prompt:taskField('prompt').value,category:taskField('category').value,batchId:taskField('batch').value,importance:Number(taskField('importance').value),urgency:Number(taskField('urgency').value),maxRetries:Number(taskField('max-retries').value),retryBackoff:readDuration('task-retry-backoff'),timeout:readDuration('task-timeout')};const button=taskField('save');button.disabled=true;try{const data=await readJson(await fetch(id?'/api/tasks/'+id:'/api/tasks',{method:id?'PUT':'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}));showToast(text(id?'feedback.taskUpdated':'feedback.taskCreated',{id:data.task.id}));document.getElementById('task-dialog').close();setTimeout(()=>location.assign(id?location.href:'/?cwd='+encodeURIComponent(data.task.cwd||'')),450)}catch(error){showToast(error.message,'error')}finally{button.disabled=false}}
     function localDateTime(milliseconds){const date=new Date(milliseconds);const local=new Date(milliseconds-date.getTimezoneOffset()*60000);return local.toISOString().slice(0,23)}
-    function updateTemplateScheduleFields(){const type=templateField('schedule-type').value;const fields={cron:templateField('cron-field'),recurring:templateField('interval-field'),delayed:templateField('run-at-field')};for(const [name,node] of Object.entries(fields)){node.hidden=name!==type;node.querySelector('input').required=name===type}}
+    function updateTemplateScheduleFields(){const type=templateField('schedule-type').value;const fields={cron:templateField('cron-field'),recurring:templateField('interval-field'),delayed:templateField('run-at-field')};for(const [name,node] of Object.entries(fields)){node.hidden=name!==type;for(const control of node.querySelectorAll('input,select'))control.required=false;const required=name==='recurring'?node.querySelector('[id$="-preset"]'):node.querySelector('input');if(required)required.required=name===type;if(name==='recurring'&&name===type)updateDurationControl('template-interval')}}
     function setOriginalRunAt(epoch){const input=templateField('run-at');const local=epoch?localDateTime(epoch):'';input.value=local;input.dataset.originalEpoch=epoch?String(epoch):'';input.dataset.originalLocal=local}
     function selectedRunAt(){const input=templateField('run-at');return resolveEditedRunAt(input.dataset.originalEpoch?Number(input.dataset.originalEpoch):null,input.dataset.originalLocal||'',input.value)}
-    function openTemplateCreator(){const form=document.getElementById('template-form');form.reset();templateField('id').value='';templateField('dialog-title').textContent=text('template.createTitle');setOriginalRunAt(null);templateField('run-at').value=localDateTime(Date.now()+3600000);updateTemplateScheduleFields();document.getElementById('template-dialog').showModal();setTimeout(()=>templateField('name').focus(),50)}
-    async function openTemplateEditor(id){try{const data=await readJson(await fetch('/api/templates/'+id));templateField('id').value=String(id);templateField('dialog-title').textContent=text('template.editTitle');templateField('name').value=data.name||'';templateField('cwd').value=data.cwd||'';templateField('agent').value=data.agent||'';templateField('model').value=data.model||'default';templateField('prompt').value=data.prompt||'';templateField('schedule-type').value=data.scheduleType;templateField('cron').value=data.cronExpr||'';templateField('interval').value=durationInput(data.intervalMs);setOriginalRunAt(data.runAt||null);if(!data.runAt)templateField('run-at').value=localDateTime(Date.now()+3600000);templateField('category').value=data.category||'general';templateField('batch').value=data.batchId||'';templateField('importance').value=String(data.importance??3);templateField('urgency').value=String(data.urgency??3);templateField('max-instances').value=String(data.maxInstances??1);templateField('max-retries').value=String(data.maxRetries??3);templateField('retry-backoff').value=durationInput(data.retryBackoffMs??30000);templateField('timeout').value=durationInput(data.timeoutMs);updateTemplateScheduleFields();document.getElementById('template-dialog').showModal();setTimeout(()=>templateField('name').focus(),50)}catch(error){showToast(error.message,'error')}}
-    async function saveTemplate(event){event.preventDefault();const form=document.getElementById('template-form');if(!form.reportValidity())return;const id=templateField('id').value;const type=templateField('schedule-type').value;const body={name:templateField('name').value,cwd:templateField('cwd').value,agent:templateField('agent').value,model:templateField('model').value,prompt:templateField('prompt').value,scheduleType:type,cronExpr:templateField('cron').value,interval:templateField('interval').value,runAt:type==='delayed'?selectedRunAt():null,category:templateField('category').value,batchId:templateField('batch').value,importance:Number(templateField('importance').value),urgency:Number(templateField('urgency').value),maxInstances:Number(templateField('max-instances').value),maxRetries:Number(templateField('max-retries').value),retryBackoff:templateField('retry-backoff').value,timeout:templateField('timeout').value};const button=templateField('save');button.disabled=true;try{await readJson(await fetch(id?'/api/templates/'+id:'/api/templates',{method:id?'PUT':'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}));showToast(text(id?'feedback.templateUpdated':'feedback.templateCreated'));document.getElementById('template-dialog').close();setTimeout(()=>location.assign(id?location.href:'/templates'),450)}catch(error){showToast(error.message,'error')}finally{button.disabled=false}}
+    function openTemplateCreator(){const form=document.getElementById('template-form');form.reset();templateField('id').value='';templateField('dialog-title').textContent=text('template.createTitle');setDuration('template-interval',3600000);setDuration('template-retry-backoff',30000);setDuration('template-timeout',null);setOriginalRunAt(null);templateField('run-at').value=localDateTime(Date.now()+3600000);updateTemplateScheduleFields();resetCatalog('template');document.getElementById('template-dialog').showModal();if(templateField('cwd').value)loadCatalog('template');setTimeout(()=>templateField('name').focus(),50)}
+    async function openTemplateEditor(id){try{const data=await readJson(await fetch('/api/templates/'+id));templateField('id').value=String(id);templateField('dialog-title').textContent=text('template.editTitle');templateField('name').value=data.name||'';templateField('cwd').value=data.cwd||'';templateField('prompt').value=data.prompt||'';templateField('schedule-type').value=data.scheduleType;templateField('cron').value=data.cronExpr||'';setDuration('template-interval',data.intervalMs);setOriginalRunAt(data.runAt||null);if(!data.runAt)templateField('run-at').value=localDateTime(Date.now()+3600000);templateField('category').value=data.category||'general';templateField('batch').value=data.batchId||'';templateField('importance').value=String(data.importance??3);templateField('urgency').value=String(data.urgency??3);templateField('max-instances').value=String(data.maxInstances??1);templateField('max-retries').value=String(data.maxRetries??3);setDuration('template-retry-backoff',data.retryBackoffMs??30000);setDuration('template-timeout',data.timeoutMs);updateTemplateScheduleFields();resetCatalog('template');document.getElementById('template-dialog').showModal();loadCatalog('template',data.agent||'',data.model||'default',true);setTimeout(()=>templateField('name').focus(),50)}catch(error){showToast(error.message,'error')}}
+    async function saveTemplate(event){event.preventDefault();const form=document.getElementById('template-form');if(!form.reportValidity())return;const id=templateField('id').value;const type=templateField('schedule-type').value;const body={name:templateField('name').value,cwd:templateField('cwd').value,agent:templateField('agent').value,model:templateField('model').value,prompt:templateField('prompt').value,scheduleType:type,cronExpr:templateField('cron').value,interval:readDuration('template-interval'),runAt:type==='delayed'?selectedRunAt():null,category:templateField('category').value,batchId:templateField('batch').value,importance:Number(templateField('importance').value),urgency:Number(templateField('urgency').value),maxInstances:Number(templateField('max-instances').value),maxRetries:Number(templateField('max-retries').value),retryBackoff:readDuration('template-retry-backoff'),timeout:readDuration('template-timeout')};const button=templateField('save');button.disabled=true;try{await readJson(await fetch(id?'/api/templates/'+id:'/api/templates',{method:id?'PUT':'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}));showToast(text(id?'feedback.templateUpdated':'feedback.templateCreated'));document.getElementById('template-dialog').close();setTimeout(()=>location.assign(id?location.href:'/templates'),450)}catch(error){showToast(error.message,'error')}finally{button.disabled=false}}
     async function enableTmpl(id){try{await readJson(await fetch('/api/templates/'+id+'/enable',{method:'POST'}));location.reload()}catch(error){showToast(error.message,'error')}}
     async function disableTmpl(id){if(!await ask(text('dialog.disableTemplate'),text('dialog.disableTemplateBody')))return;try{await readJson(await fetch('/api/templates/'+id+'/disable',{method:'POST'}));location.reload()}catch(error){showToast(error.message,'error')}}
     async function deleteTmpl(id){if(!await ask(text('dialog.deleteTemplate'),text('dialog.deleteTemplateBody'),true))return;try{await readJson(await fetch('/api/templates/'+id,{method:'DELETE'}));location.reload()}catch(error){showToast(error.message,'error')}}
@@ -20801,6 +20947,13 @@ var init_ui = __esm({
       "action.updateTask": "\u4FDD\u5B58\u4FEE\u6539",
       "action.createTemplate": "\u65B0\u5EFA\u5B9A\u65F6\u4EFB\u52A1",
       "action.saveTemplate": "\u4FDD\u5B58\u5B9A\u65F6\u4EFB\u52A1",
+      "action.chooseFolder": "\u9009\u62E9\u6587\u4EF6\u5939",
+      "action.chooseThisFolder": "\u9009\u62E9\u5F53\u524D\u6587\u4EF6\u5939",
+      "action.home": "\u4E3B\u76EE\u5F55",
+      "action.up": "\u4E0A\u4E00\u7EA7",
+      "action.copyCommand": "\u590D\u5236\u547D\u4EE4",
+      "action.showHidden": "\u663E\u793A\u9690\u85CF\u6587\u4EF6\u5939",
+      "action.hideHidden": "\u9690\u85CF\u9690\u85CF\u6587\u4EF6\u5939",
       "status.pending": "\u5F85\u6267\u884C",
       "status.running": "\u8FD0\u884C\u4E2D",
       "status.done": "\u5DF2\u5B8C\u6210",
@@ -20867,6 +21020,15 @@ var init_ui = __esm({
       "schedule.hours": "{count} \u5C0F\u65F6",
       "schedule.days": "{count} \u5929",
       "schedule.overdue": "\u5DF2\u5230\u671F",
+      "duration.unit": "\u65F6\u95F4\u5355\u4F4D",
+      "duration.seconds": "\u79D2",
+      "duration.minutes": "\u5206\u949F",
+      "duration.hours": "\u5C0F\u65F6",
+      "duration.days": "\u5929",
+      "duration.systemDefault": "\u4F7F\u7528 Gateway \u9ED8\u8BA4\u8D85\u65F6",
+      "duration.immediate": "\u7ACB\u5373\u91CD\u8BD5",
+      "duration.custom": "\u81EA\u5B9A\u4E49\u2026",
+      "duration.every": "\u6BCF {duration}",
       "system.worker": "\u4EFB\u52A1\u6267\u884C",
       "system.scheduler": "\u5B9A\u65F6\u4EFB\u52A1\u670D\u52A1",
       "system.watchdog": "\u8FD0\u884C\u76D1\u63A7",
@@ -20914,6 +21076,9 @@ var init_ui = __esm({
       "template.interval": "\u6267\u884C\u95F4\u9694",
       "template.runAt": "\u6267\u884C\u65F6\u95F4",
       "template.durationHint": "\u652F\u6301 30s\u30015min\u30011h\u30012d",
+      "template.intervalHint": "\u76F4\u63A5\u9009\u62E9\u5E38\u7528\u9891\u7387\uFF1B\u53EA\u6709\u7279\u6B8A\u9700\u6C42\u624D\u9700\u8981\u81EA\u5B9A\u4E49\u3002",
+      "template.retryBackoffHint": "\u4E00\u6B21\u5931\u8D25\u540E\uFF0C\u7B49\u5F85\u591A\u4E45\u518D\u91CD\u8BD5\u3002",
+      "template.timeoutHint": "\u7559\u7A7A\u8868\u793A\u4F7F\u7528 Gateway \u7684\u9ED8\u8BA4\u4EFB\u52A1\u8D85\u65F6\u3002",
       "template.advanced": "\u66F4\u591A\u6267\u884C\u8BBE\u7F6E",
       "template.category": "\u5206\u7C7B",
       "template.batchId": "\u6279\u6B21 ID",
@@ -20938,6 +21103,28 @@ var init_ui = __esm({
       "task.batchHint": "\u76F8\u540C\u975E\u7A7A\u6279\u6B21 ID \u7684\u4EFB\u52A1\u4E25\u683C\u4E32\u884C\uFF1B\u7559\u7A7A\u5219\u4E0D\u53D7\u6279\u6B21\u4E32\u884C\u9650\u5236\uFF0C\u4F46\u4ECD\u53D7\u5168\u5C40\u5E76\u53D1\u548C\u4F9D\u8D56\u7EA6\u675F\u3002",
       "task.projectExisting": "\u6B64\u9879\u76EE\u73B0\u6709 {total} \u4E2A\u4EFB\u52A1\uFF1A\u8FD0\u884C {running}\uFF0C\u6392\u961F {pending}\uFF0C\u5F02\u5E38 {failed}\u3002",
       "task.projectNew": "\u8FD9\u662F\u4E00\u4E2A\u65B0\u9879\u76EE\u5206\u7EC4\uFF1B\u521B\u5EFA\u540E\u4F1A\u51FA\u73B0\u5728\u9879\u76EE\u5217\u8868\u4E2D\u3002",
+      "catalog.chooseProject": "\u8BF7\u5148\u9009\u62E9\u9879\u76EE\u76EE\u5F55",
+      "catalog.defaultModel": "\u8DDF\u968F Agent / OpenCode \u9ED8\u8BA4\u6A21\u578B",
+      "catalog.defaultProvider": "\u9ED8\u8BA4\u6A21\u578B",
+      "catalog.provider": "\u6A21\u578B\u63D0\u4F9B\u5546",
+      "catalog.model": "\u5177\u4F53\u6A21\u578B",
+      "catalog.modelHint": "\u5148\u9009\u63D0\u4F9B\u5546\uFF0C\u518D\u9009\u672C\u9879\u76EE opencode models \u8FD4\u56DE\u7684\u6A21\u578B\uFF1B\u9ED8\u8BA4\u9009\u9879\u4E0D\u4F1A\u4F20\u5165 -m\u3002",
+      "catalog.agentHint": "\u6765\u81EA\u5F53\u524D\u9879\u76EE\u7684 opencode agent list\u3002",
+      "catalog.loading": "\u6B63\u5728\u8BFB\u53D6\u6B64\u9879\u76EE\u53EF\u7528\u7684 Agent \u548C\u6A21\u578B\u2026",
+      "catalog.loaded": "\u5DF2\u4ECE\u672C\u673A OpenCode \u8BFB\u53D6 {agents} \u4E2A Agent\u3001{models} \u4E2A\u6A21\u578B\u3002",
+      "catalog.failed": "\u65E0\u6CD5\u8BFB\u53D6\u6B64\u9879\u76EE\u7684 OpenCode \u914D\u7F6E\uFF1A{error}",
+      "catalog.primary": "\u4E3B Agent",
+      "catalog.subagent": "\u5B50 Agent",
+      "catalog.all": "\u901A\u7528 Agent",
+      "directory.title": "\u9009\u62E9\u9879\u76EE\u76EE\u5F55",
+      "directory.subtitle": "\u9009\u62E9\u540E\uFF0C\u7CFB\u7EDF\u4F1A\u5728\u8BE5\u76EE\u5F55\u8FD0\u884C OpenCode\uFF0C\u5E76\u8BFB\u53D6\u8BE5\u9879\u76EE\u53EF\u7528\u7684 Agent \u548C\u6A21\u578B\u3002",
+      "directory.empty": "\u8FD9\u4E2A\u6587\u4EF6\u5939\u4E2D\u6CA1\u6709\u5B50\u6587\u4EF6\u5939",
+      "logs.command": "\u5B9E\u9645\u6267\u884C\u547D\u4EE4",
+      "logs.output": "Agent \u8F93\u51FA",
+      "logs.error": "\u5931\u8D25\u539F\u56E0",
+      "logs.tools": "\u5DE5\u5177\u8C03\u7528",
+      "logs.raw": "\u67E5\u770B\u539F\u59CB\u6267\u884C\u65E5\u5FD7",
+      "logs.noText": "\u8FD9\u6B21\u6267\u884C\u6CA1\u6709\u4EA7\u751F\u53EF\u5C55\u793A\u7684\u6587\u672C\u8F93\u51FA\uFF0C\u8BF7\u67E5\u770B\u539F\u59CB\u65E5\u5FD7\u3002",
       "theme.label": "\u4E3B\u9898",
       "theme.system": "\u8DDF\u968F\u7CFB\u7EDF",
       "theme.light": "\u6D45\u8272",
@@ -20975,6 +21162,7 @@ var init_ui = __esm({
       "feedback.templateUpdated": "\u5B9A\u65F6\u4EFB\u52A1\u5DF2\u66F4\u65B0",
       "feedback.configSaved": "\u8BBE\u7F6E\u5DF2\u4FDD\u5B58",
       "feedback.sessionCommandCopied": "\u4F1A\u8BDD\u547D\u4EE4\u5DF2\u590D\u5236\uFF0C\u53EF\u76F4\u63A5\u7C98\u8D34\u5230\u7EC8\u7AEF\u8FD0\u884C",
+      "feedback.commandCopied": "\u6267\u884C\u547D\u4EE4\u5DF2\u590D\u5236",
       "feedback.restarting": "Gateway \u6B63\u5728\u91CD\u542F\uFF0C\u8BF7\u7A0D\u5019\u2026",
       "feedback.restartTimeout": "Gateway \u5C1A\u672A\u6062\u590D\uFF0C\u8BF7\u7A0D\u540E\u5237\u65B0\u6216\u68C0\u67E5 PM2 \u72B6\u6001",
       "feedback.databaseCleared": "\u6570\u636E\u5E93\u5DF2\u6E05\u7A7A\uFF0C\u5907\u4EFD\u4F4D\u4E8E\uFF1A{path}",
@@ -21023,6 +21211,13 @@ var init_ui = __esm({
       "action.updateTask": "Save changes",
       "action.createTemplate": "New scheduled task",
       "action.saveTemplate": "Save scheduled task",
+      "action.chooseFolder": "Choose folder",
+      "action.chooseThisFolder": "Choose this folder",
+      "action.home": "Home",
+      "action.up": "Up",
+      "action.copyCommand": "Copy command",
+      "action.showHidden": "Show hidden folders",
+      "action.hideHidden": "Hide hidden folders",
       "status.pending": "Pending",
       "status.running": "Running",
       "status.done": "Done",
@@ -21089,6 +21284,15 @@ var init_ui = __esm({
       "schedule.hours": "{count} hr",
       "schedule.days": "{count} days",
       "schedule.overdue": "Overdue",
+      "duration.unit": "Time unit",
+      "duration.seconds": "seconds",
+      "duration.minutes": "minutes",
+      "duration.hours": "hours",
+      "duration.days": "days",
+      "duration.systemDefault": "Use Gateway default timeout",
+      "duration.immediate": "Retry immediately",
+      "duration.custom": "Custom\u2026",
+      "duration.every": "Every {duration}",
       "system.worker": "Task execution",
       "system.scheduler": "Scheduled task service",
       "system.watchdog": "Runtime monitor",
@@ -21136,6 +21340,9 @@ var init_ui = __esm({
       "template.interval": "Interval",
       "template.runAt": "Run at",
       "template.durationHint": "Supports 30s, 5min, 1h, 2d",
+      "template.intervalHint": "Choose a common frequency directly; customize only when necessary.",
+      "template.retryBackoffHint": "How long to wait after a failure before retrying.",
+      "template.timeoutHint": "Leave blank to use the Gateway default task timeout.",
       "template.advanced": "More execution settings",
       "template.category": "Category",
       "template.batchId": "Batch ID",
@@ -21160,6 +21367,28 @@ var init_ui = __esm({
       "task.batchHint": "Tasks with the same non-empty batch ID run serially. Blank removes the batch constraint; global concurrency and dependencies still apply.",
       "task.projectExisting": "This project has {total} tasks: {running} running, {pending} queued, and {failed} with issues.",
       "task.projectNew": "This is a new project group. It appears in the project list after creation.",
+      "catalog.chooseProject": "Choose a project directory first",
+      "catalog.defaultModel": "Use the Agent / OpenCode default model",
+      "catalog.defaultProvider": "Default model",
+      "catalog.provider": "Model provider",
+      "catalog.model": "Model",
+      "catalog.modelHint": "Choose a provider, then a model returned by opencode models for this project. Default does not pass -m.",
+      "catalog.agentHint": "Loaded from opencode agent list for this project.",
+      "catalog.loading": "Loading Agents and models available to this project\u2026",
+      "catalog.loaded": "Loaded {agents} Agents and {models} models from local OpenCode.",
+      "catalog.failed": "Could not load this project\u2019s OpenCode configuration: {error}",
+      "catalog.primary": "primary Agent",
+      "catalog.subagent": "subagent",
+      "catalog.all": "general Agent",
+      "directory.title": "Choose project directory",
+      "directory.subtitle": "OpenCode runs in this directory, and its project-specific Agents and models are loaded.",
+      "directory.empty": "This folder has no subfolders",
+      "logs.command": "Executed command",
+      "logs.output": "Agent output",
+      "logs.error": "Failure reason",
+      "logs.tools": "Tool calls",
+      "logs.raw": "View raw execution log",
+      "logs.noText": "This run produced no displayable text. Inspect the raw log for details.",
       "theme.label": "Theme",
       "theme.system": "System",
       "theme.light": "Light",
@@ -21197,6 +21426,7 @@ var init_ui = __esm({
       "feedback.templateUpdated": "Scheduled task updated",
       "feedback.configSaved": "Settings saved",
       "feedback.sessionCommandCopied": "Session command copied. Paste it into a terminal to continue.",
+      "feedback.commandCopied": "Execution command copied",
       "feedback.restarting": "Gateway is restarting\u2026",
       "feedback.restartTimeout": "Gateway has not recovered yet. Refresh later or check PM2 status.",
       "feedback.databaseCleared": "Database cleared. Backup: {path}",
@@ -21407,6 +21637,18 @@ var init_ui = __esm({
   .danger-card h2 .icon { width:17px; height:17px; }
   .danger-card p { max-width:800px; margin:0 0 14px; color:var(--text-2); font-size:12px; }
   .log-panel { margin:12px 0; animation:reveal .18s ease both; }
+  .log-content { display:grid; gap:14px; padding:16px; }
+  .log-section-head { display:flex; align-items:center; justify-content:space-between; gap:12px; margin-bottom:7px; }
+  .run-command,.run-output,.run-error,.run-tools { min-width:0; }
+  .run-command strong,.run-output>strong,.run-error>strong,.run-tools>strong { display:block; margin-bottom:7px; font-size:12px; }
+  .command-cwd { margin-bottom:6px; color:var(--text-3); font-family:"SFMono-Regular",Consolas,monospace; font-size:10px; overflow-wrap:anywhere; }
+  .run-command pre,.run-output pre,.run-error pre { margin:0; padding:12px; overflow:auto; border:1px solid var(--border); border-radius:9px;
+    color:var(--text-2); background:var(--surface-2); font-family:"SFMono-Regular",Consolas,monospace; font-size:11px; white-space:pre-wrap; overflow-wrap:anywhere; }
+  .run-output pre { color:var(--text); font-family:inherit; font-size:13px; line-height:1.65; }
+  .run-error pre { color:var(--red); border-color:color-mix(in srgb,var(--red) 28%,var(--border)); background:var(--red-soft); }
+  .raw-log { padding-top:12px; border-top:1px solid var(--border); }
+  .raw-log summary { color:var(--text-2); cursor:pointer; font-size:12px; font-weight:650; }
+  .raw-log .log-box { margin-top:10px; border-radius:9px; }
   .log-box { max-height:360px; overflow:auto; padding:16px; color:var(--text-2); background:#0b1018; font-family:"SFMono-Regular",Consolas,monospace;
     font-size:12px; white-space:pre-wrap; overflow-wrap:anywhere; }
   :root[data-theme="light"] .log-box { color:#dbe5f3; }
@@ -21425,12 +21667,33 @@ var init_ui = __esm({
   .form-field-wide { grid-column:1 / -1; }
   .form-field input,.form-field select,.form-field textarea { width:100%; min-height:39px; padding:8px 10px; border:1px solid var(--border); border-radius:9px;
     outline:none; color:var(--text); background:var(--surface-2); font-weight:450; }
+  .field-action { display:flex; align-items:stretch; gap:7px; }
+  .field-action input { min-width:0; flex:1; }
+  .field-action .btn { flex:0 0 auto; white-space:nowrap; }
+  .model-selector { display:grid; grid-template-columns:minmax(120px,.75fr) minmax(0,1.25fr); gap:7px; }
+  .duration-picker { display:grid; gap:7px; }
+  .duration-control { display:grid; grid-template-columns:minmax(0,1fr) 112px; gap:7px; }
+  .duration-control input,.duration-control select { min-width:0; }
   .form-field textarea { resize:vertical; line-height:1.5; }
   .form-field input:focus,.form-field select:focus,.form-field textarea:focus { border-color:var(--primary); box-shadow:var(--focus); background:var(--surface); }
   .form-field small { color:var(--text-3); font-size:10px; font-weight:450; }
   .advanced-fields { margin-top:18px; padding-top:14px; border-top:1px solid var(--border); }
   .advanced-fields summary { margin-bottom:14px; color:var(--text-2); cursor:pointer; font-size:12px; font-weight:700; }
   .form-note { margin:16px 0 0; color:var(--text-3); font-size:11px; }
+  .catalog-status[data-state="loading"] { color:var(--blue); }
+  .catalog-status[data-state="ready"] { color:var(--green); }
+  .catalog-status[data-state="error"] { color:var(--red); }
+  .directory-dialog { width:min(720px,calc(100% - 32px)); }
+  .directory-toolbar { display:flex; align-items:center; gap:8px; margin-bottom:12px; }
+  .directory-path { min-width:0; flex:1; padding:9px 11px; overflow:hidden; border:1px solid var(--border); border-radius:9px;
+    color:var(--text-2); background:var(--surface-2); font-family:"SFMono-Regular",Consolas,monospace; font-size:11px; text-overflow:ellipsis; white-space:nowrap; }
+  .directory-list { min-height:260px; max-height:48vh; display:grid; align-content:start; gap:6px; overflow:auto; }
+  .directory-item { width:100%; min-height:40px; display:flex; align-items:center; gap:9px; padding:0 11px; border:1px solid transparent; border-radius:9px;
+    color:var(--text-2); background:transparent; cursor:pointer; text-align:left; transition:background-color .15s ease,border-color .15s ease,color .15s ease,transform .12s ease; }
+  .directory-item:hover { color:var(--text); border-color:var(--border); background:var(--surface-2); }
+  .directory-item:active { transform:scale(.99); }
+  .directory-item .icon { width:17px; height:17px; color:var(--primary); flex:0 0 auto; }
+  .directory-empty { min-height:220px; display:grid; place-items:center; color:var(--text-3); }
   .json-view { min-height:160px; margin:0; padding:15px; overflow:auto; border:1px solid var(--border); border-radius:10px; color:var(--text-2);
     background:var(--surface-2); font-size:12px; white-space:pre-wrap; overflow-wrap:anywhere; }
   .confirm-copy { color:var(--text-2); margin:0; }
@@ -21499,6 +21762,9 @@ var init_ui = __esm({
     .project-grid { grid-template-columns:1fr; }
     .template-form-grid { grid-template-columns:1fr; }
     .form-field-wide { grid-column:auto; }
+    .field-action { align-items:stretch; flex-direction:column; }
+    .field-action .btn { width:100%; }
+    .model-selector { grid-template-columns:1fr; }
   }
   @media (max-width:520px) {
     .stats-grid,.stats-grid.three { grid-template-columns:1fr 1fr; }
@@ -21528,11 +21794,21 @@ __export(web_exports, {
   dashboardApp: () => dashboardApp,
   default: () => web_default,
   isSafeDashboardRestartTarget: () => isSafeDashboardRestartTarget,
+  presentRunLog: () => presentRunLog,
   resolveDashboardConfigState: () => resolveDashboardConfigState,
   setDashboardRuntimeConfig: () => setDashboardRuntimeConfig
 });
-import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync4, renameSync as renameSync2, writeFileSync as writeFileSync3 } from "fs";
-import { basename as basename3, dirname as dirname7 } from "path";
+import {
+  existsSync as existsSync7,
+  mkdirSync as mkdirSync4,
+  readFileSync as readFileSync4,
+  readdirSync,
+  renameSync as renameSync2,
+  statSync as statSync4,
+  writeFileSync as writeFileSync3
+} from "fs";
+import { homedir as homedir4 } from "os";
+import { basename as basename3, dirname as dirname7, join as join6 } from "path";
 function setDashboardRuntimeConfig(config) {
   runtimeConfig = config === null ? null : structuredClone(config);
 }
@@ -21573,6 +21849,23 @@ function parsePositiveInteger(value) {
 function parseTaskStatus(value) {
   return TASK_STATUSES.has(value) ? value : null;
 }
+function listChildDirectories(path) {
+  return readdirSync(path, { withFileTypes: true }).flatMap((entry) => {
+    const entryPath = join6(path, entry.name);
+    if (entry.isDirectory()) return [{ name: entry.name, path: entryPath, hidden: entry.name.startsWith(".") }];
+    if (!entry.isSymbolicLink()) return [];
+    try {
+      return statSync4(entryPath).isDirectory() ? [{ name: entry.name, path: entryPath, hidden: entry.name.startsWith(".") }] : [];
+    } catch {
+      return [];
+    }
+  }).sort((left, right) => {
+    const leftHidden = left.name.startsWith(".");
+    const rightHidden = right.name.startsWith(".");
+    if (leftHidden !== rightHidden) return leftHidden ? 1 : -1;
+    return left.name.localeCompare(right.name);
+  });
+}
 function parseTaskPayload(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     throw new Error("\u8BF7\u6C42\u5185\u5BB9\u5FC5\u987B\u662F\u5BF9\u8C61");
@@ -21729,6 +22022,66 @@ function formatDuration(startAt, endAt) {
   if (seconds < 3600) return `${Math.floor(seconds / 60)}m ${seconds % 60}s`;
   return `${Math.floor(seconds / 3600)}h ${Math.floor(seconds % 3600 / 60)}m`;
 }
+function recordValue(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function shellQuote(value) {
+  if (/^[A-Za-z0-9_./:@%+=,-]+$/.test(value)) return value;
+  return `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+function presentRunLog(log) {
+  let command = null;
+  const textParts = [];
+  const errors = [];
+  const tools = [];
+  for (const line of log.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    let parsed = null;
+    try {
+      parsed = recordValue(JSON.parse(trimmed));
+    } catch {
+      errors.push(line);
+      continue;
+    }
+    if (!parsed) continue;
+    if (parsed.type === "supertask_command") {
+      const executable = typeof parsed.executable === "string" ? parsed.executable : null;
+      const cwd = typeof parsed.cwd === "string" ? parsed.cwd : null;
+      const args = Array.isArray(parsed.args) && parsed.args.every((item) => typeof item === "string") ? parsed.args : null;
+      if (executable && cwd && args) {
+        command = {
+          cwd,
+          command: `cd ${shellQuote(cwd)} && ${[executable, ...args].map(shellQuote).join(" ")}`
+        };
+      }
+      continue;
+    }
+    const part = recordValue(parsed.part);
+    const eventType = typeof parsed.type === "string" ? parsed.type : "";
+    const partType = typeof part?.type === "string" ? part.type : "";
+    const text2 = typeof part?.text === "string" ? part.text : typeof parsed.text === "string" ? parsed.text : null;
+    if (text2 && (eventType === "text" || partType === "text")) textParts.push(text2);
+    const tool = typeof part?.tool === "string" ? part.tool : typeof parsed.tool === "string" ? parsed.tool : null;
+    if (tool && (eventType === "tool_use" || partType === "tool")) tools.push(tool);
+    const error = typeof parsed.error === "string" ? parsed.error : typeof part?.error === "string" ? part.error : null;
+    if (error) errors.push(error);
+  }
+  return {
+    command,
+    text: textParts.join("\n").trim(),
+    errors: [...new Set(errors)],
+    tools
+  };
+}
+function renderRunLog(runId, taskName, log, locale) {
+  const presentation = presentRunLog(log);
+  const command = presentation.command ? `<div class="run-command"><div class="log-section-head"><strong>${t(locale, "logs.command")}</strong><button type="button" class="btn" onclick="copyRunCommand(${runId})">${icon("copy")}${t(locale, "action.copyCommand")}</button></div><div class="command-cwd">${esc(presentation.command.cwd)}</div><pre id="command-${runId}">${esc(presentation.command.command)}</pre></div>` : "";
+  const errors = presentation.errors.length > 0 ? `<div class="run-error"><strong>${t(locale, "logs.error")}</strong><pre>${esc(presentation.errors.join("\n"))}</pre></div>` : "";
+  const tools = presentation.tools.length > 0 ? `<div class="run-tools"><strong>${t(locale, "logs.tools")}</strong><div class="actions">${presentation.tools.map((tool) => `<span class="tag">${esc(tool)}</span>`).join("")}</div></div>` : "";
+  const output = `<div class="run-output"><strong>${t(locale, "logs.output")}</strong><pre>${esc(presentation.text || t(locale, "logs.noText"))}</pre></div>`;
+  return `<section id="log-${runId}" class="panel log-panel" hidden><div class="panel-head"><h3>Run #${runId} \xB7 ${esc(taskName)}</h3></div><div class="log-content">${command}${errors}${output}${tools}<details class="raw-log"><summary>${t(locale, "logs.raw")}</summary><div class="log-box">${esc(log)}</div></details></div></section>`;
+}
 function esc(value) {
   if (!value) return "";
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
@@ -21760,6 +22113,25 @@ function emptyState(title, hint, code = "") {
   return `<div class="empty-state"><div><div class="empty-icon">${icon("inbox")}</div>
       <h3>${title}</h3><p>${hint}</p>${code ? `<code>${code}</code>` : ""}</div></div>`;
 }
+function durationControl(locale, id, value, kind) {
+  const units = [
+    { value: "s", label: t(locale, "duration.seconds") },
+    { value: "min", label: t(locale, "duration.minutes") },
+    { value: "h", label: t(locale, "duration.hours") },
+    { value: "d", label: t(locale, "duration.days") }
+  ];
+  const values = kind === "interval" ? [3e5, 9e5, 18e5, 36e5, 216e5, 432e5, 864e5] : kind === "retry" ? [0, 1e4, 3e4, 6e4, 3e5] : [3e5, 9e5, 18e5, 36e5, 72e5, 144e5];
+  const presets = [
+    ...kind === "timeout" ? [{ value: "", label: t(locale, "duration.systemDefault") }] : [],
+    ...values.map((milliseconds) => ({
+      value: String(milliseconds),
+      label: milliseconds === 0 ? t(locale, "duration.immediate") : kind === "interval" ? t(locale, "duration.every", { duration: formatInterval(milliseconds, locale) }) : formatInterval(milliseconds, locale)
+    })),
+    { value: "custom", label: t(locale, "duration.custom") }
+  ];
+  const selected = value === null ? "" : String(value);
+  return `<div class="duration-picker"><select id="${id}-preset" onchange="updateDurationControl('${id}')">${presets.map((item) => `<option value="${item.value}" ${item.value === selected ? "selected" : ""}>${item.label}</option>`).join("")}</select><div id="${id}-custom" class="duration-control" hidden><input id="${id}-value" type="number" min="${kind === "retry" ? 0 : 0.1}" step="0.1" inputmode="decimal"><select id="${id}-unit" aria-label="${t(locale, "duration.unit")}">${units.map((item) => `<option value="${item.value}">${item.label}</option>`).join("")}</select></div></div>`;
+}
 function formatInterval(milliseconds, locale) {
   const formatter = new Intl.NumberFormat(locale === "en" ? "en-US" : "zh-CN", {
     maximumFractionDigits: 1
@@ -21788,6 +22160,8 @@ var init_web = __esm({
     init_drizzle_orm();
     init_db2();
     init_duration();
+    init_opencode_catalog();
+    init_task_working_directory();
     init_database_maintenance_service();
     init_task_run_service();
     init_task_service();
@@ -21841,6 +22215,33 @@ var init_web = __esm({
       const health = getGatewayHealth();
       return c.json(health, health.status === "ok" ? 200 : 503);
     });
+    app.get("/api/filesystem/directories", (c) => {
+      const requestedPath = c.req.query("path")?.trim() || homedir4();
+      try {
+        validateTaskWorkingDirectory(requestedPath);
+        return c.json({
+          path: requestedPath,
+          parent: dirname7(requestedPath),
+          home: homedir4(),
+          directories: listChildDirectories(requestedPath)
+        });
+      } catch (error) {
+        return c.json({
+          error: error instanceof Error ? error.message : String(error)
+        }, 400);
+      }
+    });
+    app.get("/api/opencode/catalog", async (c) => {
+      const cwd = c.req.query("cwd")?.trim();
+      if (!cwd) return c.json({ error: "cwd \u4E0D\u80FD\u4E3A\u7A7A" }, 400);
+      try {
+        return c.json(await loadOpenCodeCatalog(cwd));
+      } catch (error) {
+        return c.json({
+          error: error instanceof Error ? error.message : String(error)
+        }, 400);
+      }
+    });
     app.get("/", async (c) => {
       const locale = resolveLocale(c);
       const page = parsePositiveInteger(c.req.query("page") || "1");
@@ -21985,13 +22386,14 @@ var init_web = __esm({
           <div class="dialog-body">
             <div class="template-form-grid">
               <label class="form-field"><span>${t(locale, "template.name")}</span><input id="task-name" required maxlength="200" autocomplete="off"></label>
-              <label class="form-field"><span>${t(locale, "template.cwd")}</span><input id="task-cwd" required autocomplete="off" list="task-cwd-options" placeholder="/path/to/project" oninput="updateTaskProjectStatus()"><small>${t(locale, "template.cwdHint")}</small></label>
+              <label class="form-field"><span>${t(locale, "template.cwd")}</span><div class="field-action"><input id="task-cwd" required autocomplete="off" list="task-cwd-options" placeholder="/path/to/project" oninput="updateTaskProjectStatus();scheduleCatalogLoad('task')"><button id="task-cwd-picker" type="button" class="btn" onclick="openDirectoryPicker('task-cwd')">${icon("folder")}${t(locale, "action.chooseFolder")}</button></div><small>${t(locale, "template.cwdHint")}</small></label>
               <datalist id="task-cwd-options">${projects.map((project) => `<option value="${esc(project.cwd)}"></option>`).join("")}</datalist>
-              <label class="form-field"><span>${t(locale, "template.agent")}</span><input id="task-agent" required autocomplete="off" value="build" placeholder="build"></label>
-              <label class="form-field"><span>${t(locale, "template.model")}</span><input id="task-model" required autocomplete="off" value="default" placeholder="default"></label>
+              <label class="form-field"><span>${t(locale, "template.agent")}</span><select id="task-agent" required><option value="">${t(locale, "catalog.chooseProject")}</option></select><small>${t(locale, "catalog.agentHint")}</small></label>
+              <label class="form-field"><span>${t(locale, "template.model")}</span><div class="model-selector"><select id="task-model-provider" aria-label="${t(locale, "catalog.provider")}" onchange="populateModelOptions('task')"><option value="">${t(locale, "catalog.defaultProvider")}</option></select><select id="task-model" required aria-label="${t(locale, "catalog.model")}" disabled><option value="default">${t(locale, "catalog.defaultModel")}</option></select></div><small>${t(locale, "catalog.modelHint")}</small></label>
               <label class="form-field form-field-wide"><span>${t(locale, "template.prompt")}</span><textarea id="task-prompt" rows="6" required></textarea></label>
             </div>
             <p id="task-project-status" class="form-note"></p>
+            <p id="task-catalog-status" class="form-note catalog-status"></p>
             <details class="advanced-fields">
               <summary>${t(locale, "template.advanced")}</summary>
               <div class="template-form-grid">
@@ -22000,8 +22402,8 @@ var init_web = __esm({
                 <label class="form-field"><span>${t(locale, "template.importance")}</span><input id="task-importance" type="number" min="1" max="5" step="1" value="3" required></label>
                 <label class="form-field"><span>${t(locale, "template.urgency")}</span><input id="task-urgency" type="number" min="1" max="5" step="1" value="3" required></label>
                 <label class="form-field"><span>${t(locale, "template.maxRetries")}</span><input id="task-max-retries" type="number" min="0" max="1000" step="1" value="3" required></label>
-                <label class="form-field"><span>${t(locale, "template.retryBackoff")}</span><input id="task-retry-backoff" autocomplete="off" value="30s"><small>${t(locale, "template.durationHint")}</small></label>
-                <label class="form-field"><span>${t(locale, "template.timeout")}</span><input id="task-timeout" autocomplete="off" placeholder="30min"><small>${t(locale, "template.optional")}</small></label>
+                <label class="form-field"><span>${t(locale, "template.retryBackoff")}</span>${durationControl(locale, "task-retry-backoff", 3e4, "retry")}<small>${t(locale, "template.retryBackoffHint")}</small></label>
+                <label class="form-field"><span>${t(locale, "template.timeout")}</span>${durationControl(locale, "task-timeout", null, "timeout")}<small>${t(locale, "template.timeoutHint")}</small></label>
               </div>
             </details>
           </div>
@@ -22061,15 +22463,16 @@ var init_web = __esm({
           <div class="dialog-body">
             <div class="template-form-grid">
               <label class="form-field"><span>${t(locale, "template.name")}</span><input id="template-name" required maxlength="200" autocomplete="off"></label>
-              <label class="form-field"><span>${t(locale, "template.cwd")}</span><input id="template-cwd" required autocomplete="off" placeholder="/path/to/project"><small>${t(locale, "template.cwdHint")}</small></label>
-              <label class="form-field"><span>${t(locale, "template.agent")}</span><input id="template-agent" required autocomplete="off" placeholder="build"></label>
-              <label class="form-field"><span>${t(locale, "template.model")}</span><input id="template-model" required autocomplete="off" value="default" placeholder="default"></label>
+              <label class="form-field"><span>${t(locale, "template.cwd")}</span><div class="field-action"><input id="template-cwd" required autocomplete="off" placeholder="/path/to/project" oninput="scheduleCatalogLoad('template')"><button type="button" class="btn" onclick="openDirectoryPicker('template-cwd')">${icon("folder")}${t(locale, "action.chooseFolder")}</button></div><small>${t(locale, "template.cwdHint")}</small></label>
+              <label class="form-field"><span>${t(locale, "template.agent")}</span><select id="template-agent" required><option value="">${t(locale, "catalog.chooseProject")}</option></select><small>${t(locale, "catalog.agentHint")}</small></label>
+              <label class="form-field"><span>${t(locale, "template.model")}</span><div class="model-selector"><select id="template-model-provider" aria-label="${t(locale, "catalog.provider")}" onchange="populateModelOptions('template')"><option value="">${t(locale, "catalog.defaultProvider")}</option></select><select id="template-model" required aria-label="${t(locale, "catalog.model")}" disabled><option value="default">${t(locale, "catalog.defaultModel")}</option></select></div><small>${t(locale, "catalog.modelHint")}</small></label>
               <label class="form-field form-field-wide"><span>${t(locale, "template.prompt")}</span><textarea id="template-prompt" rows="6" required></textarea></label>
               <label class="form-field"><span>${t(locale, "template.scheduleType")}</span><select id="template-schedule-type" onchange="updateTemplateScheduleFields()"><option value="recurring">${t(locale, "schedule.recurring")}</option><option value="delayed">${t(locale, "schedule.delayed")}</option><option value="cron">${t(locale, "schedule.cron")}</option></select></label>
               <label id="template-cron-field" class="form-field" hidden><span>${t(locale, "template.cronExpr")}</span><input id="template-cron" autocomplete="off" placeholder="0 9 * * *"><small>${t(locale, "template.cronHint")}</small></label>
-              <label id="template-interval-field" class="form-field"><span>${t(locale, "template.interval")}</span><input id="template-interval" autocomplete="off" value="1h" placeholder="30s / 5min / 1h"><small>${t(locale, "template.durationHint")}</small></label>
+              <label id="template-interval-field" class="form-field"><span>${t(locale, "template.interval")}</span>${durationControl(locale, "template-interval", 36e5, "interval")}<small>${t(locale, "template.intervalHint")}</small></label>
               <label id="template-run-at-field" class="form-field" hidden><span>${t(locale, "template.runAt")}</span><input id="template-run-at" type="datetime-local" step="0.001"></label>
             </div>
+            <p id="template-catalog-status" class="form-note catalog-status"></p>
             <details class="advanced-fields">
               <summary>${t(locale, "template.advanced")}</summary>
               <div class="template-form-grid">
@@ -22079,8 +22482,8 @@ var init_web = __esm({
                 <label class="form-field"><span>${t(locale, "template.urgency")}</span><input id="template-urgency" type="number" min="1" max="5" step="1" value="3" required></label>
                 <label class="form-field"><span>${t(locale, "template.maxInstances")}</span><input id="template-max-instances" type="number" min="1" max="1000" step="1" value="1" required><small>${t(locale, "template.maxInstancesHint")}</small></label>
                 <label class="form-field"><span>${t(locale, "template.maxRetries")}</span><input id="template-max-retries" type="number" min="0" max="1000" step="1" value="3" required></label>
-                <label class="form-field"><span>${t(locale, "template.retryBackoff")}</span><input id="template-retry-backoff" autocomplete="off" value="30s"><small>${t(locale, "template.durationHint")}</small></label>
-                <label class="form-field"><span>${t(locale, "template.timeout")}</span><input id="template-timeout" autocomplete="off" placeholder="30min"><small>${t(locale, "template.optional")}</small></label>
+                <label class="form-field"><span>${t(locale, "template.retryBackoff")}</span>${durationControl(locale, "template-retry-backoff", 3e4, "retry")}<small>${t(locale, "template.retryBackoffHint")}</small></label>
+                <label class="form-field"><span>${t(locale, "template.timeout")}</span>${durationControl(locale, "template-timeout", null, "timeout")}<small>${t(locale, "template.timeoutHint")}</small></label>
               </div>
             </details>
             <p class="form-note">${t(locale, "template.futureOnly")}</p>
@@ -22122,7 +22525,7 @@ var init_web = __esm({
         const status = safeStatus(run.status);
         const resumable = isValidSessionId(run.sessionId);
         if (run.log) {
-          logs.push(`<section id="log-${run.id}" class="panel log-panel" hidden><div class="panel-head"><h3>Run #${run.id} \xB7 ${esc(run.taskName)}</h3></div><div class="log-box">${esc(run.log)}</div></section>`);
+          logs.push(renderRunLog(run.id, run.taskName, run.log, locale));
         }
         return `<tr>
           <td class="faint" data-label="${t(locale, "table.run")}">#${run.id}</td>
@@ -22467,6 +22870,14 @@ import { dirname as dirname3, join as join3 } from "path";
 import { randomUUID } from "crypto";
 var DEFAULT_MAX_OUTPUT_CHARS = 64 * 1024;
 var FORBIDDEN_AGENT = "supertask-runner";
+function runCommandContext(executable, args, cwd) {
+  return JSON.stringify({
+    type: "supertask_command",
+    executable,
+    args,
+    cwd
+  });
+}
 function assertWorkerProcessIsolationSupported(platform = process.platform) {
   if (platform === "win32") {
     throw new Error(
@@ -22675,6 +23086,7 @@ var WorkerEngine = class {
       runId,
       launchIdentity,
       child,
+      commandContext: runCommandContext(this.opencodeBin, args, task.cwd || process.cwd()),
       output: "",
       sessionId: null,
       timeoutTimer: null,
@@ -22839,7 +23251,7 @@ var WorkerEngine = class {
     const termination = entry.termination;
     if (termination?.kind === "shutdown") return;
     if (termination?.kind === "cancel") {
-      const output2 = entry.output.trim();
+      const output2 = this.outputWithCommand(entry);
       const log2 = `${termination.message}${output2 ? `
 ${output2}` : ""}`;
       await TaskRunService.fail(entry.runId, log2);
@@ -22853,7 +23265,7 @@ ${output2}` : ""}`;
     }
     const currentRun = await TaskRunService.getById(entry.runId);
     if (!currentRun || currentRun.status !== "running") return;
-    const output = entry.output.trim();
+    const output = this.outputWithCommand(entry);
     const log = failure ? `${failure}${output ? `
 ${output}` : ""}` : output;
     if (code === 0 && !failure) {
@@ -22989,6 +23401,11 @@ ${output}` : ""}` : output;
     const batchId = normalizeTaskBatchId(task.batchId);
     if (batchId) this.activeBatchIds.delete(batchId);
   }
+  outputWithCommand(entry) {
+    const output = entry.output.trim();
+    return `${entry.commandContext}${output ? `
+${output}` : ""}`;
+  }
   resolveModel(taskModel) {
     if (!taskModel || taskModel === "default") return null;
     return taskModel;