@love-moon/ai-sdk 0.2.31 → 0.2.33

package/dist/providers/kimi-cli-session.js

@@ -134,6 +134,8 @@ export class KimiCliSession extends EventEmitter {
         this.currentTurn = null;
         this.lastTokenUsage = null;
         this.lastContextUsagePercent = undefined;
+        this.currentTurnStatus = null;
+        this.currentTurnActivityAt = 0;
         this.turnDeadlineMs = getBoundedEnvInt("CONDUCTOR_TURN_DEADLINE_MS", DEFAULT_TURN_DEADLINE_MS, MIN_TURN_DEADLINE_MS, MAX_TURN_DEADLINE_MS);
         this.workingStatusDedupeMs = getBoundedEnvInt("CONDUCTOR_KIMI_STATUS_DEDUPE_MS", DEFAULT_STATUS_DEDUPE_MS, 0, MAX_STATUS_TIMING_MS);
         this.workingStatusThrottleMs = getBoundedEnvInt("CONDUCTOR_KIMI_STATUS_THROTTLE_MS", DEFAULT_STATUS_THROTTLE_MS, 0, MAX_STATUS_TIMING_MS);
@@ -216,12 +218,16 @@ export class KimiCliSession extends EventEmitter {
                     command: this.buildManualResumeCommand(),
                 }
                 : null,
+            currentTurnStatus: this.getCurrentTurnStatus(),
             pid: this.transport.pid || undefined,
         };
     }
     getSessionInfo() {
         return this.sessionInfo ? { ...this.sessionInfo } : null;
     }
