@love-moon/ai-sdk 0.2.31 → 0.2.32

package/dist/client.d.ts

@@ -9,6 +9,7 @@ export class RemoteAiSession extends EventEmitter<[never]> {
     };
     useSessionFileReplyStreamValue: boolean;
     sessionInfo: any;
+    currentTurnStatus: any;
     snapshot: {
         backend: undefined;
         provider: undefined;
@@ -38,6 +39,7 @@ export class RemoteAiSession extends EventEmitter<[never]> {
         model: any;
     };
     getSnapshot(): {
+        currentTurnStatus: any;
         sessionInfo: any;
         backend: undefined;
         provider: undefined;
@@ -47,6 +49,7 @@ export class RemoteAiSession extends EventEmitter<[never]> {
     };
     usesSessionFileReplyStream(): boolean;
     getSessionInfo(): any;
+    getCurrentTurnStatus(): any;
     setSessionMessageHandler(handler: any): void;
     setWorkingStatusHandler(handler: any): void;
     setSessionReplyTarget(replyTo: any): void;
@@ -75,6 +78,7 @@ declare class LocalAiSessionProxy extends EventEmitter<[never]> {
     };
     useSessionFileReplyStreamValue: boolean;
     sessionInfo: any;
+    currentTurnStatus: any;
     session: any;
     closed: boolean;
     sessionMessageHandler: any;
@@ -94,6 +98,7 @@ declare class LocalAiSessionProxy extends EventEmitter<[never]> {
     getSnapshot(): any;
     usesSessionFileReplyStream(): boolean;
     getSessionInfo(): any;
+    getCurrentTurnStatus(): any;
     setSessionMessageHandler(handler: any): void;
     setWorkingStatusHandler(handler: any): void;
     setSessionReplyTarget(replyTarget: any): void;

package/dist/client.js

@@ -39,6 +39,7 @@ export class RemoteAiSession extends EventEmitter {
         };
         this.useSessionFileReplyStreamValue = true;
         this.sessionInfo = null;
+        this.currentTurnStatus = null;
         this.snapshot = {
             backend: undefined,
             provider: undefined,
@@ -135,6 +136,7 @@ export class RemoteAiSession extends EventEmitter {
     getSnapshot() {
         return {
             ...this.snapshot,
+            currentTurnStatus: this.getCurrentTurnStatus(),
             sessionInfo: this.sessionInfo ? { ...this.sessionInfo } : null,
         };
     }
@@ -144,6 +146,9 @@ export class RemoteAiSession extends EventEmitter {
     getSessionInfo() {
         return this.sessionInfo ? { ...this.sessionInfo } : null;
     }
+    getCurrentTurnStatus() {
+        return this.currentTurnStatus ? { ...this.currentTurnStatus } : null;
+    }
     setSessionMessageHandler(handler) {
         this.sessionMessageHandler = typeof handler === "function" ? handler : null;
     }
@@ -304,6 +309,9 @@ export class RemoteAiSession extends EventEmitter {
         if (snapshot?.useSessionFileReplyStream !== undefined) {
             this.useSessionFileReplyStreamValue = Boolean(snapshot.useSessionFileReplyStream);
         }
+        if (snapshot?.currentTurnStatus && typeof snapshot.currentTurnStatus === "object") {
+            this.currentTurnStatus = { ...snapshot.currentTurnStatus };
+        }
     }
     handleWorkerResponse(payload) {
         const pending = this.pendingRequests.get(payload.id);
@@ -331,6 +339,9 @@ export class RemoteAiSession extends EventEmitter {
     }
     handleWorkerProgress(payload) {
         const pending = this.pendingRequests.get(payload.requestId);
+        if (payload?.payload && typeof payload.payload === "object") {
+            this.currentTurnStatus = { ...payload.payload };
+        }
         if (!pending || typeof pending.progressHandler !== "function") {
             return;
         }
@@ -363,6 +374,11 @@ export class RemoteAiSession extends EventEmitter {
         if (name === "assistant_message" && typeof this.sessionMessageHandler === "function") {
             await this.sessionMessageHandler(eventPayload);
         }
+        if (name === "working_status") {
+            if (eventPayload && typeof eventPayload === "object") {
+                this.currentTurnStatus = { ...eventPayload };
+            }
+        }
         if (name === "working_status" && typeof this.workingStatusHandler === "function") {
             await this.workingStatusHandler(eventPayload);
         }
@@ -395,6 +411,7 @@ class LocalAiSessionProxy extends EventEmitter {
         };
         this.useSessionFileReplyStreamValue = true;
         this.sessionInfo = null;
+        this.currentTurnStatus = null;
         this.session = null;
         this.closed = false;
         this.sessionMessageHandler = null;
@@ -428,6 +445,9 @@ class LocalAiSessionProxy extends EventEmitter {
                             this.threadIdValue = String(payload.sessionId);
                         }
                     }
+                    if (eventName === "working_status" && payload && typeof payload === "object") {
+                        this.currentTurnStatus = { ...payload };
+                    }
                     this.emit(eventName, payload);
                 });
             }
@@ -463,6 +483,7 @@ class LocalAiSessionProxy extends EventEmitter {
             backend: this.backend,
             sessionId: this.threadIdValue || undefined,
             sessionInfo: this.sessionInfo,
+            currentTurnStatus: typeof session.getCurrentTurnStatus === "function" ? session.getCurrentTurnStatus() : this.currentTurnStatus,
             useSessionFileReplyStream: this.useSessionFileReplyStreamValue,
             workerReady: true,
         };
@@ -481,6 +502,9 @@ class LocalAiSessionProxy extends EventEmitter {
                 ...this.snapshot,
                 ...sessionSnapshot,
                 backend: sessionSnapshot.backend || this.snapshot.backend,
+                currentTurnStatus: typeof this.session?.getCurrentTurnStatus === "function"
+                    ? this.session.getCurrentTurnStatus()
+                    : sessionSnapshot.currentTurnStatus || this.currentTurnStatus || null,
                 sessionId: sessionSnapshot.sessionId || this.threadIdValue || undefined,
                 sessionInfo: typeof this.session?.getSessionInfo === "function"
                     ? this.session.getSessionInfo()
@@ -489,6 +513,7 @@ class LocalAiSessionProxy extends EventEmitter {
         }
         return {
             ...this.snapshot,
+            currentTurnStatus: this.getCurrentTurnStatus(),
             sessionInfo: this.sessionInfo ? { ...this.sessionInfo } : null,
         };
     }
@@ -504,6 +529,12 @@ class LocalAiSessionProxy extends EventEmitter {
         }
         return this.sessionInfo ? { ...this.sessionInfo } : null;
     }
+    getCurrentTurnStatus() {
+        if (typeof this.session?.getCurrentTurnStatus === "function") {
+            return this.session.getCurrentTurnStatus();
+        }
+        return this.currentTurnStatus ? { ...this.currentTurnStatus } : null;
+    }
     setSessionMessageHandler(handler) {
         this.sessionMessageHandler = typeof handler === "function" ? handler : null;
         if (typeof this.session?.setSessionMessageHandler === "function") {

package/dist/providers/claude-agent-sdk-session.d.ts

@@ -31,6 +31,9 @@ export class ClaudeAgentSdkSession extends EventEmitter<[never]> {
     } | null;
     lastResult: any;
     rateLimitInfo: any;
+    currentTurnStatus: any;
+    currentTurnActivityAt: number;
+    now: any;
     turnDeadlineMs: any;
     sdkModulePromise: Promise<any> | Promise<typeof import("@anthropic-ai/claude-agent-sdk")> | null;
     env: any;
@@ -56,11 +59,13 @@ export class ClaudeAgentSdkSession extends EventEmitter<[never]> {
             ready: boolean;
             command: string;
         } | null;
+        currentTurnStatus: any;
     };
     getSessionInfo(): {
         backend: string;
         sessionId: any;
     } | null;
+    getCurrentTurnStatus(): any;
     ensureSessionInfo(): Promise<{
         backend: string;
         sessionId: any;
@@ -82,6 +87,9 @@ export class ClaudeAgentSdkSession extends EventEmitter<[never]> {
     setWorkingStatusHandler(handler: any): void;
     setSessionReplyTarget(replyTo: any): void;
     getCurrentReplyTarget(): string | undefined;
+    touchTurnActivity(): void;
+    updateCurrentTurnStatus(payload: any): void;
+    markTurnStartedStatus(): 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/claude-agent-sdk-session.js

@@ -156,6 +156,9 @@ export class ClaudeAgentSdkSession extends EventEmitter {
         this.currentTurn = null;
         this.lastResult = null;
         this.rateLimitInfo = 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.sdkModulePromise = null;
         const envConfig = loadEnvConfig(options.configFile);
@@ -203,11 +206,15 @@ export class ClaudeAgentSdkSession extends EventEmitter {
                     command: `claude --resume ${this.sessionId}`,
                 }
                 : null,
+            currentTurnStatus: this.getCurrentTurnStatus(),
         };
     }
     getSessionInfo() {
         return this.sessionInfo ? { ...this.sessionInfo } : null;
     }
+    getCurrentTurnStatus() {
+        return this.currentTurnStatus ? { ...this.currentTurnStatus } : null;
+    }
     async ensureSessionInfo() {
         return this.getSessionInfo();
     }
@@ -248,6 +255,27 @@ export class ClaudeAgentSdkSession 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: CLAUDE_PROVIDER_VARIANT,
+            reply_in_progress: true,
+            replyTo: this.getCurrentReplyTarget(),
+            phase: "turn_started",
+            status_line: "claude is working",
+            thread_id: this.sessionId || undefined,
+        });
+    }
     async emitWorkingStatus(payload, onProgress = null) {
         const normalized = {
             source: CLAUDE_PROVIDER_VARIANT,
@@ -260,15 +288,18 @@ export class ClaudeAgentSdkSession extends EventEmitter {
             reply_preview: payload?.reply_preview,
             thread_id: this.sessionId || 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,
@@ -342,8 +373,27 @@ export class ClaudeAgentSdkSession 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?.();
                 }
@@ -351,14 +401,18 @@ export class ClaudeAgentSdkSession 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);
                 }
@@ -681,6 +735,7 @@ export class ClaudeAgentSdkSession extends EventEmitter {
             terminalWorkingStatusEmitted: false,
         };
         this.currentTurn = currentTurn;
+        this.markTurnStartedStatus();
         const closeGuard = this.createCloseGuard(() => {
             abortController.abort();
             currentTurn.query?.close?.();

package/dist/providers/codex-app-server-session.d.ts

@@ -21,6 +21,9 @@ export class CodexAppServerSession extends EventEmitter<[never]> {
     nativeSessionId: string;
     rateLimits: any;
     tokenUsage: any;
+    currentTurnStatus: any;
+    currentTurnActivityAt: number;
+    now: any;
     turnDeadlineMs: any;
     currentTurn: {
         turnId: string;
@@ -52,9 +55,11 @@ export class CodexAppServerSession extends EventEmitter<[never]> {
             ready: boolean;
             command: string;
         } | null;
+        currentTurnStatus: any;
         pid: number | undefined;
     };
     getSessionInfo(): any;
+    getCurrentTurnStatus(): any;
     ensureSessionInfo(): Promise<any>;
     getSessionUsageSummary(): Promise<{
         sessionId: any;
@@ -73,6 +78,10 @@ export class CodexAppServerSession 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): Promise<void>;
     boot(): Promise<void>;
     bootInternal(): Promise<void>;
     applyThreadInfo(payload: any, { resumeReady }?: {

package/dist/providers/codex-app-server-session.js

@@ -186,6 +186,9 @@ export class CodexAppServerSession extends EventEmitter {
         this.nativeSessionId = "";
         this.rateLimits = null;
         this.tokenUsage = 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.currentTurn = null;
         this.bootPromise = null;
@@ -244,12 +247,16 @@ export class CodexAppServerSession extends EventEmitter {
                     command: `codex resume ${this.sessionId}`,
                 }
                 : 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();
@@ -291,6 +298,37 @@ export class CodexAppServerSession 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: "codex-app-server",
+            reply_in_progress: true,
+            replyTo: this.getCurrentReplyTarget(),
+            phase: "turn_started",
+            status_line: "codex is working",
+            thread_id: this.sessionId || undefined,
+        });
+    }
+    async failPendingTurnStart(error) {
+        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),
+        });
+    }
     async boot() {
         if (this.booted) {
             return;
@@ -406,12 +444,15 @@ export class CodexAppServerSession extends EventEmitter {
     }
     async emitWorkingStatus(payload) {
         const normalized = this.normalizeWorkingStatusPayload(payload);
+        this.updateCurrentTurnStatus(normalized);
+        const snapshot = this.getCurrentTurnStatus();
         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,
@@ -489,17 +530,40 @@ export class CodexAppServerSession 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;
                 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);
                 }
@@ -803,7 +867,6 @@ export class CodexAppServerSession extends EventEmitter {
         if (this.closeRequested) {
             throw this.createSessionClosedError();
         }
-        await this.boot();
         const effectivePrompt = this.buildPrompt(promptText, { useInitialImages });
         if (!effectivePrompt) {
             return {
@@ -818,6 +881,14 @@ export class CodexAppServerSession extends EventEmitter {
                 reason: "turn_already_running",
             });
         }
+        this.markTurnStartedStatus();
+        try {
+            await this.boot();
+        }
+        catch (error) {
+            await this.failPendingTurnStart(error);
+            throw error;
+        }
         this.history.push({ role: "user", content: promptText });
         const closeGuard = this.createCloseGuard();
         const turnTimeoutGuard = this.createTurnTimeoutGuard();
@@ -879,6 +950,13 @@ export class CodexAppServerSession extends EventEmitter {
             if (error?.reason === "turn_timeout") {
                 await this.interruptCurrentTurn();
             }
+            if (!this.closeRequested && error?.reason !== "session_closed") {
+                await this.emitWorkingStatus({
+                    phase: "turn_failed",
+                    reply_in_progress: false,
+                    status_done_line: error instanceof Error ? error.message : String(error),
+                });
+            }
             this.maybeEmitAuthRequired(error);
             throw error;
         }

package/dist/providers/kimi-cli-session.d.ts

@@ -32,6 +32,8 @@ export class KimiCliSession extends EventEmitter<[never]> {
     } | null;
     lastTokenUsage: any;
     lastContextUsagePercent: number | undefined;
+    currentTurnStatus: any;
+    currentTurnActivityAt: number;
     turnDeadlineMs: any;
     workingStatusDedupeMs: any;
     workingStatusThrottleMs: any;
@@ -77,12 +79,14 @@ export class KimiCliSession extends EventEmitter<[never]> {
             ready: boolean;
             command: any;
         } | null;
+        currentTurnStatus: any;
         pid: any;
     };
     getSessionInfo(): {
         backend: string;
         sessionId: any;
     } | null;
+    getCurrentTurnStatus(): any;
     ensureSessionInfo(): Promise<{
         backend: string;
         sessionId: any;
@@ -104,6 +108,10 @@ export class KimiCliSession 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>;
     buildWorkingStatusFingerprint(payload: any): string;
     shouldSuppressWorkingStatus(payload: any): boolean;
     recordWorkingStatusEmission(payload: any): void;

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.32",
   "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": "c749d4b"
 }