@yeaft/webchat-agent 1.0.143 → 1.0.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.143",
+  "version": "1.0.145",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/engine.js

@@ -1008,12 +1008,13 @@ export class Engine {
    * @param {object} [args.vpPersona]
    * @param {object} [args.activeScope] — DESIGN-PROMPT §3 ④ structured scope summary
    * @param {string} [args.sessionAnnouncement]
+   * @param {string} [args.workCenterInstructions] — frozen Agent-level Work Center policy
    * @param {string} [args.projectDoc] — resolved CLAUDE.md / AGENTS.md text (already truncated)
    * @param {object} [args.taskCtx] — legacy task-context sub-block (optional)
    * @param {string} [args.explicitSkillName] — leading /skill:<name> command, if present
    * @returns {string}
    */
-  #buildSystemPrompt({ prompt, memoryInjection, vpPersona, activeScope, sessionAnnouncement, projectDoc, taskCtx, activeTasks, explicitSkillName } = {}) {
+  #buildSystemPrompt({ prompt, memoryInjection, vpPersona, activeScope, sessionAnnouncement, workCenterInstructions, projectDoc, taskCtx, activeTasks, explicitSkillName } = {}) {
     // Get relevant skill content if SkillManager is wired. A leading
     // /skill:<name> is explicit, not relevance matching: load that skill by
     // name or inject a visible prompt warning when the command is unknown.
@@ -1040,6 +1041,7 @@ export class Engine {
       vpPersona,
       activeScope,
       sessionAnnouncement,
+      workCenterInstructions,
       projectDoc,
       runtimePlatform: getRuntimePlatformInfo(),
       taskCtx,
@@ -1647,7 +1649,7 @@ export class Engine {
    *   string-prompt shape (no regression for existing callers).
    * @yields {EngineEvent}
    */
-  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -1715,7 +1717,7 @@ export class Engine {
 
     try {
       this.#currentThreadId = threadId || MAIN_THREAD_ID;
-      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName });
+      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName });
     } finally {
       if (signal) {
         try { signal.removeEventListener('abort', onExternalAbort); } catch { /* ignore */ }
@@ -1759,7 +1761,7 @@ export class Engine {
    * in a try/finally without indenting the whole loop.
    * @private
    */
-  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null, explicitSkillName = null }) {
+  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, collabToolPolicy = null, explicitSkillName = null }) {
 
     const effectiveCollabToolPolicy = collabToolPolicy === COLLAB_TOOL_POLICY.SINGLE_VP || collabToolPolicy === COLLAB_TOOL_POLICY.MULTI_VP
       ? collabToolPolicy
@@ -1896,6 +1898,7 @@ export class Engine {
       vpPersona,
       activeScope,
       sessionAnnouncement,
+      workCenterInstructions,
       projectDoc,
       activeTasks,
       explicitSkillName,

package/yeaft/prompts.js

@@ -204,6 +204,8 @@ const PROMPTS = {
     activeScopeEnvelopeLabel: 'Handoff',
     multiVpRoutingHeader: '## multi_vp_routing',
     sessionAnnouncementHeader: '[Session Announcement]',
+    workCenterInstructionsHeader: '[Work Center Agent Instructions]',
+    workCenterInstructionsIntro: 'These Agent-level instructions apply to every Action in this WorkItem. Follow them unless they conflict with system/tool safety rules, the authoritative project document, or the WorkItem contract.',
     // Project-doc (CLAUDE.md / AGENTS.md) header + one-liner intro. Both
     // filenames are recognized: CLAUDE.md is this project's convention,
     // AGENTS.md is the cross-tool convention (Codex / OpenAI Codex CLI).
@@ -224,6 +226,8 @@ const PROMPTS = {
     activeScopeEnvelopeLabel: '转交消息',
     multiVpRoutingHeader: '## multi_vp_routing',
     sessionAnnouncementHeader: '[会话公告]',
+    workCenterInstructionsHeader: '[Work Center Agent 指令]',
+    workCenterInstructionsIntro: '这些 Agent 级指令作用于当前 Work Item 的每个 Action。除非与系统/工具安全规则、权威项目文档或 Work Item 契约冲突，否则必须遵循。',
     // 项目文档块：CLAUDE.md / AGENTS.md（与 Codex 通用命名兼容）。
     projectDocHeader: '[项目文档]',
     projectDocIntro:
@@ -293,6 +297,7 @@ export function normalizePromptLanguage(language) {
  *   activeScope?: object,
  *   vpPersona?: object,
  *   sessionAnnouncement?: string,
+ *   workCenterInstructions?: string,
  *   projectDoc?: string,
  * }} params
  * @returns {string}
@@ -306,6 +311,7 @@ export function buildSystemPrompt({
   activeScope,
   vpPersona,
   sessionAnnouncement = '',
+  workCenterInstructions = '',
   projectDoc = '',
   runtimePlatform,
   activeTasks = '',
@@ -360,6 +366,13 @@ export function buildSystemPrompt({
     parts.push(`${lang.sessionAnnouncementHeader || '[Session Announcement]'}\n${annText}`);
   }
 
+  const workCenterText = (typeof workCenterInstructions === 'string') ? workCenterInstructions.trim() : '';
+  if (workCenterText) {
+    const header = lang.workCenterInstructionsHeader || '[Work Center Agent Instructions]';
+    const intro = lang.workCenterInstructionsIntro || '';
+    parts.push(`${header}\n${intro ? `${intro}\n\n` : ''}${workCenterText}`);
+  }
+
   // ─── 2. Date Metadata ──────────────────────────────────
   parts.push(lang.date(new Date().toISOString().split('T')[0]));
 

package/yeaft/tools/create-work-item.js

@@ -34,7 +34,7 @@ Use this when work must continue beyond the current turn, needs role handoffs, r
       },
       workDir: {
         type: 'string',
-        description: { en: 'Optional project directory for execution', zh: '执行时使用的可选项目目录' },
+        description: { en: 'Existing project directory for execution', zh: '执行时使用的已存在项目目录' },
       },
       start: {
         type: 'boolean',

package/yeaft/work-center/assignment.js

@@ -14,6 +14,11 @@ const CAPABILITY_TERMS = Object.freeze({
   review: ['review', 'reviewer', 'refactor', 'architecture', 'code-smells', 'readability', 'maintainability'],
   deliver: ['deliver', 'release', 'ship', 'git', 'engineering', 'systems', 'execution'],
   research: ['research', 'science', 'analysis', 'evidence', 'investigation'],
+  design: ['design', 'architecture', 'architect', 'systems', 'product', 'ux'],
+  diagnose: ['diagnose', 'debug', 'root-cause', 'reliability', 'investigation', 'systems'],
+  migrate: ['migrate', 'migration', 'database', 'compatibility', 'data', 'systems'],
+  document: ['document', 'documentation', 'writer', 'writing', 'communication'],
+  operate: ['operate', 'operations', 'release', 'deployment', 'reliability', 'systems'],
   write: ['write', 'writer', 'writing', 'documentation', 'editor', 'communication'],
 });
 
@@ -34,7 +39,7 @@ function capabilityScore(vp, capability) {
   const needle = String(capability || '').trim().toLowerCase();
   if (!needle) return 0;
   const text = vpSearchText(vp);
-  const terms = CAPABILITY_TERMS[needle] || [needle];
+  const terms = Object.hasOwn(CAPABILITY_TERMS, needle) ? CAPABILITY_TERMS[needle] : [needle];
   let score = 0;
   for (const term of terms) {
     if (text.includes(term)) score += term === needle ? 6 : 2;

package/yeaft/work-center/bridge.js

@@ -70,6 +70,7 @@ async function getSettingsRuntime() {
     models: Array.isArray(runtime.config.availableModels) ? runtime.config.availableModels : [],
     primaryModel: runtime.config.primaryModel || runtime.config.model || null,
     fastModel: runtime.config.fastModel || null,
+    defaultWorkDir: ctx.CONFIG?.workDir || process.cwd(),
     defaultStageInstructions: defaultWorkCenterStageInstructions(),
   };
 }

package/yeaft/work-center/runner.js

@@ -277,7 +277,7 @@ function completionContract(action, workItem) {
     ? ',\n  "contractPatch": { "goal": "optional refined goal", "acceptanceCriteria": ["optional refined criterion"] }'
     : '';
   const planField = action.type === 'triage' && workItem?.workflowSnapshot?.planningMode === 'ai'
-    ? ',\n  "plan": { "workItemType": "dynamic-type", "actions": [{ "id": "stable-id", "name": "User-facing name", "type": "implement|test|review|deliver|research|write|custom", "capability": "executor capability", "objective": "specific Action objective", "separateFromActionTypes": ["optional prior Action type"], "changesRequestedActionId": "required for review when applicable", "maxAttempts": 2 }] }'
+    ? ',\n  "plan": { "workItemType": "specific-lowercase-slug", "actions": [{ "id": "stable-id", "name": "User-facing name", "type": "extensible-lowercase-slug (built-ins include research|design|diagnose|implement|migrate|test|review|document|operate|deliver|write|custom)", "capability": "specific executor capability", "objective": "independently executable and verifiable Action objective", "separateFromActionTypes": ["optional prior Action type"], "changesRequestedActionId": "for review: optional earlier editable Action id; omit to use nearest", "maxAttempts": 2 }] }'
     : '';
   return `\n\nYou are executing one Work Center Action. Before the terminal JSON, write a concise user-facing response describing what you did and the result. Do not include raw tool output or secrets. End your response with exactly one JSON object, preferably in a json code fence:\n{
   "outcome": "completed|waiting|retryable|failed",
@@ -452,6 +452,7 @@ export class WorkItemRunner {
         signal,
         scenario: 'work-item',
         vpPersona: personaFor(vp),
+        workCenterInstructions: workItem?.workflowSnapshot?.globalInstructions || '',
         workDir,
         userAlreadyPersisted: true,
         collabToolPolicy: 'single-vp',

package/yeaft/work-center/service.js

@@ -1,4 +1,5 @@
-import { join } from 'node:path';
+import { realpathSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { WorkItemStore } from './store.js';
 import { WorkflowController } from './controller.js';
@@ -16,6 +17,18 @@ function requiredString(value, name) {
   return value.trim();
 }
 
+function requiredWorkDir(value) {
+  const workDir = requiredString(value, 'workDir');
+  let canonical;
+  try {
+    canonical = realpathSync(resolve(workDir));
+    if (!statSync(canonical).isDirectory()) throw new Error('not a directory');
+  } catch {
+    throw new Error('workDir must be an existing directory');
+  }
+  return canonical;
+}
+
 export class WorkCenterService {
   constructor(options) {
     const yeaftDir = requiredString(options?.yeaftDir, 'yeaftDir');
@@ -72,6 +85,12 @@ export class WorkCenterService {
         const workflowSnapshot = explicitWorkflow
           ? resolveWorkflowSnapshot(settings, explicitWorkflow, payload.stageOverrides)
           : resolvePlanningWorkflowSnapshot(settings);
+        const runtime = !Object.hasOwn(payload, 'workDir') && !settings.defaultWorkDir
+          ? await this.runtimeInfo()
+          : null;
+        const workDir = requiredWorkDir(Object.hasOwn(payload, 'workDir')
+          ? payload.workDir
+          : settings.defaultWorkDir || runtime?.defaultWorkDir);
         const item = this.controller.create({
           title: requiredString(payload.title, 'title'),
           goal: requiredString(payload.goal, 'goal'),
@@ -80,9 +99,7 @@ export class WorkCenterService {
             : [],
           workflowTemplate,
           workflowSnapshot,
-          workDir: typeof payload.workDir === 'string' && payload.workDir.trim()
-            ? payload.workDir.trim()
-            : settings.defaultWorkDir,
+          workDir,
           reuseMemory: payload.reuseMemory !== false,
           origin: payload.origin && typeof payload.origin === 'object'
             ? {

package/yeaft/work-center/workflow.js

@@ -1,17 +1,37 @@
-const STAGE_TYPES = new Set(['triage', 'implement', 'test', 'review', 'deliver', 'research', 'write', 'custom']);
+export const BUILT_IN_ACTION_TYPES = Object.freeze([
+  'triage',
+  'research',
+  'design',
+  'diagnose',
+  'implement',
+  'migrate',
+  'test',
+  'review',
+  'document',
+  'operate',
+  'deliver',
+  'write',
+  'custom',
+]);
+const STAGE_TYPES = new Set(BUILT_IN_ACTION_TYPES);
 const ASSIGNMENT_MODES = new Set(['auto', 'pool', 'fixed']);
 const MODEL_MODES = new Set(['inherit', 'primary', 'fast', 'specific']);
 const MODEL_EFFORTS = new Set(['minimal', 'low', 'medium', 'high', 'xhigh', 'max']);
 
 const DEFAULT_STAGE_INSTRUCTIONS = Object.freeze({
-  triage: 'Analyze the request, verify scope and risks, and make the contract executable. Do not implement yet. If the goal or acceptance criteria need refinement, submit a contractPatch.',
-  implement: 'Implement the smallest correct change in the supplied work directory. Add and run relevant tests. Use the prior triage/review findings. Do not approve your own work.',
-  test: 'Verify the implementation against the acceptance criteria. Run focused tests and report reproducible evidence. Do not modify unrelated code.',
-  review: 'Review the implementation and evidence independently. Return approved or changes_requested with concrete findings.',
-  deliver: 'Deliver the approved change using the repository release policy. Verify the final remote state and provide evidence.',
-  research: 'Research the question using verifiable sources. Separate evidence from inference and return a concise synthesis.',
-  write: 'Produce the requested written deliverable, then verify it against every acceptance criterion.',
-  custom: 'Complete this stage and return verifiable evidence.',
+  triage: 'Turn the request into an executable contract. Inspect relevant repository facts before deciding the flow. Classify the WorkItem, identify constraints, risks, dependencies, and missing acceptance criteria, then plan only the Actions needed for this task. Do not implement. If the goal or acceptance criteria must change, submit a contractPatch and explain why.',
+  research: 'Answer the Action objective with verifiable evidence. Search the repository and, when needed, authoritative external sources. Separate observed facts from inference, record unresolved uncertainty, and produce a concise conclusion that a later Action can use.',
+  design: 'Design the smallest maintainable solution that satisfies the WorkItem contract. Inspect existing architecture and conventions, define data flow and boundaries, consider failure and compatibility cases, and leave concrete implementation guidance. Do not add abstraction without a demonstrated need.',
+  diagnose: 'Reproduce or otherwise establish the reported behavior, trace it to a root cause, and distinguish evidence from hypotheses. Identify the smallest safe correction and the regression tests that would prove it. Do not stop at the visible symptom.',
+  implement: 'Implement the Action objective in the supplied work directory using the smallest correct diff. Follow repository conventions, preserve compatibility, handle relevant boundary conditions, and add or update focused tests. Run the checks needed to prove the change. Use prior Action and review findings; do not approve your own work.',
+  migrate: 'Execute the required migration without losing existing semantics or data. Define compatibility and rollback boundaries, make the operation repeatable or safely fenced, validate representative legacy data, and provide evidence for both upgraded and already-current states.',
+  test: 'Verify the current result against every applicable acceptance criterion. Run focused tests first, then the broader checks justified by the risk. Cover failure, compatibility, and boundary cases, report exact reproducible evidence, and do not hide skipped or inconclusive checks.',
+  review: 'Review the implementation and evidence independently against the WorkItem contract and repository rules. Prioritize correctness, security, data loss, compatibility, and missing tests over style preferences. Return approved or changes_requested with concrete, actionable findings and evidence.',
+  document: 'Update the user or maintainer documentation required by the Action objective. Keep terminology and examples consistent with actual behavior, cover compatibility or operational consequences, and verify links, commands, and bilingual requirements where applicable.',
+  operate: 'Perform the operational change with explicit preconditions, safety fences, observability, and rollback handling. Verify the live or simulated postcondition from authoritative state, avoid destructive shortcuts, and record the exact evidence needed for handoff.',
+  deliver: 'Deliver only an approved result using the repository release policy. Recheck the reviewed commit and remote state, run required final verification on the immutable delivery tree, publish only the requested artifacts, and report commit, tag, deployment, and residual-risk evidence.',
+  write: 'Produce the requested written deliverable for its intended audience. Use the available evidence, preserve required terminology and structure, avoid unsupported claims, and verify the result against every acceptance criterion.',
+  custom: 'Complete the Action objective using repository facts and the WorkItem contract. State the approach, handle relevant risks and boundary conditions, produce the requested artifact or change, verify the result, and return concrete evidence plus any residual uncertainty.',
 });
 
 const DEFAULT_SOFTWARE_CHANGE_STAGES = Object.freeze([
@@ -94,6 +114,14 @@ export function defaultWorkCenterStageInstructions() {
   return { ...DEFAULT_STAGE_INSTRUCTIONS };
 }
 
+function normalizeGlobalInstructions(value) {
+  return typeof value === 'string' ? value.trim().slice(0, 20_000) : '';
+}
+
+function generatedActionType(value) {
+  return cleanId(value, 'custom').slice(0, 64);
+}
+
 export function normalizeWorkflowDefinition(value, index = 0) {
   if (!value || typeof value !== 'object' || Array.isArray(value)) {
     throw new Error('Work Center workflow must be an object');
@@ -103,10 +131,13 @@ export function normalizeWorkflowDefinition(value, index = 0) {
   if (!Array.isArray(value.stages) || value.stages.length === 0) {
     throw new Error(`Work Center workflow "${id}" requires at least one stage`);
   }
+  const planningMode = value.planningMode === 'ai' ? 'ai' : 'static';
   const seen = new Set();
   const stages = value.stages.map((rawStage, stageIndex) => {
     const source = rawStage && typeof rawStage === 'object' ? rawStage : {};
-    const type = STAGE_TYPES.has(source.type) ? source.type : 'custom';
+    const type = planningMode === 'ai'
+      ? generatedActionType(source.type)
+      : (STAGE_TYPES.has(source.type) ? source.type : 'custom');
     const stageId = cleanId(source.id, `${type}-${stageIndex + 1}`);
     if (seen.has(stageId)) throw new Error(`Duplicate Work Center stage id: ${stageId}`);
     seen.add(stageId);
@@ -137,7 +168,6 @@ export function normalizeWorkflowDefinition(value, index = 0) {
       throw new Error(`Review stage "${stage.id}" must return to an earlier editable stage`);
     }
   }
-  const planningMode = value.planningMode === 'ai' ? 'ai' : 'static';
   return {
     version: 1,
     id,
@@ -146,6 +176,7 @@ export function normalizeWorkflowDefinition(value, index = 0) {
     workItemType: typeof value.workItemType === 'string' && value.workItemType.trim()
       ? cleanId(value.workItemType, 'general')
       : null,
+    globalInstructions: normalizeGlobalInstructions(value.globalInstructions),
     modelPolicy: normalizeModelPolicy(value.modelPolicy),
     actionInstructions: normalizeActionInstructions(value.actionInstructions),
     stages,
@@ -169,6 +200,7 @@ export function defaultWorkCenterSettings() {
     defaultWorkflowId: 'software-change',
     startImmediately: true,
     defaultWorkDir: '',
+    globalInstructions: '',
     modelPolicy: { mode: 'inherit', model: null, effort: null },
     actionInstructions: normalizeActionInstructions(),
     workflows: [normalizeWorkflowDefinition({
@@ -204,6 +236,7 @@ export function normalizeWorkCenterSettings(value) {
     defaultWorkflowId,
     startImmediately: source.startImmediately !== false,
     defaultWorkDir: typeof source.defaultWorkDir === 'string' ? source.defaultWorkDir.trim() : '',
+    globalInstructions: normalizeGlobalInstructions(source.globalInstructions),
     modelPolicy: normalizeModelPolicy(source.modelPolicy || migratedModelPolicy),
     actionInstructions: normalizeActionInstructions(source.actionInstructions || migratedInstructions),
     workflows,
@@ -212,11 +245,12 @@ export function normalizeWorkCenterSettings(value) {
 
 export function resolvePlanningWorkflowSnapshot(settings) {
   const normalized = normalizeWorkCenterSettings(settings);
-  const triageInstruction = `${normalized.actionInstructions.triage}\n\nDecide the smallest reliable execution flow for this specific WorkItem. Classify the WorkItem and return a structured plan. Do not copy a generic workflow when fewer Actions are sufficient.`;
+  const triageInstruction = `${normalized.actionInstructions.triage}\n\nChoose a specific workItemType and the smallest reliable sequence of 1 to 8 Actions for this WorkItem. Action types are extensible lowercase slugs: use a built-in type when its reusable policy fits, or define a precise domain type when it does not. For every Action, provide an objective that is independently executable and verifiable, plus the capability needed to select the right VP. Add research, design, diagnosis, migration, documentation, operations, testing, independent review, or delivery only when the task requires them. Do not copy a generic workflow.`;
   return normalizeWorkflowDefinition({
     id: 'ai-planned',
     name: 'AI planned',
     planningMode: 'ai',
+    globalInstructions: normalized.globalInstructions,
     modelPolicy: normalized.modelPolicy,
     actionInstructions: normalized.actionInstructions,
     stages: [{
@@ -266,24 +300,32 @@ export function applyGeneratedPlan(workItem, rawPlan) {
   if (!rawPlan || typeof rawPlan !== 'object' || Array.isArray(rawPlan)) {
     throw new Error('AI-planned triage requires a structured plan');
   }
-  const workItemType = cleanId(rawPlan.workItemType, 'general');
+  if (typeof rawPlan.workItemType !== 'string' || !rawPlan.workItemType.trim()) {
+    throw new Error('AI-planned triage requires a specific workItemType');
+  }
+  const workItemType = cleanId(rawPlan.workItemType, '').slice(0, 64);
+  if (!workItemType) throw new Error('AI-planned triage requires a valid workItemType');
   if (!Array.isArray(rawPlan.actions) || rawPlan.actions.length < 1 || rawPlan.actions.length > 8) {
     throw new Error('AI-planned triage requires between 1 and 8 Actions');
   }
   const seen = new Set(['triage']);
   const generated = rawPlan.actions.map((rawAction, index) => {
     const input = rawAction && typeof rawAction === 'object' && !Array.isArray(rawAction) ? rawAction : {};
-    const type = STAGE_TYPES.has(input.type) && input.type !== 'triage' ? input.type : 'custom';
+    const type = generatedActionType(input.type);
+    if (type === 'triage') throw new Error('AI-planned Actions cannot add another triage Action');
     const id = cleanId(input.id, `${type}-${index + 1}`);
     if (seen.has(id)) throw new Error(`Duplicate AI-planned Action id: ${id}`);
     seen.add(id);
     const objective = typeof input.objective === 'string' ? input.objective.trim().slice(0, 2_000) : '';
     if (!objective) throw new Error(`AI-planned Action "${id}" requires an objective`);
+    const actionInstruction = Object.hasOwn(source.actionInstructions, type)
+      ? source.actionInstructions[type]
+      : source.actionInstructions.custom;
     const stage = {
       id,
       name: String(input.name || id).trim().slice(0, 120) || id,
       type,
-      instruction: `${source.actionInstructions[type] || source.actionInstructions.custom}\n\nAction objective for this WorkItem:\n${objective}`,
+      instruction: `${actionInstruction}\n\nAction type: ${type}\nAction objective for this WorkItem:\n${objective}`,
       assignmentPolicy: {
         mode: 'auto',
         capability: cleanId(input.capability, type),