pikiclaw 0.2.68 → 0.2.70

package/dist/bot-command-ui.js

@@ -31,6 +31,12 @@ export function encodeCommandAction(action) {
             return `mod:${action.modelId}`;
         case 'effort.set':
             return `eff:${action.effort}`;
+        case 'models.select.model':
+            return `md:${action.modelId}`;
+        case 'models.select.effort':
+            return `ed:${action.effort}`;
+        case 'models.confirm':
+            return 'mc';
         case 'skill.run':
             return `skr:${action.command}`;
     }
@@ -70,6 +76,20 @@ export function decodeCommandAction(data) {
             return null;
         return { kind: 'effort.set', effort };
     }
+    if (data.startsWith('md:')) {
+        const modelId = data.slice(3);
+        if (!modelId)
+            return null;
+        return { kind: 'models.select.model', modelId };
+    }
+    if (data.startsWith('ed:')) {
+        const effort = data.slice(3);
+        if (!effort)
+            return null;
+        return { kind: 'models.select.effort', effort };
+    }
+    if (data === 'mc')
+        return { kind: 'models.confirm' };
     if (data.startsWith('skr:')) {
         const command = data.slice(4);
         if (!command)
@@ -134,24 +154,57 @@ export function buildAgentsCommandView(bot, chatId) {
         rows: chunkRows(actions, 3),
     };
 }
-export async function buildModelsCommandView(bot, chatId) {
+const modelsDrafts = new Map();
+async function initModelsDraft(bot, chatId) {
     const data = await getModelsListData(bot, chatId);
-    const models = [...data.models].sort((a, b) => Number(b.isCurrent) - Number(a.isCurrent));
+    const draft = { modelId: data.currentModel, effort: data.effort?.current ?? null };
+    modelsDrafts.set(String(chatId), draft);
+    return draft;
+}
+export async function buildModelsCommandView(bot, chatId, draft) {
+    const data = await getModelsListData(bot, chatId);
+    // Initialize draft from current state or use the provided one
+    const d = draft ?? {
+        modelId: data.currentModel,
+        effort: data.effort?.current ?? null,
+    };
+    modelsDrafts.set(String(chatId), d);
+    const isSelected = (modelId) => modelMatchesSelection(data.agent, modelId, d.modelId);
+    const models = [...data.models].sort((a, b) => Number(isSelected(b.id)) - Number(isSelected(a.id)));
     const modelButtons = models.map(model => ({
         label: model.alias || model.id,
-        action: { kind: 'model.switch', modelId: model.id },
-        state: buttonStateFromFlags({ isCurrent: model.isCurrent }),
-        primary: model.isCurrent,
+        action: { kind: 'models.select.model', modelId: model.id },
+        state: buttonStateFromFlags({ isCurrent: isSelected(model.id) }),
+        primary: isSelected(model.id),
     }));
-    const rows = chunkRows(modelButtons, modelButtons.some(button => button.label.length > 14) ? 1 : 2);
+    const rows = chunkRows(modelButtons, 1);
     if (data.effort) {
-        rows.push(data.effort.levels.map(level => ({
+        const effortButtons = data.effort.levels.map(level => ({
             label: level.label,
-            action: { kind: 'effort.set', effort: level.id },
-            state: buttonStateFromFlags({ isCurrent: level.isCurrent }),
-            primary: level.isCurrent,
-        })));
+            action: { kind: 'models.select.effort', effort: level.id },
+            state: buttonStateFromFlags({ isCurrent: level.id === d.effort }),
+            primary: level.id === d.effort,
+        }));
+        // Section label — clicking it is harmless (triggers confirm, which is noop if nothing changed)
+        rows.push([{
+                label: '— Thinking Effort —',
+                action: { kind: 'models.confirm' },
+                state: 'default',
+                primary: false,
+            }]);
+        // ≤3 levels fit in one row; 4+ split into rows of 2 to avoid Feishu truncation
+        rows.push(...chunkRows(effortButtons, effortButtons.length <= 3 ? effortButtons.length : 2));
     }
+    // Detect whether draft differs from current live values
+    const modelChanged = !modelMatchesSelection(data.agent, d.modelId, data.currentModel);
+    const effortChanged = !!(data.effort && d.effort !== data.effort.current);
+    const hasChanges = modelChanged || effortChanged;
+    rows.push([{
+            label: hasChanges ? '✓ Apply' : '✓ OK',
+            action: { kind: 'models.confirm' },
+            state: 'default',
+            primary: hasChanges,
+        }]);
     return {
         kind: 'models',
         title: 'Models',
@@ -159,15 +212,15 @@ export async function buildModelsCommandView(bot, chatId) {
         metaLines: [
             ...(data.sources.length ? [`Source: ${data.sources.join(', ')}`] : []),
             ...(data.note ? [data.note] : []),
-            ...(data.effort ? [`Thinking Effort: ${data.effort.current}`] : []),
+            ...(data.effort ? [`Thinking Effort: ${d.effort}`] : []),
         ],
         items: models.map(model => ({
             label: model.alias || model.id,
             detail: model.alias ? model.id : null,
-            state: buttonStateFromFlags({ isCurrent: model.isCurrent }),
+            state: buttonStateFromFlags({ isCurrent: isSelected(model.id) }),
         })),
         emptyText: 'No discoverable models found.',
-        helperText: data.models.length ? 'Use the controls below to switch models.' : null,
+        helperText: data.models.length ? 'Select model and effort, then tap Apply.' : null,
         rows,
     };
 }
@@ -286,6 +339,51 @@ export async function executeCommandAction(bot, chatId, action, opts = {}) {
                 },
             };
         }
