@a1hvdy/cc-openclaw 0.27.0 → 0.27.1

package/dist/src/engines/base-oneshot-session.js

@@ -102,6 +102,8 @@ export class BaseOneShotSession extends EventEmitter {
             isReady: this._isReady,
             startTime: this._startTime,
             lastActivity: this._stats.lastActivity,
+            // v0.27.x — oneshot engine doesn't separate progress; mirror lastActivity.
+            lastProgressAt: this._stats.lastActivity,
             contextPercent: 0,
             retries: 0,
             sessionId: this.sessionId,

package/dist/src/engines/persistent-custom-session.js

@@ -797,6 +797,9 @@ export class PersistentCustomSession extends EventEmitter {
             isReady: this._isReady,
             startTime: this._startTime,
             lastActivity: this._stats.lastActivity,
+            // v0.27.x — custom engine doesn't separate progress from activity; mirror
+            // lastActivity so the shared watchdog behaves exactly as before for it.
+            lastProgressAt: this._stats.lastActivity,
             contextPercent: this.engineConfig.persistent
                 ? Math.min(100, Math.round(((this._stats.tokensIn + this._stats.tokensOut) / ctxWindow) * 100))
                 : 0,

package/dist/src/engines/persistent-session.d.ts

@@ -25,6 +25,8 @@ interface InternalStats {
     costUsd: number;
     startTime: string | null;
     lastActivity: string | null;
+    /** v0.27.x — last PROGRESS event ts (excludes api_retry); watchdog keys off it. */
+    lastProgressAt: string | null;
     history: Array<{
         time: string;
         type: string;

package/dist/src/engines/persistent-session.js

@@ -58,6 +58,7 @@ export class PersistentClaudeSession extends EventEmitter {
             costUsd: 0,
             startTime: null,
             lastActivity: null,
+            lastProgressAt: null,
             history: [],
             retries: 0,
             lastRetryError: undefined,
@@ -346,6 +347,16 @@ export class PersistentClaudeSession extends EventEmitter {
     _handleEvent(event) {
         const type = event.type;
         this.stats.lastActivity = new Date().toISOString();
+        // v0.27.x — progress signal for the stalled-session watchdog. Every event
+        // EXCEPT `system/api_retry` counts as progress. api_retry fires during an
+        // API retry-storm WITHOUT producing output; counting it as activity (as
+        // lastActivity does) defeated the watchdog — it never saw 180s of
+        // no-progress, so a stalled/retrying model call hung to the 900s envelope
+        // (the gateway's `recovery=none lastProgressAge=353s`). Keying the watchdog
+        // off lastProgressAt fast-fails it at the threshold instead.
+        const isApiRetry = type === 'system' && event.subtype === 'api_retry';
+        if (!isApiRetry)
+            this.stats.lastProgressAt = this.stats.lastActivity;
         // Track history (keep last 100)
         this.stats.history.push({ time: this.stats.lastActivity, type, event });
         if (this.stats.history.length > MAX_HISTORY_ITEMS)
@@ -769,6 +780,7 @@ export class PersistentClaudeSession extends EventEmitter {
             isReady: this._isReady,
             startTime: this.stats.startTime,
             lastActivity: this.stats.lastActivity,
+            lastProgressAt: this.stats.lastProgressAt,
             // v0.6.0: contextPercent now reflects ACTUAL per-turn context occupancy
             // (input + cache-read tokens from the last `result` event), not lifetime
             // cumulative tokens. Pre-fix it saturated at 100% by turn 3 of any

package/dist/src/session/watchdogs.d.ts

@@ -22,9 +22,11 @@
 export interface WatchdogManagedSession {
     session: {
         isBusy: boolean;
-        /** Returns at least { lastActivity }. Other stats fields are ignored. */
+        /** Returns at least { lastActivity, lastProgressAt }. The watchdog prefers
+         *  lastProgressAt (excludes api_retry pings); other stats fields ignored. */
         getStats(): {
             lastActivity?: string | null | undefined;
+            lastProgressAt?: string | null | undefined;
         };
         stop(): void;
     };

package/dist/src/session/watchdogs.js

@@ -46,18 +46,20 @@ export function watchStalledSessions(opts) {
         if (!managed.session.isBusy)
             continue;
         const stats = managed.session.getStats();
-        const lastActivityIso = stats.lastActivity;
-        const lastEventMs = lastActivityIso
-            ? new Date(lastActivityIso).getTime()
-            : managed.lastActivity;
+        // v0.27.x — prefer the PROGRESS timestamp (real output: text/tool/result),
+        // which excludes `system/api_retry` pings. Keying off lastActivity let a
+        // retry-storm reset the clock forever so the watchdog never fired. Fall back
+        // to lastActivity, then the SessionManager wall-clock.
+        const progressIso = stats.lastProgressAt ?? stats.lastActivity;
+        const lastEventMs = progressIso ? new Date(progressIso).getTime() : managed.lastActivity;
         const ageMs = now - lastEventMs;
         if (ageMs <= thresholdMs)
             continue;
-        opts.logger.warn(`[watchdog] killing stalled session ${name} (busy, no subprocess event for ${Math.round(ageMs / 1000)}s, threshold=${Math.round(thresholdMs / 1000)}s)`);
+        opts.logger.warn(`[watchdog] killing stalled session ${name} (busy, no progress for ${Math.round(ageMs / 1000)}s, threshold=${Math.round(thresholdMs / 1000)}s)`);
         try {
             trajectory.emit('session_stalled_killed', {
                 ageMs,
-                lastActivity: lastActivityIso,
+                lastProgressAt: progressIso,
                 thresholdMs,
                 model: managed.config.model,
                 cwd: managed.cwd,

package/dist/src/types.d.ts

@@ -184,6 +184,12 @@ export interface SessionStats {
     isReady: boolean;
     startTime: string | null;
     lastActivity: string | null;
+    /** v0.27.x — wall-clock ISO of the last PROGRESS event (text / tool_use /
+     *  tool_result / thinking / result / init) — i.e. the subprocess produced
+     *  real output. Distinct from lastActivity, which also moves on non-progress
+     *  events like `system/api_retry`. The stalled-session watchdog keys off this
+     *  so an API retry-storm (no output) is fast-failed instead of looking busy. */
+    lastProgressAt: string | null;
     /**
      * Approximate context window utilization (0-100).
      * Estimated as (tokensIn + tokensOut) / 200,000 * 100.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a1hvdy/cc-openclaw",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "description": "A1xAI's Anthropic CLI bridge plugin for OpenClaw",
   "author": "@a1cy",
   "license": "MIT",