@ct-agents/worker 0.2.2 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ct-agents/worker",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "type": "module",
   "files": [
     "src"
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "zod": "4.4.3",
-    "@ct-agents/harness": "0.2.2",
-    "@ct-agents/environment": "0.2.2",
-    "@ct-agents/prompts": "0.2.2",
-    "@ct-agents/memory": "0.2.2",
-    "@ct-agents/protocol": "0.2.2",
-    "@ct-agents/tools": "0.2.2"
+    "@ct-agents/environment": "0.4.0",
+    "@ct-agents/harness": "0.4.0",
+    "@ct-agents/prompts": "0.4.0",
+    "@ct-agents/memory": "0.4.0",
+    "@ct-agents/protocol": "0.4.0",
+    "@ct-agents/tools": "0.4.0"
   },
   "optionalDependencies": {
     "dockerode": "4.0.9"

package/src/index.ts

@@ -1,8 +1,4 @@
 import type {
-  ContextResolveQueue,
-  ContextResolveQueueClaimInput,
-  ContextResolveResult,
-  ContextResolveWorkItem,
   EnvironmentId,
   EnvironmentExecutionMode,
   EnvironmentHostedPolicy,
@@ -46,13 +42,6 @@ export { WorkerHttpError } from './worker-http-transport.js';
 export { DEFAULT_WORK_LEASE_RENEW_INTERVAL_MS } from './leased-item-runner.js';
 
 export type ResolveResources = (item: ToolWorkItem) => Promise<ResourceSlots> | ResourceSlots;
-export type ResolvePromptContext = (item: ContextResolveWorkItem) =>
-  Promise<Record<string, unknown>> | Record<string, unknown>;
-
-export type WorkerContextResolveQueue = Pick<
-  ContextResolveQueue,
-  'claim' | 'renew' | 'complete'
->;
 
 export type ResourceOptionsParser = {
   parse(value: unknown): Record<string, unknown>;
@@ -132,23 +121,6 @@ export type RunEnvironmentWorkerLoopInput = EnvironmentWorkerInput & {
   onError?: (error: unknown) => void | Promise<void>;
 };
 
-export type ContextResolverWorkerInput = {
-  /** 本地/内存队列可选的不透明路由句柄；HTTP client 已由 Environment Key 绑定。 */
-  scope?: ExecutionScope;
-  contextResolveQueue: WorkerContextResolveQueue;
-  resolvePromptContext: ResolvePromptContext;
-  maxBatchSize?: number;
-  executionMode?: EnvironmentExecutionMode;
-  leaseRenewIntervalMs?: number;
-  onError?: (error: unknown) => void | Promise<void>;
-};
-
-export type RunContextResolverWorkerLoopInput = ContextResolverWorkerInput & {
-  abortSignal?: AbortSignal;
-  idleDelayMs?: number;
-  errorDelayMs?: number;
-};
-
 export const DEFAULT_CLAIM_BLOCK_MS = 15_000;
 const PLATFORM_PROXY_RESOURCE_CAPABILITIES = [
   { slot: 'skills', implementationId: 'platform-skills-store' },
@@ -486,98 +458,6 @@ export class EnvironmentWorker {
 
 }
 
-/**
- * 独立 context resolver worker。
- *
- * 它只处理 context.resolve 工作项，把接入方或平台托管 Resource 物化成 prompt snapshot。
- * 该闭环不执行 tool handler，也不会写 tool.called/tool-result 事件。
- */
-export class ContextResolverWorker {
-  public constructor(private readonly input: ContextResolverWorkerInput) {}
-
-  public async drainOnce(): Promise<number> {
-    const executionMode = this.input.executionMode ?? 'self_hosted';
-    const items = await this.input.contextResolveQueue.claim({
-      scope: this.input.scope ?? {},
-      executionMode,
-      max: this.input.maxBatchSize ?? 1,
-    });
-
-    await Promise.all(items.map((item) => this.handleItem(item)));
-    return items.length;
-  }
-
-  private async handleItem(item: ContextResolveWorkItem): Promise<void> {
-    const renew = this.input.contextResolveQueue.renew;
-    const leaseId = item.leaseId;
-    await runLeasedItem<ContextResolveResult>({
-      ...(leaseId && renew ? {
-        renewal: {
-          intervalMs: this.input.leaseRenewIntervalMs,
-          renew: () => renew({
-            workId: item.workId,
-            leaseId,
-            scope: item.scope,
-            executionMode: this.input.executionMode ?? item.executionMode ?? 'self_hosted',
-          }),
-          onError: this.input.onError,
-        },
-      } : {}),
-      execute: async () => {
-        try {
-          return {
-            workId: item.workId,
-            ...(item.leaseId ? { leaseId: item.leaseId } : {}),
-            status: 'completed',
-            snapshot: await this.input.resolvePromptContext(item),
-          };
-        } catch (error) {
-          return {
-            workId: item.workId,
-            ...(item.leaseId ? { leaseId: item.leaseId } : {}),
-            status: 'failed',
-            error: {
-              message: normalizeContextResolverError(error),
-              retryable: false,
-            },
-          };
-        }
-      },
-      complete: (result) => this.input.contextResolveQueue.complete(
-        result,
-        this.buildCompleteScope(item),
-      ),
-      completeRejectedError: () => new Error(`context work complete 未被接受：${item.workId}`),
-    });
-  }
-
-  private buildCompleteScope(item: ContextResolveWorkItem) {
-    return {
-      scope: item.scope,
-      executionMode: this.input.executionMode ?? item.executionMode ?? 'self_hosted',
-      leaseId: item.leaseId,
-    };
-  }
-}
-
-export async function runContextResolverWorkerLoop(input: RunContextResolverWorkerLoopInput): Promise<void> {
-  const worker = new ContextResolverWorker(input);
-  const idleDelayMs = input.idleDelayMs ?? 250;
-  const errorDelayMs = input.errorDelayMs ?? 1000;
-
-  while (!input.abortSignal?.aborted) {
-    try {
-      const drained = await worker.drainOnce();
-      if (drained === 0) {
-        await delay(idleDelayMs, input.abortSignal);
-      }
-    } catch (error) {
-      await input.onError?.(error);
-      await delay(errorDelayMs, input.abortSignal);
-    }
-  }
-}
-
 export async function runEnvironmentWorkerLoop(input: RunEnvironmentWorkerLoopInput): Promise<void> {
   const worker = new EnvironmentWorker(input);
   const idleDelayMs = input.idleDelayMs ?? 250;
@@ -640,8 +520,6 @@ export type HttpWorkQueueClientInput = {
   signal?: AbortSignal;
 };
 
-export type HttpContextResolveQueueClientInput = Omit<HttpWorkQueueClientInput, 'workerInstanceId'>;
-
 export function zodObjectToJsonSchema(schema: z.ZodType<unknown>): Record<string, unknown> {
   const jsonSchema = z.toJSONSchema(schema) as Record<string, unknown>;
   const normalized = normalizeCatalogJsonSchema(jsonSchema, true);
@@ -738,6 +616,7 @@ export class HttpWorkQueueClient implements WorkerWorkQueue {
     }
     const data = await this.transport.requestJson('/work/complete', {
       method: 'POST',
+      signal: this.input.signal,
       body: JSON.stringify({
         ...result,
         leaseId: scope.leaseId,
@@ -768,13 +647,13 @@ export class HttpWorkQueueClient implements WorkerWorkQueue {
     };
   }
 
-  public async heartbeat(workerInstanceId: string) {
+  public async heartbeat(workerInstanceId: string, signal = this.input.signal) {
     if (workerInstanceId !== this.input.workerInstanceId) {
       throw new Error('Worker 心跳身份与 client 实例不一致');
     }
     const data = await this.transport.requestJson(`/instances/${encodeURIComponent(workerInstanceId)}/heartbeat`, {
       method: 'POST',
-      signal: this.input.signal,
+      signal,
     }, '平台工作队列响应不是 JSON 对象');
     const record = expectRecord(data, 'Worker 心跳响应缺少 data');
     return {
@@ -800,54 +679,6 @@ export class HttpWorkQueueClient implements WorkerWorkQueue {
 
 }
 
-export class HttpContextResolveQueueClient implements WorkerContextResolveQueue {
-  private readonly transport: WorkerHttpTransport;
-
-  public constructor(private readonly input: HttpContextResolveQueueClientInput) {
-    this.transport = new WorkerHttpTransport(input);
-  }
-
-  public async claim(input: ContextResolveQueueClaimInput) {
-    const data = await this.transport.requestJson('/context-work/claim', {
-      method: 'POST',
-      signal: this.input.signal,
-      body: JSON.stringify({
-        max: input.max,
-      }),
-    }, '平台 context 工作队列响应不是 JSON 对象');
-
-    const record = expectRecord(data, 'context claim 响应缺少 data');
-    const items = record.items;
-    if (!Array.isArray(items)) {
-      throw new Error('context claim 响应缺少 items 数组');
-    }
-    return items.map(parseContextResolveWorkItem);
-  }
-
-  public async complete(result: ContextResolveResult): Promise<boolean> {
-    const data = await this.transport.requestJson('/context-work/complete', {
-      method: 'POST',
-      body: JSON.stringify(result),
-    }, '平台 context 工作队列响应不是 JSON 对象');
-    const record = expectRecord(data, 'context complete 响应缺少 data');
-    if (record.accepted !== true) {
-      throw new Error(`context complete 未被接受：${result.workId}`);
-    }
-    return true;
-  }
-
-  public async renew(input: { workId: string; leaseId: string }): Promise<boolean> {
-    const data = await this.transport.requestJson('/context-work/renew', {
-      method: 'POST',
-      signal: this.input.signal,
-      body: JSON.stringify({ workId: input.workId, leaseId: input.leaseId }),
-    }, '平台 context 工作队列响应不是 JSON 对象');
-    const record = expectRecord(data, 'context renew 响应缺少 data');
-    return record.renewed === true;
-  }
-
-}
-
 function toToolExecutionResult(
   workId: string,
   execution: ToolExecution<unknown>,
@@ -1160,44 +991,6 @@ function parseExecutionScope(value: unknown): ExecutionScope {
   return Object.fromEntries(entries);
 }
 
-function parseContextResolveWorkItem(value: unknown): ContextResolveWorkItem {
-  const record = expectRecord(value, 'context work item 不是对象');
-  const workId = expectString(record.workId, 'workId');
-  const leaseId = typeof record.leaseId === 'string' && record.leaseId.trim()
-    ? record.leaseId.trim()
-    : undefined;
-  const sessionId = expectString(record.sessionId, 'sessionId');
-  const rootSessionId = expectString(record.rootSessionId, 'rootSessionId');
-  const request = expectRecord(record.request, 'request 必须是对象');
-  const kind = expectString(request.kind, 'request.kind');
-  if (kind !== 'prompt_context') {
-    throw new Error('request.kind 必须是 prompt_context');
-  }
-  const rawKeys = request.keys;
-  const keys = Array.isArray(rawKeys)
-    ? rawKeys
-      .filter((key): key is string => typeof key === 'string')
-      .map((key) => key.trim())
-      .filter(Boolean)
-    : [];
-  if (!Array.isArray(rawKeys) || keys.length === 0 || keys.length !== rawKeys.length) {
-    throw new Error('request.keys 必须是非空字符串数组');
-  }
-  const executionMode = parseExecutionMode(record.executionMode);
-  return {
-    workId,
-    ...(leaseId ? { leaseId } : {}),
-    sessionId,
-    rootSessionId,
-    scope: parseExecutionScope(record.scope),
-    request: {
-      kind: 'prompt_context',
-      keys,
-    },
-    ...(executionMode ? { executionMode } : {}),
-  };
-}
-
 function normalizeWorkerError(error: unknown): string {
   if (error instanceof Error) {
     return `工具执行失败：${error.message}`;
@@ -1222,13 +1015,6 @@ function toWorkerErrorPayload(error: unknown): NonNullable<ToolExecutionResult['
   };
 }
 
-function normalizeContextResolverError(error: unknown): string {
-  if (error instanceof Error) {
-    return `context resolve 失败：${error.message}`;
-  }
-  return `context resolve 失败：${String(error)}`;
-}
-
 function expectString(value: unknown, field: string): string {
   if (typeof value !== 'string' || !value.trim()) {
     throw new Error(`字段 ${field} 必须是非空字符串`);