clementine-agent 1.0.82 → 1.0.83

package/dist/channels/discord.js

@@ -1122,7 +1122,7 @@ export async function startDiscord(gateway, heartbeat, cronScheduler, dispatcher
             const streamer = new DiscordStreamingMessage(message.channel);
             await streamer.start();
             try {
-                const response = await gateway.handleMessage(sessionKey, effectiveText, (t) => streamer.update(t), oneOffModel, oneOffMaxTurns, (toolName, toolInput) => { streamer.setToolStatus(friendlyToolName(toolName, toolInput)); return Promise.resolve(); });
+                const response = await gateway.handleMessage(sessionKey, effectiveText, (t) => streamer.update(t), oneOffModel, oneOffMaxTurns, (toolName, toolInput) => { streamer.setToolStatus(friendlyToolName(toolName, toolInput)); return Promise.resolve(); }, (status) => { streamer.setToolStatus(status); return Promise.resolve(); });
                 await streamer.finalize(response);
                 updatePresence(sessionKey);
                 // Track bot message for feedback reactions

package/dist/gateway/router.d.ts

@@ -5,7 +5,7 @@
  * Manages per-user/channel sessions for conversation continuity.
  */
 import { PersonalAssistant, type ProjectMeta } from '../agent/assistant.js';
-import type { OnTextCallback, OnToolActivityCallback, PlanProgressUpdate, PlanStep, SelfImproveConfig, SelfImproveExperiment, SessionProvenance, TeamMessage, VerboseLevel, WorkflowDefinition } from '../types.js';
+import type { OnProgressCallback, OnTextCallback, OnToolActivityCallback, PlanProgressUpdate, PlanStep, SelfImproveConfig, SelfImproveExperiment, SessionProvenance, TeamMessage, VerboseLevel, WorkflowDefinition } from '../types.js';
 import { AgentManager } from '../agent/agent-manager.js';
 import { TeamRouter } from '../agent/team-router.js';
 import { TeamBus } from '../agent/team-bus.js';
@@ -149,7 +149,7 @@ export declare class Gateway {
      * or correct the agent mid-response instead of queuing behind a long query.
      */
     private acquireSessionLock;
-    handleMessage(sessionKey: string, text: string, onText?: OnTextCallback, model?: string, maxTurns?: number, onToolActivity?: OnToolActivityCallback): Promise<string>;
+    handleMessage(sessionKey: string, text: string, onText?: OnTextCallback, model?: string, maxTurns?: number, onToolActivity?: OnToolActivityCallback, onProgress?: OnProgressCallback): Promise<string>;
     private _handleMessageInner;
     handleHeartbeat(standingInstructions: string, changesSummary?: string, timeContext?: string, dedupContext?: string, profile?: import('../types.js').AgentProfile | null): Promise<string>;
     handleCronJob(jobName: string, jobPrompt: string, tier?: number, maxTurns?: number, model?: string, workDir?: string, mode?: 'standard' | 'unleashed', maxHours?: number, timeoutMs?: number, successCriteria?: string[], agentSlug?: string): Promise<string>;

package/dist/gateway/router.js

@@ -691,7 +691,7 @@ export class Gateway {
         };
     }
     // ── Message handling ────────────────────────────────────────────────
-    async handleMessage(sessionKey, text, onText, model, maxTurns, onToolActivity) {
+    async handleMessage(sessionKey, text, onText, model, maxTurns, onToolActivity, onProgress) {
         if (this.draining) {
             return "I'm restarting momentarily — your message will be processed after I'm back online.";
         }
@@ -713,7 +713,7 @@ export class Gateway {
                 text_len: text.length,
             });
             try {
-                const result = await this._handleMessageInner(sessionKey, text, onText, model, maxTurns, onToolActivity);
+                const result = await this._handleMessageInner(sessionKey, text, onText, model, maxTurns, onToolActivity, onProgress);
                 logAuditJsonl({
                     event_type: 'message_completed',
                     duration_ms: Date.now() - traceStart,
@@ -731,7 +731,7 @@ export class Gateway {
             }
         });
     }
-    async _handleMessageInner(sessionKey, text, onText, model, maxTurns, onToolActivity) {
+    async _handleMessageInner(sessionKey, text, onText, model, maxTurns, onToolActivity, onProgress) {
         // ── Auth circuit breaker — stop spamming error messages ────────
         if (this.authCircuitOpen) {
             if (!this.shouldProbeAuth()) {
@@ -743,10 +743,31 @@ export class Gateway {
             // Allow this one message through as a probe to see if auth recovered
             logger.info({ sessionKey }, 'Auth circuit open — allowing probe message');
         }
+        // Show "queued" status if either lane or session lock is contended,
+        // so the user doesn't stare at "thinking..." for up to 60s while a
+        // previous message is still processing.
+        const laneWaitStart = Date.now();
+        let queuedStatusShown = false;
+        const queuedTimer = onProgress
+            ? setTimeout(() => {
+                queuedStatusShown = true;
+                onProgress('waiting for previous message to finish...').catch(() => { });
+            }, 750)
+            : null;
         const releaseLane = await lanes.acquire('chat');
+        if (queuedTimer)
+            clearTimeout(queuedTimer);
         try {
             const release = await this.acquireSessionLock(sessionKey);
             try {
+                if (queuedStatusShown && onProgress) {
+                    // Lane was busy — clear the wait notice now that we're moving
+                    await onProgress('thinking...').catch(() => { });
+                }
+                const laneWaitMs = Date.now() - laneWaitStart;
+                if (laneWaitMs > 1000) {
+                    logger.info({ sessionKey, laneWaitMs }, 'Chat lane wait was non-trivial');
+                }
                 logger.info(`Message from ${sessionKey}: ${text.slice(0, 100)}...`);
                 events.emit('message:received', { sessionKey, text, timestamp: Date.now() });
                 // ── Register provenance on first interaction ────────────────
@@ -849,6 +870,9 @@ export class Gateway {
                     || text.startsWith('[Approval:')
                     || text.startsWith('[Reaction:')
                     || text.startsWith('[System:');
+                if (!isInternalMsg && !sess?.profile && !text.startsWith('!') && !isStructuredWorkflowMsg && onProgress) {
+                    await onProgress('checking if a teammate should handle this...').catch(() => { });
+                }
                 const routingResult = !isInternalMsg && !sess?.profile && !text.startsWith('!') && !isStructuredWorkflowMsg
                     ? await this._maybeRouteToSpecialist(sessionKey, text, onText)
                     : null;
@@ -1058,6 +1082,9 @@ export class Gateway {
                     // Primary guardrail is cost budget (maxBudgetUsd in buildOptions).
                     // Wall clock (CHAT_MAX_WALL_MS) and StallGuard are safety nets.
                     events.emit('query:start', { sessionKey, model: effectiveModel, maxTurns: maxTurns, timestamp: Date.now() });
+                    if (onProgress) {
+                        await onProgress('thinking...').catch(() => { });
+                    }
                     const queryStartMs = Date.now();
                     const [response] = await Promise.race([
                         this.assistant.chat(chatPrompt, effectiveSessionKey, { onText: wrappedOnText, onToolActivity: wrappedOnToolActivity, model: effectiveModel, maxTurns: maxTurns, securityAnnotation, projectOverride, profile: resolvedProfile, verboseLevel, abortController: chatAc }),

package/dist/types.d.ts

@@ -103,6 +103,13 @@ export interface ChannelCapabilities {
 export declare const DEFAULT_CHANNEL_CAPABILITIES: ChannelCapabilities;
 export type OnTextCallback = (text: string) => Promise<void>;
 export type OnToolActivityCallback = (toolName: string, toolInput: Record<string, unknown>) => Promise<void>;
+/**
+ * Pre-query progress callback. Fired at stage transitions BEFORE the SDK
+ * query starts (routing, complexity classification, lock waits, etc.) so
+ * the user sees the indicator change instead of staring at "thinking..."
+ * for several seconds.
+ */
+export type OnProgressCallback = (status: string) => Promise<void>;
 export interface NotificationContext {
     agentSlug?: string;
     /** When set, the dispatcher routes the message back to the channel that owns this session. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clementine-agent",
-  "version": "1.0.82",
+  "version": "1.0.83",
   "description": "Clementine — Personal AI Assistant (TypeScript)",
   "type": "module",
   "main": "dist/index.js",