+    getCurrentTurnStatus() {
+        return this.currentTurnStatus ? { ...this.currentTurnStatus } : null;
+    }
     async ensureSessionInfo() {
         await this.boot();
         return this.getSessionInfo();
@@ -261,6 +267,39 @@ export class KimiCliSession extends EventEmitter {
     getCurrentReplyTarget() {
         return this.activeReplyTarget || this.lastReplyTarget || undefined;
     }
+    touchTurnActivity() {
+        this.currentTurnActivityAt = this.now();
+    }
+    updateCurrentTurnStatus(payload) {
+        const updatedAtMs = this.now();
+        this.currentTurnActivityAt = updatedAtMs;
+        this.currentTurnStatus = {
+            ...payload,
+            updated_at: new Date(updatedAtMs).toISOString(),
+        };
+    }
+    markTurnStartedStatus() {
+        this.updateCurrentTurnStatus({
+            source: KIMI_PROVIDER_VARIANT,
+            reply_in_progress: true,
+            replyTo: this.getCurrentReplyTarget(),
+            phase: "turn_started",
+            status_line: statusLineForPhase("turn_started"),
+            thread_id: this.sessionId || undefined,
+            session_id: this.sessionId || undefined,
+            session_file_path: undefined,
+        });
+    }
+    async failPendingTurnStart(error, onProgress = null) {
+        if (this.closeRequested || error?.reason === "session_closed") {
+            return;
+        }
+        await this.emitWorkingStatus({
+            phase: "turn_failed",
+            reply_in_progress: false,
+            status_done_line: error instanceof Error ? error.message : String(error),
+        }, onProgress);
+    }
     buildWorkingStatusFingerprint(payload) {
         return JSON.stringify({
             reply_in_progress: Boolean(payload?.reply_in_progress),
@@ -338,18 +377,22 @@ export class KimiCliSession extends EventEmitter {
             session_file_path: undefined,
         };
         if (this.shouldSuppressWorkingStatus(normalized)) {
+            this.updateCurrentTurnStatus(normalized);
             return;
         }
+        this.updateCurrentTurnStatus(normalized);
+        const snapshot = this.getCurrentTurnStatus();
         this.recordWorkingStatusEmission(normalized);
         if (typeof onProgress === "function") {
-            onProgress(normalized);
+            onProgress(snapshot);
         }
         if (typeof this.workingStatusHandler === "function") {
-            await this.workingStatusHandler(normalized);
+            await this.workingStatusHandler(snapshot);
         }
-        this.emit("working_status", normalized);
+        this.emit("working_status", snapshot);
     }
     async emitAssistantMessage(text) {
+        this.touchTurnActivity();
         const payload = {
             text,
             preserveWhitespace: true,
@@ -423,8 +466,27 @@ export class KimiCliSession extends EventEmitter {
             };
         }
         let timer = null;
-        const promise = new Promise((_, reject) => {
+        let settled = false;
+        const schedule = (reject) => {
+            const now = this.now();
+            const lastActivityAt = Number.isFinite(this.currentTurnActivityAt) && this.currentTurnActivityAt > 0
+                ? this.currentTurnActivityAt
+                : now;
+            const elapsedMs = Math.max(0, now - lastActivityAt);
+            const waitMs = Math.max(1, this.turnDeadlineMs - elapsedMs);
             timer = setTimeout(() => {
+                if (settled) {
+                    return;
+                }
+                const activityNow = this.now();
+                const latestActivityAt = Number.isFinite(this.currentTurnActivityAt) && this.currentTurnActivityAt > 0
+                    ? this.currentTurnActivityAt
+                    : activityNow;
+                if (activityNow - latestActivityAt < this.turnDeadlineMs) {
+                    schedule(reject);
+                    return;
+                }
+                settled = true;
                 try {
                     onTimeout?.();
                 }
@@ -432,14 +494,18 @@ export class KimiCliSession extends EventEmitter {
                     // best effort
                 }
                 reject(this.createTurnTimeoutError(this.turnDeadlineMs));
-            }, this.turnDeadlineMs);
-            if (typeof timer.unref === "function") {
+            }, waitMs);
+            if (typeof timer?.unref === "function") {
                 timer.unref();
             }
+        };
+        const promise = new Promise((_, reject) => {
+            schedule(reject);
         });
         return {
             promise,
             cleanup: () => {
+                settled = true;
                 if (timer) {
                     clearTimeout(timer);
                 }
@@ -763,12 +829,19 @@ export class KimiCliSession extends EventEmitter {
         if (!effectivePrompt) {
             return buildEmptyTurnResult();
         }
-        await this.boot();
         if (this.currentTurn) {
             throw createTurnError("Kimi turn already running", {
                 reason: "turn_already_running",
             });
         }
+        this.markTurnStartedStatus();
+        try {
+            await this.boot();
+        }
+        catch (error) {
+            await this.failPendingTurnStart(error, onProgress);
+            throw error;
+        }
         this.history.push({ role: "user", content: promptText });
         const currentTurn = {
             fullText: "",

package/dist/providers/opencode-sdk-session.d.ts

@@ -46,6 +46,9 @@ export class OpencodeSdkSession extends EventEmitter<[never]> {
         };
     } | null;
     lastAssistantInfo: any;
+    currentTurnStatus: any;
+    currentTurnActivityAt: number;
+    now: any;
     turnDeadlineMs: any;
     client: any;
     sdkModulePromise: Promise<any> | Promise<typeof import("@opencode-ai/sdk/v2/client")> | null;
@@ -74,12 +77,14 @@ export class OpencodeSdkSession extends EventEmitter<[never]> {
         useSessionFileReplyStream: boolean;
         resumeReady: boolean;
         manualResume: null;
+        currentTurnStatus: any;
         pid: any;
     };
     getSessionInfo(): {
         backend: string;
         sessionId: any;
     } | null;
+    getCurrentTurnStatus(): any;
     ensureSessionInfo(): Promise<{
         backend: string;
         sessionId: any;
@@ -106,6 +111,10 @@ export class OpencodeSdkSession extends EventEmitter<[never]> {
     setWorkingStatusHandler(handler: any): void;
     setSessionReplyTarget(replyTo: any): void;
     getCurrentReplyTarget(): string | undefined;
+    touchTurnActivity(): void;
+    updateCurrentTurnStatus(payload: any): void;
+    markTurnStartedStatus(): void;
+    failPendingTurnStart(error: any, onProgress?: null): Promise<void>;
     emitWorkingStatus(payload: any, onProgress?: null): Promise<void>;
     emitAssistantMessage(text: any): Promise<void>;
     emitTerminalWorkingStatus(currentTurn: any, payload: any, onProgress?: null): Promise<void>;

package/dist/providers/opencode-sdk-session.js

@@ -154,6 +154,9 @@ export class OpencodeSdkSession extends EventEmitter {
         this.currentTurn = null;
         this.lastUsage = null;
         this.lastAssistantInfo = null;
+        this.currentTurnStatus = null;
+        this.currentTurnActivityAt = 0;
+        this.now = typeof options.now === "function" ? options.now : () => Date.now();
         this.turnDeadlineMs = getBoundedEnvInt("CONDUCTOR_TURN_DEADLINE_MS", DEFAULT_TURN_DEADLINE_MS, MIN_TURN_DEADLINE_MS, MAX_TURN_DEADLINE_MS);
         this.client = null;
         this.sdkModulePromise = null;
@@ -219,12 +222,16 @@ export class OpencodeSdkSession extends EventEmitter {
             useSessionFileReplyStream: this.usesSessionFileReplyStream(),
             resumeReady: Boolean(this.sessionId),
             manualResume: null,
+            currentTurnStatus: this.getCurrentTurnStatus(),
             pid: this.transport.pid || undefined,
         };
     }
     getSessionInfo() {
         return this.sessionInfo ? { ...this.sessionInfo } : null;
     }
+    getCurrentTurnStatus() {
+        return this.currentTurnStatus ? { ...this.currentTurnStatus } : null;
+    }
     async ensureSessionInfo() {
         await this.boot();
         return this.getSessionInfo();
@@ -260,6 +267,39 @@ export class OpencodeSdkSession extends EventEmitter {
     getCurrentReplyTarget() {
         return this.activeReplyTarget || this.lastReplyTarget || undefined;
     }
+    touchTurnActivity() {
+        this.currentTurnActivityAt = this.now();
+    }
+    updateCurrentTurnStatus(payload) {
+        const updatedAtMs = this.now();
+        this.currentTurnActivityAt = updatedAtMs;
+        this.currentTurnStatus = {
+            ...payload,
+            updated_at: new Date(updatedAtMs).toISOString(),
+        };
+    }
+    markTurnStartedStatus() {
+        this.updateCurrentTurnStatus({
+            source: OPENCODE_PROVIDER_VARIANT,
+            reply_in_progress: true,
+            replyTo: this.getCurrentReplyTarget(),
+            phase: "turn_started",
+            status_line: "opencode is working",
+            thread_id: this.sessionId || undefined,
+            session_id: this.sessionId || undefined,
+            session_file_path: undefined,
+        });
+    }
+    async failPendingTurnStart(error, onProgress = null) {
+        if (this.closeRequested || error?.reason === "session_closed") {
+            return;
+        }
+        await this.emitWorkingStatus({
+            phase: "turn_failed",
+            reply_in_progress: false,
+            status_done_line: error instanceof Error ? error.message : String(error),
+        }, onProgress);
+    }
     async emitWorkingStatus(payload, onProgress = null) {
         const normalized = {
             source: OPENCODE_PROVIDER_VARIANT,
@@ -274,15 +314,18 @@ export class OpencodeSdkSession extends EventEmitter {
             session_id: this.sessionId || undefined,
             session_file_path: undefined,
         };
+        this.updateCurrentTurnStatus(normalized);
+        const snapshot = this.getCurrentTurnStatus();
         if (typeof onProgress === "function") {
-            onProgress(normalized);
+            onProgress(snapshot);
         }
         if (typeof this.workingStatusHandler === "function") {
-            await this.workingStatusHandler(normalized);
+            await this.workingStatusHandler(snapshot);
         }
-        this.emit("working_status", normalized);
+        this.emit("working_status", snapshot);
     }
     async emitAssistantMessage(text) {
+        this.touchTurnActivity();
         const payload = {
             text,
             preserveWhitespace: true,
@@ -356,8 +399,27 @@ export class OpencodeSdkSession extends EventEmitter {
             };
         }
         let timer = null;
-        const promise = new Promise((_, reject) => {
+        let settled = false;
+        const schedule = (reject) => {
+            const now = this.now();
+            const lastActivityAt = Number.isFinite(this.currentTurnActivityAt) && this.currentTurnActivityAt > 0
+                ? this.currentTurnActivityAt
+                : now;
+            const elapsedMs = Math.max(0, now - lastActivityAt);
+            const waitMs = Math.max(1, this.turnDeadlineMs - elapsedMs);
             timer = setTimeout(() => {
+                if (settled) {
+                    return;
+                }
+                const activityNow = this.now();
+                const latestActivityAt = Number.isFinite(this.currentTurnActivityAt) && this.currentTurnActivityAt > 0
+                    ? this.currentTurnActivityAt
+                    : activityNow;
+                if (activityNow - latestActivityAt < this.turnDeadlineMs) {
+                    schedule(reject);
+                    return;
+                }
+                settled = true;
                 try {
                     onTimeout?.();
                 }
@@ -365,14 +427,18 @@ export class OpencodeSdkSession extends EventEmitter {
                     // best effort
                 }
                 reject(this.createTurnTimeoutError(this.turnDeadlineMs));
-            }, this.turnDeadlineMs);
-            if (typeof timer.unref === "function") {
+            }, waitMs);
+            if (typeof timer?.unref === "function") {
                 timer.unref();
             }
+        };
+        const promise = new Promise((_, reject) => {
+            schedule(reject);
         });
         return {
             promise,
             cleanup: () => {
+                settled = true;
                 if (timer) {
                     clearTimeout(timer);
                 }
@@ -1076,14 +1142,21 @@ export class OpencodeSdkSession extends EventEmitter {
         if (!effectivePrompt) {
             return buildEmptyTurnResult();
         }
-        await this.boot();
         if (this.currentTurn) {
             throw createTurnError("Opencode turn already running", {
                 reason: "turn_already_running",
             });
         }
-        if (!this.client?.session || typeof this.client.session.promptAsync !== "function") {
-            throw new Error("Opencode session client is unavailable");
+        this.markTurnStartedStatus();
+        try {
+            await this.boot();
+            if (!this.client?.session || typeof this.client.session.promptAsync !== "function") {
+                throw new Error("Opencode session client is unavailable");
+            }
+        }
+        catch (error) {
+            await this.failPendingTurnStart(error, onProgress);
+            throw error;
         }
         this.history.push({ role: "user", content: promptText });
         const abortController = new AbortController();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@love-moon/ai-sdk",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,5 +25,5 @@
     "@types/node": "^22.10.2",
     "typescript": "^5.6.3"
   },
-  "gitCommitId": "7e0bd83"
+  "gitCommitId": "db7f9bf"
 }

package/dist/resume.d.ts

@@ -1,26 +0,0 @@
-export function resumeProviderForBackend(backend: any): "codex" | "claude" | "copilot" | null;
-export function findSessionPath(provider: any, sessionId: any, options?: {}): Promise<any>;
-export function findCodexSessionPath(sessionId: any, options?: {}): Promise<string | null>;
-export function findClaudeSessionPath(sessionId: any, options?: {}): Promise<any>;
-export function findCopilotSessionPath(sessionId: any, options?: {}): Promise<string | null>;
-export function resolveSessionRunDirectory(sessionPath: any): Promise<string>;
-export function inspectResumeTarget(backend: any, sessionId: any, options?: {}): Promise<{
-    provider: string;
-    sessionId: string;
-    sessionPath: any;
-    cwd: string;
-    debugMetadata: {
-        cwdSource: string;
-        sessionPath: any;
-    };
-}>;
-export function resolveResumeContext(backend: any, sessionId: any, options?: {}): Promise<{
-    provider: string;
-    sessionId: string;
-    sessionPath: any;
-    cwd: string;
-    debugMetadata: {
-        cwdSource: string;
-        sessionPath: any;
-    };
-}>;