pikiclaw 0.2.71 → 0.2.73

package/dist/bot-command-ui.js

@@ -134,7 +134,7 @@ export function buildAgentsCommandView(bot, chatId) {
     const actions = data.agents
         .filter(agent => agent.installed)
         .map(agent => ({
-        label: agent.agent,
+        label: agent.version ? `${agent.agent} ${agent.version}` : agent.agent,
         action: { kind: 'agent.switch', agent: agent.agent },
         state: buttonStateFromFlags({ isCurrent: agent.isCurrent }),
         primary: agent.isCurrent,
@@ -143,15 +143,9 @@ export function buildAgentsCommandView(bot, chatId) {
         kind: 'agents',
         title: 'Agents',
         metaLines: [],
-        items: data.agents.map(agent => ({
-            label: agent.agent,
-            detail: agent.installed
-                ? (agent.version ? `Version ${agent.version}` : 'Installed')
-                : 'Not installed',
-            state: buttonStateFromFlags({ isCurrent: agent.isCurrent, unavailable: !agent.installed }),
-        })),
-        helperText: 'Use the controls below to switch agents.',
-        rows: chunkRows(actions, 3),
+        items: [],
+        emptyText: actions.length ? undefined : 'No installed agents.',
+        rows: actions.map(action => [action]),
     };
 }
 const modelsDrafts = new Map();
@@ -265,7 +259,7 @@ export async function executeCommandAction(bot, chatId, action, opts = {}) {
             };
         case 'session.switch': {
             const chat = bot.chat(chatId);
-            const result = await bot.fetchSessions(chat.agent);
+            const result = await bot.fetchSessions(chat.agent, bot.chatWorkdir(chatId));
             if (!result.ok)
                 return { kind: 'noop', message: 'Failed to load sessions' };
             const session = result.sessions.find(entry => entry.sessionId === action.sessionId);

package/dist/bot-commands.js

@@ -32,7 +32,7 @@ export function getStartData(bot, chatId) {
     return {
         ...intro,
         agent: cs.agent,
-        workdir: bot.workdir,
+        workdir: bot.chatWorkdir(chatId),
         agentDetails,
         commands,
     };
@@ -61,7 +61,7 @@ export function summarizeSessionRun(session) {
 }
 export async function getSessionsPageData(bot, chatId, page, pageSize = 5) {
     const cs = bot.chat(chatId);
-    const res = await bot.fetchSessions(cs.agent);
+    const res = await bot.fetchSessions(cs.agent, bot.chatWorkdir(chatId));
     const sessions = res.ok ? res.sessions : [];
     const total = sessions.length;
     const totalPages = Math.max(1, Math.ceil(total / pageSize));
@@ -139,7 +139,7 @@ export function getAgentsListData(bot, chatId) {
 }
 export function getSkillsListData(bot, chatId) {
     const cs = bot.chat(chatId);
-    const skills = bot.fetchSkills().skills
+    const skills = bot.fetchSkills(bot.chatWorkdir(chatId)).skills
         .map(skill => {
         const command = buildSkillCommandName(skill.name);
         if (!command)
@@ -153,7 +153,7 @@ export function getSkillsListData(bot, chatId) {
         };
     })
         .filter((skill) => !!skill);
-    return { agent: cs.agent, workdir: bot.workdir, skills };
+    return { agent: cs.agent, workdir: bot.chatWorkdir(chatId), skills };
 }
 function claudeModelSelectionKey(modelId) {
     const value = normalizeClaudeModelId(modelId).toLowerCase();
@@ -204,7 +204,7 @@ function buildEffortData(bot, agent) {
 export async function getModelsListData(bot, chatId) {
     const cs = bot.chat(chatId);
     const currentModel = bot.modelForAgent(cs.agent);
-    const res = await bot.fetchModels(cs.agent);
+    const res = await bot.fetchModels(cs.agent, bot.chatWorkdir(chatId));
     return {
         agent: cs.agent,
         currentModel,
@@ -242,22 +242,22 @@ function relSkillPath(workdir, filePath) {
     return relative && !relative.startsWith('..') ? relative : filePath;
 }
 export function resolveSkillPrompt(bot, chatId, cmd, args) {
-    const skills = bot.fetchSkills().skills;
+    const wd = bot.chatWorkdir(chatId);
+    const skills = bot.fetchSkills(wd).skills;
     const skill = indexSkillsByCommand(skills).get(cmd);
     if (!skill)
         return null;
-    const cs = bot.chat(chatId);
     const extra = args.trim();
     const suffix = extra ? ` Additional context: ${extra}` : '';
-    const workdirHint = `[Project directory: ${bot.workdir}]\n\n`;
+    const workdirHint = `[Project directory: ${wd}]\n\n`;
     let prompt;
-    const paths = getProjectSkillPaths(bot.workdir, skill.name);
+    const paths = getProjectSkillPaths(wd, skill.name);
     const skillFile = paths.claudeSkillFile || paths.sharedSkillFile || paths.agentsSkillFile;
     if (skillFile) {
         prompt = `${workdirHint}Read the skill definition at \`${skillFile}\` and execute the instructions defined there.${suffix}`;
     }
     else {
-        const fallbackPath = `${bot.workdir}/.pikiclaw/skills/${skill.name}/SKILL.md`;
+        const fallbackPath = `${wd}/.pikiclaw/skills/${skill.name}/SKILL.md`;
         prompt = `${workdirHint}Read the skill definition at \`${fallbackPath}\` and execute the instructions defined there.${suffix}`;
     }
     return { prompt, skillName: skill.name };

package/dist/bot-feishu.js

@@ -134,7 +134,6 @@ export class FeishuBot extends Bot {
         this.log(`menu: ${commands.length} commands (${skillCount} skills)`);
     }
     afterSwitchWorkdir(_oldPath, _newPath) {
-        this.sessionMessages.clear();
         if (!this.channel)
             return;
         void this.setupMenu().catch(err => this.log(`menu refresh failed: ${err}`));
@@ -187,14 +186,17 @@ export class FeishuBot extends Bot {
         return buildSessionTaskId(session, this.nextTaskId++);
     }
     registerSessionMessage(chatId, messageId, session) {
-        this.sessionMessages.register(chatId, messageId, session, this.workdir);
+        this.sessionMessages.register(chatId, messageId, session, session.workdir);
     }
     registerSessionMessages(chatId, messageIds, session) {
-        this.sessionMessages.registerMany(chatId, messageIds, session, this.workdir);
+        this.sessionMessages.registerMany(chatId, messageIds, session, session.workdir);
     }
     sessionFromMessage(chatId, messageId) {
-        const sessionKey = this.sessionMessages.resolve(chatId, messageId);
-        return this.getSessionRuntimeByKey(sessionKey);
+        const sessionRef = this.sessionMessages.resolve(chatId, messageId);
+        if (!sessionRef)
+            return null;
+        return this.getSessionRuntimeByKey(sessionRef.key, { allowAnyWorkdir: true })
+            || this.hydrateSessionRuntime(sessionRef);
     }
     ensureSession(chatId, title, files) {
         return this.ensureSessionForChat(chatId, title, files);
@@ -373,8 +375,9 @@ export class FeishuBot extends Bot {
             await ctx.reply(`**Workdir switched**\n\n\`${oldPath}\`\n↓\n\`${resolvedPath}\``);
             return;
         }
-        const browsePath = path.dirname(this.workdir);
-        const view = buildSwitchWorkdirCard(this.workdir, browsePath);
+        const wd = this.chatWorkdir(ctx.chatId);
+        const browsePath = path.dirname(wd);
+        const view = buildSwitchWorkdirCard(wd, browsePath);
         await ctx.channel.sendCard(ctx.chatId, view);
     }
     async cmdRestart(ctx) {
@@ -533,7 +536,7 @@ export class FeishuBot extends Bot {
                     }
                     const staged = stageSessionFiles({
                         agent: session.agent,
-                        workdir: this.workdir,
+                        workdir: session.workdir,
                         files: msg.files,
                         sessionId: session.sessionId,
                         title: undefined,
@@ -571,6 +574,7 @@ export class FeishuBot extends Bot {
             agent: session.agent,
             sessionKey: session.key,
             prompt,
+            attachments: files,
             startedAt: start,
             sourceMessageId: ctx.messageId,
         });
@@ -588,9 +592,10 @@ export class FeishuBot extends Bot {
         this.registerTaskPlaceholders(taskId, [placeholderId]);
         void this.queueSessionTask(session, async () => {
             let livePreview = null;
+            let task = null;
             const abortController = new AbortController();
             try {
-                const task = this.markTaskRunning(taskId, () => abortController.abort());
+                task = this.markTaskRunning(taskId, () => abortController.abort());
                 if (!task || task.cancelled) {
                     if (placeholderId) {
                         try {
@@ -633,8 +638,19 @@ export class FeishuBot extends Bot {
                 const mcpSendFile = this.createMcpSendFileCallback(ctx);
                 const result = await this.runStream(prompt, session, files, (nextText, nextThinking, nextActivity = '', meta, plan) => {
                     livePreview?.update(nextText, nextThinking, nextActivity, meta, plan);
-                }, undefined, mcpSendFile, abortController.signal, this.createCodexHumanLoopHandler(ctx, taskId));
+                }, undefined, mcpSendFile, abortController.signal, this.createCodexHumanLoopHandler(ctx, taskId), (steer) => {
+                    const currentTask = this.activeTasks.get(taskId);
+                    if (!currentTask || currentTask.cancelled || currentTask.status !== 'running')
+                        return;
+                    currentTask.steer = steer;
+                });
                 await livePreview?.settle();
+                if (task?.freezePreviewOnAbort && result.stopReason === 'interrupted') {
+                    const frozenMessageIds = await this.freezeSteerHandoffPreview(ctx, placeholderId, livePreview);
+                    this.registerSessionMessages(ctx.chatId, frozenMessageIds, session);
+                    this.log(`[handleMessage] steer handoff preserved previous preview chat=${ctx.chatId} task=${taskId}`);
+                    return;
+                }
                 const finalReplyIds = await this.sendFinalReply(ctx, placeholderId, session.agent, result);
                 this.registerSessionMessages(ctx.chatId, finalReplyIds, session);
                 this.log(`[handleMessage] end chat=${ctx.chatId} agent=${session.agent} ok=${result.ok} session=${result.sessionId || session.sessionId || '(new)'} ` +
@@ -642,6 +658,12 @@ export class FeishuBot extends Bot {
                     `tools=${formatToolLog(result.activity)}`);
             }
             catch (e) {
+                if (task?.freezePreviewOnAbort && abortController.signal.aborted) {
+                    const frozenMessageIds = await this.freezeSteerHandoffPreview(ctx, placeholderId, livePreview);
+                    this.registerSessionMessages(ctx.chatId, frozenMessageIds, session);
+                    this.log(`[handleMessage] steer handoff preserved preview after abort chat=${ctx.chatId} task=${taskId}`);
+                    return;
+                }
                 const msgText = String(e?.message || e || 'Unknown error');
                 this.log(`[handleMessage] end chat=${ctx.chatId} agent=${session.agent} ok=false session=${session.sessionId || '(new)'} ` +
                     `elapsed=${((Date.now() - start) / 1000).toFixed(1)}s error="${msgText.slice(0, 240)}" tools=-`);
@@ -671,6 +693,25 @@ export class FeishuBot extends Bot {
             this.finishTask(taskId);
         });
     }
+    async freezeSteerHandoffPreview(ctx, placeholderId, livePreview) {
+        if (!placeholderId)
+            return [];
+        const previewMarkdown = livePreview?.getRenderedPreview()?.trim() || '';
+        if (!previewMarkdown)
+            return [placeholderId];
+        try {
+            if (this.channel.isStreamingCard(placeholderId)) {
+                await this.channel.endStreaming(placeholderId, 'Steered to a new reply.');
+            }
+            await this.channel.editMessage(ctx.chatId, placeholderId, previewMarkdown, {
+                keyboard: { rows: [] },
+            });
+            return [placeholderId];
+        }
+        catch {
+            return [];
+        }
+    }
     async sendFinalReply(ctx, placeholderId, agent, result) {
         const rendered = buildFinalReplyRender(agent, result);
         const messageIds = [];
@@ -808,7 +849,7 @@ export class FeishuBot extends Bot {
     async cmdSkill(cmd, args, ctx) {
         const resolved = resolveSkillPrompt(this, ctx.chatId, cmd, args);
         if (!resolved) {
-            await ctx.reply(`Skill not found for command /${cmd} in:\n\`${this.workdir}\``);
+            await ctx.reply(`Skill not found for command /${cmd} in:\n\`${this.chatWorkdir(ctx.chatId)}\``);
             return;
         }
         this.log(`skill: ${resolved.skillName} agent=${this.chat(ctx.chatId).agent}${args.trim() ? ` args="${args.trim()}"` : ''}`);
@@ -917,7 +958,7 @@ export class FeishuBot extends Bot {
         if (!data.startsWith('tsk:steer:'))
             return false;
         const actionId = data.slice('tsk:steer:'.length).trim();
-        const result = this.steerTaskByActionId(actionId);
+        const result = await this.steerTaskByActionId(actionId);
         if (!result.task)
             return true;
         // The queued task will naturally run next after the running task is interrupted
@@ -930,7 +971,8 @@ export class FeishuBot extends Bot {
         const browsePath = resolveFeishuRegisteredPath(parseInt(pathId, 10));
         if (!browsePath)
             return true;
-        const view = buildSwitchWorkdirCard(this.workdir, browsePath, parseInt(pageRaw, 10) || 0);
+        const wd = this.chatWorkdir(ctx.chatId);
+        const view = buildSwitchWorkdirCard(wd, browsePath, parseInt(pageRaw, 10) || 0);
         await ctx.channel.editCard(ctx.chatId, ctx.messageId, view);
         return true;
     }

package/dist/bot-handler.js

@@ -16,7 +16,7 @@ import { stageSessionFiles } from './code-agent.js';
 export async function stageFilesIntoSession(bot, session, files) {
     const staged = stageSessionFiles({
         agent: session.agent,
-        workdir: bot.workdir,
+        workdir: session.workdir,
         files,
         sessionId: session.sessionId,
         title: undefined,

package/dist/bot-orchestration.js

@@ -40,7 +40,15 @@ export class SessionMessageRegistry {
             chatMessages = new Map();
             this.messages.set(chatId, chatMessages);
         }
-        chatMessages.set(messageId, session.key);
+        chatMessages.set(messageId, {
+            key: session.key,
+            workdir: session.workdir,
+            agent: session.agent,
+            sessionId: session.sessionId,
+            workspacePath: session.workspacePath ?? null,
+            codexCumulative: session.codexCumulative,
+            modelId: session.modelId ?? null,
+        });
         while (chatMessages.size > this.maxPerChat) {
             const oldest = chatMessages.keys().next();
             if (oldest.done)

package/dist/bot-telegram-live-preview.js

@@ -104,6 +104,9 @@ export class LivePreview {
     getEditCount() {
         return this.editCount;
     }
+    getRenderedPreview() {
+        return this.lastPreview;
+    }
     stopFeedback() {
         if (this.heartbeatTimer) {
             clearInterval(this.heartbeatTimer);

package/dist/bot-telegram.js

@@ -82,7 +82,6 @@ export class TelegramBot extends Bot {
         this.log(`menu: ${commands.length} commands (${skillCount} skills)`);
     }
     afterSwitchWorkdir(_oldPath, _newPath) {
-        this.sessionMessages.clear();
         if (!this.channel)
             return;
         void this.setupMenu().catch(err => this.log(`menu refresh failed after workdir switch: ${err}`));
@@ -159,14 +158,17 @@ export class TelegramBot extends Bot {
         return buildSessionTaskId(session, this.nextTaskId++);
     }
     registerSessionMessage(chatId, messageId, session) {
-        this.sessionMessages.register(chatId, messageId, session, this.workdir);
+        this.sessionMessages.register(chatId, messageId, session, session.workdir);
     }
     registerSessionMessages(chatId, messageIds, session) {
-        this.sessionMessages.registerMany(chatId, messageIds, session, this.workdir);
+        this.sessionMessages.registerMany(chatId, messageIds, session, session.workdir);
     }
     sessionFromMessage(chatId, messageId) {
-        const sessionKey = this.sessionMessages.resolve(chatId, messageId);
-        return this.getSessionRuntimeByKey(sessionKey);
+        const sessionRef = this.sessionMessages.resolve(chatId, messageId);
+        if (!sessionRef)
+            return null;
+        return this.getSessionRuntimeByKey(sessionRef.key, { allowAnyWorkdir: true })
+            || this.hydrateSessionRuntime(sessionRef);
     }
     ensureSession(chatId, title, files) {
         return this.ensureSessionForChat(chatId, title, files);
@@ -309,8 +311,9 @@ export class TelegramBot extends Bot {
         await ctx.reply(lines.join('\n'), { parseMode: 'HTML' });
     }
     async cmdSwitch(ctx) {
-        const browsePath = path.dirname(this.workdir);
-        const view = buildSwitchWorkdirView(this.workdir, browsePath);
+        const wd = this.chatWorkdir(ctx.chatId);
+        const browsePath = path.dirname(wd);
+        const view = buildSwitchWorkdirView(wd, browsePath);
         await ctx.reply(view.text, { parseMode: 'HTML', keyboard: view.keyboard });
     }
     async cmdHost(ctx) {
@@ -468,7 +471,7 @@ export class TelegramBot extends Bot {
                     }
                     const staged = stageSessionFiles({
                         agent: session.agent,
-                        workdir: this.workdir,
+                        workdir: session.workdir,
                         files: msg.files,
                         sessionId: session.sessionId,
                         title: undefined,
@@ -507,6 +510,7 @@ export class TelegramBot extends Bot {
             agent: session.agent,
             sessionKey: session.key,
             prompt,
+            attachments: files,
             startedAt: start,
             sourceMessageId: ctx.messageId,
         });
@@ -531,9 +535,10 @@ export class TelegramBot extends Bot {
         this.registerTaskPlaceholders(taskId, [phId]);
         void this.queueSessionTask(session, async () => {
             let livePreview = null;
+            let task = null;
             const abortController = new AbortController();
             try {
-                const task = this.markTaskRunning(taskId, () => abortController.abort());
+                task = this.markTaskRunning(taskId, () => abortController.abort());
                 if (!task || task.cancelled) {
                     if (phId != null) {
                         try {
@@ -573,8 +578,19 @@ export class TelegramBot extends Bot {
                 const mcpSendFile = this.createMcpSendFileCallback(ctx, messageThreadId);
                 const result = await this.runStream(prompt, session, files, (nextText, nextThinking, nextActivity = '', meta, plan) => {
                     livePreview?.update(nextText, nextThinking, nextActivity, meta, plan);
-                }, undefined, mcpSendFile, abortController.signal, this.createCodexHumanLoopHandler(ctx, taskId, messageThreadId));
+                }, undefined, mcpSendFile, abortController.signal, this.createCodexHumanLoopHandler(ctx, taskId, messageThreadId), (steer) => {
+                    const currentTask = this.activeTasks.get(taskId);
+                    if (!currentTask || currentTask.cancelled || currentTask.status !== 'running')
+                        return;
+                    currentTask.steer = steer;
+                });
                 await livePreview?.settle();
+                if (task?.freezePreviewOnAbort && result.stopReason === 'interrupted') {
+                    const frozenMessageIds = await this.freezeSteerHandoffPreview(ctx, phId, livePreview);
+                    this.registerSessionMessages(ctx.chatId, frozenMessageIds, session);
+                    this.log(`[handleMessage] steer handoff preserved previous preview chat=${ctx.chatId} task=${taskId}`);
+                    return;
+                }
                 this.log(`[handleMessage] done agent=${session.agent} ok=${result.ok} session=${result.sessionId || '?'} elapsed=${result.elapsedS.toFixed(1)}s edits=${livePreview?.getEditCount() || 0} ` +
                     `tokens=in:${fmtTokens(result.inputTokens)}/cached:${fmtTokens(result.cachedInputTokens)}/out:${fmtTokens(result.outputTokens)}`);
                 this.log(`[handleMessage] response preview: "${result.message.slice(0, 150)}"`);
@@ -583,6 +599,12 @@ export class TelegramBot extends Bot {
                 this.log(`[handleMessage] final reply sent to chat=${ctx.chatId}`);
             }
             catch (e) {
+                if (task?.freezePreviewOnAbort && abortController.signal.aborted) {
+                    const frozenMessageIds = await this.freezeSteerHandoffPreview(ctx, phId, livePreview);
+                    this.registerSessionMessages(ctx.chatId, frozenMessageIds, session);
+                    this.log(`[handleMessage] steer handoff preserved preview after abort chat=${ctx.chatId} task=${taskId}`);
+                    return;
+                }
                 const msgText = String(e?.message || e || 'Unknown error');
                 this.log(`[handleMessage] task failed chat=${ctx.chatId} session=${session.sessionId} error=${msgText}`);
                 const errorHtml = `<b>Error</b>\n\n<code>${escapeHtml(msgText.slice(0, 500))}</code>`;
@@ -612,6 +634,23 @@ export class TelegramBot extends Bot {
             this.finishTask(taskId);
         });
     }
+    async freezeSteerHandoffPreview(ctx, phId, livePreview) {
+        if (phId == null)
+            return [];
+        const previewHtml = livePreview?.getRenderedPreview()?.trim() || '';
+        if (!previewHtml)
+            return [phId];
+        try {
+            await this.channel.editMessage(ctx.chatId, phId, previewHtml, {
+                parseMode: 'HTML',
+                keyboard: { inline_keyboard: [] },
+            });
+            return [phId];
+        }
+        catch {
+            return [];
+        }
+    }
     /** Create an MCP sendFile callback bound to a Telegram chat context. */
     createMcpSendFileCallback(ctx, messageThreadId) {
         return async (filePath, opts) => {
@@ -720,7 +759,8 @@ export class TelegramBot extends Bot {
             await ctx.answerCallback('Expired, use /switch again');
             return true;
         }
-        const view = buildSwitchWorkdirView(this.workdir, browsePath, parseInt(pageRaw, 10) || 0);
+        const wd = this.chatWorkdir(ctx.chatId);
+        const view = buildSwitchWorkdirView(wd, browsePath, parseInt(pageRaw, 10) || 0);
         await ctx.editReply(ctx.messageId, view.text, { parseMode: 'HTML', keyboard: view.keyboard });
         await ctx.answerCallback();
         return true;
@@ -780,7 +820,7 @@ export class TelegramBot extends Bot {
         if (!data.startsWith('tsk:steer:'))
             return false;
         const actionId = data.slice('tsk:steer:'.length).trim();
-        const result = this.steerTaskByActionId(actionId);
+        const result = await this.steerTaskByActionId(actionId);
         if (!result.task) {
             await ctx.answerCallback('This task already finished.');
             return true;
@@ -789,7 +829,7 @@ export class TelegramBot extends Bot {
             await ctx.answerCallback('Task is already running.');
             return true;
         }
-        await ctx.answerCallback(result.interrupted ? 'Steering — interrupting current task...' : 'No running task to interrupt.');
+        await ctx.answerCallback(result.interrupted ? 'Steering — switching to the queued reply...' : 'No running task to interrupt.');
         return true;
     }
     async handleHumanLoopCallback(data, ctx) {
@@ -939,7 +979,7 @@ export class TelegramBot extends Bot {
     async cmdSkill(cmd, args, ctx) {
         const resolved = resolveSkillPrompt(this, ctx.chatId, cmd, args);
         if (!resolved) {
-            await ctx.reply(`Skill not found for command /${cmd} in:\n<code>${escapeHtml(this.workdir)}</code>`, { parseMode: 'HTML' });
+            await ctx.reply(`Skill not found for command /${cmd} in:\n<code>${escapeHtml(this.chatWorkdir(ctx.chatId))}</code>`, { parseMode: 'HTML' });
             return;
         }
         this.log(`skill: ${resolved.skillName} agent=${this.chat(ctx.chatId).agent}${args.trim() ? ` args="${args.trim()}"` : ''}`);