@modelprofile.com/flexharness 5.3.2 → 5.4.0

package/dist_ts/interfaces.d.ts

@@ -802,6 +802,11 @@ export interface IFlexHarnessOptions<TScope> {
     callbackLimits?: IFlexCallbackLimits;
     promptQueueLimits?: IFlexPromptQueueLimits;
     reversionLimits?: IFlexReversionLimits;
+    /**
+     * Bounds each turn-reversion maintenance operation. Falls back to
+     * agentSessionPolicy.generationLeaseCleanupTimeoutMs, then 30 seconds.
+     */
+    reversionMaintenanceTimeoutMs?: number;
     turnReversionProvider?: IFlexTurnReversionProvider<TScope> | IFlexTurnReversionProviderV2<TScope>;
     reversionPolicy?: TFlexReversionPolicy;
     externalErrorProjector?: TFlexExternalErrorProjector;

package/dist_ts/utils.harnessoptions.d.ts

@@ -14,6 +14,7 @@ export declare function normalizeSubagents(definitions: IFlexSubagentDefinition[
 export declare function normalizeBuiltInTools(options: IFlexHarnessOptions<unknown>['builtInTools']): INormalizedBuiltInTools;
 export declare function normalizeSlashCommands<TScope>(registrations: readonly TFlexSlashCommandRegistration<TScope>[] | undefined): ReadonlyMap<string, TRegisteredSlashCommand<TScope>>;
 export declare function resolveBoundedPositiveInteger(value: number | undefined, name: string, defaultValue: number, maximum: number): number;
+export declare function resolveReversionMaintenanceTimeoutMs<TScope>(options: IFlexHarnessOptions<TScope>): number;
 export declare function resolveCallbackLimits(limits?: IFlexCallbackLimits): Required<IFlexCallbackLimits>;
 export declare function resolvePromptQueueLimits(limits?: IFlexPromptQueueLimits): Required<IFlexPromptQueueLimits>;
 export declare function resolveReversionLimits(limits?: IFlexReversionLimits): Required<IFlexReversionLimits>;

package/dist_ts/utils.harnessoptions.js

@@ -22,6 +22,8 @@ const maxSubagentSystemBytes = 64 * 1024;
 const maxSlashCommandRegistrations = 128;
 const maxSlashCommandDescriptionBytes = 2048;
 const maxSlashCommandTemplateBytes = FLEX_SLASH_COMMAND_MAX_INPUT_BYTES;
+const defaultReversionMaintenanceTimeoutMs = 30_000;
+const maximumReversionMaintenanceTimeoutMs = 30 * 60 * 1000;
 export function normalizeSubagents(definitions) {
     if (definitions === undefined)
         return new Map();
@@ -182,6 +184,10 @@ export function resolveBoundedPositiveInteger(value, name, defaultValue, maximum
     }
     return resolved;
 }
+export function resolveReversionMaintenanceTimeoutMs(options) {
+    return resolveBoundedPositiveInteger(options.reversionMaintenanceTimeoutMs
+        ?? options.agentSessionPolicy?.generationLeaseCleanupTimeoutMs, 'reversionMaintenanceTimeoutMs', defaultReversionMaintenanceTimeoutMs, maximumReversionMaintenanceTimeoutMs);
+}
 export function resolveCallbackLimits(limits = {}) {
     const resolved = {
         maxEvents: limits.maxEvents ?? DEFAULT_CALLBACK_LIMITS.maxEvents,
@@ -264,4 +270,4 @@ export function requireHarnessStores(stores) {
     }
     return stores;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.harnessoptions.js","sourceRoot":"","sources":["../ts/utils.harnessoptions.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.harnessoptions.js","sourceRoot":"","sources":["../ts/utils.harnessoptions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelprofile.com/flexharness",
-  "version": "5.3.2",
+  "version": "5.4.0",
   "private": false,
   "description": "Provider-neutral model-session runtime with durable history, permissions, typed events, and pluggable local or remote tool execution.",
   "main": "dist_ts/index.js",
@@ -22,15 +22,15 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@push.rocks/smartagent": "^5.0.1",
+    "@push.rocks/smartagent": "^6.0.0",
     "@types/json-schema": "7.0.15"
   },
   "devDependencies": {
     "@git.zone/tsbuild": "4.4.2",
     "@git.zone/tsrun": "2.0.6",
     "@git.zone/tstest": "4.0.0",
-    "@types/node": "26.2.0",
-    "ai": "6.0.237"
+    "@types/node": "26.4.1",
+    "ai": "7.0.79"
   },
   "files": [
     "ts/**/*",

package/readme.hints.md

@@ -37,6 +37,7 @@ Implementation findings for flexharness.
 - Detached tool-provider cleanup and retained session cleanup are owned by the exact loaded storage state. Failed drains retain that ownership and the cached state for retry. Scope retirement cannot await or consume another namespace's cleanup, while full disposal settles all storage drains and orphaned initialization cleanup before aggregating failures.
 - JSON provider release hooks evict non-destructive session wrapper caches after AgentSession and execution-context ownership ends. Failed partial-initialization releases remain storage-scoped orphan ownership and are retried by retirement or disposal.
 - Turn-reversion capture release is idempotent and tombstone-owned. Session deletion aborts same-session commands, waits runtime settlement, releases every durable workspace capture, and only then removes projection data; a failed or unacknowledged release leaves the tombstone and projection available for retry.
+- Turn-reversion inspection, recovery, finalization, and release use a dedicated aggregate maintenance timeout. The top-level reversion option takes precedence over the legacy agent-session cleanup timeout fallback so hosts can order provider-call, aggregate-maintenance, and enclosing lifecycle deadlines independently.
 - Projection schemas 1 and 2 remain read-only compatibility inputs. Every projection write uses schema 3 with explicit protocol, provenance, and V2 disposition; schema-2 workspace references migrate as protocol-1 ownership without being discarded.
 - A loaded schema-1 or schema-2 projection retains its exact durable baseline until the first schema-3 save is confirmed, so a non-committing upgrade failure rolls back without fencing while a post-commit throw reconciles the new schema.
 - Workspace-required traversal keeps the cursor in completed-root group coordinates. Candidate operations may jump across trailing no-change groups, while pending, nonrevertible, mixed, and legacy transcript groups remain barriers without changing transcript-optional grouping.

package/readme.md

@@ -638,7 +638,7 @@ The protocol is durable and inspectable:
 
 Under `workspace-required`, a group is a barrier when any segment is pending, nonrevertible, or legacy transcript-only history. It is a candidate when at least one segment is revertible and none is a barrier; otherwise it is no-change. Only candidates can be traversed. No-change groups after a candidate travel with that candidate until the next candidate or barrier. Leading no-change groups remain visible. A retained barrier blocks older groups, while later candidates remain undoable. A mixed revertible/nonrevertible group is a barrier.
 
-Inspection, recovery, finalization, and release use fresh maintenance signals bounded by `agentSessionPolicy.generationLeaseCleanupTimeoutMs`, which defaults to 30 seconds. Providers must observe every supplied signal and must serialize ownership for a storage namespace. A provider with the matching persisted `protocolVersion` must remain configured whenever a capture-backed session is reopened, retired, disposed, or deleted. Capture-backed recovery and deletion fail closed without it.
+Inspection, recovery, finalization, and release use fresh maintenance signals bounded by the top-level `reversionMaintenanceTimeoutMs` option. It must be a positive safe integer no greater than 30 minutes. When omitted, FlexHarness uses `agentSessionPolicy.generationLeaseCleanupTimeoutMs` as a compatibility fallback, then defaults to 30 seconds when neither option is supplied. The agent-session setting continues to govern SmartAgent generation-lease cleanup independently. Providers must observe every supplied signal and must serialize ownership for a storage namespace. A provider with the matching persisted `protocolVersion` must remain configured whenever a capture-backed session is reopened, retired, disposed, or deleted. Capture-backed recovery and deletion fail closed without it.
 
 Workspace reversion is generic and application-defined. It does not reverse network, database, billing, or other side effects unless the provider deliberately captures them. References are normalized with `toolOutputLimits` and have an absolute 256 KiB encoded cap.
 

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@modelprofile.com/flexharness',
-  version: '5.3.2',
+  version: '5.4.0',
   description: 'Provider-neutral model-session runtime with durable history, permissions, typed events, and pluggable local or remote tool execution.'
 }

package/ts/classes.flexharness.ts

@@ -148,6 +148,7 @@ import {
   resolveBoundedPositiveInteger,
   resolveCallbackLimits,
   resolvePromptQueueLimits,
+  resolveReversionMaintenanceTimeoutMs,
   resolveReversionLimits,
   type INormalizedBuiltInTools,
   type INormalizedProjectManagementTools,
@@ -692,6 +693,7 @@ export class FlexHarness<TScope = unknown> {
   private readonly callbackLimits: Required<IFlexCallbackLimits>;
   private readonly promptQueueLimits: Required<IFlexPromptQueueLimits>;
   private readonly reversionLimits: Required<IFlexReversionLimits>;
+  private readonly reversionMaintenanceTimeoutMs: number;
   private readonly turnReversionProvider: IFlexHarnessOptions<TScope>['turnReversionProvider'];
   private readonly reversionPolicy: TFlexReversionPolicy;
   private readonly externalErrorProjector?: TFlexExternalErrorProjector;
@@ -756,6 +758,7 @@ export class FlexHarness<TScope = unknown> {
     this.callbackLimits = resolveCallbackLimits(options.callbackLimits);
     this.promptQueueLimits = resolvePromptQueueLimits(options.promptQueueLimits);
     this.reversionLimits = resolveReversionLimits(options.reversionLimits);
+    this.reversionMaintenanceTimeoutMs = resolveReversionMaintenanceTimeoutMs(options);
     this.turnReversionProvider = options.turnReversionProvider;
     this.reversionPolicy = options.reversionPolicy ?? 'transcript-optional';
     if (!['transcript-optional', 'workspace-required'].includes(this.reversionPolicy)) {
@@ -4807,52 +4810,107 @@ export class FlexHarness<TScope = unknown> {
     const content = plugins.z.string().min(1).max(FLEX_PROJECT_MANAGEMENT_LIMITS.maxTaskContentBytes);
     return plugins.tool({
       description: 'List, create, update, delete, or clear session-local project tasks.',
-      inputSchema: plugins.z.discriminatedUnion('action', [
-        plugins.z.object({ action: plugins.z.literal('list') }).strict(),
-        plugins.z.object({
-          action: plugins.z.literal('create'),
-          id: id.optional(),
-          content,
-          status: status.optional(),
-          priority: priority.optional(),
-        }).strict(),
-        plugins.z.object({
-          action: plugins.z.literal('update'),
-          id,
-          content: content.optional(),
-          status: status.optional(),
-          priority: priority.optional(),
-        }).strict().refine(
-          (input) => input.content !== undefined
-            || input.status !== undefined
-            || input.priority !== undefined,
-          { message: 'Task update requires content, status, or priority.' },
-        ),
-        plugins.z.object({ action: plugins.z.literal('delete'), id }).strict(),
-        plugins.z.object({ action: plugins.z.literal('clear') }).strict(),
-      ]),
+      strict: false,
+      inputSchema: plugins.z.object({
+        action: plugins.z.enum(['list', 'create', 'update', 'delete', 'clear']),
+        id: id.optional(),
+        content: content.optional(),
+        status: status.optional(),
+        priority: priority.optional(),
+      }).strict().superRefine((input, context) => {
+        const rejectFields = (...fields: Array<keyof typeof input>): void => {
+          for (const field of fields) {
+            if (input[field] === undefined) continue;
+            context.addIssue({
+              code: 'custom',
+              path: [field],
+              message: `Task action "${input.action}" does not accept ${field}.`,
+            });
+          }
+        };
+        if (input.action === 'list' || input.action === 'clear') {
+          rejectFields('id', 'content', 'status', 'priority');
+        } else if (input.action === 'create') {
+          if (input.content === undefined) {
+            context.addIssue({
+              code: 'custom',
+              path: ['content'],
+              message: 'Task creation requires content.',
+            });
+          }
+        } else if (input.action === 'update') {
+          if (input.id === undefined) {
+            context.addIssue({
+              code: 'custom',
+              path: ['id'],
+              message: 'Task update requires an id.',
+            });
+          }
+          if (
+            input.content === undefined
+            && input.status === undefined
+            && input.priority === undefined
+          ) {
+            context.addIssue({
+              code: 'custom',
+              message: 'Task update requires content, status, or priority.',
+            });
+          }
+        } else {
+          if (input.id === undefined) {
+            context.addIssue({
+              code: 'custom',
+              path: ['id'],
+              message: 'Task deletion requires an id.',
+            });
+          }
+          rejectFields('content', 'status', 'priority');
+        }
+      }),
       execute: (
-        input: TProjectTaskToolInput,
+        input,
         options?: { toolCallId?: string },
-      ) => this.executeProjectTaskTool(run, input, options?.toolCallId),
+      ) => this.executeProjectTaskTool(
+        run,
+        input as TProjectTaskToolInput,
+        options?.toolCallId,
+      ),
     });
   }
 
   private createProjectGoalTool(run: IActiveRun): unknown {
     return plugins.tool({
       description: 'Get, set, or clear the session-local project goal.',
-      inputSchema: plugins.z.discriminatedUnion('action', [
-        plugins.z.object({ action: plugins.z.literal('get') }).strict(),
-        plugins.z.object({
-          action: plugins.z.literal('set'),
-          goal: plugins.z.string().min(1).max(FLEX_PROJECT_MANAGEMENT_LIMITS.maxGoalBytes),
-        }).strict(),
-        plugins.z.object({ action: plugins.z.literal('clear') }).strict(),
-      ]),
+      strict: false,
+      inputSchema: plugins.z.object({
+        action: plugins.z.enum(['get', 'set', 'clear']),
+        goal: plugins.z.string()
+          .min(1)
+          .max(FLEX_PROJECT_MANAGEMENT_LIMITS.maxGoalBytes)
+          .optional(),
+      }).strict().superRefine((input, context) => {
+        if (input.action === 'set' && input.goal === undefined) {
+          context.addIssue({
+            code: 'custom',
+            path: ['goal'],
+            message: 'Goal set requires a goal.',
+          });
+        } else if (input.action !== 'set' && input.goal !== undefined) {
+          context.addIssue({
+            code: 'custom',
+            path: ['goal'],
+            message: `Goal action "${input.action}" does not accept goal.`,
+          });
+        }
+      }),
       execute: (
-        input: TProjectGoalToolInput,
+        input,
         options?: { toolCallId?: string },
-      ) => this.executeProjectGoalTool(run, input, options?.toolCallId),
+      ) => this.executeProjectGoalTool(
+        run,
+        input as TProjectGoalToolInput,
+        options?.toolCallId,
+      ),
     });
   }
 
@@ -4860,16 +4918,39 @@ export class FlexHarness<TScope = unknown> {
     const content = plugins.z.string().max(FLEX_PROJECT_MANAGEMENT_LIMITS.maxScratchpadBytes);
     return plugins.tool({
       description: 'Get, set, append to, or clear the session-local project scratchpad.',
-      inputSchema: plugins.z.discriminatedUnion('action', [
-        plugins.z.object({ action: plugins.z.literal('get') }).strict(),
-        plugins.z.object({ action: plugins.z.literal('set'), content }).strict(),
-        plugins.z.object({ action: plugins.z.literal('append'), content }).strict(),
-        plugins.z.object({ action: plugins.z.literal('clear') }).strict(),
-      ]),
+      strict: false,
+      inputSchema: plugins.z.object({
+        action: plugins.z.enum(['get', 'set', 'append', 'clear']),
+        content: content.optional(),
+      }).strict().superRefine((input, context) => {
+        if (
+          (input.action === 'set' || input.action === 'append')
+          && input.content === undefined
+        ) {
+          context.addIssue({
+            code: 'custom',
+            path: ['content'],
+            message: `Scratchpad ${input.action} requires content.`,
+          });
+        } else if (
+          (input.action === 'get' || input.action === 'clear')
+          && input.content !== undefined
+        ) {
+          context.addIssue({
+            code: 'custom',
+            path: ['content'],
+            message: `Scratchpad action "${input.action}" does not accept content.`,
+          });
+        }
+      }),
       execute: (
-        input: TProjectScratchpadToolInput,
+        input,
         options?: { toolCallId?: string },
-      ) => this.executeProjectScratchpadTool(run, input, options?.toolCallId),
+      ) => this.executeProjectScratchpadTool(
+        run,
+        input as TProjectScratchpadToolInput,
+        options?.toolCallId,
+      ),
     });
   }
 
@@ -5650,7 +5731,7 @@ export class FlexHarness<TScope = unknown> {
     operation: (signal: AbortSignal) => Promise<TResult> | TResult,
   ): Promise<TResult> {
     const controller = new AbortController();
-    const timeoutMs = this.agentSessionPolicy.generationLeaseCleanupTimeoutMs ?? 30_000;
+    const timeoutMs = this.reversionMaintenanceTimeoutMs;
     const timeoutError = new Error(`Turn reversion maintenance timed out after ${timeoutMs}ms.`);
     let rejectTimeout!: (error: Error) => void;
     const timeout = new Promise<never>((_resolve, reject) => {

package/ts/interfaces.ts

@@ -1092,6 +1092,11 @@ export interface IFlexHarnessOptions<TScope> {
   callbackLimits?: IFlexCallbackLimits;
   promptQueueLimits?: IFlexPromptQueueLimits;
   reversionLimits?: IFlexReversionLimits;
+  /**
+   * Bounds each turn-reversion maintenance operation. Falls back to
+   * agentSessionPolicy.generationLeaseCleanupTimeoutMs, then 30 seconds.
+   */
+  reversionMaintenanceTimeoutMs?: number;
   turnReversionProvider?: IFlexTurnReversionProvider<TScope> | IFlexTurnReversionProviderV2<TScope>;
   reversionPolicy?: TFlexReversionPolicy;
   externalErrorProjector?: TFlexExternalErrorProjector;

package/ts/utils.harnessoptions.ts

@@ -57,6 +57,8 @@ const maxSubagentSystemBytes = 64 * 1024;
 const maxSlashCommandRegistrations = 128;
 const maxSlashCommandDescriptionBytes = 2048;
 const maxSlashCommandTemplateBytes = FLEX_SLASH_COMMAND_MAX_INPUT_BYTES;
+const defaultReversionMaintenanceTimeoutMs = 30_000;
+const maximumReversionMaintenanceTimeoutMs = 30 * 60 * 1000;
 
 export function normalizeSubagents(
   definitions: IFlexSubagentDefinition[] | undefined,
@@ -272,6 +274,18 @@ export function resolveBoundedPositiveInteger(
   return resolved;
 }
 
+export function resolveReversionMaintenanceTimeoutMs<TScope>(
+  options: IFlexHarnessOptions<TScope>,
+): number {
+  return resolveBoundedPositiveInteger(
+    options.reversionMaintenanceTimeoutMs
+      ?? options.agentSessionPolicy?.generationLeaseCleanupTimeoutMs,
+    'reversionMaintenanceTimeoutMs',
+    defaultReversionMaintenanceTimeoutMs,
+    maximumReversionMaintenanceTimeoutMs,
+  );
+}
+
 export function resolveCallbackLimits(limits: IFlexCallbackLimits = {}): Required<IFlexCallbackLimits> {
   const resolved = {
     maxEvents: limits.maxEvents ?? DEFAULT_CALLBACK_LIMITS.maxEvents,