@p-dsh-market/graph-job-orchestrator 0.1.2 → 0.1.3

package/README.md

@@ -6,7 +6,7 @@
 - `%LOCALAPPDATA%/dsh-desktop/plugin-data/graph-job-orchestrator/` 下的原子 JSON 与 append-only JSONL 存储；
 - DSH in-process Subagent executor、merge barrier、read 并行/write 串行、失败暂停、有限 transport/rate-limit retry、取消和终止；
 - `artifactRefs` workspace-relative 校验、插件 Skill/Graph Job 递归保护、`/graphjob` 命令、Web API、SSE 和任务图编辑面板；
-- Codex provider 的能力发现、model/reasoningEffort 快照与 capability mismatch 错误。
+- Codex provider 的能力发现、model/reasoningEffort 快照与 capability mismatch 错误；官方 `subagent-codex` 按 one-shot 运行，不会误走 DSH continuable 路径。
 
 运行时必须先安装并注册 Codex Subagent provider，阶段 4 才会显示 Codex executor 可用；没有 provider 时不会伪装成可运行，而是在能力快照和运行错误中明确说明。当前仓库的本地 runtime 只有 DSH `spawn/fork` provider，因此不会在安装插件时自动修改 profile。
 
@@ -18,6 +18,26 @@ dsh plugin --profile <name> add @deepseek-ai/dsh-subagent-codex
 
 插件只负责发现和校验 provider，不会代替用户安装 Bundle、登录 Codex 或修改 Codex 原生权限配置。
 
+官方 Codex Bundle 的 `model` 是 provider 实例级静态配置，不是一次调用时的动态参数。若希望在 Graph Job 设置中选择多个 Codex 模型，可在目标 Profile 的 `cordis.patch.yml` 挂载多个命名实例，例如：
+
+```yaml
+- insert:
+    - id: graph-job-codex-luna
+      name: '@deepseek-ai/dsh-subagent-codex'
+      config:
+        providerName: codex-luna
+        model: gpt-5.6-luna
+        permissionMode: never
+    - id: graph-job-codex-sol
+      name: '@deepseek-ai/dsh-subagent-codex'
+      config:
+        providerName: codex-sol
+        model: gpt-5.6-sol
+        permissionMode: never
+```
+
+Graph Job 会从 runtime capability snapshot 读取这些 provider/model；`reasoningEffort` 只有 Codex provider 明确公布可选值时才显示和发送。
+
 主要端点：
 
 - `GET /graph-job-orchestrator/capabilities`
@@ -29,12 +49,13 @@ dsh plugin --profile <name> add @deepseek-ai/dsh-subagent-codex
 - `GET /graph-job-orchestrator/templates/previews/:previewId`
 - `POST /graph-job-orchestrator/templates/preview|confirm|bind`
 - `GET/POST /graph-job-orchestrator/subagents`
+- `POST /graph-job-orchestrator/planner/decision`
 - `GET /graph-job-orchestrator/runs/:runId/events`
 - `POST /graph-job-orchestrator/runs/:runId/retry|cancel|terminate`
 
-带目标的 `/graphjob <目标>` 会向当前主对话排入一次 Planner follow-up；空 `/graphjob` 只打开或创建空图。Planner 只接受当前会话的 roster、Graph JSON Schema 和受限 patch；候选图必须先 preview，再由用户确认。已有手工锁定图时，Planner 请求必须明确 `templateMode: "saveAs"` 或 `"overwrite"`，不会隐式改写当前模板。运行时输出严格投影为 `text` 和 `artifactRefs`，子会话 ID 只保存在运行状态和事件中。
+带目标的 `/graphjob <目标>` 会向当前主对话排入一次 Planner follow-up；空 `/graphjob` 只打开或创建空图。首次打开时生成的空手工占位图不会阻挡第一份模型草案；真正编辑过的手工锁定图会在任务图面板要求选择 `saveAs` 或 `overwrite`，选择通过 `/planner/decision` 提交，不会隐式改写当前模板。Planner 只接受当前会话的 roster、Graph JSON Schema 和受限 patch；候选图必须先 preview，再由用户确认。运行时输出严格投影为 `text` 和 `artifactRefs`，子会话 ID 只保存在运行状态和事件中。
 
-`POST /graph-job-orchestrator/subagents` 创建可继续对话的独立 Subagent，并按所选 Agent Profile 快照 Provider/Model；客户端会在创建后打开对应的子会话。该入口默认过滤 `skill` 和 Graph Job 管理工具。Host 和客户端会输出 `[graph-job-orchestrator]` 前缀的脱敏诊断日志，只记录会话短标识、长度、状态、耗时和错误代码，不记录用户任务正文或 token。
+`POST /graph-job-orchestrator/subagents` 按所选 Agent Profile 创建 Subagent。DSH provider 创建可继续对话的子会话；官方 Codex provider 使用 one-shot `start`，等待单轮结果后直接显示最终正文和脱敏诊断，不创建可继续的 Codex 会话。官方 provider 的 model、权限、MCP 和 Skills 由 Profile Bundle/原生 Codex 配置决定；只有 provider 明确公布动态能力时才允许按 Profile 传入对应字段。该入口默认过滤 `skill` 和 Graph Job 管理工具。Host 和客户端会输出 `[graph-job-orchestrator]` 前缀的脱敏诊断日志，只记录会话短标识、长度、状态、耗时和错误代码，不记录用户任务正文或 token。
 
 模板 manifest 支持 `scope: "workspace" | "global"`，默认是当前 workspace；workspace 模板不会出现在其他工作区的模板列表中。切换模板会创建新的 Graph Instance，不会把可变模板文件直接绑定为活动 Graph。
 

package/lib/capabilities.js

@@ -105,16 +105,23 @@ function providerCapabilities(item) {
     persona: Boolean(value.persona),
     permissionMode: Boolean(value.permissionMode || value.permissionModes),
     permissionModes: stringArray(value.permissionModes),
-    reasoningEfforts: stringArray(value.reasoningEfforts || value.reasoningEffort)
+    reasoningEfforts: stringArray(value.reasoningEfforts || value.reasoningEffort),
+    dynamicModel: Boolean(value.dynamicModel || value.modelOverride),
+    dynamicReasoning: Boolean(value.dynamicReasoning || value.reasoningEffortOverride)
   }
 }
 
 function normalizeProvider(item) {
   if (typeof item === 'string') return { name: item, capabilities: {} }
+  const config = item?.config && typeof item.config === 'object' ? item.config : {}
+  const staticModel = String(item?.staticModel || item?.model || config.model || '').trim()
+  const staticPermissionMode = String(item?.staticPermissionMode || config.permissionMode || '').trim()
   return {
     name: String(item?.name || item?.id || item?.providerName || '').trim(),
     inheritsParentContext: item?.inheritsParentContext === true,
-    models: asArray(item?.models || item?.capabilities?.models).map((model) => typeof model === 'string' ? model : String(model?.id || model?.name || '').trim()).filter(Boolean),
+    models: asArray(item?.models || item?.capabilities?.models || (staticModel ? [staticModel] : [])).map((model) => typeof model === 'string' ? model : String(model?.id || model?.name || '').trim()).filter(Boolean),
+    ...(staticModel ? { staticModel } : {}),
+    ...(staticPermissionMode ? { staticPermissionMode } : {}),
     capabilities: providerCapabilities(item)
   }
 }
