@oyasmi/pipiclaw 0.6.6-beta.2 → 0.6.6

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

@@ -11,15 +11,17 @@ export declare class ChannelRunner implements AgentRunner {
     private readonly channelDir;
     private readonly workspacePath;
     private readonly workspaceDir;
-    private readonly session;
-    private readonly agent;
-    private readonly sessionManager;
+    private session;
+    private agent;
+    private sessionManager;
     private readonly settingsManager;
     private readonly modelRegistry;
     private readonly memoryLifecycle;
     private readonly memoryCandidateStore;
     private readonly sessionResourceGate;
     private readonly sessionReady;
+    private readonly sessionRuntime;
+    private sessionUnsubscribe?;
     private subAgentDiscovery;
     private activeModel;
     private currentSkills;
@@ -34,7 +36,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>;
@@ -54,6 +55,10 @@ export declare class ChannelRunner implements AgentRunner {
     private refreshSubAgentDiscovery;
     private reportSettingsDiagnostics;
     private reportConfigDiagnostics;
+    private createResourceLoader;
+    private createAgentSessionServices;
+    private createEmptyExtensionsResult;
+    private createSessionRuntime;
     private buildRuntimeTools;
     private rebuildSessionTools;
     private subscribeToSessionEvents;

package/dist/agent/channel-runner.js

@@ -1,5 +1,5 @@
 import { Agent } from "@mariozechner/pi-agent-core";
-import { AgentSession, AuthStorage, convertToLlm, DefaultResourceLoader, ModelRegistry, SessionManager, } from "@mariozechner/pi-coding-agent";
+import { AgentSession, AgentSessionRuntime, AuthStorage, convertToLlm, createExtensionRuntime, DefaultResourceLoader, ModelRegistry, SessionManager, } from "@mariozechner/pi-coding-agent";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { dirname, join, resolve } from "path";
 import * as log from "../log.js";
@@ -80,15 +80,14 @@ export class ChannelRunner {
         this.activeModel = resolveInitialModel(this.modelRegistry, this.settingsManager);
         log.logInfo(`Using model: ${this.activeModel.provider}/${this.activeModel.id} (${this.activeModel.name})`);
         this.subAgentDiscovery = this.refreshSubAgentDiscovery();
-        // Create tools
-        const tools = this.buildRuntimeTools();
-        // Create agent
+        const initialSessionManager = this.sessionManager;
+        const initialTools = this.buildRuntimeTools();
         this.agent = new Agent({
             initialState: {
                 systemPrompt: "",
                 model: this.activeModel,
                 thinkingLevel: "off",
-                tools,
+                tools: initialTools,
             },
             convertToLlm,
             getApiKey: async () => getApiKeyForModel(this.modelRegistry, this.activeModel),
@@ -105,62 +104,33 @@ export class ChannelRunner {
                 void this.recordMemoryActivity(event);
             },
         });
-        const resourceLoader = new DefaultResourceLoader({
-            cwd: process.cwd(),
-            agentDir: APP_HOME_DIR,
-            settingsManager: asSdkSettingsManager(this.settingsManager),
-            extensionFactories: [
-                this.memoryLifecycle.createExtensionFactory(),
-                createCommandExtension({
-                    getCurrentModel: () => this.session.model ?? this.activeModel,
-                    getAvailableModels: async () => {
-                        this.modelRegistry.refresh();
-                        return await this.modelRegistry.getAvailable();
-                    },
-                    getSessionStats: () => this.session.getSessionStats(),
-                    getThinkingLevel: () => this.session.thinkingLevel,
-                    switchModel: async (model) => {
-                        await this.session.setModel(model);
-                        this.activeModel = model;
-                    },
-                    refreshSessionResources: async () => {
-                        await this.refreshSessionResources();
-                    },
-                }),
-            ],
-            appendSystemPromptOverride: (base) => {
-                const soul = getSoul(this.workspaceDir);
-                const sections = [...base];
-                if (soul) {
-                    sections.unshift(soul);
-                }
-                sections.push(buildAppendSystemPrompt(this.workspacePath, this.channelId, this.sandboxConfig, {
-                    subAgentList: formatSubAgentList(this.subAgentDiscovery.agents),
-                }));
-                return sections;
-            },
-            agentsFilesOverride: () => {
-                const agentConfig = getAgentConfig(this.channelDir);
-                return {
-                    agentsFiles: agentConfig ? [{ path: `${this.workspacePath}/AGENTS.md`, content: agentConfig }] : [],
-                };
-            },
-            skillsOverride: (base) => ({
-                skills: [...base.skills, ...this.currentSkills],
-                diagnostics: base.diagnostics,
-            }),
-        });
-        const baseToolsOverride = Object.fromEntries(tools.map((tool) => [tool.name, tool]));
-        // Create AgentSession
+        const initialResourceLoader = this.createResourceLoader();
+        const baseToolsOverride = Object.fromEntries(initialTools.map((tool) => [tool.name, tool]));
         this.session = new AgentSession({
             agent: this.agent,
-            sessionManager: this.sessionManager,
+            sessionManager: initialSessionManager,
             settingsManager: asSdkSettingsManager(this.settingsManager),
             cwd: process.cwd(),
             modelRegistry: this.modelRegistry,
-            resourceLoader,
+            resourceLoader: initialResourceLoader,
             baseToolsOverride,
         });
+        this.sessionRuntime = new AgentSessionRuntime(this.session, this.createAgentSessionServices(initialResourceLoader), async ({ sessionManager, sessionStartEvent }) => {
+            const next = this.createSessionRuntime(sessionManager, sessionStartEvent);
+            return {
+                session: next.session,
+                extensionsResult: this.createEmptyExtensionsResult(),
+                services: this.createAgentSessionServices(next.resourceLoader),
+                diagnostics: [],
+            };
+        });
+        this.sessionRuntime.setRebindSession(async (session) => {
+            this.session = session;
+            this.agent = session.agent;
+            this.sessionManager = session.sessionManager;
+            await this.bindSessionExtensions();
+            this.subscribeToSessionEvents();
+        });
         this.sessionResourceGate = new SessionResourceGate(async () => {
             await this.reloadSessionResources();
         });
@@ -356,10 +326,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 +404,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 +428,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);
     }
@@ -502,20 +464,18 @@ export class ChannelRunner {
             commandContextActions: {
                 waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
-                    const success = await this.session.newSession(options);
-                    return { cancelled: !success };
+                    return await this.sessionRuntime.newSession(options);
                 },
-                fork: async (entryId) => {
-                    const result = await this.session.fork(entryId);
+                fork: async (entryId, options) => {
+                    const result = await this.sessionRuntime.fork(entryId, options);
                     return { cancelled: result.cancelled };
                 },
                 navigateTree: async (targetId, options) => {
                     const result = await this.session.navigateTree(targetId, options);
                     return { cancelled: result.cancelled };
                 },
-                switchSession: async (sessionPath) => {
-                    const success = await this.session.switchSession(sessionPath);
-                    return { cancelled: !success };
+                switchSession: async (sessionPath, options) => {
+                    return await this.sessionRuntime.switchSession(sessionPath, options);
                 },
                 reload: async () => {
                     await this.refreshSessionResources();
@@ -565,6 +525,96 @@ export class ChannelRunner {
             log.logWarning(`[${this.channelId}] ${formatConfigDiagnostic(diagnostic)}`, diagnostic.path);
         }
     }
+    createResourceLoader() {
+        return new DefaultResourceLoader({
+            cwd: process.cwd(),
+            agentDir: APP_HOME_DIR,
+            settingsManager: asSdkSettingsManager(this.settingsManager),
+            extensionFactories: [
+                this.memoryLifecycle.createExtensionFactory(),
+                createCommandExtension({
+                    getCurrentModel: () => this.session.model ?? this.activeModel,
+                    getAvailableModels: async () => {
+                        this.modelRegistry.refresh();
+                        return await this.modelRegistry.getAvailable();
+                    },
+                    getSessionStats: () => this.session.getSessionStats(),
+                    getThinkingLevel: () => this.session.thinkingLevel,
+                    switchModel: async (model) => {
+                        await this.session.setModel(model);
+                        this.activeModel = model;
+                    },
+                    refreshSessionResources: async () => {
+                        await this.refreshSessionResources();
+                    },
+                }),
+            ],
+            appendSystemPromptOverride: (base) => {
+                const soul = getSoul(this.workspaceDir);
+                const sections = [...base];
+                if (soul) {
+                    sections.unshift(soul);
+                }
+                sections.push(buildAppendSystemPrompt(this.workspacePath, this.channelId, this.sandboxConfig, {
+                    subAgentList: formatSubAgentList(this.subAgentDiscovery.agents),
+                }));
+                return sections;
+            },
+            agentsFilesOverride: () => {
+                const agentConfig = getAgentConfig(this.channelDir);
+                return {
+                    agentsFiles: agentConfig ? [{ path: `${this.workspacePath}/AGENTS.md`, content: agentConfig }] : [],
+                };
+            },
+            skillsOverride: (base) => ({
+                skills: [...base.skills, ...this.currentSkills],
+                diagnostics: base.diagnostics,
+            }),
+        });
+    }
+    createAgentSessionServices(resourceLoader) {
+        return {
+            cwd: process.cwd(),
+            agentDir: APP_HOME_DIR,
+            authStorage: AuthStorage.create(AUTH_CONFIG_PATH),
+            settingsManager: asSdkSettingsManager(this.settingsManager),
+            modelRegistry: this.modelRegistry,
+            resourceLoader,
+            diagnostics: [],
+        };
+    }
+    createEmptyExtensionsResult() {
+        return {
+            extensions: [],
+            errors: [],
+            runtime: createExtensionRuntime(),
+        };
+    }
+    createSessionRuntime(sessionManager, sessionStartEvent) {
+        const tools = this.buildRuntimeTools();
+        const agent = new Agent({
+            initialState: {
+                systemPrompt: "",
+                model: this.activeModel,
+                thinkingLevel: "off",
+                tools,
+            },
+            convertToLlm,
+            getApiKey: async () => getApiKeyForModel(this.modelRegistry, this.activeModel),
+        });
+        const resourceLoader = this.createResourceLoader();
+        const session = new AgentSession({
+            agent,
+            sessionManager,
+            settingsManager: asSdkSettingsManager(this.settingsManager),
+            cwd: process.cwd(),
+            modelRegistry: this.modelRegistry,
+            resourceLoader,
+            baseToolsOverride: Object.fromEntries(tools.map((tool) => [tool.name, tool])),
+            sessionStartEvent,
+        });
+        return { agent, session, resourceLoader };
+    }
     buildRuntimeTools() {
         const securityLoad = loadSecurityConfigWithDiagnostics(APP_HOME_DIR);
         const toolsLoad = loadToolsConfigWithDiagnostics(APP_HOME_DIR);
@@ -589,13 +639,15 @@ export class ChannelRunner {
     }
     rebuildSessionTools() {
         const tools = this.buildRuntimeTools();
-        this.agent.setTools(tools);
         this.session._baseToolsOverride =
             Object.fromEntries(tools.map((tool) => [tool.name, tool]));
+        this.agent.state.tools = tools;
+        this.session.setActiveToolsByName(tools.map((tool) => tool.name));
     }
     // === Session event subscription ===
     subscribeToSessionEvents() {
-        this.session.subscribe(async (event) => {
+        this.sessionUnsubscribe?.();
+        this.sessionUnsubscribe = this.session.subscribe(async (event) => {
             if (isRecord(event) && event.type === "message_start") {
                 this.agentLoopStarted = true;
             }

package/dist/agent/command-extension.js

@@ -27,8 +27,8 @@ async function runCompact(ctx, customInstructions) {
         });
     });
 }
-function sendCommandResult(pi, text) {
-    pi.sendMessage({
+function sendCommandResult(sender, text) {
+    return sender.sendMessage({
         customType: COMMAND_RESULT_CUSTOM_TYPE,
         content: text,
         display: true,
@@ -83,13 +83,21 @@ ${available}`);
         pi.registerCommand("new", {
             description: "Start a new session",
             handler: async (_args, ctx) => {
-                const result = await ctx.newSession();
-                if (!result.cancelled) {
+                let sentFromReplacement = false;
+                const result = await ctx.newSession({
+                    withSession: async (nextCtx) => {
+                        sentFromReplacement = true;
+                        await options.refreshSessionResources();
+                        await sendCommandResult(nextCtx, `已开启新会话。\n\nSession ID: \`${nextCtx.sessionManager.getSessionId()}\``);
+                    },
+                });
+                if (result.cancelled) {
+                    sendCommandResult(pi, "新会话已取消。");
+                }
+                else if (!sentFromReplacement) {
                     await options.refreshSessionResources();
+                    sendCommandResult(pi, `已开启新会话。\n\nSession ID: \`${ctx.sessionManager.getSessionId()}\``);
                 }
-                sendCommandResult(pi, result.cancelled
-                    ? "新会话已取消。"
-                    : `已开启新会话。\n\nSession ID: \`${ctx.sessionManager.getSessionId()}\``);
             },
         });
         pi.registerCommand("compact", {

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/memory/lifecycle.d.ts

@@ -45,6 +45,6 @@ export declare class MemoryLifecycle {
     private handleSessionBeforeCompact;
     private handleSessionCompact;
     private handleSessionBeforeSwitch;
-    private handleSessionSwitch;
+    private handleSessionStart;
     private recordActivity;
 }

package/dist/memory/lifecycle.js

@@ -33,8 +33,8 @@ export class MemoryLifecycle {
             pi.on("session_before_switch", async (event) => {
                 await this.handleSessionBeforeSwitch(event);
             });
-            pi.on("session_switch", async (event) => {
-                this.handleSessionSwitch(event);
+            pi.on("session_start", async (event) => {
+                this.handleSessionStart(event);
             });
         };
     }
@@ -204,7 +204,7 @@ export class MemoryLifecycle {
         }
         await this.runPreflightConsolidation("new-session");
     }
-    handleSessionSwitch(event) {
+    handleSessionStart(event) {
         if (event.reason !== "new") {
             return;
         }

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/dist/subagents/tool.d.ts

@@ -1,5 +1,6 @@
 import { type AgentEvent, type AgentMessage, type AgentTool } from "@mariozechner/pi-agent-core";
 import type { Api, Model } from "@mariozechner/pi-ai";
+import { Type } from "typebox";
 import type { MemoryCandidateStore } from "../memory/candidates.js";
 import type { Executor } from "../sandbox.js";
 import type { SecurityConfig } from "../security/types.js";
@@ -7,21 +8,21 @@ import type { PipiclawMemoryRecallSettings } from "../settings.js";
 import type { UsageTotals } from "../shared/types.js";
 import type { PipiclawWebToolsConfig } from "../tools/config.js";
 import { type ResolvedSubAgentConfig, type SubAgentDiscoveryResult } from "./discovery.js";
-declare const subagentSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    agent: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    name: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    task: import("@sinclair/typebox").TString;
-    systemPrompt: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    tools: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    model: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    maxTurns: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    maxToolCalls: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    maxWallTimeSec: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    bashTimeoutSec: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    contextMode: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    memory: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    paths: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+declare const subagentSchema: Type.TObject<{
+    label: Type.TString;
+    agent: Type.TOptional<Type.TString>;
+    name: Type.TOptional<Type.TString>;
+    task: Type.TString;
+    systemPrompt: Type.TOptional<Type.TString>;
+    tools: Type.TOptional<Type.TArray<Type.TString>>;
+    model: Type.TOptional<Type.TString>;
+    maxTurns: Type.TOptional<Type.TNumber>;
+    maxToolCalls: Type.TOptional<Type.TNumber>;
+    maxWallTimeSec: Type.TOptional<Type.TNumber>;
+    bashTimeoutSec: Type.TOptional<Type.TNumber>;
+    contextMode: Type.TOptional<Type.TString>;
+    memory: Type.TOptional<Type.TString>;
+    paths: Type.TOptional<Type.TArray<Type.TString>>;
 }>;
 export interface SubAgentToolDetails {
     kind: "subagent";

package/dist/subagents/tool.js

@@ -1,6 +1,6 @@
 import { Agent } from "@mariozechner/pi-agent-core";
 import { convertToLlm } from "@mariozechner/pi-coding-agent";
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { readChannelSession } from "../memory/files.js";
 import { recallRelevantMemory } from "../memory/recall.js";
 import { formatModelReference } from "../models/utils.js";

package/dist/tools/attach.d.ts

@@ -1,9 +1,10 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { SecurityConfig, SecurityRuntimeContext } from "../security/types.js";
-declare const attachSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TString;
-    title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+declare const attachSchema: Type.TObject<{
+    label: Type.TString;
+    path: Type.TString;
+    title: Type.TOptional<Type.TString>;
 }>;
 export type UploadFunction = (filePath: string, title?: string) => Promise<void>;
 export interface AttachToolOptions {

package/dist/tools/attach.js

@@ -1,5 +1,5 @@
-import { Type } from "@sinclair/typebox";
 import { basename, resolve as resolvePath } from "path";
+import { Type } from "typebox";
 import { DEFAULT_SECURITY_CONFIG } from "../security/config.js";
 import { logSecurityEvent } from "../security/logger.js";
 import { guardPath } from "../security/path-guard.js";

package/dist/tools/bash.d.ts

@@ -1,10 +1,11 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { Executor } from "../sandbox.js";
 import type { SecurityConfig, SecurityRuntimeContext } from "../security/types.js";
-declare const bashSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    command: import("@sinclair/typebox").TString;
-    timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+declare const bashSchema: Type.TObject<{
+    label: Type.TString;
+    command: Type.TString;
+    timeout: Type.TOptional<Type.TNumber>;
 }>;
 export interface BashToolOptions {
     defaultTimeoutSeconds?: number;

package/dist/tools/bash.js

@@ -2,7 +2,7 @@ import { randomBytes } from "node:crypto";
 import { createWriteStream } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { guardCommand } from "../security/command-guard.js";
 import { DEFAULT_SECURITY_CONFIG } from "../security/config.js";
 import { logSecurityEvent } from "../security/logger.js";

package/dist/tools/edit.d.ts

@@ -1,11 +1,12 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { Executor } from "../sandbox.js";
 import type { SecurityConfig, SecurityRuntimeContext } from "../security/types.js";
-declare const editSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TString;
-    oldText: import("@sinclair/typebox").TString;
-    newText: import("@sinclair/typebox").TString;
+declare const editSchema: Type.TObject<{
+    label: Type.TString;
+    path: Type.TString;
+    oldText: Type.TString;
+    newText: Type.TString;
 }>;
 export interface EditToolOptions {
     securityConfig?: SecurityConfig;

package/dist/tools/edit.js

@@ -1,5 +1,5 @@
-import { Type } from "@sinclair/typebox";
 import * as Diff from "diff";
+import { Type } from "typebox";
 import { DEFAULT_SECURITY_CONFIG } from "../security/config.js";
 import { logSecurityEvent } from "../security/logger.js";
 import { guardPath } from "../security/path-guard.js";

package/dist/tools/read.d.ts

@@ -1,11 +1,12 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { Executor } from "../sandbox.js";
 import type { SecurityConfig, SecurityRuntimeContext } from "../security/types.js";
-declare const readSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TString;
-    offset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+declare const readSchema: Type.TObject<{
+    label: Type.TString;
+    path: Type.TString;
+    offset: Type.TOptional<Type.TNumber>;
+    limit: Type.TOptional<Type.TNumber>;
 }>;
 export interface ReadToolOptions {
     securityConfig?: SecurityConfig;

package/dist/tools/read.js

@@ -1,5 +1,5 @@
-import { Type } from "@sinclair/typebox";
 import { extname } from "path";
+import { Type } from "typebox";
 import { DEFAULT_SECURITY_CONFIG } from "../security/config.js";
 import { logSecurityEvent } from "../security/logger.js";
 import { guardPath } from "../security/path-guard.js";

package/dist/tools/session-search.d.ts

@@ -1,11 +1,12 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
 import type { Api, Model } from "@mariozechner/pi-ai";
+import { Type } from "typebox";
 import type { PipiclawSessionSearchSettings } from "../settings.js";
-declare const sessionSearchSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    query: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    roleFilter: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
+declare const sessionSearchSchema: Type.TObject<{
+    label: Type.TString;
+    query: Type.TOptional<Type.TString>;
+    limit: Type.TOptional<Type.TNumber>;
+    roleFilter: Type.TOptional<Type.TArray<Type.TString>>;
 }>;
 export interface SessionSearchToolOptions {
     channelDir: string;

package/dist/tools/session-search.js

@@ -1,4 +1,4 @@
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { searchChannelSessions } from "../memory/session-search.js";
 const sessionSearchSchema = Type.Object({
     label: Type.String({ description: "Brief description of what you're searching for and why (shown to user)" }),

package/dist/tools/skill-list.d.ts

@@ -1,6 +1,7 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
-declare const skillListSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
+import { Type } from "typebox";
+declare const skillListSchema: Type.TObject<{
+    label: Type.TString;
 }>;
 export interface WorkspaceSkillSummary {
     name: string;

package/dist/tools/skill-list.js

@@ -1,6 +1,6 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { validateSkillFrontmatter, validateSkillName } from "./skill-security.js";
 const skillListSchema = Type.Object({
     label: Type.String({ description: "Brief description of why you're listing workspace skills (shown to user)" }),

package/dist/tools/skill-manage.d.ts

@@ -1,12 +1,13 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
-declare const skillManageSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    action: import("@sinclair/typebox").TString;
-    name: import("@sinclair/typebox").TString;
-    content: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    filePath: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    find: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    replace: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+import { Type } from "typebox";
+declare const skillManageSchema: Type.TObject<{
+    label: Type.TString;
+    action: Type.TString;
+    name: Type.TString;
+    content: Type.TOptional<Type.TString>;
+    filePath: Type.TOptional<Type.TString>;
+    find: Type.TOptional<Type.TString>;
+    replace: Type.TOptional<Type.TString>;
 }>;
 export type SkillManageAction = "create" | "patch" | "write_file";
 export interface SkillManageResult {

package/dist/tools/skill-manage.js

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { createAtomicTempPath, writeFileAtomically } from "../shared/atomic-file.js";
 import { resolveSkillPath, resolveSkillSupportingFile, scanSkillContent, validateSkillMarkdown, } from "./skill-security.js";
 const skillManageSchema = Type.Object({

package/dist/tools/skill-view.d.ts

@@ -1,8 +1,9 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
-declare const skillViewSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    name: import("@sinclair/typebox").TString;
-    filePath: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+import { Type } from "typebox";
+declare const skillViewSchema: Type.TObject<{
+    label: Type.TString;
+    name: Type.TString;
+    filePath: Type.TOptional<Type.TString>;
 }>;
 export interface SkillViewToolOptions {
     workspaceDir: string;

package/dist/tools/skill-view.js

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { resolveSkillPath, resolveSkillSupportingFile } from "./skill-security.js";
 const skillViewSchema = Type.Object({
     label: Type.String({ description: "Brief description of why you're viewing this skill (shown to user)" }),

package/dist/tools/web-fetch.d.ts

@@ -1,11 +1,12 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { SecurityConfig } from "../security/types.js";
 import type { PipiclawWebToolsConfig } from "./config.js";
-declare const webFetchSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    url: import("@sinclair/typebox").TString;
-    extractMode: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"markdown">, import("@sinclair/typebox").TLiteral<"text">]>>;
-    maxChars: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+declare const webFetchSchema: Type.TObject<{
+    label: Type.TString;
+    url: Type.TString;
+    extractMode: Type.TOptional<Type.TUnion<[Type.TLiteral<"markdown">, Type.TLiteral<"text">]>>;
+    maxChars: Type.TOptional<Type.TNumber>;
 }>;
 export interface WebFetchToolOptions {
     webConfig: PipiclawWebToolsConfig;

package/dist/tools/web-fetch.js

@@ -1,4 +1,4 @@
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { resolveWebFetchRequest } from "../web/config.js";
 import { runWebFetch } from "../web/fetch.js";
 const webFetchSchema = Type.Object({

package/dist/tools/web-search.d.ts

@@ -1,10 +1,11 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { SecurityConfig } from "../security/types.js";
 import type { PipiclawWebToolsConfig } from "./config.js";
-declare const webSearchSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    query: import("@sinclair/typebox").TString;
-    count: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+declare const webSearchSchema: Type.TObject<{
+    label: Type.TString;
+    query: Type.TString;
+    count: Type.TOptional<Type.TNumber>;
 }>;
 export interface WebSearchToolOptions {
     webConfig: PipiclawWebToolsConfig;

package/dist/tools/web-search.js

@@ -1,4 +1,4 @@
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { resolveWebSearchRequest } from "../web/config.js";
 import { runWebSearch } from "../web/search.js";
 const webSearchSchema = Type.Object({

package/dist/tools/write.d.ts

@@ -1,10 +1,11 @@
 import type { AgentTool } from "@mariozechner/pi-agent-core";
+import { Type } from "typebox";
 import type { Executor } from "../sandbox.js";
 import type { SecurityConfig, SecurityRuntimeContext } from "../security/types.js";
-declare const writeSchema: import("@sinclair/typebox").TObject<{
-    label: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TString;
-    content: import("@sinclair/typebox").TString;
+declare const writeSchema: Type.TObject<{
+    label: Type.TString;
+    path: Type.TString;
+    content: Type.TString;
 }>;
 export interface WriteToolOptions {
     securityConfig?: SecurityConfig;

package/dist/tools/write.js

@@ -1,4 +1,4 @@
-import { Type } from "@sinclair/typebox";
+import { Type } from "typebox";
 import { writeContent } from "./write-content.js";
 const writeSchema = Type.Object({
     label: Type.String({ description: "Brief description of what you're writing (shown to user)" }),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oyasmi/pipiclaw",
-	"version": "0.6.6-beta.2",
+	"version": "0.6.6",
 	"description": "An AI assistant runtime for coding and team workflows, with DingTalk AI Cards, sub-agents, memory, and scheduled events.",
 	"type": "module",
 	"bin": {
@@ -33,11 +33,10 @@
 		"prepublishOnly": "npm run clean && npm run build && npm run check"
 	},
 	"dependencies": {
-		"@mariozechner/pi-agent-core": "^0.63.0",
-		"@mariozechner/pi-ai": "^0.63.0",
-		"@mariozechner/pi-coding-agent": "^0.63.0",
+		"@mariozechner/pi-agent-core": "^0.70.2",
+		"@mariozechner/pi-ai": "^0.70.2",
+		"@mariozechner/pi-coding-agent": "^0.70.2",
 		"@mozilla/readability": "^0.6.0",
-		"@sinclair/typebox": "^0.34.0",
 		"axios": "^1.7.0",
 		"croner": "^9.1.0",
 		"diff": "^8.0.2",
@@ -46,7 +45,8 @@
 		"https-proxy-agent": "^7.0.6",
 		"jsdom": "^26.1.0",
 		"proxy-from-env": "^1.1.0",
-		"socks-proxy-agent": "^8.0.5"
+		"socks-proxy-agent": "^8.0.5",
+		"typebox": "^1.1.34"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.3.5",