@oyasmi/pipiclaw 0.6.6-beta.2 → 0.6.6-beta.3

package/dist/agent/channel-runner.d.ts

@@ -34,7 +34,6 @@ export declare class ChannelRunner implements AgentRunner {
     }>;
     handleBuiltinCommand(ctx: DingTalkContext, command: BuiltInCommand): Promise<void>;
     queueSteer(text: string, userName?: string): Promise<void>;
-    queueFollowUp(text: string, userName?: string): Promise<void>;
     flushMemoryForShutdown(): Promise<void>;
     getMemoryMaintenanceContext(): Promise<MemoryMaintenanceRuntimeContext>;
     abort(): Promise<void>;

package/dist/agent/channel-runner.js

@@ -356,10 +356,7 @@ export class ChannelRunner {
         }
     }
     async queueSteer(text, userName) {
-        await this.queueBusyMessage("steer", this.requireQueuedMessage(text, "steer"), userName);
-    }
-    async queueFollowUp(text, userName) {
-        await this.queueBusyMessage("followUp", this.requireQueuedMessage(text, "followup"), userName);
+        await this.queueBusyMessage(this.requireQueuedMessage(text, "steer"), userName);
     }
     async flushMemoryForShutdown() {
         await this.memoryLifecycle.flushForShutdown();
@@ -437,7 +434,7 @@ export class ChannelRunner {
         const timestamp = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}${offsetSign}${offsetHours}:${offsetMins}`;
         return `[${timestamp}] [${userName || "unknown"}]: ${text}`;
     }
-    async queueBusyMessage(delivery, text, userName) {
+    async queueBusyMessage(text, userName) {
         if (!this.acceptingBusyMessages) {
             throw new Error("No task is currently running.");
         }
@@ -461,12 +458,7 @@ export class ChannelRunner {
             if (this.agentLoopStarted && !this.session.isStreaming) {
                 throw new Error("No task is currently running.");
             }
-            if (delivery === "followUp") {
-                await this.session.followUp(queuedMessage);
-            }
-            else {
-                await this.session.steer(queuedMessage);
-            }
+            await this.session.steer(queuedMessage);
         };
         await this.sessionResourceGate.runPrompt(queueMessage);
     }

package/dist/agent/session-events.js

@@ -127,7 +127,6 @@ export async function handleSessionEvent(event, context) {
         const commandResultText = extractCustomCommandResultText(event.message);
         if (commandResultText) {
             runState.finalOutcome = { kind: "final", text: commandResultText };
-            runState.finalResponseDelivered = false;
             log.logResponse(logCtx, commandResultText);
             queue.enqueue(async () => {
                 const delivered = await ctx.respondPlain(commandResultText);
@@ -196,7 +195,6 @@ export async function handleSessionEvent(event, context) {
                 return;
             }
             runState.finalOutcome = { kind: "final", text: finalText };
-            runState.finalResponseDelivered = false;
             memoryLifecycle.noteCompletedAssistantTurn();
             log.logResponse(logCtx, finalText);
             queue.enqueue(async () => {

package/dist/agent/types.d.ts

@@ -10,7 +10,6 @@ export interface AgentRunner {
     }>;
     handleBuiltinCommand(ctx: DingTalkContext, command: BuiltInCommand): Promise<void>;
     queueSteer(text: string, userName?: string): Promise<void>;
-    queueFollowUp(text: string, userName?: string): Promise<void>;
     flushMemoryForShutdown(): Promise<void>;
     getMemoryMaintenanceContext(): Promise<MemoryMaintenanceRuntimeContext>;
     abort(): Promise<void>;

package/dist/runtime/bootstrap.js

@@ -393,17 +393,21 @@ export function createRuntimeContext(options) {
         },
         async handleBusyMessage(event, bot, mode, queueText) {
             if (shuttingDown) {
-                return true;
+                return { kind: "handled" };
             }
             const state = getState(event.channelId);
             const trimmedQueueText = queueText.trim();
+            if (!trimmedQueueText) {
+                const commandName = mode === "followUp" ? "followup" : "steer";
+                await bot.sendPlain(event.channelId, `Could not queue this message: /${commandName} requires a message.`);
+                return { kind: "handled" };
+            }
+            if (mode === "followUp") {
+                log.logInfo(`[${event.channelId}] Queued followUp as next task: ${trimmedQueueText.substring(0, 80)}`);
+                return { kind: "requeue", text: trimmedQueueText };
+            }
             try {
-                if (mode === "followUp") {
-                    await state.runner.queueFollowUp(trimmedQueueText, event.userName);
-                }
-                else {
-                    await state.runner.queueSteer(trimmedQueueText, event.userName);
-                }
+                await state.runner.queueSteer(trimmedQueueText, event.userName);
                 await archiveIncomingMessage(event.channelId, {
                     date: new Date().toISOString(),
                     ts: event.ts,
@@ -414,26 +418,22 @@ export function createRuntimeContext(options) {
                     deliveryMode: mode,
                     skipContextSync: true,
                 }, `${mode} message`);
-                const confirmation = mode === "followUp"
-                    ? event.text.trim().startsWith("/")
-                        ? "Queued as follow-up. I’ll handle it after the current task completes."
-                        : "Queued as follow-up. I’ll handle it after the current task completes. Use `/steer <message>` to apply it after the current tool step finishes."
-                    : event.text.trim().startsWith("/")
-                        ? "Queued as steer. I’ll apply it after the current tool step finishes."
-                        : "Queued as steer. I’ll apply this after the current tool step finishes. Use `/followup <message>` to queue it after completion.";
+                const confirmation = event.text.trim().startsWith("/")
+                    ? "Queued as steer. I’ll apply it after the current tool step finishes."
+                    : "Queued as steer. I’ll apply this after the current tool step finishes. Use `/followup <message>` to queue it after completion.";
                 await bot.sendPlain(event.channelId, confirmation);
                 log.logInfo(`[${event.channelId}] Queued ${mode}: ${trimmedQueueText.substring(0, 80)}`);
-                return true;
+                return { kind: "handled" };
             }
             catch (err) {
                 const errMsg = err instanceof Error ? err.message : String(err);
                 if (isNoRunningTaskQueueError(err)) {
                     log.logInfo(`[${event.channelId}] Busy ${mode} window closed; requeueing as a normal message`);
-                    return false;
+                    return { kind: "requeue", text: trimmedQueueText };
                 }
                 log.logWarning(`[${event.channelId}] Failed to queue ${mode}`, errMsg);
                 await bot.sendPlain(event.channelId, `Could not queue this message: ${errMsg}`);
-                return true;
+                return { kind: "handled" };
             }
         },
         async handleEvent(event, bot, _isEvent) {

package/dist/runtime/delivery.js

@@ -96,28 +96,10 @@ class ChannelDeliveryController {
             log.logWarning(`[${this.event.channelId}] Failed to archive bot response`, err instanceof Error ? err.message : String(err));
         });
     }
-    resetProgressAfterFinal() {
-        if (!this.finalResponseDelivered) {
-            return;
-        }
-        this.progressSegments = [];
-        this.cachedProgressText = "";
-        this.progressTextDirty = false;
-        this.mode = "progress";
-        this.progressStartedAt = 0;
-        this.progressWindowStartedAt = 0;
-        this.toolCallCount = 0;
-        this.sentProgressChars = 0;
-        this.replayRequired = false;
-        this.finalReplacementText = "";
-        this.cardWarmupTriggered = false;
-        this.finalResponseDelivered = false;
-    }
     async appendProgress(text, shouldLog) {
-        if (this.closed || !text.trim())
+        if (this.closed || this.finalResponseDelivered || !text.trim())
             return;
         this.clearCardWarmup();
-        this.resetProgressAfterFinal();
         if (this.progressStartedAt === 0) {
             this.progressStartedAt = Date.now();
         }
@@ -142,8 +124,8 @@ class ChannelDeliveryController {
         this.bumpRevision(false);
     }
     async sendFinal(text, shouldLog) {
-        if (this.closed)
-            return false;
+        if (this.closed || this.finalResponseDelivered)
+            return this.finalResponseDelivered;
         this.clearCardWarmup();
         if (shouldLog) {
             this.archiveBotResponse(text);
@@ -158,7 +140,7 @@ class ChannelDeliveryController {
         return true;
     }
     async replaceWithFinal(text) {
-        if (this.closed)
+        if (this.closed || this.finalResponseDelivered)
             return;
         this.clearCardWarmup();
         this.finalReplacementText = text;

package/dist/runtime/dingtalk.d.ts

@@ -47,11 +47,17 @@ export interface DingTalkContext {
     flush: () => Promise<void>;
     close: () => Promise<void>;
 }
+export type BusyMessageResult = {
+    kind: "handled";
+} | {
+    kind: "requeue";
+    text: string;
+};
 export interface DingTalkHandler {
     isRunning(channelId: string): boolean;
     handleEvent(event: DingTalkEvent, bot: DingTalkBot, isEvent?: boolean): Promise<void>;
     handleStop(channelId: string, bot: DingTalkBot): Promise<void>;
-    handleBusyMessage(event: DingTalkEvent, bot: DingTalkBot, mode: BusyMessageMode, queueText: string): Promise<boolean>;
+    handleBusyMessage(event: DingTalkEvent, bot: DingTalkBot, mode: BusyMessageMode, queueText: string): Promise<BusyMessageResult>;
 }
 export declare class DingTalkBot {
     private handler;

package/dist/runtime/dingtalk.js

@@ -481,11 +481,12 @@ export class DingTalkBot {
         });
         return true;
     }
-    enqueueStreamMessage(event) {
+    enqueueStreamMessage(event, textOverride) {
+        const queuedEvent = textOverride === undefined ? event : { ...event, text: textOverride };
         this.getQueue(event.channelId).enqueue(async () => {
             this.activeMessageProcessing = true;
             try {
-                await this.handler.handleEvent(event, this);
+                await this.handler.handleEvent(queuedEvent, this);
             }
             finally {
                 this.activeMessageProcessing = false;
@@ -870,16 +871,16 @@ export class DingTalkBot {
                 return;
             }
             if (builtInCommand?.name === "steer") {
-                const handled = await this.handler.handleBusyMessage(event, this, "steer", builtInCommand.args);
-                if (!handled) {
-                    this.enqueueStreamMessage(event);
+                const result = await this.handler.handleBusyMessage(event, this, "steer", builtInCommand.args);
+                if (result.kind === "requeue") {
+                    this.enqueueStreamMessage(event, result.text);
                 }
                 return;
             }
             if (builtInCommand?.name === "followup") {
-                const handled = await this.handler.handleBusyMessage(event, this, "followUp", builtInCommand.args);
-                if (!handled) {
-                    this.enqueueStreamMessage(event);
+                const result = await this.handler.handleBusyMessage(event, this, "followUp", builtInCommand.args);
+                if (result.kind === "requeue") {
+                    this.enqueueStreamMessage(event, result.text);
                 }
                 return;
             }
@@ -891,9 +892,9 @@ export class DingTalkBot {
                 await this.sendPlain(channelId, "A task is already running. Only `/stop`, `/steer <message>`, and `/followup <message>` are available while streaming.");
                 return;
             }
-            const handled = await this.handler.handleBusyMessage(event, this, this.busyMessageDefault, content);
-            if (!handled) {
-                this.enqueueStreamMessage(event);
+            const result = await this.handler.handleBusyMessage(event, this, this.busyMessageDefault, content);
+            if (result.kind === "requeue") {
+                this.enqueueStreamMessage(event, result.text);
             }
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oyasmi/pipiclaw",
-	"version": "0.6.6-beta.2",
+	"version": "0.6.6-beta.3",
 	"description": "An AI assistant runtime for coding and team workflows, with DingTalk AI Cards, sub-agents, memory, and scheduled events.",
 	"type": "module",
 	"bin": {