pi-web-ui 0.63.1 → 0.63.3

package/dist/server/agent-service.js

@@ -23,6 +23,7 @@ import { hasActiveSubagentRun, hasPendingWaitSubscription, shouldRetainActive }
 import { syncPluginToolsIntoSession } from "./plugins.js";
 import { SettingsService } from "./settings-service.js";
 import { GoalService } from "./goal-service.js";
+import { MarkerService } from "./marker-service.js";
 import { SlashCommandsService, parseSlash } from "./slash-commands.js";
 import { ModelAdminService } from "./model-admin.js";
 import { FilesService, workspacePath } from "./files-service.js";
@@ -83,14 +84,14 @@ export class QuiesceRejectedError extends Error {
  *  programs wait for input that never comes. Legacy Chinese files are often
  *  GBK/GB2312 — read them with the right encoding, never paste mojibake into
  *  reasoning/answers. */
-const WINDOWS_PERSONA = `You are a coding agent running on Windows. The bash tool runs Git Bash (bash.exe), not PowerShell. Follow these rules to avoid hanging the session:
-
-
-
-- ALWAYS pass a timeout parameter to the bash tool (in seconds). There is NO default timeout — a command that never finishes (servers, watchers, infinite loops, slow downloads/installs) will hang the entire conversation indefinitely. Pick a generous timeout for long-running work, but never omit it.
-- NEVER run interactive or foreground long-running commands through the bash tool (vi, less, top, python -, node -, npm run dev, sleep 10000). For servers/daemons use background execution with output redirected to a log file, then poll the log; stop them when done.
-- In the interactive terminal (TTY) — which is Git Bash too, not PowerShell — NEVER use heredocs (<<'EOF' ... EOF) or here-strings, and NEVER start interactive programs (vi, less, python -, node -, npm init): they wait for keyboard input that never arrives and hang the terminal forever. Prefer writing a temp script file (e.g. .pi-tmp.sh) and running it non-interactively. ALWAYS pass a timeout to long-running commands (e.g. \`timeout 120 npm run dev\`).
-
+const WINDOWS_PERSONA = `You are a coding agent running on Windows. The bash tool runs Git Bash (bash.exe), not PowerShell. Follow these rules to avoid hanging the session:
+
+
+
+- ALWAYS pass a timeout parameter to the bash tool (in seconds). There is NO default timeout — a command that never finishes (servers, watchers, infinite loops, slow downloads/installs) will hang the entire conversation indefinitely. Pick a generous timeout for long-running work, but never omit it.
+- NEVER run interactive or foreground long-running commands through the bash tool (vi, less, top, python -, node -, npm run dev, sleep 10000). For servers/daemons use background execution with output redirected to a log file, then poll the log; stop them when done.
+- In the interactive terminal (TTY) — which is Git Bash too, not PowerShell — NEVER use heredocs (<<'EOF' ... EOF) or here-strings, and NEVER start interactive programs (vi, less, python -, node -, npm init): they wait for keyboard input that never arrives and hang the terminal forever. Prefer writing a temp script file (e.g. .pi-tmp.sh) and running it non-interactively. ALWAYS pass a timeout to long-running commands (e.g. \`timeout 120 npm run dev\`).
+
 Many legacy Chinese text files (.html/.txt/.md/.log, exported documents) are GBK/GB2312 encoded: the read tool decodes UTF-8 only and will show mojibake (乱码) for them. If a file's content looks garbled, read it through the terminal instead: in Git Bash use \`cat file | iconv -f GBK -t UTF-8\` (or \`iconv -f GBK -t UTF-8 file\`); in cmd use \`chcp 65001 && type file\`; in PowerShell use \`Get-Content -Encoding Default file\`. Never paste mojibake into your reasoning or answer — describe the decoded content instead.`;
 /** bash 工具输出限制/过滤管道引导：模型习惯套 `| tail/-n`、`| head`、`| grep`、`| less`
  *  等限输出。这些管道在持久终端里会①缓冲（可见终端全程哑火、看不到实时进度）②把退出码
@@ -176,6 +177,34 @@ export function makeAdaptiveBashTool(killable, terminalBacked, useTerminal) {
         execute: (id, params, signal, onUpdate, ctx) => (useTerminal() ? terminalBacked : killable).execute(id, params, signal, onUpdate, ctx),
     };
 }
+/**
+ * 内置标记只读查询工具（markers_list）— 读操作仍走真工具。
+ */
+function makeMarkersListTool(getActiveId, markerSvc) {
+    return {
+        name: "markers_list",
+        label: "List marker state",
+        description: "只读查询内联标记状态。状态【写】操作请一律用内联标记（[[todo:new:...]] / [[svc:add:...]] 等）写在回答正文里，不要调用本工具做写操作。",
+        parameters: Type.Object({
+            action: Type.Unsafe({ enum: ["list"] }),
+            tool: Type.Optional(Type.Union([Type.Literal("todo"), Type.Literal("svc")], { description: "查询哪个命名空间（默认 todo）" })),
+            includeDeleted: Type.Optional(Type.Boolean({ description: "是否包含已删除任务（tombstone，仅 todo）" })),
+        }),
+        execute: async (_id, params) => {
+            const p = params;
+            const which = p.tool ?? "todo";
+            const convId = getActiveId();
+            if (which === "svc") {
+                const text = markerSvc.describe(convId, "svc", false);
+                return { content: [{ type: "text", text }], details: { action: "list", tool: "svc" } };
+            }
+            const text = markerSvc.describe(convId, "todo", !!p.includeDeleted);
+            const state = markerSvc.getRawState(convId, "todo");
+            const visible = (state?.tasks ?? []).filter((t) => p.includeDeleted || t.status !== "deleted");
+            return { content: [{ type: "text", text }], details: { action: "list", todos: visible, nextId: state?.nextId } };
+        },
+    };
+}
 /**
  * 插件结构化工具 → SDK ToolDefinition。
  * execute 返回值宽容处理：{content,details} 原样收编；字符串/对象包成文本块。
@@ -246,6 +275,16 @@ function extractPartialText(partial) {
     }
     return null;
 }
+function extractAssistantTextFromContent(content) {
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .filter((c) => c.type === "text" && typeof c.text === "string")
+        .map((c) => c.text)
+        .join("\n");
+}
 export { workspacePath };
 /** Hard cap on how long ONE tool call may run before the watchdog aborts the
  *  session. The SDK bash tool has NO default timeout, so a command that never
@@ -262,6 +301,14 @@ const MAX_OPEN_CONVERSATIONS = 8;
 const DEFAULT_CONV_TITLE = "新对话";
 /** First user text in a session, truncated for the conversation list. */
 function conversationTitle(session) {
+    try {
+        const named = session.sessionManager.getSessionName();
+        if (named && named.trim())
+            return named.trim();
+    }
+    catch {
+        // best-effort — fall through to first-message title
+    }
     try {
         for (const m of session.agent.state.messages) {
             if (m.role !== "user")
@@ -755,12 +802,29 @@ export class ClientSession {
     watchTimer = null;
     /** 子代理模板库（全局共享，<dataDir>/subagent-templates.json）。 */
     subagentTemplates;
+    /** 内置标记服务（todo/notify/svc/rename 等，可全局/分组开关）。 */
+    markerSvc;
     constructor(clientId, cwd, agentDir, stateStore) {
         this.clientId = clientId;
         this.cwd = cwd;
         this.agentDir = agentDir;
         this.stateStore = stateStore;
         this.subagentTemplates = new SubagentTemplatesStore(join(stateStore.dataDir, "subagent-templates.json"));
+        this.markerSvc = new MarkerService({
+            clientId,
+            stateStore,
+            emit: (msg) => this.emit(msg),
+            isDisposed: () => this.disposed,
+            getActiveConversationId: () => this.activeId,
+            getSessionManager: (id) => {
+                const c = this.convs.get(id);
+                return c ? c.session.sessionManager : undefined;
+            },
+            renameConversation: (convId, title) => {
+                // 复用现有重命名路径（内存标题 + 磁盘 session_info）
+                void this.renameConversation(convId, title);
+            },
+        });
         this.settingsSvc = new SettingsService({
             clientId,
             stateStore,
@@ -779,6 +843,11 @@ export class ClientSession {
             },
             effectiveDefaultSystemPrompt: () => this.effectiveDefaultSystemPrompt(),
             effectiveSystemPrompt: () => this.effectiveSystemPrompt(),
+            getMarkerState: () => ({
+                markersEnabled: this.markerSvc.current.markersEnabled,
+                disabledMarkers: [...this.markerSvc.current.disabledMarkers],
+                markers: this.markerSvc.listForUi(),
+            }),
         }, this.subagentTemplates);
         this.goalSvc = new GoalService({
             clientId,
@@ -909,6 +978,10 @@ export class ClientSession {
                         // 管道末尾命令（tail 恒 0、grep 无命中 1）、长驻/出错命令挂到超时。
                         // 让模型改用 bash 的 tail 参数，长驻/交互改走持久终端。
                         out.push(PIPELESS_BASH_GUIDANCE);
+                        // 内置标记工具引导（按总开关/分组开关过滤）
+                        const markerGuidance = this.markerSvc.buildGuidance();
+                        if (markerGuidance)
+                            out.push(markerGuidance);
                         return out;
                     },
                     // 技能：模板非空白名单时只启用白名单里的；否则按主会话禁用集过滤。
@@ -961,6 +1034,8 @@ export class ClientSession {
                     // 第一方子代理工具（spawn/get_result/steer/list/stop）。子代理会话
                     // 也注册了它们，因此可自然嵌套派发。
                     ...makeSubagentTools(this.subagentHost),
+                    // 内置标记只读查询工具（todo/svc 状态查询，写操作走内联标记）。
+                    makeMarkersListTool(() => this.activeId, this.markerSvc),
                 ],
             });
             // 终端工具开关从创建起就生效（工具始终注册进注册表，只调活跃集）。
@@ -1328,6 +1403,23 @@ export class ClientSession {
             case "agent_end": {
                 this.scheduleSessionsRefresh();
                 this.refreshConversationTitle(conv);
+                // agent_end 兜底：若 entry_appended 未触发（部分 SDK 路径），扫描最后一条 assistant 消息补处理
+                try {
+                    const msgs = event.messages;
+                    if (Array.isArray(msgs)) {
+                        for (let i = msgs.length - 1; i >= 0; i--) {
+                            const m = msgs[i];
+                            if (m?.role === "assistant") {
+                                const text = extractAssistantTextFromContent(m.content);
+                                if (text && text.includes("[[")) {
+                                    void this.markerSvc.handleAssistantText(conv.id, text);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+                catch { }
                 // Manual interrupt (Stop button / abort): the last assistant message
                 // carries stopReason "aborted". A half-finished run should NOT be
                 // reviewed (it would fail and inject a revision, only to be stopped
@@ -1355,10 +1447,18 @@ export class ClientSession {
                 }
                 break;
             }
-            case "entry_appended":
+            case "entry_appended": {
                 this.scheduleSessionsRefresh();
                 this.refreshConversationTitle(conv);
+                // 内置标记：assistant 终稿落库时解析执行（todo/rename 等）
+                const entry = event.entry;
+                if (entry?.type === "message" && entry.message?.role === "assistant") {
+                    const text = extractAssistantTextFromContent(entry.message.content);
+                    if (text)
+                        void this.markerSvc.handleAssistantText(conv.id, text);
+                }
                 break;
+            }
             case "message_update": {
                 // Live assistant-message increment, deliberately OUTSIDE the snapshot
                 // channel: send() drops snapshots under backpressure (big sessions),
@@ -1887,6 +1987,20 @@ export class ClientSession {
         setModel: (id) => this.setModel(id),
         setCwd: (path) => this.setCwd(path),
         setThinking: (level) => this.setThinking(level),
+        renameSession: async (name) => {
+            this.session.setSessionName(name);
+            this.conv.title = name;
+            this.invalidateSessionInfos();
+            this.emitConversations();
+            await this.pushSessions();
+            this.emit({
+                type: "notice",
+                level: "info",
+                text: `已重命名当前会话为「${name}」`,
+                textEn: `Renamed current session to "${name}"`,
+            });
+            this.flushSnapshot();
+        },
         refreshSessions: () => this.refreshSessions(),
         afterReload: () => this.applyTerminalToolGating(this.session),
         pluginCommands: () => this.pluginCommandsProvider?.() ?? [],
@@ -2081,7 +2195,31 @@ export class ClientSession {
     }
     /** Persist + apply a partial settings update (prompt text/mode, toggles). */
     async setSettings(partial) {
-        await this.settingsSvc.set(partial);
+        const { markersEnabled, disabledMarkers, ...rest } = partial;
+        let markerChanged = false;
+        if (markersEnabled !== undefined || disabledMarkers !== undefined) {
+            this.markerSvc.setAll({
+                ...(markersEnabled !== undefined ? { markersEnabled } : {}),
+                ...(disabledMarkers !== undefined ? { disabledMarkers } : {}),
+            });
+            markerChanged = true;
+        }
+        await this.settingsSvc.set(rest);
+        if (markerChanged) {
+            // 标记开关影响 system prompt 引导，需重载生效（流式中则延迟）
+            this.pushSettings();
+            this.flushSnapshot();
+            // 尝试立即重载，若流式中会由 SettingsService 延迟到 agent_end
+            if (!this.session.isStreaming) {
+                try {
+                    await this.session.reload();
+                    this.applyTerminalToolGating(this.session);
+                    await this.pushSlashCommands();
+                    this.pushSettings();
+                }
+                catch { }
+            }
+        }
     }
     /** Save the CURRENT settings as a named preset (overwrites if exists). */
     async savePreset(name) {
@@ -2225,7 +2363,7 @@ export class ClientSession {
             // rename entirely. A failed send still leaves the name, which matches
             // what the user typed intent-wise; the entry_appended fallback below
             // re-derives it from the persisted transcript when needed.
-            if (conv.title === DEFAULT_CONV_TITLE && text.trim()) {
+            if (conv.title === DEFAULT_CONV_TITLE && text.trim() && !conv.session.sessionName?.trim()) {
                 const trimmed = text.trim().replace(/\s+/g, " ");
                 conv.title = trimmed.length > 30 ? `${trimmed.slice(0, 30)}…` : trimmed;
                 this.emitConversations();
@@ -2918,6 +3056,85 @@ export class ClientSession {
             });
         }
     }
+    /** Rename a persisted session by appending a session_info entry — the same
+     *  mechanism pi's /name uses (SessionManager.appendSessionInfo). Works on
+     *  any transcript under the sessions root, live or not; no session switch. */
+    async renameSession(path, name) {
+        try {
+            const trimmed = (name ?? "").trim();
+            if (!trimmed)
+                return;
+            const abs = resolve(path);
+            const sessionsRoot = resolve(this.agentDir, "sessions");
+            if (!abs.startsWith(sessionsRoot + sep)) {
+                this.emit({
+                    type: "notice",
+                    level: "error",
+                    text: "只能重命名会话目录中的对话记录",
+                    textEn: "Only transcripts inside the session directory can be renamed",
+                });
+                return;
+            }
+            const mgr = SessionManager.open(abs);
+            mgr.appendSessionInfo(trimmed);
+            this.setConversationTitleForFile(abs, trimmed);
+            this.invalidateSessionInfos();
+            await this.refreshSessions();
+        }
+        catch (err) {
+            this.emit({
+                type: "notice",
+                level: "error",
+                text: `重命名会话失败：${err.message}`,
+                textEn: `Failed to rename session: ${err.message}`,
+            });
+        }
+    }
+    /** Rename a live conversation by id: retitle in memory AND persist a
+     *  session_info entry to its transcript so History matches immediately. */
+    async renameConversation(id, name) {
+        try {
+            const trimmed = (name ?? "").trim();
+            if (!trimmed)
+                return;
+            const conv = this.convs.get(id);
+            if (!conv)
+                return;
+            conv.title = trimmed;
+            try {
+                const file = conv.session.sessionFile;
+                if (file !== undefined)
+                    SessionManager.open(resolve(file)).appendSessionInfo(trimmed);
+            }
+            catch {
+                // in-memory title still updated; transcript write is best-effort
+            }
+            this.emitConversations();
+            this.invalidateSessionInfos();
+            await this.refreshSessions();
+        }
+        catch (err) {
+            this.emit({
+                type: "notice",
+                level: "error",
+                text: `重命名对话失败：${err.message}`,
+                textEn: `Failed to rename conversation: ${err.message}`,
+            });
+        }
+    }
+    /** Point every live conversation holding this transcript file at a new title. */
+    setConversationTitleForFile(abs, title) {
+        let changed = false;
+        for (const conv of this.convs.values()) {
+            const file = conv.session.sessionFile;
+            if (file !== undefined && resolve(file) === abs) {
+                conv.title = title;
+                changed = true;
+            }
+        }
+        if (changed)
+            this.emitConversations();
+    }
     /** Dismiss a running conversation from the left-panel list without deleting its
      *  transcript file. Only idle (non-streaming) conversations that are not
      *  retained by terminal/wake/review state can be dismissed. The session stays

package/dist/server/attachments.js

@@ -449,9 +449,9 @@ export async function buildAttachmentMessages(ctx, attachments) {
                         content: [
                             {
                                 type: "text",
-                                text: `
-<vision-bridge>
-${transcript}
+                                text: `
+<vision-bridge>
+${transcript}
 </vision-bridge>`,
                             },
                             ...(pathImg

package/dist/server/client-state.js

@@ -291,4 +291,22 @@ export class ClientStateStore {
             delete all[clientId].projectModels;
         this.save();
     }
+    /** 内置标记工具开关（全局 + 按 marker 禁用）。 */
+    getMarkerSettings(clientId) {
+        const s = this.load()[clientId]?.markers;
+        return {
+            markersEnabled: s?.markersEnabled ?? true,
+            disabledMarkers: s?.disabledMarkers ?? [],
+        };
+    }
+    saveMarkerSettings(clientId, settings) {
+        const all = this.load();
+        const state = (all[clientId] ??= { projects: [] });
+        const cur = state.markers ?? { markersEnabled: true, disabledMarkers: [] };
+        state.markers = {
+            markersEnabled: settings.markersEnabled ?? cur.markersEnabled ?? true,
+            disabledMarkers: settings.disabledMarkers ?? cur.disabledMarkers ?? [],
+        };
+        this.save();
+    }
 }

package/dist/server/dsh/dsh-agent-service.js

@@ -1575,6 +1575,24 @@ export class DshClientSession {
         }
         this.emit({ type: "sessions", sessions: summaries });
     }
+    async renameSession(_path, _name) {
+        this.emit({
+            type: "notice",
+            level: "warning",
+            text: "DSH 引擎暂不支持重命名会话",
+            textEn: "The DSH engine does not support renaming sessions yet",
+        });
+    }
+    async renameConversation(id, name) {
+        const trimmed = (name ?? "").trim();
+        if (!trimmed)
+            return;
+        const conv = this.convs.get(id);
+        if (!conv)
+            return;
+        conv.title = trimmed;
+        this.emitConversations();
+    }
     async deleteSession(path) {
         try {
             const { rmSync } = await import("node:fs");
@@ -2022,6 +2040,9 @@ export class DshClientSession {
             reviewSkills: [],
             extensions: [],
             presets: this.stateStore.getPresets(this.clientId),
+            markersEnabled: true,
+            disabledMarkers: [],
+            markers: [],
             subagentTemplates: [],
             subagentDefaultTemplates: [],
         };

package/dist/server/dsh/runtime/cordis.yml

@@ -1 +1 @@
-[]
+[]