@yeaft/webchat-agent 1.0.531 → 1.0.532

package/yeaft/work-center/runner.js

@@ -17,6 +17,7 @@ import { existsSync, lstatSync, readFileSync, realpathSync } from 'node:fs';
 import path from 'node:path';
 import { sessionMessageQuotePrompt } from '../session-message-quote.js';
 import { buildWorkItemAttachmentContext } from './attachments.js';
+import { WorkCenterResourceAdapter } from './resource-control.js';
 import { withUsageAccounting } from '../llm/usage-accounting.js';
 import {
   commitActionWorktree,
@@ -51,20 +52,7 @@ import {
   renderMainlineContextSnapshot,
 } from './mainline-projection.js';
 
-const WORK_ITEM_TOOL_NAMES = Object.freeze([
-  'FileRead',
-  'FileWrite',
-  'FileEdit',
-  'ApplyPatch',
-  'Glob',
-  'Grep',
-  'ListDir',
-  'Bash',
-  'WebSearch',
-  'WebFetch',
-  'ViewImage',
-  'Skill',
-]);
+import { WORK_ITEM_TOOL_NAMES, workItemBuiltinToolNames } from './capabilities.js';
 const WORK_ITEM_TOOL_ALLOWLIST = new Set(WORK_ITEM_TOOL_NAMES);
 const DEFAULT_PROGRESS_INTERVAL_MS = 200;
 const ACTION_INPUT_QUOTE_MAX_BYTES = 8 * 1024;
@@ -272,7 +260,7 @@ function assertToolInput(toolName, input, workDir, attachmentFiles) {
 
 export function workItemToolPolicySnapshot(workDir, attachmentRefs = [], extraToolNames = []) {
   const hasAttachments = attachmentRefs.length > 0;
-  const builtInTools = WORK_ITEM_TOOL_NAMES.filter(name => !hasAttachments || name !== 'Bash');
+  const builtInTools = workItemBuiltinToolNames(hasAttachments);
   return {
     policyVersion: 1,
     allowedToolNames: [...builtInTools, ...extraToolNames],
@@ -427,7 +415,7 @@ export function createSubmitWorkItemPlanTool({
       properties: {
         summary: { type: 'string', minLength: 1, maxLength: 2_000 },
         evidence: { type: 'array', minItems: 1, maxItems: 20, items: { type: 'string', minLength: 1, maxLength: 1_000 } },
-        acceptanceChecks: { type: 'array', items: { type: 'object', additionalProperties: false, required: ['criterion', 'status', 'evidence'], properties: { criterion: { type: 'string' }, status: { type: 'string', enum: ['passed', 'deferred', 'not_applicable'] }, evidence: { type: 'string', minLength: 1, maxLength: 1_000 } } } },
+        acceptanceChecks: { type: 'array', items: { type: 'object', additionalProperties: false, required: ['criterion', 'status', 'evidence'], properties: { criterion: { type: 'string' }, status: { type: 'string', enum: ['passed', 'failed', 'deferred', 'not_applicable'] }, evidence: { type: 'string', minLength: 1, maxLength: 1_000 } } } },
         contractPatch: { type: 'object', additionalProperties: false, required: ['title', 'goal', 'acceptanceCriteria'], properties: { title: { type: 'string', minLength: 1, maxLength: 200 }, goal: { type: 'string', minLength: 1, maxLength: 8_000 }, acceptanceCriteria: { type: 'array', minItems: 1, items: { type: 'string', minLength: 1, maxLength: 2_000 } } } },
         workItemType: { type: 'string', minLength: 1, maxLength: 64 },
         actions: { type: 'array', minItems: 1, maxItems: 8, items: { type: 'object', additionalProperties: false, required: ['id', 'name', 'type', 'objective', 'approach', 'expectedOutcome', 'candidateVpIds', 'assignmentReason', 'dependsOnActionIds', 'workspaceMode'], properties: {
@@ -483,7 +471,7 @@ function terminalPlanningFields(options = {}) {
   return {
     summary: { type: 'string', minLength: 1, maxLength: 2_000 },
     evidence: { type: 'array', minItems: 1, maxItems: 20, items: { type: 'string', minLength: 1, maxLength: 1_000 } },
-    acceptanceChecks: { type: 'array', items: { type: 'object', additionalProperties: false, required: ['criterion', 'status', 'evidence'], properties: { criterion: { type: 'string' }, status: { type: 'string', enum: ['passed', 'deferred', 'not_applicable'] }, evidence: { type: 'string', minLength: 1, maxLength: 1_000 } } } },
+    acceptanceChecks: { type: 'array', items: { type: 'object', additionalProperties: false, required: ['criterion', 'status', 'evidence'], properties: { criterion: { type: 'string' }, status: { type: 'string', enum: ['passed', 'failed', 'deferred', 'not_applicable'] }, evidence: { type: 'string', minLength: 1, maxLength: 1_000 } } } },
     ...(options.review === true ? {
       reviewDecision: { type: 'string', const: 'changes_requested' },
     } : {}),
@@ -748,7 +736,7 @@ function completionContract(action, workItem) {
       : '';
   const acceptanceChecks = (workItem?.acceptanceCriteria || []).map(criterion => ({
     criterion,
-    status: 'passed|deferred|not_applicable',
+    status: 'passed|failed|deferred|not_applicable',
     evidence: 'specific evidence reference',
   }));
   return `${toolSubmission}\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{
@@ -759,7 +747,7 @@ function completionContract(action, workItem) {
   "acceptanceChecks": ${JSON.stringify(acceptanceChecks)},
   "waitingReason": null,
   "error": null${reviewField}${triageField}${planField}
-}\nFor completed, provide at least one concrete evidence item and exactly one acceptanceChecks entry for every current acceptance criterion, in the same order, with status passed, deferred, or not_applicable and a non-empty evidence reference. Report every user-consumable file, URL, PR, or commit in outputs; evidence proves work, while outputs tell the user where the deliverable is. Triage must use its proposed criteria when submitting a contractPatch. An intermediate Action may defer criteria outside its task-specific expected result; the final deliver Action, and an approved review with no downstream work, require every criterion to pass. If a criterion is no longer applicable, ask the WorkItem Coordinator to revise the contract instead of pretending it passed. This is a deterministic submission gate, not independent proof: later verification and delivery Actions must verify the claims. A model turn ending is not completion. Use waiting when user or external input is required. Use retryable only for a transient failure. Do not start background jobs or delegate this Action.`;
+}\nFor completed, provide at least one concrete evidence item and exactly one acceptanceChecks entry for every current acceptance criterion, in the same order, with status passed, failed, deferred, or not_applicable and a non-empty evidence reference. Report every user-consumable file, URL, PR, or commit in outputs; evidence proves work, while outputs tell the user where the deliverable is. Triage must use its proposed criteria when submitting a contractPatch. An intermediate Action may defer criteria outside its task-specific expected result; the final deliver Action, and an approved review with no downstream work, require every criterion to pass. If a criterion is no longer applicable, request user confirmation of any contract change instead of pretending it passed. For response delivery, provide the user-facing conclusion in summary with concrete evidence; no artificial file or PR is required. This is a deterministic submission gate, not independent proof: later verification and delivery Actions must verify the claims. A model turn ending is not completion. Use waiting when user or external input is required. Use retryable only for a transient failure. Do not start background jobs or delegate this Action.`;
 }
 
 function safeCheckpointUrl(value) {
@@ -1163,6 +1151,7 @@ export class WorkItemRunner {
         )
       : null;
     const isRunActive = () => !signal.aborted
+      && !this.store.isExecutionStopped?.(workItem.id)
       && this.store.isActiveRun(run.id, ownerBootId, run.leaseEpoch);
     const workspaceRuntime = await this.#workspaceRuntime(workspaceDir, workDir, isRunActive);
     const mcpToolNames = workspaceRuntime.mcpTools.map(tool => tool.name);
@@ -1337,7 +1326,8 @@ export class WorkItemRunner {
       return onProgress(currentProgress());
     };
     if (typeof registerProgressReader === 'function') registerProgressReader(currentProgress);
-    const adapter = withUsageAccounting(runtime.adapter, usage => {
+    const adapter = withUsageAccounting(
+      new WorkCenterResourceAdapter(runtime.adapter, this.store, workItem.id, run.id), usage => {
       usageStats.inputTokens += usage.inputTokens;
       usageStats.outputTokens += usage.outputTokens;
       usageStats.cacheReadTokens += usage.cacheReadTokens;

package/yeaft/work-center/service.js

@@ -247,13 +247,16 @@ export class WorkCenterService {
             workItemId,
           });
           const shouldStart = payload.start === undefined ? settings.startImmediately : payload.start !== false;
+          const goal = requiredString(payload.goal, 'goal');
+          const requestedCriteria = Array.isArray(payload.acceptanceCriteria)
+            ? payload.acceptanceCriteria.map(value => String(value).trim()).filter(Boolean) : [];
           this.controller.create({
             id: workItemId,
             title: requiredString(payload.title, 'title'),
-            goal: requiredString(payload.goal, 'goal'),
-            acceptanceCriteria: Array.isArray(payload.acceptanceCriteria)
-              ? payload.acceptanceCriteria.map(value => String(value).trim()).filter(Boolean)
-              : [],
+            goal,
+            // With no separate criteria, the user's goal itself is the minimum
+            // contract. Do not force a follow-up or invent broader requirements.
+            acceptanceCriteria: requestedCriteria.length ? requestedCriteria : [goal],
             workflowTemplate,
             workflowSnapshot,
             coordinationMode: DYNAMIC_COORDINATION_MODE,
@@ -263,7 +266,7 @@ export class WorkCenterService {
             // browser/user request. Trusted model producers may provide
             // Session provenance, but cannot grant themselves delivery rights.
             deliveryTarget: requestContext.userOriginated === true
-              && ['workspace_files', 'pull_request', 'merge'].includes(payload.deliveryTarget)
+              && ['response', 'workspace_files', 'pull_request', 'merge'].includes(payload.deliveryTarget)
               ? payload.deliveryTarget : null,
             reuseMemory: payload.reuseMemory !== false,
             origin: payload.origin && typeof payload.origin === 'object'
@@ -320,9 +323,21 @@ export class WorkCenterService {
         this.#emit({ type: 'work_item.cancelled', workItem: detail });
         return detail;
       }
+      case 'extend_budget': {
+        if (requestContext.userOriginated !== true) throw new Error('Only explicit user requests can extend execution budget');
+        const id = requiredString(payload.id, 'id');
+        const detail = this.controller.extendBudget(id, payload);
+        this.#emit({ type: 'work_item.execution_budget_extended', workItem: detail });
+        return detail;
+      }
       case 'resume': {
+        if (requestContext.userOriginated !== true) throw new Error('Only explicit user requests can resume execution');
         const id = requiredString(payload.id, 'id');
-        const detail = this.controller.resume(id, { revision: payload.revision });
+        if (!Number.isSafeInteger(payload.executionControlRevision)) {
+          throw new Error('executionControlRevision is required to resume a WorkItem');
+        }
+        const detail = this.controller.resume(id, { revision: payload.revision,
+          executionControlRevision: payload.executionControlRevision });
         this.watcher.abortInvalidWorkItemRuns(id);
         if (detail.coordinationMode === DYNAMIC_COORDINATION_MODE) {
           this.#queueDynamicCoordinatorWake(id);
@@ -633,7 +648,8 @@ export class WorkCenterService {
     const entry = entries.find(candidate => candidate.payload?.turnId) || entries[0];
     if (!entry) return null;
     const detail = this.store.getWorkItemDetail(workItemId);
-    if (detail?.actions?.some(action => action.status === 'running')) return null;
+    if (!this.store.canAutomaticallyCoordinate(workItemId)
+        || detail?.actions?.some(action => action.status === 'running')) return null;
     let turn;
     try {
       turn = this.coordinator.advance(entry.id, {
@@ -673,6 +689,7 @@ export class WorkCenterService {
     this.store.recoverCoordinatorProviderTurns();
     this.store.recoverCoordinatorMailbox();
     for (const recoverable of this.store.getRecoverableCoordinatorTurns?.() || []) {
+      if (!this.store.canAutomaticallyCoordinate(recoverable.workItemId)) continue;
       const claim = this.store.claimCoordinatorTurn(
         recoverable.workItemId, recoverable.turnId, this.ownerBootId,
       );
@@ -717,6 +734,10 @@ export class WorkCenterService {
     let next = null;
     for (const [key, entry] of this.recoveryQueue) {
       const detail = this.store.getWorkItemDetail(entry.workItemId);
+      if (!this.store.canAutomaticallyCoordinate(entry.workItemId)) {
+        this.recoveryQueue.delete(key);
+        continue;
+      }
       const action = detail?.actions?.find(candidate => candidate.id === entry.actionId);
       if (!detail || ['done', 'cancelled'].includes(detail.status)
           || action?.status !== 'failed'