@@ -171,8 +178,9 @@ export async function buildCapabilityCatalog(options = {}) {
   const models = await discoverModels(options.llm)
   const codexProviders = subagentProviders.filter((item) => /codex/i.test(item.name))
   const codexReasoning = [...new Set(codexProviders.flatMap((item) => item.capabilities.reasoningEfforts))]
-  const modelReasoning = models.flatMap((item) => item.reasoningEfforts)
-  const reasoningEfforts = [...new Set([...codexReasoning, ...modelReasoning])]
+  // Reasoning is an executor/provider capability. LLM model metadata from an
+  // unrelated DSH adapter must never make the Codex selector appear supported.
+  const reasoningEfforts = [...new Set(codexReasoning)]
   const catalog = {
     schemaVersion: GRAPH_SCHEMA_VERSION,
     capturedAt: Date.now(),

package/lib/client.js

@@ -12,6 +12,7 @@ window.__ModuleLoader__.load({
     var PLUGIN_ID = '@p-dsh-market/graph-job-orchestrator'
     var BASE = '/graph-job-orchestrator'
     var DESKTOP_RPC_METHOD = 'graphJobOrchestrator.open'
+    var DESKTOP_SUBAGENT_RPC_METHOD = 'graphJobOrchestrator.openSubagent'
     var sessionsService = null
     var plannerWaitUntil = {}
     var subagentOverlayStore = { open: false, version: 0, initialPrompt: '' }
@@ -86,7 +87,10 @@ window.__ModuleLoader__.load({
           if (!response.ok || body.ok === false) {
             reportedFailure = true
             clientDiagnostic('request.failed', { method: method, path: path, status: response.status, durationMs: Date.now() - startedAt, code: body.code || 'HTTP_ERROR' })
-            throw new Error(body.error || 'Graph Job 请求失败。')
+            var requestError = new Error(body.error || 'Graph Job 请求失败。')
+            requestError.code = body.code || 'HTTP_ERROR'
+            requestError.status = response.status
+            throw requestError
           }
           clientDiagnostic('request.done', { method: method, path: path, status: response.status, durationMs: Date.now() - startedAt })
           return body
@@ -246,7 +250,7 @@ window.__ModuleLoader__.load({
 
     function GraphJobView(props) {
       var sessionId = useSessionId(props)
-      var state = React.useState({ graph: null, profiles: [], capabilities: null, templates: [], templateId: '', templateScope: 'workspace', run: null, preview: null, templatePreview: null, loading: true, planning: false, saving: false, error: '', message: '', selectedId: '', connectFrom: '' })
+      var state = React.useState({ graph: null, profiles: [], capabilities: null, templates: [], templateId: '', templateScope: 'workspace', templateDecisionMode: 'saveAs', templateName: '', planner: null, run: null, preview: null, templatePreview: null, loading: true, planning: false, saving: false, error: '', message: '', selectedId: '', connectFrom: '' })
       var store = state[0]
       var setStore = state[1]
       function patch(next) { setStore(function (current) { return Object.assign({}, current, next) }) }
@@ -257,12 +261,13 @@ window.__ModuleLoader__.load({
         Promise.all([request('/graphs?sessionId=' + encodeURIComponent(sessionId)), request('/profiles'), request('/capabilities'), request('/templates?sessionId=' + encodeURIComponent(sessionId))]).then(function (values) {
           var body = values[0]
           var planner = body.planner || null
-          if (planner && planner.state === 'running' && !plannerWaitUntil[sessionId]) plannerWaitUntil[sessionId] = Date.now() + 90000
-          var waiting = Boolean((plannerWaitUntil[sessionId] || 0) > Date.now())
-          var freshPreview = planner && planner.state === 'ready' && body.preview ? body.preview : (waiting ? store.preview : body.preview)
-          var plannerFailed = planner && planner.state === 'failed'
-          patch({ graph: freshPreview && freshPreview.graph ? layoutGraph(freshPreview.graph) : (body.graph ? layoutGraph(body.graph) : null), preview: freshPreview || null, run: body.binding && body.binding.activeRunId ? null : null, profiles: values[1].profiles || [], capabilities: values[2].capabilities || null, templates: values[3].templates || [], planning: waiting && !plannerFailed, loading: false, error: plannerFailed ? planner.error : '', message: planner && planner.state === 'ready' && body.preview ? 'Planner 草案已生成；请检查 DAG 后确认 revision。' : '' })
-          if ((planner && (planner.state === 'ready' || planner.state === 'failed')) || !waiting) delete plannerWaitUntil[sessionId]
+           if (planner && ['queued', 'running'].indexOf(planner.state) >= 0 && !plannerWaitUntil[sessionId]) plannerWaitUntil[sessionId] = Date.now() + 90000
+           var waiting = Boolean((plannerWaitUntil[sessionId] || 0) > Date.now())
+           var plannerNeedsDecision = planner && planner.state === 'needs-decision'
+           var freshPreview = plannerNeedsDecision ? null : (planner && planner.state === 'ready' && body.preview ? body.preview : (waiting ? store.preview : body.preview))
+           var plannerFailed = planner && planner.state === 'failed'
+           patch({ graph: freshPreview && freshPreview.graph ? layoutGraph(freshPreview.graph) : (body.graph ? layoutGraph(body.graph) : null), preview: freshPreview || null, templatePreview: body.templatePreview || null, planner: planner, run: body.binding && body.binding.activeRunId ? null : null, profiles: values[1].profiles || [], capabilities: values[2].capabilities || null, templates: values[3].templates || [], planning: waiting && !plannerFailed && !plannerNeedsDecision, loading: false, error: plannerFailed || plannerNeedsDecision ? planner.error || '模型修订需要先选择 saveAs 或 overwrite 模板。' : '', message: planner && planner.state === 'ready' && body.preview ? 'Planner 草案已生成；请检查 DAG 后确认 revision。' : plannerNeedsDecision ? '手工 Graph 已锁定；请选择模型候选的模板保存方式。' : '' })
+           if ((planner && (planner.state === 'ready' || planner.state === 'failed' || planner.state === 'needs-decision')) || !waiting) delete plannerWaitUntil[sessionId]
           else setTimeout(load, 1000)
           if (body.binding && body.binding.activeRunId) request('/runs/' + encodeURIComponent(body.binding.activeRunId)).then(function (runBody) { patch({ run: runBody.run }) }).catch(function () {})
         }).catch(function (error) { patch({ loading: false, error: error.message || String(error) }) })
@@ -273,14 +278,27 @@ window.__ModuleLoader__.load({
           var detail = event && event.detail || {}
           if (detail.sessionId && detail.sessionId !== sessionId) return
           plannerWaitUntil[sessionId] = Date.now() + 90000
-          patch({ preview: null, planning: true, error: '', message: '已收到 /graphjob 目标，正在生成 Graph Job 草案…' })
+          patch({ preview: null, templatePreview: null, planner: { state: 'queued' }, planning: true, error: '', message: '已收到 /graphjob 目标，正在生成 Graph Job 草案…' })
           load()
         }
         window.addEventListener('gjo:planner-start', onPlannerStart)
         return function () { window.removeEventListener('gjo:planner-start', onPlannerStart) }
       }, [sessionId])
 
-      function save() {
+       function submitPlannerDecision() {
+         var mode = store.templateDecisionMode || 'saveAs'
+         if (mode === 'overwrite' && !store.templateId) { patch({ error: '覆盖模板前必须选择一个模板。' }); return }
+         plannerWaitUntil[sessionId] = Date.now() + 90000
+         patch({ planning: true, error: '', message: '正在按所选模板方式生成候选…' })
+         request('/planner/decision', { method: 'POST', body: { sessionId: sessionId, mode: mode, templateId: mode === 'overwrite' ? store.templateId : '', templateScope: store.templateScope || 'workspace', templateName: store.templateName || (store.graph && store.graph.goal) || 'Graph Job 模板' } }).then(function (body) {
+           var next = { planning: body.state === 'queued', error: '', message: body.state === 'queued' ? '已提交模板选择，正在生成候选…' : '候选模板已生成；请确认后保存。' }
+           if (body.templatePreview) next.templatePreview = body.templatePreview
+           if (body.state === 'ready') { next.planner = Object.assign({}, store.planner || {}, { state: 'ready', previewId: body.preview && body.preview.previewId || '' }); next.planning = false }
+           patch(next)
+           if (body.state === 'queued') setTimeout(load, 600)
+         }).catch(function (error) { delete plannerWaitUntil[sessionId]; patch({ planning: false, error: error.message || String(error) }) })
+       }
+       function save() {
         if (!store.graph || store.saving) return
         patch({ saving: true, error: '', message: '' })
         request('/graphs/' + encodeURIComponent(store.graph.graphId), { method: 'PATCH', body: { sessionId: sessionId, graph: store.graph } }).then(function (body) {
@@ -340,13 +358,23 @@ window.__ModuleLoader__.load({
       }
       function removeEdge(edge) { patch({ graph: Object.assign({}, clone(store.graph), { edges: (store.graph.edges || []).filter(function (item) { return item.from !== edge.from || item.to !== edge.to }) }), preview: null }) }
       function updateGoal(event) { patch({ graph: Object.assign({}, store.graph, { goal: event.target.value }), preview: null }) }
-      var selected = nodeById(store.graph, store.selectedId)
+       var selected = nodeById(store.graph, store.selectedId)
+       var plannerNeedsDecision = store.planner && store.planner.state === 'needs-decision'
       if (store.loading) return React.createElement('div', { className: 'gjo-shell gjo-empty' }, '正在加载 Graph Job…')
       if (!store.graph) return React.createElement('div', { className: 'gjo-shell gjo-empty' }, [React.createElement('div', { key: 'icon', className: 'gjo-icon' }, '◇'), React.createElement('h2', { key: 'h' }, '当前会话还没有 Graph Job'), React.createElement('p', { key: 'p' }, '从空白任务图开始，或让当前对话中的 Planner 先提出一个受限草案。'), React.createElement('button', { key: 'create', type: 'button', className: 'gjo-primary', onClick: newGraph }, '创建任务图')])
       return React.createElement('div', { className: 'gjo-shell' }, [
         React.createElement('header', { key: 'header', className: 'gjo-header' }, [React.createElement('div', { key: 'copy' }, [React.createElement('div', { key: 'eyebrow', className: 'gjo-eyebrow' }, 'GRAPH JOB / SESSION ' + sessionId.slice(0, 12)), React.createElement('h2', { key: 'title' }, '多 Subagent 任务图'), React.createElement('p', { key: 'sub' }, 'Revision ' + store.graph.revision + ' · ' + (store.graph.manualLock ? '手工锁定' : 'Planner 草案')), React.createElement('div', { key: 'actions', className: 'gjo-header-actions' }, [React.createElement('button', { key: 'new', type: 'button', className: 'gjo-secondary', onClick: newGraph }, '新建'), React.createElement('button', { key: 'refresh', type: 'button', className: 'gjo-secondary', onClick: load }, '刷新'), React.createElement('button', { key: 'save', type: 'button', className: 'gjo-secondary', disabled: store.saving, onClick: save }, store.saving ? '保存中…' : '保存 revision'), React.createElement('button', { key: 'template', type: 'button', className: 'gjo-secondary', onClick: function () { previewTemplate('saveAs') } }, '另存模板'), React.createElement('select', { key: 'scope', className: 'gjo-template-select', value: store.templateScope || 'workspace', onChange: function (event) { patch({ templateScope: event.target.value }) } }, [React.createElement('option', { key: 'workspace', value: 'workspace' }, 'workspace 模板'), React.createElement('option', { key: 'global', value: 'global' }, 'global 模板')]), store.templates.length ? React.createElement('select', { key: 'template-select', className: 'gjo-template-select', value: store.templateId || '', onChange: function (event) { var id = event.target.value; var selected = (store.templates || []).filter(function (template) { return template.id === id })[0]; patch({ templateId: id, templateScope: selected && selected.scope || 'workspace' }) } }, [React.createElement('option', { key: 'empty', value: '' }, '选择覆盖模板'), store.templates.map(function (template) { return React.createElement('option', { key: template.id, value: template.id }, (template.name || template.id) + ' · ' + (template.scope || 'workspace')) })]) : null, React.createElement('button', { key: 'bind', type: 'button', className: 'gjo-secondary', disabled: !store.templateId, onClick: bindTemplate }, '切换到模板'), React.createElement('button', { key: 'overwrite', type: 'button', className: 'gjo-secondary', disabled: !store.templateId, onClick: function () { previewTemplate('overwrite') } }, '覆盖模板'), React.createElement('button', { key: 'preview', type: 'button', className: 'gjo-primary', onClick: preview }, '预览 DAG')])])]),
         React.createElement('div', { key: 'goal', className: 'gjo-goal-bar' }, [React.createElement('label', { key: 'label' }, '目标'), React.createElement('textarea', { key: 'input', rows: 2, value: store.graph.goal || '', onChange: updateGoal, placeholder: '这个 Graph 要完成什么？' }), React.createElement('div', { key: 'limit', className: 'gjo-limit-copy' }, 'maxParallel ' + (store.graph.limits && store.graph.limits.maxParallel || 4) + ' · write 串行 · 失败暂停')]),
-        store.error ? React.createElement('div', { key: 'error', className: 'gjo-error' }, store.error) : null,
+         store.error ? React.createElement('div', { key: 'error', className: 'gjo-error' }, store.error) : null,
+         plannerNeedsDecision ? React.createElement('section', { key: 'planner-decision', className: 'gjo-decision-panel' }, [
+           React.createElement('strong', { key: 'title' }, '选择模型候选的保存方式'),
+           React.createElement('p', { key: 'copy' }, '当前会话的 Graph 已被手工编辑锁定。模型只能生成候选，必须另存为新模板或覆盖已有模板。'),
+           React.createElement('label', { key: 'mode' }, ['保存方式', React.createElement('select', { key: 'input', value: store.templateDecisionMode || 'saveAs', onChange: function (event) { patch({ templateDecisionMode: event.target.value }) } }, [React.createElement('option', { key: 'saveAs', value: 'saveAs' }, 'saveAs：另存为新模板'), React.createElement('option', { key: 'overwrite', value: 'overwrite' }, 'overwrite：覆盖已有模板')])]),
+           store.templateDecisionMode === 'overwrite' ? React.createElement('label', { key: 'template' }, ['目标模板', React.createElement('select', { key: 'input', value: store.templateId || '', onChange: function (event) { patch({ templateId: event.target.value }) } }, [React.createElement('option', { key: 'empty', value: '' }, '请选择模板'), (store.templates || []).map(function (template) { return React.createElement('option', { key: template.id, value: template.id }, (template.name || template.id) + ' · ' + (template.scope || 'workspace')) })])]) : null,
+           React.createElement('label', { key: 'name' }, ['模板名称', React.createElement('input', { key: 'input', value: store.templateName || (store.graph && store.graph.goal) || '', onChange: function (event) { patch({ templateName: event.target.value }) } })]),
+           React.createElement('label', { key: 'scope' }, ['模板作用域', React.createElement('select', { key: 'input', value: store.templateScope || 'workspace', onChange: function (event) { patch({ templateScope: event.target.value }) } }, [React.createElement('option', { key: 'workspace', value: 'workspace' }, 'workspace'), React.createElement('option', { key: 'global', value: 'global' }, 'global')])]),
+           React.createElement('button', { key: 'submit', type: 'button', className: 'gjo-primary', disabled: store.planning, onClick: submitPlannerDecision }, store.planning ? '生成中…' : '按选择生成候选')
+         ]) : null,
         store.message ? React.createElement('div', { key: 'message', className: 'gjo-message' }, store.message) : null,
         store.planning ? React.createElement('div', { key: 'planning', className: 'gjo-message' }, 'Planner 正在生成草案；完成后会显示预览。') : null,
          store.preview ? React.createElement(ValidationPanel, { key: 'validation', validation: store.preview.validation }) : null,
@@ -384,21 +412,28 @@ window.__ModuleLoader__.load({
           return Object.assign({}, value, { draft: draft })
         })
       }
+      function providerEntry(name) {
+        return ((store.capabilities && store.capabilities.subagentProviders) || []).filter(function (item) { return item.name === name })[0] || null
+      }
       function listValues(value) {
         return Array.from(new Set((value || []).map(function (item) { return String(item || '').trim() }).filter(Boolean)))
       }
       function providersFor(profile) {
         var capabilities = store.capabilities || {}
-        var providers = (capabilities.subagentProviders || []).filter(function (item) { return profile.executor !== 'codex' || /codex/i.test(item.name || '') }).map(function (item) { return item.name }).filter(Boolean)
+        var providers = profile.executor === 'codex'
+          ? (capabilities.subagentProviders || []).filter(function (item) { return /codex/i.test(item.name || '') }).map(function (item) { return item.name }).filter(Boolean)
+          : (capabilities.models || []).map(function (item) { return typeof item === 'string' ? item : item.provider }).filter(Boolean)
         if (profile.executor === 'codex') providers = listValues((capabilities.executors && capabilities.executors.codex && capabilities.executors.codex.providers) || providers)
-        else if (capabilities.executors && capabilities.executors.dsh && capabilities.executors.dsh.provider) providers.unshift(capabilities.executors.dsh.provider)
+        else if (capabilities.defaultModel && capabilities.defaultModel.provider) providers.unshift(capabilities.defaultModel.provider)
         if (profile.provider) providers.unshift(profile.provider)
         return listValues(providers)
       }
       function modelsFor(profile) {
-        var values = (store.capabilities && store.capabilities.models || []).filter(function (item) { return typeof item === 'string' || !profile.provider || item.provider === profile.provider }).map(function (item) { return typeof item === 'string' ? item : item.model })
         var provider = (store.capabilities && store.capabilities.subagentProviders || []).filter(function (item) { return item.name === profile.provider })[0]
-        values = values.concat(provider && provider.models || [])
+        var values = profile.executor === 'codex'
+          ? (provider && provider.models || [])
+          : (store.capabilities && store.capabilities.models || []).filter(function (item) { return typeof item === 'string' || !profile.provider || item.provider === profile.provider }).map(function (item) { return typeof item === 'string' ? item : item.model })
+        values = values.concat(provider && provider.staticModel || [])
         if (profile.model) values.unshift(profile.model)
         return listValues(values)
       }
@@ -408,22 +443,58 @@ window.__ModuleLoader__.load({
         var values = provider && provider.capabilities && provider.capabilities.reasoningEfforts || (store.capabilities && store.capabilities.executors && store.capabilities.executors.codex && store.capabilities.executors.codex.reasoningEfforts) || []
         return listValues(values)
       }
+      function changeProvider(index, providerName) {
+        var profile = (store.draft || [])[index] || {}
+        var next = { provider: providerName }
+        if (profile.executor === 'codex') {
+          var provider = providerEntry(providerName)
+          var models = listValues(provider && (provider.models || []).concat(provider.staticModel || []))
+          next.model = models.length ? models[0] : ''
+          next.reasoningEffort = ''
+        }
+        update(index, next)
+      }
       function changeExecutor(index, executor) {
         var profile = (store.draft || [])[index] || {}
-        var next = Object.assign({}, profile, { executor: executor, reasoningEffort: executor === 'codex' ? profile.reasoningEffort || '' : '' })
+        var next = Object.assign({}, profile, { executor: executor, provider: profile.provider || '', model: '', reasoningEffort: '' })
         var providers = providersFor(next)
+        if (executor === 'codex') {
+          var providerEntries = (store.capabilities && store.capabilities.subagentProviders || []).filter(function (item) { return /codex/i.test(item.name || '') })
+          var configured = providerEntries.filter(function (item) { return (item.models && item.models.length) || item.staticModel })[0]
+          if (configured) next.provider = configured.name
+        } else {
+          var dshProviders = providers
+          if (dshProviders.length && dshProviders.indexOf(next.provider) < 0) next.provider = dshProviders[0]
+        }
         if (providers.length && providers.indexOf(next.provider) < 0) next.provider = providers[0]
         var models = modelsFor(next)
         if (models.length && models.indexOf(next.model) < 0) next.model = models[0]
         update(index, next)
       }
+      function newProfile() {
+        setStore(function (value) {
+          var draft = clone(value.draft || [])
+          var ids = {}
+          draft.forEach(function (profile) { ids[profile.id] = true })
+          var index = draft.length + 1
+          var id = 'agent-' + index
+          while (ids[id]) { index += 1; id = 'agent-' + index }
+          var capabilities = value.capabilities || {}
+          var codexEntries = (capabilities.subagentProviders || []).filter(function (item) { return /codex/i.test(item.name || '') })
+          var codex = codexEntries.filter(function (item) { return (item.models && item.models.length) || item.staticModel })[0] || codexEntries[0]
+          var useCodex = Boolean(capabilities.executors && capabilities.executors.codex && capabilities.executors.codex.available && codex)
+          var model = useCodex ? listValues((codex.models || []).concat(codex.staticModel || []))[0] || '' : ''
+          draft.push({ id: id, name: useCodex ? 'Codex Agent ' + index : 'DSH Agent ' + index, executor: useCodex ? 'codex' : 'dsh', provider: useCodex ? codex.name : '', model: model, reasoningEffort: '', persona: '', permissionMode: 'default', maxOutputTokens: 4096, capabilities: { tools: [], skills: [] }, enabled: true })
+          return Object.assign({}, value, { draft: draft, message: useCodex ? '已新增 Codex Profile，请检查 Model 后保存。' : '已新增 DSH Profile，请检查配置后保存。' })
+        })
+      }
       function save() {
         setStore(function (value) { return Object.assign({}, value, { saving: true, error: '' }) })
         request('/profiles', { method: 'PUT', body: { profiles: store.draft } }).then(function (body) { setStore(function (value) { return Object.assign({}, value, { profiles: body.profiles, draft: clone(body.profiles), saving: false, message: 'Agent Profile 已保存。' }) }) }).catch(function (error) { setStore(function (value) { return Object.assign({}, value, { saving: false, error: error.message || String(error) }) }) })
       }
       if (store.loading) return React.createElement('div', { className: 'gjo-settings gjo-empty' }, '正在读取 Agent Profile…')
       return React.createElement('div', { className: 'gjo-settings' }, [
-        React.createElement('div', { key: 'head', className: 'gjo-settings-head' }, [React.createElement('div', { key: 'copy' }, [React.createElement('h2', { key: 'h' }, 'Graph Job Agent Profiles'), React.createElement('p', { key: 'p' }, 'revision 创建时会快照 Provider/Model；普通 DSH 不显示 reasoningEffort，Codex 只显示能力快照公布的值。')]), React.createElement('button', { key: 'save', type: 'button', className: 'gjo-primary', disabled: store.saving, onClick: save }, store.saving ? '保存中…' : '保存')]),
+        React.createElement('div', { key: 'head', className: 'gjo-settings-head' }, [React.createElement('div', { key: 'copy' }, [React.createElement('h2', { key: 'h' }, 'Graph Job Agent Profiles'), React.createElement('p', { key: 'p' }, 'revision 创建时会快照 Provider/Model；普通 DSH 不显示 reasoningEffort，Codex 只显示能力快照公布的值。')]), React.createElement('div', { key: 'actions', className: 'gjo-header-actions' }, [React.createElement('button', { key: 'new', type: 'button', className: 'gjo-secondary', onClick: newProfile }, '新增 Profile'), React.createElement('button', { key: 'save', type: 'button', className: 'gjo-primary', disabled: store.saving, onClick: save }, store.saving ? '保存中…' : '保存')])]),
         store.error ? React.createElement('div', { key: 'error', className: 'gjo-error' }, store.error) : null,
         store.message ? React.createElement('div', { key: 'message', className: 'gjo-message' }, store.message) : null,
         React.createElement('div', { key: 'list', className: 'gjo-profile-list' }, (store.draft || []).map(function (profile, index) {
@@ -433,10 +504,10 @@ window.__ModuleLoader__.load({
           return React.createElement('article', { key: profile.id, className: 'gjo-profile-card' }, [
             React.createElement('div', { key: 'top', className: 'gjo-profile-top' }, [React.createElement('strong', { key: 'name' }, profile.name || profile.id), React.createElement('span', { key: 'executor', className: 'gjo-pill' }, profile.executor)]),
             React.createElement('label', { key: 'executor' }, ['Executor', React.createElement('select', { key: 'input', value: profile.executor || 'dsh', onChange: function (event) { changeExecutor(index, event.target.value) } }, [React.createElement('option', { key: 'dsh', value: 'dsh' }, 'DSH in-process'), React.createElement('option', { key: 'codex', value: 'codex', disabled: !(store.capabilities && store.capabilities.executors && store.capabilities.executors.codex && store.capabilities.executors.codex.available) }, 'Codex')])]),
-            React.createElement('label', { key: 'provider' }, ['Provider', providers.length ? React.createElement('select', { key: 'input', value: profile.provider || '', onChange: function (event) { update(index, { provider: event.target.value }) } }, [React.createElement('option', { key: 'empty', value: '' }, '选择 Provider'), providers.map(function (item) { return React.createElement('option', { key: item, value: item }, item) })]) : React.createElement('input', { key: 'input', value: profile.provider || '', placeholder: 'revision 时继承默认', onChange: function (event) { update(index, { provider: event.target.value }) } })]),
+            React.createElement('label', { key: 'provider' }, ['Provider', providers.length ? React.createElement('select', { key: 'input', value: profile.provider || '', onChange: function (event) { changeProvider(index, event.target.value) } }, [React.createElement('option', { key: 'empty', value: '' }, '选择 Provider'), providers.map(function (item) { return React.createElement('option', { key: item, value: item }, item) })]) : React.createElement('input', { key: 'input', value: profile.provider || '', placeholder: 'revision 时继承默认', onChange: function (event) { update(index, { provider: event.target.value }) } })]),
             React.createElement('label', { key: 'model' }, ['Model', models.length ? React.createElement('select', { key: 'input', value: profile.model || '', onChange: function (event) { update(index, { model: event.target.value }) } }, [React.createElement('option', { key: 'empty', value: '' }, '选择 Model'), models.map(function (item) { return React.createElement('option', { key: item, value: item }, item) })]) : React.createElement('input', { key: 'input', value: profile.model || '', placeholder: 'revision 时继承默认', onChange: function (event) { update(index, { model: event.target.value }) } })]),
             profile.executor === 'codex' ? React.createElement('label', { key: 'reasoning' }, ['Reasoning effort', reasoning.length ? React.createElement('select', { key: 'input', value: profile.reasoningEffort || '', onChange: function (event) { update(index, { reasoningEffort: event.target.value }) } }, [React.createElement('option', { key: 'empty', value: '' }, '不设置'), reasoning.map(function (item) { return React.createElement('option', { key: item, value: item }, item) })]) : React.createElement('span', { key: 'empty', className: 'gjo-muted' }, '当前 Codex capability 未公布可选值')]) : null,
-            React.createElement('label', { key: 'permission' }, ['Permission mode', React.createElement('select', { key: 'input', value: profile.permissionMode || 'default', onChange: function (event) { update(index, { permissionMode: event.target.value }) } }, [React.createElement('option', { key: 'default', value: 'default' }, 'default'), React.createElement('option', { key: 'never', value: 'never' }, 'never'), React.createElement('option', { key: 'approve', value: 'approve-for-me' }, 'approve-for-me')])]),
+             React.createElement('label', { key: 'permission' }, ['Permission mode', React.createElement('select', { key: 'input', value: profile.permissionMode || 'default', onChange: function (event) { update(index, { permissionMode: event.target.value }) } }, [React.createElement('option', { key: 'default', value: 'default' }, 'default'), React.createElement('option', { key: 'never', value: 'never' }, 'never'), React.createElement('option', { key: 'approve', value: 'approve-for-me' }, 'approve-for-me'), React.createElement('option', { key: 'dangerous', value: 'dangerously-bypass-approvals-and-sandbox' }, 'dangerously-bypass-approvals-and-sandbox')])]),
             React.createElement('label', { key: 'persona' }, ['Persona', React.createElement('textarea', { key: 'input', rows: 3, value: profile.persona || '', onChange: function (event) { update(index, { persona: event.target.value }) } } )]),
             React.createElement('p', { key: 'caps', className: 'gjo-muted' }, '工具 ' + ((profile.capabilities && profile.capabilities.tools || []).join(', ') || '无') + ' · Skills ' + ((profile.capabilities && profile.capabilities.skills || []).join(', ') || '无') + (profile.executor === 'codex' ? ' · reasoningEffort 由 capability 校验' : ''))
           ])
@@ -465,19 +536,22 @@ window.__ModuleLoader__.load({
       var sessions = props.sessions || sessionsService
       var sessionId = useSessionId({ sessions: sessions })
       var overlay = useSubagentOverlay()
-      var state = React.useState({ label: '新建 Subagent', prompt: overlay.initialPrompt || '', profileId: '', profiles: [], loading: false, busy: false, error: '', message: '' })
+       var state = React.useState({ label: '新建 Subagent', prompt: overlay.initialPrompt || '', profileId: '', profiles: [], capabilities: null, loading: false, busy: false, error: '', message: '', oneShotResult: null })
       var store = state[0]
       var setStore = state[1]
       React.useEffect(function () {
         if (!overlay.open) return undefined
-        setStore({ label: '新建 Subagent', prompt: overlay.initialPrompt || '', profileId: '', profiles: [], loading: true, busy: false, error: '', message: '' })
-        request('/profiles').then(function (body) {
-          var profiles = (body.profiles || []).filter(function (profile) { return profile.enabled !== false })
-          setStore(function (value) { return Object.assign({}, value, { profiles: profiles, profileId: profiles[0] && profiles[0].id || '', loading: false }) })
-        }).catch(function (error) { setStore(function (value) { return Object.assign({}, value, { loading: false, error: error.message || String(error) }) }) })
+         setStore({ label: '新建 Subagent', prompt: overlay.initialPrompt || '', profileId: '', profiles: [], capabilities: null, loading: true, busy: false, error: '', message: '', oneShotResult: null })
+         Promise.all([request('/profiles'), request('/capabilities')]).then(function (values) {
+           var body = values[0]
+           var profiles = (body.profiles || []).filter(function (profile) { return profile.enabled !== false })
+           setStore(function (value) { return Object.assign({}, value, { profiles: profiles, capabilities: values[1].capabilities || null, profileId: profiles[0] && profiles[0].id || '', loading: false }) })
+         }).catch(function (error) { setStore(function (value) { return Object.assign({}, value, { loading: false, error: error.message || String(error) }) }) })
         return undefined
       }, [overlay.open, overlay.version, sessionId])
-      function update(patch) { setStore(function (value) { return Object.assign({}, value, patch) }) }
+       function update(patch) { setStore(function (value) { return Object.assign({}, value, patch) }) }
+       var selectedProfile = (store.profiles || []).filter(function (profile) { return profile.id === store.profileId })[0] || null
+       var selectedCodex = selectedProfile && selectedProfile.executor === 'codex'
       function openChild(child) {
         var childId = child && (child.childId || child.id)
         if (!childId) throw new Error('Runtime 没有返回子会话 ID。')
@@ -499,24 +573,34 @@ window.__ModuleLoader__.load({
         event.preventDefault()
         if (store.busy || !sessionId || !store.prompt.trim()) return
         update({ busy: true, error: '', message: '' })
-        request('/subagents', { method: 'POST', body: { sessionId: sessionId, label: store.label, prompt: store.prompt, profileId: store.profileId } }).then(function (body) {
-          update({ message: 'Subagent 已创建，正在打开独立会话。' })
-          return openChild(body.child || {})
-        }).then(function () {
-          setSubagentOverlayOpen(false)
-        }).catch(function (error) { update({ busy: false, error: error.message || String(error) }) })
+         request('/subagents', { method: 'POST', body: { sessionId: sessionId, label: store.label, prompt: store.prompt, profileId: store.profileId } }).then(function (body) {
+           var child = body.child || {}
+           if (child.mode === 'one-shot') {
+             update({ busy: false, message: 'Codex one-shot 已完成；结果保留在这里，未创建可继续会话。', oneShotResult: child.result || null })
+             return null
+           }
+           update({ message: 'Subagent 已创建，正在打开独立会话。' })
+           return openChild(child).then(function () { setSubagentOverlayOpen(false) })
+         }).catch(function (error) { update({ busy: false, error: error.message || String(error) }) })
       }
       if (!overlay.open) return null
       return React.createElement('div', { className: 'gjo-subagent-overlay', onMouseDown: function (event) { if (event.target === event.currentTarget) setSubagentOverlayOpen(false) } }, React.createElement('aside', { className: 'gjo-subagent-panel', role: 'dialog', 'aria-modal': 'true', 'aria-label': '新建 Subagent' }, [
         React.createElement('div', { key: 'head', className: 'gjo-subagent-head' }, [React.createElement('div', { key: 'copy' }, [React.createElement('span', { key: 'eyebrow', className: 'gjo-eyebrow' }, 'SUBAGENT'), React.createElement('h2', { key: 'title' }, '新建 Subagent')]), React.createElement('button', { key: 'close', type: 'button', className: 'gjo-subagent-close', onClick: function () { setSubagentOverlayOpen(false) } }, '×')]),
-        React.createElement('p', { key: 'intro', className: 'gjo-subagent-intro' }, '创建一个可继续对话的独立 Agent。创建后会自动切换到它的会话，当前主会话仍保留。'),
-        store.error ? React.createElement('div', { key: 'error', className: 'gjo-error' }, store.error) : null,
+         React.createElement('p', { key: 'intro', className: 'gjo-subagent-intro' }, selectedCodex ? 'Codex 通过官方 one-shot provider 运行一次任务；它会使用 Profile Bundle/原生配置中的模型和权限，完成后在此显示结果。' : '创建一个可继续对话的独立 Agent。创建后会自动切换到它的会话，当前主会话仍保留。'),
+         store.error ? React.createElement('div', { key: 'error', className: 'gjo-error' }, store.error) : null,
+         selectedProfile ? React.createElement('div', { key: 'profile-summary', className: 'gjo-subagent-profile-summary' }, [
+           React.createElement('strong', { key: 'title' }, '当前 Profile 能力'),
+           React.createElement('span', { key: 'provider' }, 'Executor：' + (selectedProfile.executor || 'dsh') + ' · Provider：' + (selectedProfile.provider || '默认')),
+           React.createElement('span', { key: 'model' }, 'Model：' + (selectedProfile.model || (selectedCodex ? '由 Codex 原生配置决定' : '由 DSH 默认配置决定'))),
+           selectedCodex ? React.createElement('span', { key: 'reasoning' }, 'Reasoning：' + (selectedProfile.reasoningEffort || '未设置；官方 provider 未公布动态推理档次')) : null
+         ]) : null,
+         store.oneShotResult ? React.createElement('div', { key: 'one-shot-result', className: 'gjo-subagent-result' }, [React.createElement('strong', { key: 'title' }, 'Codex 结果'), React.createElement('pre', { key: 'text' }, store.oneShotResult.text || '（无正文输出）'), store.oneShotResult.diagnostic ? React.createElement('small', { key: 'diagnostic' }, '诊断：' + store.oneShotResult.diagnostic) : null]) : null,
         React.createElement('form', { key: 'form', onSubmit: create }, [
           React.createElement('label', { key: 'label' }, ['名称', React.createElement('input', { key: 'input', value: store.label, maxLength: 120, onChange: function (event) { update({ label: event.target.value }) }, placeholder: '例如：资料检索员' })]),
           React.createElement('label', { key: 'profile' }, ['Agent Profile', store.loading ? React.createElement('span', { key: 'loading', className: 'gjo-muted' }, '读取中…') : React.createElement('select', { key: 'select', value: store.profileId, onChange: function (event) { update({ profileId: event.target.value }) } }, [React.createElement('option', { key: 'empty', value: '' }, '使用默认 Profile'), store.profiles.map(function (profile) { return React.createElement('option', { key: profile.id, value: profile.id }, (profile.name || profile.id) + ' · ' + profile.executor) })])]),
           React.createElement('label', { key: 'prompt' }, ['初始任务', React.createElement('textarea', { key: 'textarea', rows: 10, maxLength: 20000, value: store.prompt, onChange: function (event) { update({ prompt: event.target.value }) }, placeholder: '告诉 Subagent 要完成什么，以及需要关注的约束。' })]),
-          React.createElement('p', { key: 'note', className: 'gjo-note' }, 'Subagent 默认不能使用 Graph Job 管理工具或 Skill 工具；模型、Provider 和权限沿用所选 Profile 的受控配置。'),
-          React.createElement('div', { key: 'actions', className: 'gjo-subagent-actions' }, [React.createElement('button', { key: 'cancel', type: 'button', className: 'gjo-secondary', onClick: function () { setSubagentOverlayOpen(false) } }, '取消'), React.createElement('button', { key: 'submit', type: 'submit', className: 'gjo-primary', disabled: store.busy || !sessionId || !store.prompt.trim() }, store.busy ? '创建中…' : '创建并打开')])
+           React.createElement('p', { key: 'note', className: 'gjo-note' }, selectedCodex ? '官方 Codex provider 不接受 per-call agentOptions、Tools、Skills、persona 或动态 reasoning；需要先在 Profile Bundle/原生 Codex 配置中设置。' : 'Subagent 默认不能使用 Graph Job 管理工具或 Skill 工具；模型、Provider 和权限沿用所选 Profile 的受控配置。'),
+           React.createElement('div', { key: 'actions', className: 'gjo-subagent-actions' }, [React.createElement('button', { key: 'cancel', type: 'button', className: 'gjo-secondary', onClick: function () { setSubagentOverlayOpen(false) } }, '取消'), React.createElement('button', { key: 'submit', type: 'submit', className: 'gjo-primary', disabled: store.busy || !sessionId || !store.prompt.trim() }, store.busy ? '创建中…' : selectedCodex ? '运行 Codex one-shot' : '创建并打开')])
         ])
       ]))
     }
@@ -530,6 +614,10 @@ window.__ModuleLoader__.load({
     CSS += `
 .gjo-sidebar-action{display:flex;align-items:center;justify-content:center;width:calc(100% - 20px);margin:6px 10px 0;padding:7px 10px;border:1px solid var(--dsw-alias-border-l2,#30343e);border-radius:7px;background:transparent;color:var(--dsw-alias-label-secondary,#aab1bd);cursor:pointer;font:inherit;font-size:12px}.gjo-sidebar-action:hover{background:var(--dsw-alias-interactive-bg-hover,#ffffff0d);color:var(--dsw-alias-label-primary,#e7e9ee);border-color:var(--dsw-alias-state-business-primary,#4f8cff)}
 .gjo-subagent-overlay{position:fixed;z-index:1000;inset:0;display:flex;justify-content:flex-end;background:#0007}.gjo-subagent-panel{box-sizing:border-box;width:min(440px,100vw);height:100%;overflow:auto;padding:20px;background:var(--dsw-alias-bg-layer-1,#1d2028);border-left:1px solid var(--dsw-alias-border-l2,#30343e);box-shadow:-8px 0 30px #0006;color:var(--dsw-alias-label-primary,#e7e9ee)}.gjo-subagent-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}.gjo-subagent-head h2{margin:3px 0 0;font-size:19px}.gjo-subagent-close{border:0;background:transparent;color:var(--dsw-alias-label-secondary,#aab1bd);font-size:24px;line-height:1;cursor:pointer}.gjo-subagent-intro{margin:12px 0 18px;color:var(--dsw-alias-label-secondary,#aab1bd);font-size:12px}.gjo-subagent-panel .gjo-error{margin:0 0 12px}.gjo-subagent-panel label{display:flex;flex-direction:column;gap:6px;margin:13px 0;color:var(--dsw-alias-label-secondary,#aab1bd);font-size:11px}.gjo-subagent-panel input,.gjo-subagent-panel select,.gjo-subagent-panel textarea{box-sizing:border-box;width:100%;border:1px solid var(--dsw-alias-border-l2,#30343e);border-radius:7px;background:var(--dsw-specific-input-major,#101217);color:inherit;padding:8px 9px;font:inherit;font-size:12px}.gjo-subagent-panel textarea{resize:vertical}.gjo-subagent-panel .gjo-note{margin-top:16px}.gjo-subagent-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:18px}
+`
+
+    CSS += `
+.gjo-decision-panel{margin:10px 22px 0;padding:12px;border:1px solid var(--dsw-alias-state-warn-primary,#c77b26);border-radius:8px;background:var(--dsw-alias-state-warn-tertiary,#c77b2614)}.gjo-decision-panel p{margin:5px 0 10px;color:var(--dsw-alias-label-secondary,#aab1bd);font-size:11px}.gjo-decision-panel label{display:flex;flex-direction:column;gap:5px;margin:9px 0;color:var(--dsw-alias-label-secondary,#aab1bd);font-size:11px}.gjo-decision-panel input,.gjo-decision-panel select{box-sizing:border-box;width:100%;border:1px solid var(--dsw-alias-border-l2,#30343e);border-radius:7px;background:var(--dsw-specific-input-major,#101217);color:inherit;padding:7px 9px;font:inherit;font-size:12px}.gjo-decision-panel button{margin-top:4px}.gjo-subagent-profile-summary,.gjo-subagent-result{display:flex;flex-direction:column;gap:4px;margin:10px 0;padding:9px;border:1px solid var(--dsw-alias-border-l2,#30343e);border-radius:7px;background:var(--dsw-alias-bg-layer-2,#ffffff08);font-size:11px}.gjo-subagent-profile-summary span,.gjo-subagent-result small{color:var(--dsw-alias-label-secondary,#aab1bd)}.gjo-subagent-result pre{max-height:260px;overflow:auto;margin:4px 0;white-space:pre-wrap;word-break:break-word;font:11px/1.5 ui-monospace,SFMono-Regular,Consolas,monospace}
 `
 
     function activateConversationView() {
@@ -550,7 +638,9 @@ window.__ModuleLoader__.load({
         function onDesktopMessage(event) {
           if (event.source !== window.parent) return
           var data = event.data
-          if (data && data.source === 'dsh-desktop' && data.type === 'plugin-rpc' && data.pluginId === PLUGIN_ID && data.method === DESKTOP_RPC_METHOD) activateConversationView()
+          if (!data || data.source !== 'dsh-desktop' || data.type !== 'plugin-rpc' || data.pluginId !== PLUGIN_ID) return
+          if (data.method === DESKTOP_RPC_METHOD) activateConversationView()
+          if (data.method === DESKTOP_SUBAGENT_RPC_METHOD) openSubagentOverlay()
         }
         window.addEventListener('message', onDesktopMessage)
         return function () { window.removeEventListener('message', onDesktopMessage) }

package/lib/executors.js

@@ -123,6 +123,25 @@ export function resolveCodexPermission(profile = {}, providerCapabilities = {})
   return { mode: requested, passThrough: true }
 }
 
+function isNativeCodexProvider(providerName, provider, providerCapabilities) {
+  return /codex/i.test(String(providerName || '')) &&
+    provider?.inheritsParentContext === false &&
+    providerCapabilities.toolFilter !== true &&
+    providerCapabilities.depthLimit !== true &&
+    providerCapabilities.persona !== true &&
+    providerCapabilities.outputSchema !== true
+}
+
+function staticProviderValue(provider, descriptor, key) {
+  return String(
+    provider?.[key] ||
+    provider?.config?.[key] ||
+    descriptor?.[key] ||
+    descriptor?.config?.[key] ||
+    ''
+  ).trim()
+}
+
 function contentText(content) {
   if (typeof content === 'string') return content.trim()
   if (content && typeof content === 'object' && !Array.isArray(content)) {
@@ -434,29 +453,63 @@ export class CodexExecutor {
     }
     const descriptor = this.capabilityCatalog.subagentProviders?.find((item) => item.name === providerName)
     const providerCapabilities = provider?.capabilities || descriptor?.capabilities || {}
-    if (providerCapabilities.toolFilter !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持安全 Tool allowlist。`)
-    if (providerCapabilities.depthLimit !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 delegation depth 限制。`)
-    if (profile.persona && providerCapabilities.persona !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 per-profile persona。`)
-    if (profile.reasoningEffort && (!Array.isArray(providerCapabilities.reasoningEfforts) || !providerCapabilities.reasoningEfforts.includes(profile.reasoningEffort))) {
-      throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 reasoningEffort=${profile.reasoningEffort}。`)
-    }
-    const permission = resolveCodexPermission(profile, providerCapabilities)
     const prompt = buildNodePrompt({ graph, node, profile, predecessorResults })
-    const toolFilter = buildToolFilter(profile, this.capabilityCatalog.tools || [])
-    const agentOptions = { model: profile.model, maxTokens: profile.maxOutputTokens }
-    if (profile.reasoningEffort) agentOptions.reasoningEffort = profile.reasoningEffort
-    const startRequest = {
-      label: `graph-job:codex:${graph.graphId}:${node.id}:attempt-${attempt}`,
-      prompt: [{ type: 'text', text: prompt }],
-      parent: parentAgent,
-      signal,
-      maxDepth: graph.limits.maxDepth,
-      persona: profile.persona || undefined,
-      agentOptions
+    const nativeCodex = isNativeCodexProvider(providerName, provider, providerCapabilities)
+    let startRequest
+    if (nativeCodex) {
+      // The official subagent-codex bundle is intentionally one-shot and
+      // exposes NO_START_CAPABILITIES. It fixes model/permission on the
+      // provider instance and rejects shared agentOptions, tool filtering,
+      // persona, output schema and depth controls. Do not send generic DSH
+      // fields here: doing so makes the provider reject the whole run.
+      if (profile.capabilities?.tools?.length || profile.capabilities?.skills?.length) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 不支持通过 Graph Profile 传入 Tools/Skills；请在 Codex 原生配置中管理它们。`)
+      }
+      if (profile.persona) throw new CapabilityMismatchError(`Codex provider ${providerName} 不支持 per-profile persona；请在 Codex 原生配置中管理身份。`)
+      if (profile.reasoningEffort && (!Array.isArray(providerCapabilities.reasoningEfforts) || !providerCapabilities.reasoningEfforts.includes(profile.reasoningEffort))) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 未公布 reasoningEffort=${profile.reasoningEffort}；当前包不支持按调用指定推理档次。`)
+      }
+      const staticModel = staticProviderValue(provider, descriptor, 'staticModel') || staticProviderValue(provider, descriptor, 'model')
+      if (profile.model && providerCapabilities.dynamicModel !== true && staticModel !== profile.model) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 的 model 由 Profile Bundle 静态配置；当前运行不能按节点动态覆盖 ${profile.model}。`)
+      }
+      const staticPermission = staticProviderValue(provider, descriptor, 'staticPermissionMode') || staticProviderValue(provider, descriptor, 'permissionMode')
+      if (profile.permissionMode && profile.permissionMode !== 'default' && staticPermission && staticPermission !== profile.permissionMode) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 的 permissionMode 固定为 ${staticPermission}，不能在节点运行时改成 ${profile.permissionMode}。`)
+      }
+      if (profile.permissionMode && profile.permissionMode !== 'default' && !staticPermission) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 未公布可动态设置 permissionMode；请在 Profile Bundle 配置后使用 default。`)
+      }
+      startRequest = {
+        label: `graph-job:codex:${graph.graphId}:${node.id}:attempt-${attempt}`,
+        prompt: [{ type: 'text', text: prompt }],
+        parent: parentAgent,
+        signal
+      }
+    } else {
+      if (providerCapabilities.toolFilter !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持安全 Tool allowlist。`)
+      if (providerCapabilities.depthLimit !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 delegation depth 限制。`)
+      if (profile.persona && providerCapabilities.persona !== true) throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 per-profile persona。`)
+      if (profile.reasoningEffort && (!Array.isArray(providerCapabilities.reasoningEfforts) || !providerCapabilities.reasoningEfforts.includes(profile.reasoningEffort))) {
+        throw new CapabilityMismatchError(`Codex provider ${providerName} 未明确支持 reasoningEffort=${profile.reasoningEffort}。`)
+      }
+      const permission = resolveCodexPermission(profile, providerCapabilities)
+      const toolFilter = buildToolFilter(profile, this.capabilityCatalog.tools || [])
+      const agentOptions = { model: profile.model, maxTokens: profile.maxOutputTokens }
+      if (profile.reasoningEffort) agentOptions.reasoningEffort = profile.reasoningEffort
+      startRequest = {
+        label: `graph-job:codex:${graph.graphId}:${node.id}:attempt-${attempt}`,
+        prompt: [{ type: 'text', text: prompt }],
+        parent: parentAgent,
+        signal,
+        maxDepth: graph.limits.maxDepth,
+        persona: profile.persona || undefined,
+        agentOptions
+      }
+      if (permission.passThrough) startRequest.permissionMode = permission.mode
+      if (toolFilter) startRequest.toolFilter = toolFilter
+      if (providerCapabilities.outputSchema) startRequest.outputSchema = NODE_OUTPUT_SCHEMA
     }
-    if (permission.passThrough) startRequest.permissionMode = permission.mode
-    if (toolFilter) startRequest.toolFilter = toolFilter
-    if (providerCapabilities.outputSchema) startRequest.outputSchema = NODE_OUTPUT_SCHEMA
     const run = await start.call(this.services.subagents, providerName, startRequest)
     const childSessionId = childSessionIdFromRun(run)
     try {

package/lib/graph-schema.js

@@ -13,13 +13,13 @@ const AGENT_PROFILE_SCHEMA = {
   properties: {
     id: { type: 'string', minLength: 1, maxLength: 120 },
     name: { type: 'string', maxLength: 200 },
-    executor: { enum: [...EXECUTORS] },
+    executor: { type: 'string', enum: [...EXECUTORS] },
     provider: { type: 'string', maxLength: 200 },
     subagentProvider: { type: 'string', maxLength: 200 },
     model: { type: 'string', maxLength: 300 },
     reasoningEffort: { type: 'string', maxLength: 40 },
     persona: { type: 'string', maxLength: 12000 },
-    permissionMode: { enum: ['default', 'never', 'approve-for-me'] },
+    permissionMode: { type: 'string', enum: ['default', 'never', 'approve-for-me', 'dangerously-bypass-approvals-and-sandbox'] },
     maxOutputTokens: { type: 'integer', minimum: 256, maximum: 128000 },
     capabilities: {
       type: 'object',
@@ -37,7 +37,7 @@ const OUTPUT_CONTRACT_SCHEMA = {
   type: 'object',
   additionalProperties: false,
   properties: {
-    fields: { type: 'array', items: { enum: ['text', 'artifactRefs'] }, maxItems: 2 },
+    fields: { type: 'array', items: { type: 'string', enum: ['text', 'artifactRefs'] }, maxItems: 2 },
     text: { type: 'boolean' },
     artifactRefs: { type: 'boolean' },
     requireText: { type: 'boolean' },
@@ -52,13 +52,13 @@ const NODE_SCHEMA = {
   required: ['id', 'kind', 'title'],
   properties: {
     id: { type: 'string', minLength: 1, maxLength: 120 },
-    kind: { enum: [...NODE_KINDS] },
+    kind: { type: 'string', enum: [...NODE_KINDS] },
     title: { type: 'string', minLength: 1, maxLength: 300 },
     instruction: { type: 'string', maxLength: 20000 },
     agentProfileId: { type: 'string', maxLength: 120 },
-    access: { enum: [...ACCESS_MODES] },
+    access: { type: 'string', enum: [...ACCESS_MODES] },
     outputContract: OUTPUT_CONTRACT_SCHEMA,
-    failurePolicy: { enum: [...FAILURE_POLICIES] },
+    failurePolicy: { type: 'string', enum: [...FAILURE_POLICIES] },
     ui: {
       type: 'object',
       additionalProperties: false,
@@ -117,7 +117,7 @@ export const GRAPH_PATCH_SCHEMA = Object.freeze({
         type: 'object',
         required: ['op'],
         properties: {
-          op: { enum: ['addNode', 'removeNode', 'updateNode', 'addEdge', 'removeEdge', 'updateLimits', 'setGoal'] },
+          op: { type: 'string', enum: ['addNode', 'removeNode', 'updateNode', 'addEdge', 'removeEdge', 'updateLimits', 'setGoal'] },
           id: { type: 'string' },
           nodeId: { type: 'string' },
           node: NODE_SCHEMA,
@@ -180,9 +180,14 @@ export function normalizeProfile(input = {}, options = {}) {
     provider = executor === 'codex' ? 'codex' : defaultProvider
     modelSource = 'default'
   }
-  if (!model && options.resolveDefaults) {
+  if (!model && options.resolveDefaults && executor !== 'codex') {
     model = defaultModelName
     modelSource = 'default'
+  } else if (!model && options.resolveDefaults && executor === 'codex') {
+    // The official Codex provider may inherit its model from the static
+    // provider bundle/native Codex settings. Never inject the DSH chat model
+    // into a Codex one-shot request.
+    modelSource = 'provider-default'
   }
   const reasoningEffort = executor === 'codex' ? text(input.reasoningEffort) : ''
   return {

package/lib/index.js

@@ -55,7 +55,16 @@ function diagnosticLog(logger, level, event, details = {}) {
   } catch { /* diagnostics must never break the user path */ }
 }
 
-function makePlannerFollowup(goal) {
+function makePlannerFollowup(goal, decision = {}) {
+  const decisionText = decision.templateMode
+    ? [
+        '用户已经在 Graph Job 面板选择了手工图修订方式。',
+        `templateMode：${decision.templateMode}`,
+        decision.templateId ? `templateId：${decision.templateId}` : 'templateId：无（请创建新模板）',
+        `templateScope：${decision.templateScope || 'workspace'}`,
+        decision.templateName ? `templateName：${decision.templateName}` : ''
+      ].filter(Boolean).join('\n')
+    : ''
   return {
     id: `graphjob-command-${randomUUID()}`,
     role: 'user',
@@ -65,8 +74,9 @@ function makePlannerFollowup(goal) {
         '用户刚刚通过 /graphjob 提交了一个任务图目标。',
         '请只调用 graphjob_plan，为这个目标生成受限的 Graph Job 草案；不要运行 Graph，不要执行目标中的业务动作，也不要发送外部消息。',
         `用户目标：${goal}`,
+        decisionText,
         '生成预览后等待用户在 Graph Job 面板中确认。'
-      ].join('\n\n')
+      ].filter(Boolean).join('\n\n')
     }],
     source: { kind: 'plugin', plugin: PLUGIN_ID, form: 'instructions' }
   }
@@ -108,8 +118,20 @@ function commandDefinition(orchestrator, logger) {
         }
         return { kind: 'success', text: 'Graph Job 已打开。请在任务图面板中补充节点，完成预览和确认后再运行。' }
       }
+      orchestrator.setPlannerRequest?.(sessionId, { goal: rawGoal, cwd: agent.session.header.cwd })
       try {
-        await Promise.resolve(agent.followup(makePlannerFollowup(rawGoal)))
+        // Agent.followup is deliberately a synchronous queue operation. Awaiting
+        // a promise here would make the slash-command lifecycle depend on the
+        // whole planner/model turn and leaves the composer in "停止生成" state.
+         const queuedFollowup = agent.followup(makePlannerFollowup(rawGoal))
+         if (queuedFollowup && typeof queuedFollowup.catch === 'function') {
+           queuedFollowup.catch((error) => diagnosticLog(logger, 'error', 'command.planner_turn_failed', {
+             sessionId: sessionMarker(sessionId),
+             code: error?.code || 'UNKNOWN',
+             message: diagnosticMessage(error)
+           }))
+         }
+        orchestrator.setPlannerStatus?.(sessionId, { state: 'queued' })
         diagnosticLog(logger, 'info', 'command.planner_queued', { sessionId: sessionMarker(sessionId), goalLength: rawGoal.length })
         return { kind: 'success', text: 'Graph Job 已打开，正在生成草案；完成后请在任务图面板预览并确认。' }
       } catch (error) {
@@ -130,14 +152,16 @@ const planOutputSchema = {
     confirmationToken: { type: 'string' },
     summary: { type: 'object' },
     validation: { type: 'object' },
-    templateDecision: {
-      type: 'object',
-      additionalProperties: false,
-      required: ['mode'],
+      templateDecision: {
+        type: 'object',
+        additionalProperties: false,
+      required: [],
       properties: {
         mode: { type: 'string', enum: ['saveAs', 'overwrite'] },
         templateId: { type: 'string' },
-        scope: { type: 'string', enum: ['global', 'workspace'] }
+        scope: { type: 'string', enum: ['global', 'workspace'] },
+        required: { type: 'boolean' },
+        message: { type: 'string' }
       }
     }
   }
@@ -165,7 +189,9 @@ function planTool(orchestrator, logger) {
     },
     output: {
       schema: planOutputSchema,
-      render: (_args, value) => [{ type: 'text', text: `Graph Job 草案已生成，等待用户预览确认。\n${JSON.stringify(value.summary)}` }]
+      render: (_args, value) => [{ type: 'text', text: value?.templateDecision?.required
+        ? `Graph Job 草案等待用户选择模板保存方式：${value.templateDecision.message || 'saveAs 或 overwrite'}。`
+        : `Graph Job 草案已生成，等待用户预览确认。\n${JSON.stringify(value.summary)}` }]
     },
     presentCall(args) {
       return { card: 'generic', kind: 'graph-job-plan', title: '生成 Graph Job 任务图', rawInput: JSON.stringify({ goal: args?.goal || '' }) }
@@ -180,6 +206,13 @@ function planTool(orchestrator, logger) {
       if (!parentAgent || !header?.id) throw new Error(`${PLAN_TOOL_NAME} 只能从正在运行的 DSH 主对话调用。`)
       if (header.origin === 'subagent') throw new Error('Subagent 不能递归调用 Graph Job Planner。')
       const startedAt = Date.now()
+      orchestrator.setPlannerRequest?.(header.id, {
+        goal: args?.goal,
+        cwd: header.cwd,
+        draft: args?.draft,
+        patch: args?.patch,
+        baseGraph: args?.baseGraph
+      })
       orchestrator.setPlannerStatus?.(header.id, { state: 'running' })
       diagnosticLog(logger, 'info', 'planner.request', {
         sessionId: sessionMarker(header.id),
@@ -218,7 +251,18 @@ function planTool(orchestrator, logger) {
           message: diagnosticMessage(error),
           durationMs: Date.now() - startedAt
         })
-        orchestrator.setPlannerStatus?.(header.id, { state: 'failed', error: diagnosticMessage(error) })
+        if (error?.code === 'TEMPLATE_DECISION_REQUIRED') {
+          const message = diagnosticMessage(error)
+          orchestrator.setPlannerStatus?.(header.id, { state: 'needs-decision', code: error.code, error: message })
+          return {
+            previewId: '',
+            confirmationRequired: false,
+            summary: { requiresTemplateDecision: true },
+            validation: { valid: false, errors: [{ code: error.code, message }], warnings: [] },
+            templateDecision: { required: true, message }
+          }
+        }
+        orchestrator.setPlannerStatus?.(header.id, { state: 'failed', code: error?.code || 'UNKNOWN', error: diagnosticMessage(error) })
         throw error
       }
     }
@@ -246,6 +290,147 @@ function graphJobToolFilter(toolNames) {
   return denied.length ? { deny: denied } : undefined
 }
 
+function oneShotText(value) {
+  if (typeof value === 'string') return value.trim()
+  if (Array.isArray(value)) return value.map(oneShotText).filter(Boolean).join('\n\n').trim()
+  if (!value || typeof value !== 'object') return ''
+  if (typeof value.text === 'string') return value.text.trim()
+  return oneShotText(value.content || value.output || value.message)
+}
+
+function oneShotDiagnostic(result) {
+  const value = result?.diagnostic || result?.error?.message || result?.error?.code || result?.code || ''
+  if (!value) return ''
+  if (typeof value === 'string') return diagnosticMessage({ message: value })
+  try { return diagnosticMessage({ message: JSON.stringify(value) }) } catch { return diagnosticMessage(value) }
+}
+
+function oneShotResult(result) {
+  if (!result || typeof result !== 'object') throw codedError('Codex Subagent 没有返回结果 payload。', 'MISSING_SUBAGENT_PAYLOAD')
+  const stopReason = String(result.stopReason || 'completed').trim()
+  const diagnostic = oneShotDiagnostic(result)
+  if (result.isError === true || stopReason !== 'completed') {
+    const lower = `${stopReason} ${diagnostic}`.toLowerCase()
+    if (/abort|cancel/.test(lower)) throw codedError('Codex Subagent 已取消。', 'ABORTED')
+    if (/auth|unauthori[sz]|credential|login|token/.test(lower)) throw codedError(diagnostic || 'Codex Subagent 需要认证。', 'AUTH_REQUIRED')
+    if (/rate.?limit|too many requests|\b429\b/.test(lower)) throw codedError(diagnostic || 'Codex Subagent 请求受到限流。', 'RATE_LIMIT')
+    if (/timeout|timed.?out|network|transport|connection|econn/.test(lower)) throw codedError(diagnostic || 'Codex Subagent transport 失败。', 'TRANSPORT_ERROR')
+    throw codedError(diagnostic || `Codex Subagent 以 ${stopReason || 'error'} 结束。`, 'SUBAGENT_ERROR')
+  }
+  return {
+    stopReason,
+    text: oneShotText(result.output || result.text || result.content || result.structured?.text).slice(0, 40000),
+    diagnostic: diagnostic.slice(0, 320)
+  }
+}
+
+function providerStaticValue(provider, descriptor, key) {
+  return String(
+    provider?.[key] || provider?.config?.[key] ||
+    descriptor?.[key] || descriptor?.config?.[key] || ''
+  ).trim()
+}
+
+function providerModels(provider, descriptor) {
+  return [...new Set([
+    ...(Array.isArray(provider?.models) ? provider.models : []),
+    ...(Array.isArray(descriptor?.models) ? descriptor.models : []),
+    providerStaticValue(provider, descriptor, 'staticModel'),
+    providerStaticValue(provider, descriptor, 'model')
+  ].map((item) => typeof item === 'string' ? item.trim() : String(item?.id || item?.name || '').trim()).filter(Boolean))]
+}
+
+async function createCodexSubagent({ services, parentAgent, profile, providerName, provider, catalog, label, prompt, sessionId, logger }) {
+  if (!services.subagents || typeof services.subagents.start !== 'function') {
+    throw codedError('当前 runtime 未提供 Codex one-shot Subagent 能力。', 'CODEX_PROVIDER_UNAVAILABLE')
+  }
+  if (!provider) throw codedError(`Codex provider 不可用：${providerName}`, 'NO_PROVIDER')
+
+  const descriptor = catalog.subagentProviders?.find((item) => item.name === providerName) || {}
+  const capabilities = { ...(descriptor.capabilities || {}), ...(provider.capabilities || {}) }
+  const staticModel = providerStaticValue(provider, descriptor, 'staticModel') || providerStaticValue(provider, descriptor, 'model')
+  const models = providerModels(provider, descriptor)
+  const requestedModel = String(profile.model || '').trim()
+  const dynamicModel = capabilities.dynamicModel === true || capabilities.modelOverride === true
+  if (requestedModel && !dynamicModel && (!models.length || !models.includes(requestedModel))) {
+    throw codedError(`Codex provider ${providerName} 的 model 由 Profile Bundle/原生配置静态决定，不能动态指定 ${requestedModel}。请把 Profile 的 Model 留空，或选择与 Bundle 相同的 model。`, 'UNSUPPORTED_CAPABILITY')
+  }
+  if (requestedModel && staticModel && requestedModel !== staticModel && !dynamicModel) {
+    throw codedError(`Codex provider ${providerName} 的 model 固定为 ${staticModel}，不能改成 ${requestedModel}。`, 'UNSUPPORTED_CAPABILITY')
+  }
+
+  const requestedReasoning = String(profile.reasoningEffort || '').trim()
+  const reasoningEfforts = Array.isArray(capabilities.reasoningEfforts) ? capabilities.reasoningEfforts : []
+  if (requestedReasoning && (!reasoningEfforts.includes(requestedReasoning) || capabilities.dynamicReasoning !== true && capabilities.reasoningEffortOverride !== true)) {
+    throw codedError(`Codex provider ${providerName} 未公布可按调用指定的 reasoningEffort=${requestedReasoning}；当前官方包只支持静态配置。`, 'UNSUPPORTED_CAPABILITY')
+  }
+  if (profile.capabilities?.tools?.length || profile.capabilities?.skills?.length) {
+    throw codedError(`Codex provider ${providerName} 不支持通过 Profile 传入 Tools/Skills；请在 Codex 原生配置中管理它们。`, 'UNSUPPORTED_CAPABILITY')
+  }
+  if (profile.persona) throw codedError(`Codex provider ${providerName} 不支持 per-profile persona；请在 Codex 原生配置中管理身份。`, 'UNSUPPORTED_CAPABILITY')
+
+  const requestedPermission = String(profile.permissionMode || 'default').trim()
+  const staticPermission = providerStaticValue(provider, descriptor, 'staticPermissionMode') || providerStaticValue(provider, descriptor, 'permissionMode')
+  const permissionModes = Array.isArray(capabilities.permissionModes) ? capabilities.permissionModes : []
+  if (requestedPermission !== 'default' && staticPermission && staticPermission !== requestedPermission) {
+    throw codedError(`Codex provider ${providerName} 的 permissionMode 固定为 ${staticPermission}，不能改成 ${requestedPermission}。`, 'UNSUPPORTED_CAPABILITY')
+  }
+  if (requestedPermission !== 'default' && !staticPermission && !(capabilities.permissionMode === true || permissionModes.includes(requestedPermission))) {
+    throw codedError(`Codex provider ${providerName} 未公布可动态设置 permissionMode；请在 Profile Bundle 配置后使用 default。`, 'UNSUPPORTED_CAPABILITY')
+  }
+
+  const request = {
+    label,
+    prompt: [{ type: 'text', text: prompt }],
+    parent: parentAgent,
+    signal: new AbortController().signal
+  }
+  diagnosticLog(logger, 'info', 'subagent.codex_one_shot_requested', {
+    parentSessionId: sessionMarker(sessionId),
+    labelLength: label.length,
+    promptLength: prompt.length,
+    profileId: profile.id,
+    provider: providerName,
+    model: requestedModel ? '[profile]' : '[provider-default]',
+    reasoningEffort: requestedReasoning ? '[profile]' : '[provider-default]'
+  })
+  let run
+  try {
+    run = await services.subagents.start.call(services.subagents, providerName, request)
+    if (!run || run.result === undefined) throw codedError('Codex provider 返回了缺少 result 的 payload。', 'MISSING_SUBAGENT_PAYLOAD')
+    const result = oneShotResult(await run.result)
+    diagnosticLog(logger, 'info', 'subagent.codex_one_shot_completed', {
+      parentSessionId: sessionMarker(sessionId),
+      profileId: profile.id,
+      provider: providerName,
+      stopReason: result.stopReason,
+      outputLength: result.text.length
+    })
+    return {
+      mode: 'one-shot',
+      runId: String(run.id || '').trim(),
+      label,
+      parentSessionId: sessionId,
+      profileId: profile.id,
+      provider: providerName,
+      result
+    }
+  } catch (error) {
+    diagnosticLog(logger, 'error', 'subagent.codex_one_shot_failed', {
+      parentSessionId: sessionMarker(sessionId),
+      profileId: profile.id,
+      provider: providerName,
+      code: error?.code || 'UNKNOWN',
+      message: diagnosticMessage(error)
+    })
+    throw error
+  } finally {
+    try { await run?.dispose?.() } catch (error) {
+      diagnosticLog(logger, 'warn', 'subagent.codex_one_shot_dispose_failed', { provider: providerName, message: diagnosticMessage(error) })
+    }
+  }
+}
+
 export async function createSubagent(orchestrator, services, input = {}, logger) {
   const sessionId = String(input.sessionId || '').trim()
   if (!sessionId) throw codedError('创建 Subagent 需要当前会话。', 'MISSING_SESSION')
@@ -264,6 +449,9 @@ export async function createSubagent(orchestrator, services, input = {}, logger)
   const catalog = await orchestrator.capabilities({ cwd })
   const providerName = String(profile.subagentProvider || (profile.executor === 'codex' ? profile.provider : catalog.executors?.dsh?.provider) || 'spawn').trim()
   const provider = services.subagents?.getProvider?.(providerName)
+  if (profile.executor === 'codex') {
+    return createCodexSubagent({ services, parentAgent, profile, providerName, provider, catalog, label, prompt, sessionId, logger })
+  }
   if (!services.subagents || typeof services.subagents.startContinuable !== 'function') {
     throw codedError('当前 DSH Runtime 未提供 continuable Subagent 能力。', 'CONTINUATION_UNAVAILABLE')
   }
@@ -431,6 +619,66 @@ async function handleGraphRoutes(req, res, orchestrator) {
   return jsonResponse(res, 404, { ok: false, error: 'Graph action 不存在。' })
 }
 
+async function handlePlannerDecisionRoute(req, res, orchestrator, services, logger) {
+  if (methodOf(req) !== 'POST') return jsonResponse(res, 405, { ok: false, error: '仅支持 POST。' })
+  const body = await readJson(req)
+  const sessionId = sessionIdFrom(req, body)
+  if (!sessionId) return jsonResponse(res, 400, { ok: false, error: '缺少 sessionId。' })
+  const mode = String(body.mode || '').trim()
+  if (!['saveAs', 'overwrite'].includes(mode)) throw codedError('必须选择 saveAs 或 overwrite。', 'TEMPLATE_DECISION_REQUIRED')
+  const templateId = String(body.templateId || '').trim()
+  if (mode === 'overwrite' && !templateId) throw codedError('覆盖模板必须选择 templateId。', 'TEMPLATE_DECISION_REQUIRED')
+  const parentAgent = services.agents?.get?.(sessionId)
+  if (!parentAgent?.session?.header?.id) throw codedError('当前会话没有可用的主 Agent；请先让主对话完成启动。', 'PARENT_AGENT_NOT_LIVE')
+  const pending = orchestrator.plannerRequestForSession?.(sessionId)
+  if (!pending?.goal) throw codedError('当前会话没有等待模板选择的 Planner 草案，请重新发送 /graphjob。', 'PLANNER_REQUEST_NOT_FOUND')
+  const decision = {
+    templateMode: mode,
+    templateId,
+    templateScope: String(body.templateScope || 'workspace').trim() || 'workspace',
+    templateName: String(body.templateName || '').trim().slice(0, 200)
+  }
+  diagnosticLog(logger, 'info', 'planner.decision', {
+    sessionId: sessionMarker(sessionId),
+    mode,
+    hasTemplateId: Boolean(templateId)
+  })
+
+  const plannerInput = {
+    sessionId,
+    cwd: parentAgent.session.header.cwd || pending.cwd,
+    goal: pending.goal,
+    templateMode: mode,
+    ...(templateId ? { templateId } : {}),
+    ...(decision.templateScope ? { templateScope: decision.templateScope } : {}),
+    ...(decision.templateName ? { templateName: decision.templateName } : {}),
+    ...(pending.draft ? { draft: pending.draft } : {}),
+    ...(pending.patch ? { patch: pending.patch } : {}),
+    ...(pending.baseGraph ? { baseGraph: pending.baseGraph } : {})
+  }
+  if (pending.draft || pending.patch) {
+    orchestrator.setPlannerStatus?.(sessionId, { state: 'running' })
+    try {
+      const preview = await orchestrator.previewPlanner(plannerInput)
+      orchestrator.setPlannerStatus?.(sessionId, { state: 'ready', previewId: preview.previewId })
+      return jsonResponse(res, 200, { ok: true, state: 'ready', preview, templatePreview: preview })
+    } catch (error) {
+      orchestrator.setPlannerStatus?.(sessionId, { state: 'failed', code: error?.code || 'UNKNOWN', error: diagnosticMessage(error) })
+      throw error
+    }
+  }
+
+  orchestrator.setPlannerStatus?.(sessionId, { state: 'queued' })
+  orchestrator.setPlannerRequest?.(sessionId, { goal: pending.goal, cwd: plannerInput.cwd })
+  try {
+    parentAgent.followup(makePlannerFollowup(pending.goal, decision))
+  } catch (error) {
+    orchestrator.setPlannerStatus?.(sessionId, { state: 'failed', code: error?.code || 'UNKNOWN', error: diagnosticMessage(error) })
+    throw error
+  }
+  return jsonResponse(res, 202, { ok: true, state: 'queued' })
+}
+
 async function handleSubagentRoutes(req, res, orchestrator, services, logger) {
   const segments = pathSegments(req, `${BASE_PATH}/subagents`)
   if (!segments) return false
@@ -575,7 +823,19 @@ export function createHost(options = {}) {
             const result = await handleSubagentRoutes(req, res, orchestrator, services, logger)
             if (result === false) return jsonResponse(res, 404, { ok: false, error: 'Not found' })
           } catch (error) {
-            const status = ['PARENT_AGENT_NOT_LIVE', 'CONTINUATION_UNAVAILABLE', 'UNSUPPORTED_CAPABILITY', 'NO_PROVIDER'].includes(error?.code) ? 409 : 400
+            const status = ['PARENT_AGENT_NOT_LIVE', 'CONTINUATION_UNAVAILABLE', 'CODEX_PROVIDER_UNAVAILABLE', 'UNSUPPORTED_CAPABILITY', 'NO_PROVIDER'].includes(error?.code) ? 409 : 400
+            return writeError(res, status, error)
+          }
+        }
+      })
+      registerEffect(ctx, services.webServer, {
+        kind: 'exact',
+        path: `${BASE_PATH}/planner/decision`,
+        handler: async (req, res) => {
+          try {
+            return await handlePlannerDecisionRoute(req, res, orchestrator, services, logger)
+          } catch (error) {
+            const status = ['PARENT_AGENT_NOT_LIVE', 'PLANNER_REQUEST_NOT_FOUND'].includes(error?.code) ? 409 : error?.code === 'TEMPLATE_DECISION_REQUIRED' ? 412 : 400
             return writeError(res, status, error)
           }
         }

package/lib/orchestrator.js

@@ -55,6 +55,17 @@ function templateVisible(template, workspaceId) {
   return Boolean(workspaceId) && normalizeWorkspaceId(template?.workspaceId) === normalizeWorkspaceId(workspaceId)
 }
 
+function isUntouchedManualPlaceholder(graph) {
+  if (!graph || graph.source !== 'manual' || graph.manualLock !== true) return false
+  if ((graph.nodes || []).length || (graph.edges || []).length) return false
+  const goal = String(graph.goal || '').trim()
+  return !goal || [
+    '请填写任务图目标。',
+    '请在任务图编辑器中补充目标。',
+    'Graph Job 已打开。请在任务图面板中补充节点，完成预览和确认后再运行。'
+  ].includes(goal)
+}
+
 function publicProfile(profile) {
   const value = clone(profile)
   if (!value) return value
@@ -77,6 +88,7 @@ export class GraphJobOrchestrator {
     this.bindings = {}
     this.previews = new Map()
     this.plannerStatuses = new Map()
+    this.plannerRequests = new Map()
     this.templatePreviews = new Map()
     this.schedulers = new Map()
     this.startLocks = new Map()
@@ -340,20 +352,20 @@ export class GraphJobOrchestrator {
     this.initialize()
     const sessionId = String(input.sessionId || '').trim()
     const binding = this.getBinding(sessionId)
-    const manualTemplateEdit = binding?.manualLock === true
+    const activeGraph = this.graphForSession(sessionId)
+    const manualTemplateEdit = binding?.manualLock === true && !isUntouchedManualPlaceholder(activeGraph)
     if (manualTemplateEdit && !['saveAs', 'overwrite'].includes(input.templateMode)) {
       throw errorWithCode('当前会话的 Graph 已被手工编辑锁定；模型修订只能作为候选，并必须选择 saveAs 或 overwrite 模板。', 'TEMPLATE_DECISION_REQUIRED')
     }
     const cwd = String(input.cwd || '').trim() || process.cwd()
     const catalog = await this.capabilities({ cwd })
-    const activeGraph = this.graphForSession(sessionId)
     if (input.patch && input.baseGraph && activeGraph && (
       String(input.baseGraph.graphId || '') !== String(activeGraph.graphId || '') ||
       Number(input.baseGraph.revision || 0) !== Number(activeGraph.revision || 0)
     )) {
       throw errorWithCode('Planner patch 的 baseGraph 不是当前会话活动 revision。', 'GRAPH_REVISION_CONFLICT')
     }
-    const baseGraph = input.patch ? activeGraph : (input.baseGraph || null)
+    const baseGraph = input.patch ? activeGraph : (input.baseGraph || (isUntouchedManualPlaceholder(activeGraph) ? activeGraph : null))
     let draft
     if (input.patch) {
       if (!baseGraph) throw errorWithCode('Planner patch 找不到当前 Graph。', 'GRAPH_NOT_FOUND')
@@ -474,6 +486,7 @@ export class GraphJobOrchestrator {
       state: String(status.state || 'idle'),
       updatedAt: nowValue(this.now),
       ...(status.previewId ? { previewId: String(status.previewId) } : {}),
+      ...(status.code ? { code: String(status.code).slice(0, 120) } : {}),
       ...(status.error ? { error: String(status.error).slice(0, 320) } : {})
     }
     this.plannerStatuses.set(id, value)
@@ -485,6 +498,25 @@ export class GraphJobOrchestrator {
     return id ? clone(this.plannerStatuses.get(id) || null) : null
   }
 
+  setPlannerRequest(sessionId, request = {}) {
+    const id = String(sessionId || '').trim()
+    if (!id) return null
+    const value = {
+      goal: String(request.goal || '').trim().slice(0, 20000),
+      cwd: String(request.cwd || '').trim()
+    }
+    if (request.draft && typeof request.draft === 'object') value.draft = clone(request.draft)
+    if (request.patch && typeof request.patch === 'object') value.patch = clone(request.patch)
+    if (request.baseGraph && typeof request.baseGraph === 'object') value.baseGraph = clone(request.baseGraph)
+    this.plannerRequests.set(id, value)
+    return clone(value)
+  }
+
+  plannerRequestForSession(sessionId) {
+    const id = String(sessionId || '').trim()
+    return id ? clone(this.plannerRequests.get(id) || null) : null
+  }
+
   latestPreviewForSession(sessionId) {
     this.initialize()
     const id = String(sessionId || '').trim()
@@ -497,6 +529,18 @@ export class GraphJobOrchestrator {
     return latest ? this.publicPreview(latest) : null
   }
 
+  latestTemplatePreviewForSession(sessionId) {
+    this.initialize()
+    const id = String(sessionId || '').trim()
+    if (!id) return null
+    let latest = null
+    for (const record of this.templatePreviews.values()) {
+      if (record.sessionId !== id || record.expiresAt < nowValue(this.now)) continue
+      latest = record
+    }
+    return latest ? this.getTemplatePreview(latest.previewId) : null
+  }
+
   saveManualGraph(input = {}) {
     this.initialize()
     const graphInput = input.graph || input
@@ -544,7 +588,14 @@ export class GraphJobOrchestrator {
     this.initialize()
     const binding = this.getBinding(sessionId)
     const graph = binding?.activeGraphId ? this.getGraph(binding.activeGraphId, binding.activeRevision) : null
-    return { binding, graph, preview: this.latestPreviewForSession(sessionId), planner: this.plannerStatusForSession(sessionId), graphs: [...this.graphs.values()].map(clone).filter(Boolean) }
+    return {
+      binding,
+      graph,
+      preview: this.latestPreviewForSession(sessionId),
+      templatePreview: this.latestTemplatePreviewForSession(sessionId),
+      planner: this.plannerStatusForSession(sessionId),
+      graphs: [...this.graphs.values()].map(clone).filter(Boolean)
+    }
   }
 
   listTemplates(options = {}) {
@@ -847,6 +898,7 @@ export class GraphJobOrchestrator {
     this.listeners.clear()
     this.previews.clear()
     this.plannerStatuses.clear()
+    this.plannerRequests.clear()
     this.templatePreviews.clear()
     this.startLocks.clear()
   }

package/lib/validator.js

@@ -51,9 +51,11 @@ function reasoningEfforts(capabilities) {
 function availableModels(capabilities, profile) {
   if (!capabilities) return null
   const providerModels = capabilities.subagentProviders?.find?.((item) => item?.name === profile.provider)?.models
-  const values = profile.executor === 'codex' && Array.isArray(providerModels) && providerModels.length
-    ? providerModels.map((model) => ({ provider: profile.provider, model: String(model) }))
-    : Array.isArray(capabilities.models) ? capabilities.models : []
+  if (profile.executor === 'codex') {
+    if (!Array.isArray(providerModels) || !providerModels.length) return null
+    return new Set(providerModels.map((model) => `${profile.provider}\u0000${String(model)}`))
+  }
+  const values = Array.isArray(capabilities.models) ? capabilities.models : []
   if (!values.length) return null
   return new Set(values.map((item) => {
     if (typeof item === 'string') return `${profile.provider}\u0000${item}`
@@ -95,7 +97,7 @@ export function validateGraph(input, options = {}) {
     profileMap.set(profile.id, profile)
     if (!EXECUTORS.has(profile.executor)) push(errors, `agentProfiles[${index}].executor`, `不支持的 executor：${profile.executor}。`, 'EXECUTOR')
     if (!profile.provider) push(errors, `agentProfiles[${index}].provider`, 'provider 必须在 revision 创建时解析完成。', 'MODEL_UNRESOLVED')
-    if (!profile.model) push(errors, `agentProfiles[${index}].model`, 'model 必须在 revision 创建时解析完成。', 'MODEL_UNRESOLVED')
+    if (!profile.model && profile.executor !== 'codex') push(errors, `agentProfiles[${index}].model`, 'model 必须在 revision 创建时解析完成。', 'MODEL_UNRESOLVED')
     if (options.enforceExecutorAvailability && capabilities?.executors?.[profile.executor]) {
       const executor = capabilities.executors[profile.executor]
       if (executor.available === false) push(errors, `agentProfiles[${index}].executor`, `${profile.executor} executor 当前不可用。`, 'CAPABILITY_MISMATCH')
@@ -107,7 +109,7 @@ export function validateGraph(input, options = {}) {
     if (modelSet && !modelSet.has(`${profile.provider}\u0000${profile.model}`)) {
       push(errors, `agentProfiles[${index}].model`, `当前 capability 不提供 ${profile.provider}/${profile.model}。`, 'CAPABILITY_MISMATCH')
     }
-    if (!['default', 'never', 'approve-for-me'].includes(profile.permissionMode)) {
+    if (!['default', 'never', 'approve-for-me', 'dangerously-bypass-approvals-and-sandbox'].includes(profile.permissionMode)) {
       push(errors, `agentProfiles[${index}].permissionMode`, `不支持的 permissionMode：${profile.permissionMode}。`, 'PERMISSION_MODE')
     }
     for (const tool of profile.capabilities.tools) {
@@ -126,7 +128,7 @@ export function validateGraph(input, options = {}) {
     }
     if (profile.executor === 'codex' && profile.reasoningEffort) {
       const effortSet = reasoningEfforts(capabilities)
-      if (effortSet && !effortSet.has(profile.reasoningEffort)) {
+      if (capabilities && (!effortSet || !effortSet.has(profile.reasoningEffort))) {
         push(errors, `agentProfiles[${index}].reasoningEffort`, `当前 Codex capability 不支持 reasoningEffort=${profile.reasoningEffort}。`, 'CAPABILITY_MISMATCH')
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p-dsh-market/graph-job-orchestrator",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "DSH Graph Job 多 Subagent 任务图编排器",
   "keywords": [
     "dsh",
@@ -72,10 +72,20 @@
               "type": "pluginRpc",
               "method": "graphJobOrchestrator.open"
             }
+          },
+          {
+            "id": "open-graph-job-subagent",
+            "slot": "desktop.titlebar.workspaceActions",
+            "label": "新建 Subagent",
+            "order": 145,
+            "when": ["dshRunning", "pluginActive", "restartNotRequired"],
+            "action": {
+              "type": "pluginRpc",
+              "method": "graphJobOrchestrator.openSubagent"
+            }
           }
         ]
       }
     }
   }
 }
-