+        case 'models.select.model': {
+            const draft = modelsDrafts.get(String(chatId)) ?? await initModelsDraft(bot, chatId);
+            draft.modelId = action.modelId;
+            return { kind: 'view', view: await buildModelsCommandView(bot, chatId, draft), callbackText: '' };
+        }
+        case 'models.select.effort': {
+            const draft = modelsDrafts.get(String(chatId)) ?? await initModelsDraft(bot, chatId);
+            draft.effort = action.effort;
+            return { kind: 'view', view: await buildModelsCommandView(bot, chatId, draft), callbackText: '' };
+        }
+        case 'models.confirm': {
+            const chat = bot.chat(chatId);
+            const draft = modelsDrafts.get(String(chatId));
+            modelsDrafts.delete(String(chatId));
+            if (!draft)
+                return { kind: 'noop', message: 'No changes' };
+            const currentModel = bot.modelForAgent(chat.agent);
+            const currentEffort = bot.effortForAgent(chat.agent);
+            const modelChanged = !modelMatchesSelection(chat.agent, draft.modelId, currentModel);
+            const effortChanged = draft.effort != null && draft.effort !== currentEffort;
+            if (!modelChanged && !effortChanged) {
+                return { kind: 'noop', message: 'No changes' };
+            }
+            const parts = [];
+            if (modelChanged) {
+                bot.switchModelForChat(chatId, draft.modelId);
+                parts.push(`Model: ${draft.modelId}`);
+            }
+            if (effortChanged) {
+                bot.switchEffortForChat(chatId, draft.effort);
+                parts.push(`Effort: ${draft.effort}`);
+            }
+            return {
+                kind: 'notice',
+                callbackText: parts.join(', '),
+                notice: {
+                    title: 'Configuration Updated',
+                    value: parts.join('\n'),
+                    detail: modelChanged
+                        ? `${chat.agent} · session reset`
+                        : `${chat.agent} · takes effect on next message`,
+                    valueMode: 'plain',
+                },
+            };
+        }
         case 'skill.run': {
             const resolved = resolveSkillPrompt(bot, chatId, action.command, '');
             if (!resolved)

package/dist/bot-commands.js

@@ -249,25 +249,16 @@ export function resolveSkillPrompt(bot, chatId, cmd, args) {
     const cs = bot.chat(chatId);
     const extra = args.trim();
     const suffix = extra ? ` Additional context: ${extra}` : '';
+    const workdirHint = `[Project directory: ${bot.workdir}]\n\n`;
     let prompt;
-    if (skill.source === 'commands') {
-        prompt = `In this project's .claude/commands/${skill.name}.md file, there is a custom command definition. Please read and execute the instructions defined there.${suffix}`;
-        return { prompt, skillName: skill.name };
-    }
     const paths = getProjectSkillPaths(bot.workdir, skill.name);
-    if (cs.agent === 'claude' && paths.claudeSkillFile) {
-        prompt = `Please execute the /${skill.name} skill defined in this project.${suffix}`;
+    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 canonicalPath = paths.sharedSkillFile
-            ? `\`${relSkillPath(bot.workdir, paths.sharedSkillFile)}\``
-            : `\`.pikiclaw/skills/${skill.name}/SKILL.md\``;
-        const locationText = paths.sharedSkillFile
-            ? canonicalPath
-            : paths.agentsSkillFile || paths.claudeSkillFile
-                ? canonicalPath
-                : `\`${skill.name}/SKILL.md\``;
-        prompt = `In this project, the ${skill.name} skill is defined in ${locationText}. Please read that SKILL.md file and execute the instructions.${suffix}`;
+        const fallbackPath = `${bot.workdir}/.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-render.js

@@ -100,6 +100,29 @@ export function renderCommandSelectionCard(view) {
         rows: view.rows.map(row => ({ actions: row.map(actionButton) })),
     };
 }
+/**
+ * Strip code-fence markers (``` / ~~~) from text that is not meant to be
+ * rendered as full markdown (thinking, activity).  Truncation by
+ * extractThinkingTail can leave stray fences that open unwanted code blocks.
+ */
+function stripCodeFences(text) {
+    return text.replace(/^(`{3,}|~{3,}).*$/gm, '');
+}
+/**
+ * Ensure code fences in markdown text are balanced.  If an odd number of
+ * fence markers is detected, append a closing fence so partial code blocks
+ * do not swallow the rest of the card.
+ */
+function ensureBalancedCodeFences(text) {
+    let inCode = false;
+    for (const line of text.split('\n')) {
+        const trimmed = line.trimStart();
+        if (trimmed.startsWith('```') || trimmed.startsWith('~~~')) {
+            inCode = !inCode;
+        }
+    }
+    return inCode ? text + '\n```' : text;
+}
 function escapeFeishuMarkdownText(text) {
     return text.replace(/([\\`*_{}[\]()#+\-.!|>~])/g, '\\$1');
 }
@@ -172,19 +195,19 @@ function buildPreviewMarkdown(input, options) {
     const data = extractStreamPreviewData(input);
     const parts = [];
     if (data.planDisplay) {
-        parts.push(`**Plan**\n${data.planDisplay}`);
+        parts.push(`**Plan**\n${stripCodeFences(data.planDisplay)}`);
     }
     if (data.activityDisplay) {
-        parts.push(`**Activity**\n${trimActivityForPreview(data.activityDisplay, data.maxActivity)}`);
+        parts.push(`**Activity**\n${stripCodeFences(trimActivityForPreview(data.activityDisplay, data.maxActivity))}`);
     }
     if (data.thinkDisplay && !data.display) {
-        parts.push(`**${data.label}**\n${data.thinkDisplay}`);
+        parts.push(`**${data.label}**\n${stripCodeFences(data.thinkDisplay)}`);
     }
     else if (data.display) {
         if (data.rawThinking) {
-            parts.push(`**${data.label}**\n${data.thinkSnippet}`);
+            parts.push(`**${data.label}**\n${stripCodeFences(data.thinkSnippet)}`);
         }
-        parts.push(data.preview);
+        parts.push(ensureBalancedCodeFences(data.preview));
     }
     if (options?.includeFooter !== false) {
         parts.push(formatPreviewFooter(input.agent, input.elapsedMs, input.meta ?? null));
@@ -213,21 +236,21 @@ export function buildFinalReplyRender(agent, result) {
     let activityText = '';
     let activityNoteText = '';
     if (data.activityNarrative) {
-        activityText = `**Activity**\n${data.activityNarrative}\n\n`;
+        activityText = `**Activity**\n${stripCodeFences(data.activityNarrative)}\n\n`;
     }
     if (data.activityCommandSummary) {
         activityNoteText = `*${data.activityCommandSummary}*\n\n`;
     }
     let thinkingText = '';
     if (data.thinkingDisplay) {
-        thinkingText = `**${data.thinkLabel}**\n${data.thinkingDisplay}\n\n`;
+        thinkingText = `**${data.thinkLabel}**\n${stripCodeFences(data.thinkingDisplay)}\n\n`;
     }
     let statusText = '';
     if (data.statusLines) {
         statusText = `**⚠ Incomplete Response**\n${data.statusLines.join('\n')}\n\n`;
     }
     const headerText = `${activityText}${activityNoteText}${statusText}${thinkingText}`;
-    const bodyText = data.bodyMessage;
+    const bodyText = ensureBalancedCodeFences(data.bodyMessage);
     return {
         fullText: `${headerText}${bodyText}${footerText}`,
         headerText,
@@ -583,6 +606,10 @@ function normalizeFeishuMarkdown(lines) {
         pendingBlankLine = false;
         out.push(line);
     }
+    // Safety: close any unclosed code block so it doesn't swallow the rest of
+    // a Feishu card element (e.g. truncated body text ending mid-fence).
+    if (inCodeBlock)
+        out.push('```');
     return out.join('\n');
 }
 export function adaptMarkdownForFeishu(markdown) {

package/dist/bot-telegram.js

@@ -651,7 +651,8 @@ export class TelegramBot extends Bot {
             finalMsgId = await replacePreview(rendered.fullHtml);
         }
         else {
-            const maxFirst = 3900 - rendered.headerHtml.length - rendered.footerHtml.length;
+            // Split: header on first message, footer on last message
+            const maxFirst = 3900 - rendered.headerHtml.length;
             let firstBody;
             let remaining;
             if (maxFirst > 200) {
@@ -665,13 +666,28 @@ export class TelegramBot extends Bot {
                 firstBody = '';
                 remaining = rendered.bodyHtml;
             }
-            const firstHtml = `${rendered.headerHtml}${firstBody}${rendered.footerHtml}`;
-            finalMsgId = await replacePreview(firstHtml);
             if (remaining.trim()) {
+                // Multi-message: header on first, footer on last
+                const firstHtml = `${rendered.headerHtml}${firstBody}`;
+                finalMsgId = await replacePreview(firstHtml);
                 const chunks = splitText(remaining, 3800);
-                for (const chunk of chunks) {
-                    remember(await sendFinalText(chunk, finalMsgId ?? phId ?? ctx.messageId));
+                for (let i = 0; i < chunks.length; i++) {
+                    const isLast = i === chunks.length - 1;
+                    const chunkText = isLast ? `${chunks[i]}${rendered.footerHtml}` : chunks[i];
+                    remember(await sendFinalText(chunkText, finalMsgId ?? phId ?? ctx.messageId));
                 }
+                // Safety: re-clear the Stop keyboard on the placeholder in case the first edit silently failed
+                if (phId != null) {
+                    try {
+                        await this.channel.editMessage(ctx.chatId, phId, firstHtml || '(done)', { parseMode: 'HTML', keyboard: { inline_keyboard: [] } });
+                    }
+                    catch { }
+                }
+            }
+            else {
+                // Body fits on first message; only footer pushes it over — keep together
+                const firstHtml = `${rendered.headerHtml}${firstBody}${rendered.footerHtml}`;
+                finalMsgId = await replacePreview(firstHtml);
             }
         }
         return { primaryMessageId: finalMsgId, messageIds };

package/dist/cli.js

@@ -299,10 +299,15 @@ Docs: https://github.com/xiaotonng/pikiclaw
  */
 function persistWorkdir(args, userConfig) {
     if (!process.env.PIKICLAW_DAEMON_CHILD) {
-        const cliWorkdir = path.resolve(args.workdir || '.');
-        if (userConfig.workdir !== cliWorkdir) {
-            updateUserConfig({ workdir: cliWorkdir });
-            return loadUserConfig();
+        // Only overwrite persisted workdir when the user explicitly passed -w.
+        // Falling back to cwd when no flag is given can clobber a valid saved
+        // workdir with a temp directory (e.g. after a non-daemon restart).
+        if (args.workdir) {
+            const cliWorkdir = path.resolve(args.workdir);
+            if (userConfig.workdir !== cliWorkdir) {
+                updateUserConfig({ workdir: cliWorkdir });
+                return loadUserConfig();
+            }
         }
     }
     return userConfig;

package/dist/code-agent.js

@@ -1209,32 +1209,15 @@ export function getProjectSkillPaths(workdir, skillName) {
     const sharedSkillFile = path.join(workdir, '.pikiclaw', 'skills', skillName, 'SKILL.md');
     const agentsSkillFile = path.join(workdir, '.agents', 'skills', skillName, 'SKILL.md');
     const claudeSkillFile = path.join(workdir, '.claude', 'skills', skillName, 'SKILL.md');
-    const claudeCommandFile = path.join(workdir, '.claude', 'commands', `${skillName}.md`);
     return {
         sharedSkillFile: hasFile(sharedSkillFile) ? sharedSkillFile : null,
         agentsSkillFile: hasFile(agentsSkillFile) ? agentsSkillFile : null,
         claudeSkillFile: hasFile(claudeSkillFile) ? claudeSkillFile : null,
-        claudeCommandFile: hasFile(claudeCommandFile) ? claudeCommandFile : null,
     };
 }
 export function listSkills(workdir) {
     const skills = [];
     const seen = new Set();
-    const commandsDir = path.join(workdir, '.claude', 'commands');
-    for (const entry of readSortedDir(commandsDir)) {
-        if (!entry.endsWith('.md'))
-            continue;
-        const name = entry.replace(/\.md$/, '');
-        if (!name || seen.has(name))
-            continue;
-        let meta = { label: null, description: null };
-        try {
-            meta = parseSkillMeta(fs.readFileSync(path.join(commandsDir, entry), 'utf-8'));
-        }
-        catch { }
-        skills.push({ name, label: meta.label, description: meta.description, source: 'commands' });
-        seen.add(name);
-    }
     const skillRoots = [
         path.join(workdir, '.pikiclaw', 'skills'),
     ];

package/dist/driver-claude.js

@@ -223,9 +223,10 @@ function getNativeClaudeSessions(workdir) {
         const filePath = path.join(projectDir, entry.name);
         try {
             const stat = fs.statSync(filePath);
-            // Read first few KB to extract title and model from first user/assistant messages
+            // Read enough bytes to get past the system_prompt line (can be 20KB+) and
+            // reach the first user/assistant events for title and model extraction.
             const fd = fs.openSync(filePath, 'r');
-            const buf = Buffer.alloc(8192);
+            const buf = Buffer.alloc(65536);
             const bytesRead = fs.readSync(fd, buf, 0, buf.length, 0);
             fs.closeSync(fd);
             const head = buf.toString('utf8', 0, bytesRead);

package/dist/process-control.js

@@ -168,6 +168,7 @@ function spawnReplacementProcess(bin, args, env, log) {
         stdio: 'inherit',
         detached: true,
         env,
+        cwd: process.cwd(),
     });
     child.unref();
     log?.(`restart: new process spawned (PID ${child.pid})`);

package/dist/run.js

@@ -112,14 +112,13 @@ async function main() {
         case 'skills': {
             const result = listSkills(workdir);
             if (!result.skills.length) {
-                process.stdout.write(`No custom skills found in ${workdir} (.pikiclaw/skills, .claude/commands)\n`);
+                process.stdout.write(`No custom skills found in ${workdir} (.pikiclaw/skills)\n`);
                 break;
             }
             process.stdout.write(`Project skills (${result.skills.length}):\n\n`);
             for (const sk of result.skills) {
-                const src = sk.source === 'skills' ? 'skill' : 'command';
                 const desc = sk.description ? `  ${sk.description}` : '';
-                process.stdout.write(`  ${sk.name}  [${src}]${desc}\n`);
+                process.stdout.write(`  ${sk.name}${desc}\n`);
             }
             break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pikiclaw",
-  "version": "0.2.68",
+  "version": "0.2.70",
   "description": "Put the world's smartest AI agents in your pocket. Command local Claude & Gemini via IM. | 让最好用的 IM 变成你电脑上的顶级 Agent 控制台",
   "type": "module",
   "bin": {