@wowyuarm/dsh-agent-team 0.1.2 → 0.1.4

package/packages/agent-team/lib/recovery.js

@@ -8,59 +8,55 @@ export function classifyRecoverableError(message) {
     return undefined;
 }
 export const RECOVERY_DELAY_MS = 120_000;
-export const RECOVERY_MAX_ATTEMPTS = 3;
+export const RECOVERY_MAX_CONSECUTIVE_ERRORS = 3;
 /**
- * Per-member automatic recovery episodes. One episode covers a run of
- * identical errors; a changed error string starts a fresh one, and any clean
- * turn end clears the slate. After `maxAttempts` injections of the same error
- * the coordinator stands down and leaves the Member in error for the operator.
+ * Per-member automatic recovery episodes. An episode is every recoverable
+ * `agent/error` occurrence until a clean turn end, regardless of error text
+ * or family. Each of the first two occurrences schedules its own wakeup.
  */
 export class RecoveryCoordinator {
     episodes = new Map();
-    inject;
+    wake;
     onStandDown;
     delayMs;
-    maxAttempts;
+    maxConsecutiveErrors;
     constructor(options) {
-        this.inject = options.inject;
+        this.wake = options.wake;
         this.onStandDown = options.onStandDown;
         this.delayMs = options.delayMs ?? RECOVERY_DELAY_MS;
-        this.maxAttempts = options.maxAttempts ?? RECOVERY_MAX_ATTEMPTS;
+        this.maxConsecutiveErrors = options.maxConsecutiveErrors ?? RECOVERY_MAX_CONSECUTIVE_ERRORS;
     }
-    /** Observe one error occurrence for a Member. */
+    /** Observe one `agent/error` occurrence for a Member. */
     onError(memberId, errorMessage) {
-        const kind = classifyRecoverableError(errorMessage);
-        if (kind === undefined) {
-            // A non-retryable failure cancels anything pending: retrying cannot help.
+        if (classifyRecoverableError(errorMessage) === undefined) {
+            // A non-recoverable failure cancels anything pending: retrying cannot help.
             this.stopTracking(memberId);
             return;
         }
         let episode = this.episodes.get(memberId);
-        if (episode === undefined || episode.lastError !== errorMessage) {
-            this.cancelTimer(episode);
-            episode = { kind, lastError: errorMessage, attempts: 0 };
+        if (episode === undefined) {
+            episode = { consecutiveFailures: 0, timers: new Set() };
             this.episodes.set(memberId, episode);
         }
-        else if (episode.attempts >= this.maxAttempts) {
-            // The same error survived every allowed injection — stand down once.
-            if (episode.stoodDown !== true) {
-                episode.stoodDown = true;
-                this.onStandDown?.(memberId, episode.attempts);
-            }
+        if (episode.stoodDown === true)
             return;
-        }
-        if (episode.timer !== undefined)
+        episode.consecutiveFailures += 1;
+        if (episode.consecutiveFailures >= this.maxConsecutiveErrors) {
+            this.cancelTimers(episode);
+            episode.stoodDown = true;
+            this.onStandDown?.(memberId, episode.consecutiveFailures);
             return;
-        episode.timer = setTimeout(() => {
-            episode.timer = undefined;
-            episode.attempts += 1;
+        }
+        const timer = setTimeout(() => {
+            episode.timers.delete(timer);
             try {
-                this.inject(memberId, episode.attempts, kind);
+                this.wake(memberId);
             }
             catch {
                 this.stopTracking(memberId);
             }
         }, this.delayMs);
+        episode.timers.add(timer);
     }
     /** A turn ended cleanly (running→idle without an error): the episode is over. */
     onCleanTurnEnd(memberId) {
@@ -70,18 +66,17 @@ export class RecoveryCoordinator {
         const episode = this.episodes.get(memberId);
         if (episode === undefined)
             return;
-        this.cancelTimer(episode);
+        this.cancelTimers(episode);
         this.episodes.delete(memberId);
     }
     dispose() {
         for (const episode of this.episodes.values())
-            this.cancelTimer(episode);
+            this.cancelTimers(episode);
         this.episodes.clear();
     }
-    cancelTimer(episode) {
-        if (episode?.timer === undefined)
-            return;
-        clearTimeout(episode.timer);
-        episode.timer = undefined;
+    cancelTimers(episode) {
+        for (const timer of episode.timers)
+            clearTimeout(timer);
+        episode.timers.clear();
     }
 }

package/packages/agent-team/lib/spec.js

@@ -60,18 +60,21 @@ const attachmentSchema = z.object({
     byteSize: z.number().int().nonnegative(),
     mediaType: z.string().min(1),
 }).strict();
+function omitUndefined(value) {
+    return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== undefined));
+}
 const messageSchema = z.object({
     messageRef: messageRefSchema,
     channelRef: channelRefSchema,
     threadRef: threadRefSchema,
-    taskRef: taskRefSchema,
+    taskRef: taskRefSchema.optional(),
     sender: memberIdSchema,
     body: z.string().min(1),
     attachments: z.array(attachmentSchema).optional(),
     topLevel: z.boolean(),
     sequence: z.number().int().positive(),
     occurredAt: z.string().datetime().optional(),
-}).strict();
+}).strict().transform(omitUndefined);
 /** Stamp one bare stored message with the wrapping operation's occurrence instant; complete messages pass through unchanged. */
 function stampMessage(occurredAt, message) {
     const { occurredAt: stored } = message;
@@ -96,9 +99,9 @@ const taskSchema = z.object({
 }).strict();
 const threadSchema = z.object({
     threadRef: threadRefSchema,
-    taskRef: taskRefSchema,
+    taskRef: taskRefSchema.optional(),
     revision: z.number().int().positive(),
-}).strict();
+}).strict().transform(omitUndefined);
 const attentionSchema = z.object({
     memberId: memberIdSchema,
     threadRef: threadRefSchema,
@@ -158,7 +161,7 @@ const claimActivitySchema = z.object({
 }).strict();
 const taskActivitySchema = z.object({
     ...activityBase,
-    kind: z.union([z.literal('accept'), z.literal('close'), z.literal('reopen')]),
+    kind: z.union([z.literal('promote'), z.literal('accept'), z.literal('close'), z.literal('reopen')]),
     releasedClaimRefs: z.array(claimRefSchema).min(1).optional(),
     completedClaimRefs: z.array(claimRefSchema).min(1).optional(),
 }).strict();
@@ -275,10 +278,10 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
             workspaceId: workspaceIdSchema,
             mentions: z.array(memberIdSchema),
             message: messageSchema,
-            task: taskSchema,
+            task: taskSchema.optional(),
             thread: threadSchema,
             inbox: inboxDeltaSchema,
-        }).strict(),
+        }).strict().transform(omitUndefined),
     }).strict(),
     z.object({
         ...operationBase,
@@ -289,6 +292,19 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
             baseRevision: z.number().int().positive(),
             mentions: z.array(memberIdSchema),
             message: messageSchema,
+            task: taskSchema.optional(),
+            thread: threadSchema,
+            inbox: inboxDeltaSchema,
+        }).strict().transform(omitUndefined),
+    }).strict(),
+    z.object({
+        ...operationBase,
+        previousOperationId: operationIdSchema.nullable(),
+        kind: z.literal('team/thread-promoted'),
+        data: z.object({
+            workspaceId: workspaceIdSchema,
+            baseRevision: z.number().int().positive(),
+            activity: taskActivitySchema,
             task: taskSchema,
             thread: threadSchema,
             inbox: inboxDeltaSchema,
@@ -319,10 +335,10 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
             workspaceId: workspaceIdSchema,
             action: z.union([z.literal('follow'), z.literal('unfollow')]),
             memberId: memberIdSchema,
-            task: taskSchema,
+            task: taskSchema.optional(),
             thread: threadSchema,
             inbox: inboxDeltaSchema,
-        }).strict(),
+        }).strict().transform(omitUndefined),
     }).strict(),
     z.object({
         ...operationBase,
@@ -331,7 +347,7 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
         data: z.object({
             workspaceId: workspaceIdSchema,
             memberId: memberIdSchema,
-            task: taskSchema,
+            task: taskSchema.optional(),
             thread: threadSchema,
             claims: z.array(claimSchema),
             anchor: messageSchema,
@@ -341,7 +357,7 @@ const storedAgentTeamOperationSchema = z.discriminatedUnion('kind', [
             remainingUnreadCount: z.number().int().nonnegative(),
             attention: attentionSchema.optional(),
             inbox: inboxDeltaSchema,
-        }).strict(),
+        }).strict().transform(omitUndefined),
     }).strict(),
     z.object({
         ...operationBase,